Tue Apr 12 16:19:33 UTC 2011

Author: runa
Date: 2011-04-12 16:19:31 +0000 (Tue, 12 Apr 2011)
New Revision: 24595

Added:
   translation/trunk/projects/website/po/da/
   translation/trunk/projects/website/po/da/1-high.index.po
   translation/trunk/projects/website/po/de/docs/
   translation/trunk/projects/website/po/de/docs/1-high.proxychain.po
   translation/trunk/projects/website/po/de/download/
   translation/trunk/projects/website/po/de/download/1-high.download-easy.po
   translation/trunk/projects/website/po/de/download/3-low.download.po
   translation/trunk/projects/website/po/fa/about/2-medium.overview.po
   translation/trunk/projects/website/po/fa/about/2-medium.torusers.po
   translation/trunk/projects/website/po/fa/docs/1-high.tor-doc-windows.po
   translation/trunk/projects/website/po/fa/docs/2-medium.tor-doc-osx.po
   translation/trunk/projects/website/po/fa/docs/2-medium.verifying-signatures.po
   translation/trunk/projects/website/po/fa/docs/3-low.tor-doc-unix.po
   translation/trunk/projects/website/po/fa/docs/3-low.tor-doc-web.po
   translation/trunk/projects/website/po/fa/download/
   translation/trunk/projects/website/po/fa/download/3-low.download.po
Modified:
   translation/trunk/projects/website/po/.tx/config
   translation/trunk/projects/website/po/ar/1-high.index.po
   translation/trunk/projects/website/po/ar/about/3-low.board.po
   translation/trunk/projects/website/po/ar/about/3-low.contact.po
   translation/trunk/projects/website/po/ar/about/3-low.corepeople.po
   translation/trunk/projects/website/po/ar/about/3-low.financials.po
   translation/trunk/projects/website/po/ar/about/3-low.sponsors.po
   translation/trunk/projects/website/po/ar/about/3-low.translators.po
   translation/trunk/projects/website/po/ar/about/3-low.volunteers.po
   translation/trunk/projects/website/po/ar/about/4-optional.gsoc.po
   translation/trunk/projects/website/po/ar/docs/1-high.proxychain.po
   translation/trunk/projects/website/po/ar/docs/2-medium.documentation.po
   translation/trunk/projects/website/po/ar/docs/2-medium.faq.po
   translation/trunk/projects/website/po/ar/docs/2-medium.installguide.po
   translation/trunk/projects/website/po/ar/docs/2-medium.tor-doc-osx.po
   translation/trunk/projects/website/po/ar/docs/2-medium.tor-doc-relay.po
   translation/trunk/projects/website/po/ar/docs/2-medium.verifying-signatures.po
   translation/trunk/projects/website/po/ar/docs/3-low.N900.po
   translation/trunk/projects/website/po/ar/docs/3-low.android.po
   translation/trunk/projects/website/po/ar/docs/3-low.debian-vidalia.po
   translation/trunk/projects/website/po/ar/docs/3-low.debian.po
   translation/trunk/projects/website/po/ar/docs/3-low.rpms.po
   translation/trunk/projects/website/po/ar/docs/3-low.tor-doc-unix.po
   translation/trunk/projects/website/po/ar/docs/3-low.tor-doc-web.po
   translation/trunk/projects/website/po/ar/docs/3-low.tor-hidden-service.po
   translation/trunk/projects/website/po/ar/docs/3-low.trademark-faq.po
   translation/trunk/projects/website/po/ar/docs/4-optional.running-a-mirror.po
   translation/trunk/projects/website/po/ar/donate/3-low.become-sponsor.po
   translation/trunk/projects/website/po/ar/donate/3-low.donate-hardware.po
   translation/trunk/projects/website/po/ar/donate/3-low.donate-service.po
   translation/trunk/projects/website/po/ar/donate/3-low.matching-program.po
   translation/trunk/projects/website/po/ar/download/3-low.download-unix.po
   translation/trunk/projects/website/po/ar/download/3-low.thankyou.po
   translation/trunk/projects/website/po/ar/getinvolved/3-low.mirrors.po
   translation/trunk/projects/website/po/ar/getinvolved/3-low.tshirt.po
   translation/trunk/projects/website/po/ar/getinvolved/4-optional.open-positions.po
   translation/trunk/projects/website/po/ar/getinvolved/4-optional.research.po
   translation/trunk/projects/website/po/ar/getinvolved/4-optional.translation-overview.po
   translation/trunk/projects/website/po/ar/getinvolved/4-optional.translation.po
   translation/trunk/projects/website/po/ar/getinvolved/4-optional.volunteer.po
   translation/trunk/projects/website/po/ar/press/3-low.inthemedia.po
   translation/trunk/projects/website/po/ar/press/3-low.press.po
   translation/trunk/projects/website/po/ar/press/4-optional.2008-12-19-roadmap-press-release.po
   translation/trunk/projects/website/po/ar/press/4-optional.2010-03-25-tor-store-press-release.po
   translation/trunk/projects/website/po/ar/projects/1-high.torbrowser-split.po
   translation/trunk/projects/website/po/ar/projects/1-high.torbrowser.po
   translation/trunk/projects/website/po/ar/projects/3-low.gettor.po
   translation/trunk/projects/website/po/ar/projects/3-low.projects.po
   translation/trunk/projects/website/po/ar/projects/3-low.puppettor.po
   translation/trunk/projects/website/po/ar/projects/3-low.tordnsel.po
   translation/trunk/projects/website/po/ar/projects/3-low.torweather.po
   translation/trunk/projects/website/po/ar/projects/4-optional.arm.po
   translation/trunk/projects/website/po/ar/projects/4-optional.torbrowser-details.po
   translation/trunk/projects/website/po/ar/torbutton/3-low.index.po
   translation/trunk/projects/website/po/ar/torbutton/3-low.torbutton-faq.po
   translation/trunk/projects/website/po/ar/torbutton/3-low.torbutton-options.po
   translation/trunk/projects/website/po/cs/1-high.index.po
   translation/trunk/projects/website/po/de/1-high.index.po
   translation/trunk/projects/website/po/el/1-high.index.po
   translation/trunk/projects/website/po/es/1-high.index.po
   translation/trunk/projects/website/po/es/about/3-low.contact.po
   translation/trunk/projects/website/po/es/about/3-low.corepeople.po
   translation/trunk/projects/website/po/es/about/3-low.volunteers.po
   translation/trunk/projects/website/po/es/docs/1-high.proxychain.po
   translation/trunk/projects/website/po/es/docs/2-medium.faq.po
   translation/trunk/projects/website/po/es/docs/2-medium.tor-doc-osx.po
   translation/trunk/projects/website/po/es/docs/2-medium.tor-doc-relay.po
   translation/trunk/projects/website/po/es/getinvolved/4-optional.volunteer.po
   translation/trunk/projects/website/po/es/press/3-low.inthemedia.po
   translation/trunk/projects/website/po/es/press/4-optional.2010-03-25-tor-store-press-release.po
   translation/trunk/projects/website/po/es/projects/1-high.torbrowser.po
   translation/trunk/projects/website/po/fa/1-high.index.po
   translation/trunk/projects/website/po/fa/press/3-low.inthemedia.po
   translation/trunk/projects/website/po/fa/projects/1-high.torbrowser.po
   translation/trunk/projects/website/po/fr/1-high.index.po
   translation/trunk/projects/website/po/fr/about/3-low.contact.po
   translation/trunk/projects/website/po/it/1-high.index.po
   translation/trunk/projects/website/po/it/about/3-low.contact.po
   translation/trunk/projects/website/po/it/about/3-low.corepeople.po
   translation/trunk/projects/website/po/it/about/3-low.volunteers.po
   translation/trunk/projects/website/po/it/docs/1-high.proxychain.po
   translation/trunk/projects/website/po/it/docs/2-medium.faq.po
   translation/trunk/projects/website/po/it/docs/2-medium.tor-doc-osx.po
   translation/trunk/projects/website/po/it/docs/2-medium.tor-doc-relay.po
   translation/trunk/projects/website/po/it/getinvolved/4-optional.volunteer.po
   translation/trunk/projects/website/po/it/press/3-low.inthemedia.po
   translation/trunk/projects/website/po/it/press/4-optional.2010-03-25-tor-store-press-release.po
   translation/trunk/projects/website/po/it/projects/1-high.torbrowser.po
   translation/trunk/projects/website/po/ja_JP/1-high.index.po
   translation/trunk/projects/website/po/my/1-high.index.po
   translation/trunk/projects/website/po/nl_NL/1-high.index.po
   translation/trunk/projects/website/po/pl_PL/1-high.index.po
   translation/trunk/projects/website/po/pl_PL/about/2-medium.overview.po
   translation/trunk/projects/website/po/pl_PL/about/3-low.contact.po
   translation/trunk/projects/website/po/pl_PL/about/3-low.corepeople.po
   translation/trunk/projects/website/po/pl_PL/about/3-low.volunteers.po
   translation/trunk/projects/website/po/pl_PL/docs/1-high.proxychain.po
   translation/trunk/projects/website/po/pl_PL/docs/2-medium.faq.po
   translation/trunk/projects/website/po/pl_PL/docs/2-medium.tor-doc-osx.po
   translation/trunk/projects/website/po/pl_PL/docs/2-medium.tor-doc-relay.po
   translation/trunk/projects/website/po/pl_PL/getinvolved/4-optional.volunteer.po
   translation/trunk/projects/website/po/pl_PL/press/3-low.inthemedia.po
   translation/trunk/projects/website/po/pl_PL/projects/1-high.torbrowser.po
   translation/trunk/projects/website/po/ru/1-high.index.po
   translation/trunk/projects/website/po/ru/about/3-low.contact.po
   translation/trunk/projects/website/po/ru/about/3-low.corepeople.po
   translation/trunk/projects/website/po/ru/about/3-low.volunteers.po
   translation/trunk/projects/website/po/ru/docs/1-high.proxychain.po
   translation/trunk/projects/website/po/ru/docs/2-medium.faq.po
   translation/trunk/projects/website/po/ru/docs/2-medium.tor-doc-osx.po
   translation/trunk/projects/website/po/ru/docs/2-medium.tor-doc-relay.po
   translation/trunk/projects/website/po/ru/getinvolved/4-optional.volunteer.po
   translation/trunk/projects/website/po/ru/press/3-low.inthemedia.po
   translation/trunk/projects/website/po/ru/press/4-optional.2010-03-25-tor-store-press-release.po
   translation/trunk/projects/website/po/ru/projects/1-high.torbrowser.po
   translation/trunk/projects/website/po/tr/1-high.index.po
   translation/trunk/projects/website/po/zh_CN/1-high.index.po
   translation/trunk/projects/website/po/zh_CN/about/2-medium.overview.po
Log:
new and updated translations from transifex for the website

Modified: translation/trunk/projects/website/po/.tx/config
===================================================================

--- translation/trunk/projects/website/po/.tx/config	2011-04-12 16:15:00 UTC (rev 24594)
+++ translation/trunk/projects/website/po/.tx/config	2011-04-12 16:19:31 UTC (rev 24595)
@@ -1,333 +1,333 @@
-[torproject.2-website-docs-bridges-pot]
-file_filter = <lang>/docs/1-high.bridges.po
-source_file = templates/docs/1-high.bridges.pot
+[torproject.5-website-torbutton-index-pot]
+file_filter = <lang>/torbutton/3-low.index.po
+source_file = templates/torbutton/3-low.index.pot
 source_lang = en
 
-[torproject.4-website-docs-android-pot]
-file_filter = <lang>/docs/3-low.android.po
-source_file = templates/docs/3-low.android.pot
+[torproject.4-website-docs-rpms-pot]
+file_filter = <lang>/docs/3-low.rpms.po
+source_file = templates/docs/3-low.rpms.pot
 source_lang = en
 
-[torproject.5-website-about-contact-pot]
-file_filter = <lang>/about/3-low.contact.po
-source_file = templates/about/3-low.contact.pot
+[torproject.4-website-docs-faq-pot]
+file_filter = <lang>/docs/2-medium.faq.po
+source_file = templates/docs/2-medium.faq.pot
 source_lang = en
 
-[torproject.5-website-getinvolved-translation-pot]
-file_filter = <lang>/getinvolved/4-optional.translation.po
-source_file = templates/getinvolved/4-optional.translation.pot
+[torproject.5-website-projects-tordnsel-pot]
+file_filter = <lang>/projects/3-low.tordnsel.po
+source_file = templates/projects/3-low.tordnsel.pot
 source_lang = en
 
-[torproject.5-website-donate-become-sponsor-pot]
-file_filter = <lang>/donate/3-low.become-sponsor.po
-source_file = templates/donate/3-low.become-sponsor.pot
+[torproject.5-website-about-contact-pot]
+file_filter = <lang>/about/3-low.contact.po
+source_file = templates/about/3-low.contact.pot
 source_lang = en
 
-[torproject.5-website-about-translators-pot]
-file_filter = <lang>/about/3-low.translators.po
-source_file = templates/about/3-low.translators.pot
+[torproject.3-website-docs-documentation-pot]
+file_filter = <lang>/docs/2-medium.documentation.po
+source_file = templates/docs/2-medium.documentation.pot
 source_lang = en
 
-[torproject.2-website-about-overview-pot]
-file_filter = <lang>/about/2-medium.overview.po
-source_file = templates/about/2-medium.overview.pot
+[torproject.5-website-projects-puppettor-pot]
+file_filter = <lang>/projects/3-low.puppettor.po
+source_file = templates/projects/3-low.puppettor.pot
 source_lang = en
 
-[torproject.4-website-docs-debian-pot]
-file_filter = <lang>/docs/3-low.debian.po
-source_file = templates/docs/3-low.debian.pot
+[torproject.3-website-projects-torbrowser-pot]
+file_filter = <lang>/projects/1-high.torbrowser.po
+source_file = templates/projects/1-high.torbrowser.pot
 source_lang = en
 
-[torproject.4-website-getinvolved-tshirt-pot]
-file_filter = <lang>/getinvolved/3-low.tshirt.po
-source_file = templates/getinvolved/3-low.tshirt.pot
+[torproject.4-website-docs-tor-hidden-service-pot]
+file_filter = <lang>/docs/3-low.tor-hidden-service.po
+source_file = templates/docs/3-low.tor-hidden-service.pot
 source_lang = en
 
-[torproject.5-website-projects-torweather-pot]
-file_filter = <lang>/projects/3-low.torweather.po
-source_file = templates/projects/3-low.torweather.pot
-source_lang = en
-
 [torproject.5-website-press-2008-12-19-press-release-pot]
 file_filter = <lang>/press/4-optional.2008-12-19-roadmap-press-release.po
 source_file = templates/press/4-optional.2008-12-19-roadmap-press-release.pot
 source_lang = en
 
-[torproject.4-website-getinvolved-mirrors-pot]
-file_filter = <lang>/getinvolved/3-low.mirrors.po
-source_file = templates/getinvolved/3-low.mirrors.pot
+[torproject.1-website-download-download-pot]
+file_filter = <lang>/download/3-low.download.po
+source_file = templates/download/3-low.download.pot
 source_lang = en
 
-[torproject.5-website-press-press-pot]
-file_filter = <lang>/press/3-low.press.po
-source_file = templates/press/3-low.press.pot
+[torproject.5-website-about-volunteers-pot]
+file_filter = <lang>/about/3-low.volunteers.po
+source_file = templates/about/3-low.volunteers.pot
 source_lang = en
 
-[torproject.5-website-donate-donate-pot]
-file_filter = <lang>/donate/3-low.donate.po
-source_file = templates/donate/3-low.donate.pot
+[torproject.4-website-docs-debian-pot]
+file_filter = <lang>/docs/3-low.debian.po
+source_file = templates/docs/3-low.debian.pot
 source_lang = en
 
-[torproject.5-website-about-sponsors-pot]
-file_filter = <lang>/about/3-low.sponsors.po
-source_file = templates/about/3-low.sponsors.pot
+[torproject.5-website-press-inthemedia-pot]
+file_filter = <lang>/press/3-low.inthemedia.po
+source_file = templates/press/3-low.inthemedia.pot
 source_lang = en
 
+[torproject.2-website-download-download-easy-pot]
+file_filter = <lang>/download/1-high.download-easy.po
+source_file = templates/download/1-high.download-easy.pot
+source_lang = en
+
 [torproject.5-website-docs-N900-pot]
 file_filter = <lang>/docs/3-low.N900.po
 source_file = templates/docs/3-low.N900.pot
 source_lang = en
 
-[torproject.5-website-projects-vidalia-pot]
-file_filter = <lang>/projects/4-optional.vidalia.po
-source_file = templates/projects/4-optional.vidalia.pot
+[torproject.3-website-docs-installguide-pot]
+file_filter = <lang>/docs/2-medium.installguide.po
+source_file = templates/docs/2-medium.installguide.pot
 source_lang = en
 
-[torproject.4-website-docs-rpms-pot]
-file_filter = <lang>/docs/3-low.rpms.po
-source_file = templates/docs/3-low.rpms.pot
+[torproject.5-website-about-contributors-pot]
+file_filter = <lang>/about/3-low.contributors.po
+source_file = templates/about/3-low.contributors.pot
 source_lang = en
 
-[torproject.5-website-donate-matching-program-pot]
-file_filter = <lang>/donate/3-low.matching-program.po
-source_file = templates/donate/3-low.matching-program.pot
+[torproject.5-website-docs-tor-doc-web-pot]
+file_filter = <lang>/docs/3-low.tor-doc-web.po
+source_file = templates/docs/3-low.tor-doc-web.pot
 source_lang = en
 
-[torproject.1-website-download-download-pot]
-file_filter = <lang>/download/3-low.download.po
-source_file = templates/download/3-low.download.pot
+[torproject.4-website-about-torusers-pot]
+file_filter = <lang>/about/2-medium.torusers.po
+source_file = templates/about/2-medium.torusers.pot
 source_lang = en
 
-[torproject.4-website-docs-debian-vidalia-pot]
-file_filter = <lang>/docs/3-low.debian-vidalia.po
-source_file = templates/docs/3-low.debian-vidalia.pot
+[torproject.5-website-about-gsoc-pot]
+file_filter = <lang>/about/4-optional.gsoc.po
+source_file = templates/about/4-optional.gsoc.pot
 source_lang = en
 
-[torproject.5-website-getinvolved-research-pot]
-file_filter = <lang>/getinvolved/4-optional.research.po
-source_file = templates/getinvolved/4-optional.research.pot
+[torproject.5-website-getinvolved-translation-overview-pot]
+file_filter = <lang>/getinvolved/4-optional.translation-overview.po
+source_file = templates/getinvolved/4-optional.translation-overview.pot
 source_lang = en
 
-[torproject.5-website-torbutton-index-pot]
-file_filter = <lang>/torbutton/3-low.index.po
-source_file = templates/torbutton/3-low.index.pot
+[torproject.3-website-docs-tor-doc-osx-pot]
+file_filter = <lang>/docs/2-medium.tor-doc-osx.po
+source_file = templates/docs/2-medium.tor-doc-osx.pot
 source_lang = en
 
-[torproject.5-website-press-inthemedia-pot]
-file_filter = <lang>/press/3-low.inthemedia.po
-source_file = templates/press/3-low.inthemedia.pot
+[torproject.5-website-getinvolved-volunteer-pot]
+file_filter = <lang>/getinvolved/4-optional.volunteer.po
+source_file = templates/getinvolved/4-optional.volunteer.pot
 source_lang = en
 
-[torproject.3-website-projects-torbrowser-pot]
-file_filter = <lang>/projects/1-high.torbrowser.po
-source_file = templates/projects/1-high.torbrowser.pot
+[torproject.5-website-projects-torbrowser-details-pot]
+file_filter = <lang>/projects/4-optional.torbrowser-details.po
+source_file = templates/projects/4-optional.torbrowser-details.pot
 source_lang = en
 
-[torproject.4-website-torbutton-torbutton-faq-pot]
-file_filter = <lang>/torbutton/3-low.torbutton-faq.po
-source_file = templates/torbutton/3-low.torbutton-faq.pot
+[torproject.2-website-docs-highproxychain-pot]
+file_filter = <lang>/docs/1-high.proxychain.po
+source_file = templates/docs/1-high.proxychain.pot
 source_lang = en
 
-[torproject.3-website-docs-installguide-pot]
-file_filter = <lang>/docs/2-medium.installguide.po
-source_file = templates/docs/2-medium.installguide.pot
+[torproject.5-website-press-press-pot]
+file_filter = <lang>/press/3-low.press.po
+source_file = templates/press/3-low.press.pot
 source_lang = en
 
-[torproject.5-website-about-board-pot]
-file_filter = <lang>/about/3-low.board.po
-source_file = templates/about/3-low.board.pot
+[torproject.4-website-docs-android-pot]
+file_filter = <lang>/docs/3-low.android.po
+source_file = templates/docs/3-low.android.pot
 source_lang = en
 
-[torproject.5-website-about-corepeople-pot]
-file_filter = <lang>/about/3-low.corepeople.po
-source_file = templates/about/3-low.corepeople.pot
+[torproject.5-website-about-financials-pot]
+file_filter = <lang>/about/3-low.financials.po
+source_file = templates/about/3-low.financials.pot
 source_lang = en
 
-[torproject.5-website-getinvolved-volunteer-pot]
-file_filter = <lang>/getinvolved/4-optional.volunteer.po
-source_file = templates/getinvolved/4-optional.volunteer.pot
-source_lang = en
-
-[torproject.3-website-docs-verifying-signatures-pot]
-file_filter = <lang>/docs/2-medium.verifying-signatures.po
-source_file = templates/docs/2-medium.verifying-signatures.pot
-source_lang = en
-
-[torproject.4-website-about-torusers-pot]
-file_filter = <lang>/about/2-medium.torusers.po
-source_file = templates/about/2-medium.torusers.pot
-source_lang = en
-
 [main]
 host = https://www.transifex.net
 
-[torproject.5-website-about-volunteers-pot]
-file_filter = <lang>/about/3-low.volunteers.po
-source_file = templates/about/3-low.volunteers.pot
+[torproject.1-website-docs-tor-doc-windows-pot]
+file_filter = <lang>/docs/1-high.tor-doc-windows.po
+source_file = templates/docs/1-high.tor-doc-windows.pot
 source_lang = en
 
-[torproject.1-website-index-pot]
-file_filter = <lang>/1-high.index.po
-source_file = templates/1-high.index.pot
+[torproject.4-website-docs-faq-abuse-pot]
+file_filter = <lang>/docs/3-low.faq-abuse.po
+source_file = templates/docs/3-low.faq-abuse.pot
 source_lang = en
 
-[torproject.3-website-docs-documentation-pot]
-file_filter = <lang>/docs/2-medium.documentation.po
-source_file = templates/docs/2-medium.documentation.pot
+[torproject.5-website-donate-matching-program-pot]
+file_filter = <lang>/donate/3-low.matching-program.po
+source_file = templates/donate/3-low.matching-program.pot
 source_lang = en
 
-[torproject.5-website-getinvolved-translation-overview-pot]
-file_filter = <lang>/getinvolved/4-optional.translation-overview.po
-source_file = templates/getinvolved/4-optional.translation-overview.pot
-source_lang = en
-
-[torproject.4-website-docs-trademark-faq-pot]
-file_filter = <lang>/docs/3-low.trademark-faq.po
-source_file = templates/docs/3-low.trademark-faq.pot
-source_lang = en
-
 [torproject.4-website-download-download-unix-pot]
 file_filter = <lang>/download/3-low.download-unix.po
 source_file = templates/download/3-low.download-unix.pot
 source_lang = en
 
+[torproject.5-website-about-corepeople-pot]
+file_filter = <lang>/about/3-low.corepeople.po
+source_file = templates/about/3-low.corepeople.pot
+source_lang = en
+
 [torproject.4-website-docs-tor-doc-unix-pot]
 file_filter = <lang>/docs/3-low.tor-doc-unix.po
 source_file = templates/docs/3-low.tor-doc-unix.pot
 source_lang = en
 
-[torproject.5-website-projects-gettor-pot]
-file_filter = <lang>/projects/3-low.gettor.po
-source_file = templates/projects/3-low.gettor.pot
-source_lang = en
-
-[torproject.4-website-docs-faq-pot]
-file_filter = <lang>/docs/2-medium.faq.po
-source_file = templates/docs/2-medium.faq.pot
-source_lang = en
-
-[torproject.1-website-docs-tor-doc-windows-pot]
-file_filter = <lang>/docs/1-high.tor-doc-windows.po
-source_file = templates/docs/1-high.tor-doc-windows.pot
-source_lang = en
-
 [torproject.5-website-download-thankyou-pot]
 file_filter = <lang>/download/3-low.thankyou.po
 source_file = templates/download/3-low.thankyou.pot
 source_lang = en
 
-[torproject.3-website-docs-tor-doc-osx-pot]
-file_filter = <lang>/docs/2-medium.tor-doc-osx.po
-source_file = templates/docs/2-medium.tor-doc-osx.pot
+[torproject.4-website-getinvolved-mirrors-pot]
+file_filter = <lang>/getinvolved/3-low.mirrors.po
+source_file = templates/getinvolved/3-low.mirrors.pot
 source_lang = en
 
-[torproject.5-website-docs-hidden-services-pot]
-file_filter = <lang>/docs/3-low.hidden-services.po
-source_file = templates/docs/3-low.hidden-services.pot
+[torproject.4-website-torbutton-torbutton-faq-pot]
+file_filter = <lang>/torbutton/3-low.torbutton-faq.po
+source_file = templates/torbutton/3-low.torbutton-faq.pot
 source_lang = en
 
-[torproject.5-website-donate-donate-hardware-pot]
-file_filter = <lang>/donate/3-low.donate-hardware.po
-source_file = templates/donate/3-low.donate-hardware.pot
+[torproject.5-website-torbutton-torbutton-options-pot]
+file_filter = <lang>/torbutton/3-low.torbutton-options.po
+source_file = templates/torbutton/3-low.torbutton-options.pot
 source_lang = en
 
-[torproject.2-website-docs-highproxychain-pot]
-file_filter = <lang>/docs/1-high.proxychain.po
-source_file = templates/docs/1-high.proxychain.pot
+[torproject.5-website-docs-running-a-mirror-pot]
+file_filter = <lang>/docs/4-optional.running-a-mirror.po
+source_file = templates/docs/4-optional.running-a-mirror.pot
 source_lang = en
 
-[torproject.5-website-projects-puppettor-pot]
-file_filter = <lang>/projects/3-low.puppettor.po
-source_file = templates/projects/3-low.puppettor.pot
+[torproject.1-website-index-pot]
+file_filter = <lang>/1-high.index.po
+source_file = templates/1-high.index.pot
 source_lang = en
 
-[torproject.2-website-download-download-easy-pot]
-file_filter = <lang>/download/1-high.download-easy.po
-source_file = templates/download/1-high.download-easy.pot
+[torproject.5-website-getinvolved-translation-pot]
+file_filter = <lang>/getinvolved/4-optional.translation.po
+source_file = templates/getinvolved/4-optional.translation.pot
 source_lang = en
 
-[torproject.5-website-docs-tor-doc-web-pot]
-file_filter = <lang>/docs/3-low.tor-doc-web.po
-source_file = templates/docs/3-low.tor-doc-web.pot
+[torproject.2-website-docs-bridges-pot]
+file_filter = <lang>/docs/1-high.bridges.po
+source_file = templates/docs/1-high.bridges.pot
 source_lang = en
 
-[torproject.5-website-press-2010-03-25-press-release-pot]
-file_filter = <lang>/press/4-optional.2010-03-25-tor-store-press-release.po
-source_file = templates/press/4-optional.2010-03-25-tor-store-press-release.pot
-source_lang = en
-
 [torproject.5-website-getinvolved-open-positions-pot]
 file_filter = <lang>/getinvolved/4-optional.open-positions.po
 source_file = templates/getinvolved/4-optional.open-positions.pot
 source_lang = en
 
-[torproject.5-website-projects-tordnsel-pot]
-file_filter = <lang>/projects/3-low.tordnsel.po
-source_file = templates/projects/3-low.tordnsel.pot
+[torproject.5-website-about-board-pot]
+file_filter = <lang>/about/3-low.board.po
+source_file = templates/about/3-low.board.pot
 source_lang = en
 
-[torproject.4-website-docs-tor-hidden-service-pot]
-file_filter = <lang>/docs/3-low.tor-hidden-service.po
-source_file = templates/docs/3-low.tor-hidden-service.pot
+[torproject.5-website-press-2010-03-25-press-release-pot]
+file_filter = <lang>/press/4-optional.2010-03-25-tor-store-press-release.po
+source_file = templates/press/4-optional.2010-03-25-tor-store-press-release.pot
 source_lang = en
 
-[torproject.5-website-about-contributors-pot]
-file_filter = <lang>/about/3-low.contributors.po
-source_file = templates/about/3-low.contributors.pot
+[torproject.5-website-donate-become-sponsor-pot]
+file_filter = <lang>/donate/3-low.become-sponsor.po
+source_file = templates/donate/3-low.become-sponsor.pot
 source_lang = en
 
+[torproject.2-website-about-overview-pot]
+file_filter = <lang>/about/2-medium.overview.po
+source_file = templates/about/2-medium.overview.pot
+source_lang = en
+
 [torproject.4-website-docs-tor-doc-relay-pot]
 file_filter = <lang>/docs/2-medium.tor-doc-relay.po
 source_file = templates/docs/2-medium.tor-doc-relay.pot
 source_lang = en
 
-[torproject.4-website-docs-faq-abuse-pot]
-file_filter = <lang>/docs/3-low.faq-abuse.po
-source_file = templates/docs/3-low.faq-abuse.pot
+[torproject.4-website-docs-trademark-faq-pot]
+file_filter = <lang>/docs/3-low.trademark-faq.po
+source_file = templates/docs/3-low.trademark-faq.pot
 source_lang = en
 
+[torproject.4-website-getinvolved-tshirt-pot]
+file_filter = <lang>/getinvolved/3-low.tshirt.po
+source_file = templates/getinvolved/3-low.tshirt.pot
+source_lang = en
+
+[torproject.4-website-docs-debian-vidalia-pot]
+file_filter = <lang>/docs/3-low.debian-vidalia.po
+source_file = templates/docs/3-low.debian-vidalia.pot
+source_lang = en
+
+[torproject.5-website-projects-gettor-pot]
+file_filter = <lang>/projects/3-low.gettor.po
+source_file = templates/projects/3-low.gettor.pot
+source_lang = en
+
+[torproject.5-website-docs-hidden-services-pot]
+file_filter = <lang>/docs/3-low.hidden-services.po
+source_file = templates/docs/3-low.hidden-services.pot
+source_lang = en
+
+[torproject.5-website-getinvolved-research-pot]
+file_filter = <lang>/getinvolved/4-optional.research.po
+source_file = templates/getinvolved/4-optional.research.pot
+source_lang = en
+
+[torproject.5-website-projects-torweather-pot]
+file_filter = <lang>/projects/3-low.torweather.po
+source_file = templates/projects/3-low.torweather.pot
+source_lang = en
+
+[torproject.5-website-projects-arm-pot]
+file_filter = <lang>/projects/4-optional.arm.po
+source_file = templates/projects/4-optional.arm.pot
+source_lang = en
+
 [torproject.5-website-donate-donate-service-pot]
 file_filter = <lang>/donate/3-low.donate-service.po
 source_file = templates/donate/3-low.donate-service.pot
 source_lang = en
 
-[torproject.5-website-torbutton-torbutton-options-pot]
-file_filter = <lang>/torbutton/3-low.torbutton-options.po
-source_file = templates/torbutton/3-low.torbutton-options.pot
-source_lang = en
-
 [torproject.3-website-projects-torbrowser-split-pot]
 file_filter = <lang>/projects/1-high.torbrowser-split.po
 source_file = templates/projects/1-high.torbrowser-split.pot
 source_lang = en
 
-[torproject.5-website-projects-torbrowser-details-pot]
-file_filter = <lang>/projects/4-optional.torbrowser-details.po
-source_file = templates/projects/4-optional.torbrowser-details.pot
+[torproject.3-website-docs-verifying-signatures-pot]
+file_filter = <lang>/docs/2-medium.verifying-signatures.po
+source_file = templates/docs/2-medium.verifying-signatures.pot
 source_lang = en
 
-[torproject.5-website-projects-arm-pot]
-file_filter = <lang>/projects/4-optional.arm.po
-source_file = templates/projects/4-optional.arm.pot
+[torproject.5-website-about-sponsors-pot]
+file_filter = <lang>/about/3-low.sponsors.po
+source_file = templates/about/3-low.sponsors.pot
 source_lang = en
 
-[torproject.5-website-projects-projects-pot]
-file_filter = <lang>/projects/3-low.projects.po
-source_file = templates/projects/3-low.projects.pot
+[torproject.5-website-donate-donate-hardware-pot]
+file_filter = <lang>/donate/3-low.donate-hardware.po
+source_file = templates/donate/3-low.donate-hardware.pot
 source_lang = en
 
-[torproject.5-website-docs-running-a-mirror-pot]
-file_filter = <lang>/docs/4-optional.running-a-mirror.po
-source_file = templates/docs/4-optional.running-a-mirror.pot
+[torproject.5-website-projects-vidalia-pot]
+file_filter = <lang>/projects/4-optional.vidalia.po
+source_file = templates/projects/4-optional.vidalia.pot
 source_lang = en
 
-[torproject.5-website-about-gsoc-pot]
-file_filter = <lang>/about/4-optional.gsoc.po
-source_file = templates/about/4-optional.gsoc.pot
+[torproject.5-website-donate-donate-pot]
+file_filter = <lang>/donate/3-low.donate.po
+source_file = templates/donate/3-low.donate.pot
 source_lang = en
 
-[torproject.5-website-about-financials-pot]
-file_filter = <lang>/about/3-low.financials.po
-source_file = templates/about/3-low.financials.pot
+[torproject.5-website-projects-projects-pot]
+file_filter = <lang>/projects/3-low.projects.po
+source_file = templates/projects/3-low.projects.pot
 source_lang = en
 
+[torproject.5-website-about-translators-pot]
+file_filter = <lang>/about/3-low.translators.po
+source_file = templates/about/3-low.translators.pot
+source_lang = en
+

Modified: translation/trunk/projects/website/po/ar/1-high.index.po
===================================================================
--- translation/trunk/projects/website/po/ar/1-high.index.po	2011-04-12 16:15:00 UTC (rev 24594)
+++ translation/trunk/projects/website/po/ar/1-high.index.po	2011-04-12 16:19:31 UTC (rev 24595)
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-03-17 18:05+0000\n"
-"PO-Revision-Date: 2011-03-24 06:24+0000\n"
+"POT-Creation-Date: 2011-03-28 12:48+0200\n"
+"PO-Revision-Date: 2011-03-29 00:25+0000\n"
 "Last-Translator: OsamaK <osamak at gnu.org>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
@@ -18,12 +18,12 @@
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5\n"
 
 #. type: Content of: <div><div><div><div><ul><li>
-#: /home/runa/tor/website/en/index.wml:12
+#: /home/runa/dev/website/en/index.wml:12
 msgid "Tor prevents anyone from learning your location or browsing habits."
 msgstr "يمنع تور كل من يحاول معرفة مكانك أو ما تتصفح."
 
 #. type: Content of: <div><div><div><div><ul><li>
-#: /home/runa/tor/website/en/index.wml:13
+#: /home/runa/dev/website/en/index.wml:13
 msgid ""
 "Tor is for web browsers, instant messaging clients, remote logins, and more."
 msgstr ""
@@ -31,25 +31,25 @@
 "وغيرها الكثير."
 
 #. type: Content of: <div><div><div><div><ul><li>
-#: /home/runa/tor/website/en/index.wml:14
+#: /home/runa/dev/website/en/index.wml:14
 msgid "Tor is free and open source for Windows, Mac, Linux/Unix, and Android"
 msgstr ""
 "تور حر ومفتوح المصدر ويعمل على أنظمة ويندوز وماك ولينكس/يونكس وآندرويد."
 
 #. type: Content of: <div><div><div><div><h1>
-#: /home/runa/tor/website/en/index.wml:16
+#: /home/runa/dev/website/en/index.wml:16
 msgid "Anonymity Online"
 msgstr "السرية على الإنترنت"
 
 #. type: Content of: <div><div><div><div><p>
-#: /home/runa/tor/website/en/index.wml:17
+#: /home/runa/dev/website/en/index.wml:17
 msgid ""
 "Protect your privacy. Defend yourself against network surveillance and "
 "traffic analysis."
 msgstr "احمِ خصوصيتك. دافع عن نفسك من الرقابة على الشبكات ومن تحليل بيانتها."
 
 #. type: Content of: <div><div><div><div><div>
-#: /home/runa/tor/website/en/index.wml:20
+#: /home/runa/dev/website/en/index.wml:20
 msgid ""
 "<a href=\"<page download/download>\"> <span class=\"download-tor\">Download "
 "Tor</span></a>"
@@ -58,12 +58,12 @@
 "تور</span></a>"
 
 #. type: Content of: <div><div><div><div><div><h2>
-#: /home/runa/tor/website/en/index.wml:26
+#: /home/runa/dev/website/en/index.wml:26
 msgid "What is Tor?"
 msgstr "ما هو تور؟"
 
 #. type: Content of: <div><div><div><div><div><p>
-#: /home/runa/tor/website/en/index.wml:26
+#: /home/runa/dev/website/en/index.wml:26
 msgid ""
 "Tor is free software and an open network that helps you defend against a "
 "form of network surveillance that threatens personal freedom and privacy, "
@@ -79,12 +79,12 @@
 "about/overview>\">تعلم المزيد عن تور &raquo;</a></span>"
 
 #. type: Content of: <div><div><div><div><div><h2>
-#: /home/runa/tor/website/en/index.wml:36
+#: /home/runa/dev/website/en/index.wml:36
 msgid "Why Anonymity Matters"
 msgstr "أهمية السرية"
 
 #. type: Content of: <div><div><div><div><div><p>
-#: /home/runa/tor/website/en/index.wml:37
+#: /home/runa/dev/website/en/index.wml:37
 msgid ""
 "Tor protects you by bouncing your communications around a distributed "
 "network of relays run by volunteers all around the world: it prevents "
@@ -104,22 +104,22 @@
 "&raquo;</a></span>"
 
 #. type: Content of: <div><div><div><div><h2>
-#: /home/runa/tor/website/en/index.wml:50
+#: /home/runa/dev/website/en/index.wml:50
 msgid "Our Projects"
 msgstr "مشاريعنا"
 
 #. type: Content of: <div><div><div><div><table><tr><td>
-#: /home/runa/tor/website/en/index.wml:55
+#: /home/runa/dev/website/en/index.wml:55
 msgid "<img src=\"$(IMGROOT)/icon-TorButton.jpg\" alt=\"Torbutton Icon\">"
 msgstr "<img src=\"$(IMGROOT)/icon-TorButton.jpg\" alt=\"أيقونة زر تور\">"
 
 #. type: Content of: <div><div><div><div><table><tr><td><h3>
-#: /home/runa/tor/website/en/index.wml:56
+#: /home/runa/dev/website/en/index.wml:56
 msgid "<a href=\"<page torbutton/index>\">Torbutton</a>"
 msgstr "<a href=\"<page torbutton/index>\">زر تور</a>"
 
 #. type: Content of: <div><div><div><div><table><tr><td><p>
-#: /home/runa/tor/website/en/index.wml:57
+#: /home/runa/dev/website/en/index.wml:57
 msgid ""
 "Torbutton is a 1-click way for Firefox users to enable or disable Tor in "
 "Firefox."
@@ -127,60 +127,60 @@
 "زر تور وسيلة يمكن من خلالها لمستخدمي فيرفكس تفعيل أو تعطيل تور بضغة زر."
 
 #. type: Content of: <div><div><div><div><table><tr><td>
-#: /home/runa/tor/website/en/index.wml:61
+#: /home/runa/dev/website/en/index.wml:61
 msgid "<img src=\"$(IMGROOT)/icon-TorCheck.jpg\" alt=\"Tor Check Icon\">"
 msgstr "<img src=\"$(IMGROOT)/icon-TorCheck.jpg\" alt=\"أيقونة التحقق من تور\">"
 
 #. type: Content of: <div><div><div><div><table><tr><td><h3>
-#: /home/runa/tor/website/en/index.wml:62
+#: /home/runa/dev/website/en/index.wml:62
 msgid "<a href=\"https://check.torproject.org/\">Check</a>"
 msgstr "<a href=\"https://check.torproject.org/\">الفحص</a>"
 
 #. type: Content of: <div><div><div><div><table><tr><td><p>
-#: /home/runa/tor/website/en/index.wml:63
+#: /home/runa/dev/website/en/index.wml:63
 msgid "Check determines if you are successfully browsing with Tor."
 msgstr "يُمكّنك الفحص من معرفة إن كنت تتصفح بأمان باستخدام تور."
 
 #. type: Content of: <div><div><div><div><table><tr><td>
-#: /home/runa/tor/website/en/index.wml:69
+#: /home/runa/dev/website/en/index.wml:69
 msgid "<img src=\"$(IMGROOT)/icon-Vidalia.jpg\" alt=\"Vidalia Icon\">"
 msgstr "<img src=\"$(IMGROOT)/icon-Vidalia.jpg\" alt=\"أيقونة ڤيداليا\">"
 
 #. type: Content of: <div><div><div><div><table><tr><td><h3>
-#: /home/runa/tor/website/en/index.wml:70
+#: /home/runa/dev/website/en/index.wml:70
 msgid "<a href=\"<page projects/vidalia>\">Vidalia</a>"
 msgstr "<a href=\"<page projects/vidalia>\">ڤيداليا</a>"
 
 #. type: Content of: <div><div><div><div><table><tr><td><p>
-#: /home/runa/tor/website/en/index.wml:71
+#: /home/runa/dev/website/en/index.wml:71
 msgid ""
 "Vidalia is a graphical way to control and view Tor's connections and "
 "settings."
 msgstr "ڤيداليا وسيلة رسومية للتحكم بتور وعرض اتصالاته وإعدادته."
 
 #. type: Content of: <div><div><div><div><table><tr><td>
-#: /home/runa/tor/website/en/index.wml:75
+#: /home/runa/dev/website/en/index.wml:75
 msgid "<img src=\"$(IMGROOT)/icon-TorBrowser.jpg\" alt=\"TorBrowser Icon\">"
 msgstr "<img src=\"$(IMGROOT)/icon-TorBrowser.jpg\" alt=\"أيقونة متصفح تور\">"
 
 #. type: Content of: <div><div><div><div><table><tr><td><h3>
-#: /home/runa/tor/website/en/index.wml:76
+#: /home/runa/dev/website/en/index.wml:76
 msgid "<a href=\"<page projects/torbrowser>\">Tor Browser</a>"
 msgstr "<a href=\"<page projects/torbrowser>\">متصفح تور</a>"
 
 #. type: Content of: <div><div><div><div><table><tr><td><p>
-#: /home/runa/tor/website/en/index.wml:78
+#: /home/runa/dev/website/en/index.wml:78
 msgid ""
 "Tor Browser contains everything you need to safely browse the Internet."
 msgstr "يحتوي متصفح تور كل ما تحتاج للتصفح الإنترنت بأمان."
 
 #. type: Content of: <div><div><div><div><h2>
-#: /home/runa/tor/website/en/index.wml:90
+#: /home/runa/dev/website/en/index.wml:90
 msgid "Who Uses Tor?"
 msgstr "من يستخدم تور؟"
 
 #. type: Content of: <div><div><div><div><div><h3>
-#: /home/runa/tor/website/en/index.wml:93
+#: /home/runa/dev/website/en/index.wml:93
 msgid ""
 "<a href=\"<page about/torusers>#normalusers\"><img "
 "src=\"$(IMGROOT)/family.jpg\" alt=\"Normal People\">Family &amp; Friends</a>"
@@ -189,7 +189,7 @@
 "src=\"$(IMGROOT)/family.jpg\" alt=\"أشخاص عاديون\">العائلة والأصدقاء</a>"
 
 #. type: Content of: <div><div><div><div><div><p>
-#: /home/runa/tor/website/en/index.wml:95
+#: /home/runa/dev/website/en/index.wml:95
 msgid ""
 "People like you and your family use Tor to protect themselves, their "
 "children, and their dignity while using the Internet."
@@ -198,7 +198,7 @@
 "استخدام الإنترنت."
 
 #. type: Content of: <div><div><div><div><div><h3>
-#: /home/runa/tor/website/en/index.wml:99
+#: /home/runa/dev/website/en/index.wml:99
 msgid ""
 "<a href=\"<page about/torusers>#executives\"><img "
 "src=\"$(IMGROOT)/consumers.jpg\" alt=\"Businesses\">Businesses</a>"
@@ -207,7 +207,7 @@
 "src=\"$(IMGROOT)/consumers.jpg\" alt=\"التجار\">التجار</a>"
 
 #. type: Content of: <div><div><div><div><div><p>
-#: /home/runa/tor/website/en/index.wml:101
+#: /home/runa/dev/website/en/index.wml:101
 msgid ""
 "Businesses use Tor to research competition, keep business strategies "
 "confidential, and facilitate internal accountability."
@@ -216,7 +216,7 @@
 "ولتُفعّل المحاسبة الداخلية."
 
 #. type: Content of: <div><div><div><div><div><h3>
-#: /home/runa/tor/website/en/index.wml:105
+#: /home/runa/dev/website/en/index.wml:105
 msgid ""
 "<a href=\"<page about/torusers>#activists\"><img "
 "src=\"$(IMGROOT)/activists.jpg\" alt=\"Activists &amp; "
@@ -226,7 +226,7 @@
 "src=\"$(IMGROOT)/activists.jpg\" alt=\"النشطاء والمسربون\">النشطاء</a>"
 
 #. type: Content of: <div><div><div><div><div><p>
-#: /home/runa/tor/website/en/index.wml:107
+#: /home/runa/dev/website/en/index.wml:107
 msgid ""
 "Activists use Tor to anonymously report abuses from danger zones.  "
 "Whistleblowers use Tor to safely report on corruption."
@@ -235,7 +235,7 @@
 "يستخدم المسربون تور ليبلغوا عن الفساد بأمان."
 
 #. type: Content of: <div><div><div><div><div><h3>
-#: /home/runa/tor/website/en/index.wml:111
+#: /home/runa/dev/website/en/index.wml:111
 msgid ""
 "<a href=\"<page about/torusers>#journalist\"><img "
 "src=\"$(IMGROOT)/media.jpg\" alt=\"Journalists and the Media\">Media</a>"
@@ -244,14 +244,14 @@
 "src=\"$(IMGROOT)/media.jpg\" alt=\"الصحفيون والإعلاميون\">الإعلام</a>"
 
 #. type: Content of: <div><div><div><div><div><p>
-#: /home/runa/tor/website/en/index.wml:113
+#: /home/runa/dev/website/en/index.wml:113
 msgid ""
 "Journalists and the media use Tor to protect their research and sources "
 "online."
 msgstr "يستخدم الصحفيون والإعلاميون تور ليحموا أبحاثهم ومصادرهم على الإنترنت."
 
 #. type: Content of: <div><div><div><div><div><h3>
-#: /home/runa/tor/website/en/index.wml:117
+#: /home/runa/dev/website/en/index.wml:117
 msgid ""
 "<a href=\"<page about/torusers>#military\"><img "
 "src=\"$(IMGROOT)/military.jpg\" alt=\"Military and Law "
@@ -262,7 +262,7 @@
 "وسلطات فرض القانون</a>"
 
 #. type: Content of: <div><div><div><div><div><p>
-#: /home/runa/tor/website/en/index.wml:119
+#: /home/runa/dev/website/en/index.wml:119
 msgid ""
 "Militaries and law enforcement use Tor to protect their communications, "
 "investigations, and intelligence gathering online."
@@ -271,17 +271,32 @@
 "على الإنترنت."
 
 #. type: Content of: <div><div><div><div><h2>
-#: /home/runa/tor/website/en/index.wml:123
+#: /home/runa/dev/website/en/index.wml:123
 msgid "Announcements"
 msgstr "إعلانات"
 
 #. type: Content of: <div><div><div><div><table><tr><td><div>
-#: /home/runa/tor/website/en/index.wml:128
+#: /home/runa/dev/website/en/index.wml:128
+msgid "<span class=\"month\">Mar</span><br><span class=\"day\">23</span>"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><table><tr><td><p>
+#: /home/runa/dev/website/en/index.wml:129
+msgid ""
+"The Tor Project wins the \"Project of Social Benefit\" award from the Free "
+"Software Foundation and GNU Project. We are honored to win this award and to"
+" be listed amongst the former winners. <a "
+"href=\"https://blog.torproject.org/blog/tor-project-receives-fsf-"
+"award\">Read more</a> about this award."
+msgstr ""
+
+#. type: Content of: <div><div><div><div><table><tr><td><div>
+#: /home/runa/dev/website/en/index.wml:135
 msgid "<span class=\"month\">Feb</span><br><span class=\"day\">23</span>"
 msgstr "<span class=\"day\">23</span><br><span class=\"month\">فبراير</span>"
 
 #. type: Content of: <div><div><div><div><table><tr><td><p>
-#: /home/runa/tor/website/en/index.wml:129
+#: /home/runa/dev/website/en/index.wml:136
 msgid ""
 "The latest stable Tor version, 0.2.1.30, is <a "
 "href=\"https://lists.torproject.org/pipermail/tor-"
@@ -297,22 +312,3 @@
 "المشاكل قليلة الخطورة ويشمل تغييرا بسيطا في مصافحة TLS التي تمكن الإيرانيين "
 "من الوصول إلى التحويلات والجسور التي تعمل بهذه النسخة الجديدة. لا نتوقع أن "
 "ينجح ذلك التغيير على الأمد الطويل، لكنه يمنحنا بعض الوقت لإيجاد حل أفضل."
-
-#. type: Content of: <div><div><div><div><table><tr><td><div>
-#: /home/runa/tor/website/en/index.wml:138
-msgid "<span class=\"month\">Jan</span><br><span class=\"day\">30</span>"
-msgstr "<span class=\"day\">30</span><br><span class=\"month\">يناير</span>"
-
-#. type: Content of: <div><div><div><div><table><tr><td><p>
-#: /home/runa/tor/website/en/index.wml:139
-msgid ""
-"Tor helping with Egypt.  Here's what we've learned <a "
-"href=\"https://blog.torproject.org/blog/recent-events-egypt\">about recent "
-"events in Egypt</a>. And we're keeping our <a href=\"<page "
-"press/inthemedia>\">In the media</a> page up to date with stories about how "
-"we're helping around the world."
-msgstr ""
-"تور يساعد مصر. هنا ما تعلمنا <a href=\"https://blog.torproject.org/blog"
-"/recent-events-egypt\">من مستجدات مصر</a> ولا زلنا نحدث صفحة <a href=\"<page"
-" press/inthemedia>\">في الإعلام</a> بأحدث الأخبار التي تتناول السبل التي "
-"يساعد بها المشروع العالم."

Modified: translation/trunk/projects/website/po/ar/about/3-low.board.po
===================================================================
--- translation/trunk/projects/website/po/ar/about/3-low.board.po	2011-04-12 16:15:00 UTC (rev 24594)
+++ translation/trunk/projects/website/po/ar/about/3-low.board.po	2011-04-12 16:19:31 UTC (rev 24595)
@@ -8,7 +8,7 @@
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
 "POT-Creation-Date: 2010-12-05 19:13+0000\n"
-"PO-Revision-Date: 2011-03-27 17:31+0000\n"
+"PO-Revision-Date: 2011-04-12 16:13+0000\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"

Modified: translation/trunk/projects/website/po/ar/about/3-low.contact.po
===================================================================
--- translation/trunk/projects/website/po/ar/about/3-low.contact.po	2011-04-12 16:15:00 UTC (rev 24594)
+++ translation/trunk/projects/website/po/ar/about/3-low.contact.po	2011-04-12 16:19:31 UTC (rev 24595)
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-02-12 12:19+0000\n"
-"PO-Revision-Date: 2011-03-22 16:18+0000\n"
+"POT-Creation-Date: 2011-03-28 12:49+0200\n"
+"PO-Revision-Date: 2011-03-29 00:25+0000\n"
 "Last-Translator: runasand <runa.sandvik at gmail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
@@ -18,7 +18,7 @@
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5\n"
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/about/en/contact.wml:9
+#: /home/runa/dev/website/about/en/contact.wml:9
 msgid ""
 "<a href=\"<page index>\">Home &raquo; </a> <a href=\"<page "
 "about/overview>\">About &raquo; </a> <a href=\"<page "
@@ -29,12 +29,12 @@
 "بنا</a>"
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/about/en/contact.wml:14
+#: /home/runa/dev/website/about/en/contact.wml:14
 msgid "Tor: Contact"
 msgstr "Tor: اتصل بنا"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/about/en/contact.wml:16
+#: /home/runa/dev/website/about/en/contact.wml:16
 msgid ""
 "First, if you have a problem or question about using Tor, go look at the <a "
 "href=\"<page docs/documentation>#Support\">Support section</a> for how to "
@@ -50,30 +50,30 @@
 "docs/faq>#SupportMail\">بالبحث عن متطوعين للدعم</a>."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/about/en/contact.wml:18
+#: /home/runa/dev/website/about/en/contact.wml:18
 msgid ""
-"If you really do need to reach us, here are some approaches. All of these "
-"addresses are @torproject.org. Please be patient and <a "
-"href=\"http://www.catb.org/~esr/faqs/smart-questions.html\">helpful</a>, and"
-" please make sure to write your mail in English."
+"If you really do need to reach us, here are some approaches. Please be "
+"patient and <a href=\"http://www.catb.org/~esr/faqs/smart-"
+"questions.html\">helpful</a>, and please make sure to write your mail in "
+"English."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/about/en/contact.wml:23
+#: /home/runa/dev/website/about/en/contact.wml:21
 msgid ""
-"<i>tor-assistants</i> is the catch-all address for everything. It can be "
-"used for:"
+"<i>tor-assistants at lists.torproject.org</i> is the catch-all address for "
+"everything. It can be used for:"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/about/en/contact.wml:27
+#: /home/runa/dev/website/about/en/contact.wml:25
 msgid ""
 "Contacting the people who manage the directory authorities. Use this if you "
 "run a Tor relay and have a question or problem with your relay."
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/about/en/contact.wml:30
+#: /home/runa/dev/website/about/en/contact.wml:28
 msgid ""
 "So we can fix typos on the website, change wrong statements or directions on"
 " the website, and add new sections and paragraphs that you send us. You "
@@ -82,7 +82,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/about/en/contact.wml:34
+#: /home/runa/dev/website/about/en/contact.wml:32
 msgid ""
 "Hearing about your documents, patches, testing, experiences with supporting "
 "applications, and so forth inspired by our <a href=\"<page "
@@ -94,58 +94,59 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/about/en/contact.wml:44
+#: /home/runa/dev/website/about/en/contact.wml:42
 msgid "A few other addresses are more specific:"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/about/en/contact.wml:47
+#: /home/runa/dev/website/about/en/contact.wml:45
 msgid ""
-"<i>tor-translation</i> can put new <a href=\"<page "
+"<i>tor-translation at lists.torproject.org</i> can put new <a href=\"<page "
 "getinvolved/translation>\">website translations</a> into place, and help "
 "answer questions about existing and new translations."
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/about/en/contact.wml:50
+#: /home/runa/dev/website/about/en/contact.wml:48
 msgid ""
-"<i>tordnsel</i> is the alias for the people responsible for the tordns "
-"exitlist."
+"<i>tordnsel at torproject.org</i> is the alias for the people responsible "
+"for the tordns exitlist."
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/about/en/contact.wml:52
+#: /home/runa/dev/website/about/en/contact.wml:50
 msgid ""
-"<i>donations</i> is for questions and comments about <a href=\"<page "
-"donate/donate>\">getting money to the developers</a>. More donations means "
-"<a href=\"<page docs/faq>#Funding\">more Tor</a>. We're happy to help think "
-"about creative ways for you to contribute."
+"<i>donations at torproject.org</i> is for questions and comments about <a "
+"href=\"<page donate/donate>\">getting money to the developers</a>. More "
+"donations means <a href=\"<page docs/faq>#Funding\">more Tor</a>. We're "
+"happy to help think about creative ways for you to contribute."
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/about/en/contact.wml:57
+#: /home/runa/dev/website/about/en/contact.wml:55
 msgid ""
-"<i>execdir</i> is for press/media, questions and comments about Tor the non-"
-"profit corporation: trademark questions, affiliation and coordination, major"
-" gifts, contract inquiries, licensing and certification, etc."
+"<i>execdir at torproject.org</i> is for press/media, questions and comments "
+"about Tor the non-profit corporation: trademark questions, affiliation and "
+"coordination, major gifts, contract inquiries, licensing and certification, "
+"etc."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/about/en/contact.wml:63
+#: /home/runa/dev/website/about/en/contact.wml:61
 msgid ""
 "<a id=\"irc\"></a> Tor users and developers can also be found in the "
 "following channels on <a href=\"http://www.oftc.net/oftc/\">oftc</a>:"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/about/en/contact.wml:68
+#: /home/runa/dev/website/about/en/contact.wml:66
 msgid ""
 "<i>#tor</i> - User and relay operation discussions. Having trouble running "
 "Tor or a question for other Tor users? Then this is the spot for you."
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/about/en/contact.wml:71
+#: /home/runa/dev/website/about/en/contact.wml:69
 msgid ""
 "<i>#tor-dev</i> - Channel for people who want to do development.  "
 "Discussions about Tor related coding, protocols, and <a href=\"<page "
@@ -153,7 +154,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/about/en/contact.wml:74
+#: /home/runa/dev/website/about/en/contact.wml:72
 msgid ""
 "<i>#nottor</i> - This is where Tor people hang out to talk about stuff that "
 "is not related to Tor."

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

Modified: translation/trunk/projects/website/po/ar/about/3-low.financials.po
===================================================================
--- translation/trunk/projects/website/po/ar/about/3-low.financials.po	2011-04-12 16:15:00 UTC (rev 24594)
+++ translation/trunk/projects/website/po/ar/about/3-low.financials.po	2011-04-12 16:19:31 UTC (rev 24595)
@@ -8,7 +8,7 @@
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
 "POT-Creation-Date: 2010-12-26 14:32+0000\n"
-"PO-Revision-Date: 2011-03-27 17:38+0000\n"
+"PO-Revision-Date: 2011-04-12 16:11+0000\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"

Modified: translation/trunk/projects/website/po/ar/about/3-low.sponsors.po
===================================================================
--- translation/trunk/projects/website/po/ar/about/3-low.sponsors.po	2011-04-12 16:15:00 UTC (rev 24594)
+++ translation/trunk/projects/website/po/ar/about/3-low.sponsors.po	2011-04-12 16:19:31 UTC (rev 24595)
@@ -8,7 +8,7 @@
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
 "POT-Creation-Date: 2011-01-03 14:39+0000\n"
-"PO-Revision-Date: 2011-03-27 17:29+0000\n"
+"PO-Revision-Date: 2011-04-12 16:15+0000\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"

Modified: translation/trunk/projects/website/po/ar/about/3-low.translators.po
===================================================================
--- translation/trunk/projects/website/po/ar/about/3-low.translators.po	2011-04-12 16:15:00 UTC (rev 24594)
+++ translation/trunk/projects/website/po/ar/about/3-low.translators.po	2011-04-12 16:19:31 UTC (rev 24595)
@@ -8,7 +8,7 @@
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
 "POT-Creation-Date: 2010-12-26 14:32+0000\n"
-"PO-Revision-Date: 2011-03-27 17:27+0000\n"
+"PO-Revision-Date: 2011-04-12 16:15+0000\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"

Modified: translation/trunk/projects/website/po/ar/about/3-low.volunteers.po
===================================================================
--- translation/trunk/projects/website/po/ar/about/3-low.volunteers.po	2011-04-12 16:15:00 UTC (rev 24594)
+++ translation/trunk/projects/website/po/ar/about/3-low.volunteers.po	2011-04-12 16:19:31 UTC (rev 24595)
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-02-12 12:19+0000\n"
-"PO-Revision-Date: 2011-03-27 17:32+0000\n"
+"POT-Creation-Date: 2011-03-28 12:49+0200\n"
+"PO-Revision-Date: 2011-04-12 16:09+0000\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
@@ -18,7 +18,7 @@
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5\n"
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/about/en/volunteers.wml:8
+#: /home/runa/dev/website/about/en/volunteers.wml:8
 msgid ""
 "<a href=\"<page index>\">Home &raquo; </a> <a href=\"<page "
 "about/overview>\">About &raquo; </a> <a href=\"<page "
@@ -26,27 +26,27 @@
 msgstr ""
 
 #. type: Content of: <div><div><h1>
-#: /home/runa/tor/website/about/en/volunteers.wml:13
+#: /home/runa/dev/website/about/en/volunteers.wml:13
 msgid "Volunteers"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/volunteers.wml:15
+#: /home/runa/dev/website/about/en/volunteers.wml:15
 msgid "Anonym"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/volunteers.wml:15
+#: /home/runa/dev/website/about/en/volunteers.wml:15
 msgid "Maintainer of the Incognito LiveCD."
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/volunteers.wml:16
+#: /home/runa/dev/website/about/en/volunteers.wml:16
 msgid "Kevin Bankston"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/volunteers.wml:16
+#: /home/runa/dev/website/about/en/volunteers.wml:16
 msgid ""
 "EFF lawyer who helped write the <a href=\"<page eff/tor-legal-faq>\">Tor "
 "Legal FAQ</a> and tirelessly answers the phone when somebody in the world "
@@ -54,148 +54,138 @@
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/volunteers.wml:20
+#: /home/runa/dev/website/about/en/volunteers.wml:20
 msgid "Marco Bonetti"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/volunteers.wml:20
+#: /home/runa/dev/website/about/en/volunteers.wml:20
 msgid "Focusing on MobileTor for the iPhone."
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/volunteers.wml:21
+#: /home/runa/dev/website/about/en/volunteers.wml:21
 msgid "Kasimir Gabert"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/volunteers.wml:21
+#: /home/runa/dev/website/about/en/volunteers.wml:21
 msgid ""
 "Maintains the <a href=\"https://torstatus.kgprog.com/\">TorStatus</a> "
 "statistics pages."
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/volunteers.wml:23
+#: /home/runa/dev/website/about/en/volunteers.wml:23
 msgid "Andreas Jonsson"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/volunteers.wml:23
+#: /home/runa/dev/website/about/en/volunteers.wml:23
 msgid "Works on OS X Tor Browser Bundle sandbox technology."
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/volunteers.wml:25
+#: /home/runa/dev/website/about/en/volunteers.wml:25
 msgid "Fabian Keil"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/volunteers.wml:25
+#: /home/runa/dev/website/about/en/volunteers.wml:25
 msgid ""
 "One of the core Privoxy developers, and also a Tor fan. He's the reason Tor "
 "and Privoxy still work well together."
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/volunteers.wml:27
+#: /home/runa/dev/website/about/en/volunteers.wml:27
 msgid "Bruce Leidl"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/volunteers.wml:27
+#: /home/runa/dev/website/about/en/volunteers.wml:27
 msgid "Working on a Tor client in Java."
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/volunteers.wml:28
+#: /home/runa/dev/website/about/en/volunteers.wml:28
 msgid "Julius Mittenzwei"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/volunteers.wml:28
+#: /home/runa/dev/website/about/en/volunteers.wml:28
 msgid ""
 "A lawyer with the CCC in Germany. Coordinates the German Tor community with "
 "respect to legal questions and concerns."
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/volunteers.wml:31
+#: /home/runa/dev/website/about/en/volunteers.wml:31
 msgid "Shava Nerad"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/volunteers.wml:31
+#: /home/runa/dev/website/about/en/volunteers.wml:31
 msgid ""
 "Our former Development Director. She still works on PR and community "
 "relations."
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/volunteers.wml:33
+#: /home/runa/dev/website/about/en/volunteers.wml:33
 msgid "Linus Nordberg"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/volunteers.wml:33
+#: /home/runa/dev/website/about/en/volunteers.wml:33
 msgid ""
 "Enjoys measuring the Tor network and helps with outreach in the Nordic "
 "countries."
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/volunteers.wml:35
+#: /home/runa/dev/website/about/en/volunteers.wml:35
 msgid "Lasse &Oslash;verlier"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/volunteers.wml:35
+#: /home/runa/dev/website/about/en/volunteers.wml:35
 msgid ""
 "Writes research papers on Tor: attacks, defenses, and resource management, "
 "especially for hidden services."
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/volunteers.wml:37
+#: /home/runa/dev/website/about/en/volunteers.wml:37
 msgid "Martin Peck"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/volunteers.wml:37
+#: /home/runa/dev/website/about/en/volunteers.wml:37
 msgid ""
 "Working on a VM-based transparent proxying approach for Tor clients on "
 "Windows."
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/volunteers.wml:39
-msgid "Robert Ransom"
-msgstr ""
-
-#. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/volunteers.wml:39
-msgid "Bug catcher and immensely helpful on irc and the email lists"
-msgstr ""
-
-#. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/volunteers.wml:41
+#: /home/runa/dev/website/about/en/volunteers.wml:39
 msgid "rovv (a pseudonym -- he's managed to stay anonymous even from us!)"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/volunteers.wml:42
+#: /home/runa/dev/website/about/en/volunteers.wml:40
 msgid ""
 "The most dedicated bug reporter we've ever heard from. He must read Tor "
 "source code every day over breakfast."
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/volunteers.wml:44
+#: /home/runa/dev/website/about/en/volunteers.wml:42
 msgid "tup (another pseudonym)"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/volunteers.wml:44
+#: /home/runa/dev/website/about/en/volunteers.wml:42
 msgid ""
 "Periodically adds new features for making Tor easier to use as a <a "
 "href=\"<wiki>TransparentProxy\">transparent proxy</a>. Also maintains the <a"
@@ -203,34 +193,24 @@
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/volunteers.wml:49
-msgid "Tomás Touceda"
-msgstr ""
-
-#. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/volunteers.wml:49
-msgid "Fantastic developer involved with the Vidalia project"
-msgstr ""
-
-#. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/volunteers.wml:51
+#: /home/runa/dev/website/about/en/volunteers.wml:47
 msgid "Kyle Williams"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/volunteers.wml:51
+#: /home/runa/dev/website/about/en/volunteers.wml:47
 msgid ""
 "Developer for JanusVM, a VMWare-based transparent Tor proxy that makes Tor "
 "easier to set up and use."
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/volunteers.wml:54
+#: /home/runa/dev/website/about/en/volunteers.wml:50
 msgid "Ethan Zuckerman"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/volunteers.wml:54
+#: /home/runa/dev/website/about/en/volunteers.wml:50
 msgid ""
 "A blogger who has written some <a "
 "href=\"http://www.ethanzuckerman.com/blog/?p=1019\">interesting</a> <a "
@@ -240,7 +220,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/volunteers.wml:59
+#: /home/runa/dev/website/about/en/volunteers.wml:55
 msgid ""
 "All our relay operators, people who write <a "
 "href=\"http://freehaven.net/anonbib/\">research papers</a> about Tor, people"

Modified: translation/trunk/projects/website/po/ar/about/4-optional.gsoc.po
===================================================================
--- translation/trunk/projects/website/po/ar/about/4-optional.gsoc.po	2011-04-12 16:15:00 UTC (rev 24594)
+++ translation/trunk/projects/website/po/ar/about/4-optional.gsoc.po	2011-04-12 16:19:31 UTC (rev 24595)
@@ -8,7 +8,7 @@
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
 "POT-Creation-Date: 2011-03-25 16:51+0000\n"
-"PO-Revision-Date: 2011-03-27 17:38+0000\n"
+"PO-Revision-Date: 2011-04-12 16:11+0000\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"

Modified: translation/trunk/projects/website/po/ar/docs/1-high.proxychain.po
===================================================================
--- translation/trunk/projects/website/po/ar/docs/1-high.proxychain.po	2011-04-12 16:15:00 UTC (rev 24594)
+++ translation/trunk/projects/website/po/ar/docs/1-high.proxychain.po	2011-04-12 16:19:31 UTC (rev 24595)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-01-29 21:06+0000\n"
+"POT-Creation-Date: 2011-03-28 12:48+0200\n"
 "PO-Revision-Date: 2011-03-22 16:45+0000\n"
 "Last-Translator: OsamaK <osamak at gnu.org>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -18,7 +18,7 @@
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5\n"
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/proxychain.wml:8
+#: /home/runa/dev/website/docs/en/proxychain.wml:8
 msgid ""
 "<a href=\"<page index>\">Home &raquo; </a> <a href=\"<page "
 "docs/documentation>\">Documentation &raquo; </a> <a href=\"<page "
@@ -29,24 +29,24 @@
 "docs/proxychain>\">ضبط تور على استخدام وسيط</a>"
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/proxychain.wml:13
+#: /home/runa/dev/website/docs/en/proxychain.wml:13
 msgid "<a id=\"proxychain\"></a>"
 msgstr "<a id=\"proxychain\"></a>"
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/docs/en/proxychain.wml:14
+#: /home/runa/dev/website/docs/en/proxychain.wml:14
 msgid ""
 "<a class=\"anchor\" href=\"#proxychain\">Tor: Configuring Tor to use a "
 "Proxy</a>"
 msgstr "<a class=\"anchor\" href=\"#proxychain\">تور: ضبط تور على استخدام وسيط</a>"
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/proxychain.wml:15
+#: /home/runa/dev/website/docs/en/proxychain.wml:15
 msgid "<hr>"
 msgstr "<hr>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/proxychain.wml:18
+#: /home/runa/dev/website/docs/en/proxychain.wml:18
 msgid ""
 "The current version of Tor and the Vidalia Graphical Tor Controller support "
 "the ability to use any HTTPS or SOCKS proxy to get access to the Tor "
@@ -63,7 +63,7 @@
 "ترسلها لأنها تمرر بطبقات تعمية."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/proxychain.wml:28
+#: /home/runa/dev/website/docs/en/proxychain.wml:28
 msgid ""
 "These steps assume you have a functional Tor/Vidalia configuration, and you "
 "have found a list of HTTPS, SOCKS4, or SOCKS5 proxies. (To clarify, an HTTPS"
@@ -74,17 +74,17 @@
 " CONNECT)."
 
 #. type: Content of: <div><div><p><ol><li>
-#: /home/runa/tor/website/docs/en/proxychain.wml:33
+#: /home/runa/dev/website/docs/en/proxychain.wml:33
 msgid "Open the Vidalia Control Panel, click on Settings."
 msgstr "افتح لوحة التحكم بڤيداليا وانقر إعدادات."
 
 #. type: Content of: <div><div><p><ol><li>
-#: /home/runa/tor/website/docs/en/proxychain.wml:34
+#: /home/runa/dev/website/docs/en/proxychain.wml:34
 msgid "Click Network.  Select \"I use a proxy to access the Internet\"."
 msgstr "انقر الشبكة. اختر \"أستخدم وسيطًا (بروكسي) للاتصال بالإنترنت\"."
 
 #. type: Content of: <div><div><p><ol><li>
-#: /home/runa/tor/website/docs/en/proxychain.wml:35
+#: /home/runa/dev/website/docs/en/proxychain.wml:35
 msgid ""
 "On the Address line, enter the open proxy address.  This can be a hostname "
 "or IP Address."
@@ -93,12 +93,12 @@
 " عنوان IP."
 
 #. type: Content of: <div><div><p><ol><li>
-#: /home/runa/tor/website/docs/en/proxychain.wml:36
+#: /home/runa/dev/website/docs/en/proxychain.wml:36
 msgid "Enter the port for the proxy."
 msgstr "أدخل منفذ الوسيط."
 
 #. type: Content of: <div><div><p><ol><li>
-#: /home/runa/tor/website/docs/en/proxychain.wml:37
+#: /home/runa/dev/website/docs/en/proxychain.wml:37
 msgid ""
 "Generally, you do not need a Username and Password.  If you do, enter the "
 "information in the proper fields."
@@ -107,14 +107,14 @@
 "الحقل المائم."
 
 #. type: Content of: <div><div><p><ol><li>
-#: /home/runa/tor/website/docs/en/proxychain.wml:38
+#: /home/runa/dev/website/docs/en/proxychain.wml:38
 msgid ""
 "Choose the Type of proxy you are using, whether HTTP/HTTPS, SOCKS4, or "
 "SOCKS5."
 msgstr "اختر نوع الوسيط الذي تستخدمه وهو إما HTTP/HTTPS أو SOCKS4 أو SOCKS5."
 
 #. type: Content of: <div><div><p><ol><li>
-#: /home/runa/tor/website/docs/en/proxychain.wml:39
+#: /home/runa/dev/website/docs/en/proxychain.wml:39
 msgid ""
 "Push the Ok button.  Vidalia and Tor are now configured to use a proxy to "
 "access the rest of the Tor Network."
@@ -123,7 +123,7 @@
 "شبكة تور."
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/proxychain.wml:42
+#: /home/runa/dev/website/docs/en/proxychain.wml:42
 msgid ""
 "<br><br> <img src=\"$(IMGROOT)/vidalia-proxy.png\" alt=\"Vidalia's Network "
 "Proxy settings page\"> <br><br>"

Modified: translation/trunk/projects/website/po/ar/docs/2-medium.documentation.po
===================================================================
--- translation/trunk/projects/website/po/ar/docs/2-medium.documentation.po	2011-04-12 16:15:00 UTC (rev 24594)
+++ translation/trunk/projects/website/po/ar/docs/2-medium.documentation.po	2011-04-12 16:19:31 UTC (rev 24595)
@@ -8,7 +8,7 @@
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
 "POT-Creation-Date: 2011-03-17 18:04+0000\n"
-"PO-Revision-Date: 2011-03-27 17:33+0000\n"
+"PO-Revision-Date: 2011-04-12 16:08+0000\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"

Modified: translation/trunk/projects/website/po/ar/docs/2-medium.faq.po
===================================================================
--- translation/trunk/projects/website/po/ar/docs/2-medium.faq.po	2011-04-12 16:15:00 UTC (rev 24594)
+++ translation/trunk/projects/website/po/ar/docs/2-medium.faq.po	2011-04-12 16:19:31 UTC (rev 24595)
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-03-17 18:04+0000\n"
-"PO-Revision-Date: 2011-03-22 16:26+0000\n"
+"POT-Creation-Date: 2011-03-28 12:48+0200\n"
+"PO-Revision-Date: 2011-03-29 00:25+0000\n"
 "Last-Translator: OsamaK <osamak at gnu.org>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
@@ -18,7 +18,7 @@
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5\n"
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:8
+#: /home/runa/dev/website/docs/en/faq.wml:8
 msgid ""
 "<a href=\"<page index>\">Home &raquo; </a> <a href=\"<page "
 "docs/documentation>\">Documentation &raquo; </a> <a href=\"<page "
@@ -26,57 +26,57 @@
 msgstr ""
 
 #. type: Content of: <div><div><h1>
-#: /home/runa/tor/website/docs/en/faq.wml:14
+#: /home/runa/dev/website/docs/en/faq.wml:14
 msgid "Tor FAQ"
 msgstr "أسئلة تور المتكررة"
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:15 /tmp/B_aDff_VuJ.xml:1646
+#: /home/runa/dev/website/docs/en/faq.wml:15 /tmp/tNikbgsymy.xml:1646
 msgid "<hr>"
 msgstr "<hr>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:17
+#: /home/runa/dev/website/docs/en/faq.wml:17
 msgid "General questions:"
 msgstr "أسئلة عامة:"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:19
+#: /home/runa/dev/website/docs/en/faq.wml:19
 msgid "<a href=\"#WhatIsTor\">What is Tor?</a>"
 msgstr "<a href=\"#WhatIsTor\">ما هو تور؟</a>"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:20
+#: /home/runa/dev/website/docs/en/faq.wml:20
 msgid "<a href=\"#Torisdifferent\">How is Tor different from other proxies?</a>"
 msgstr ""
 "<a href=\"#Torisdifferent\">ما الفرق بين تور وغيره من الوسطاء "
 "(البروكسي)؟</a>"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:21
+#: /home/runa/dev/website/docs/en/faq.wml:21
 msgid "<a href=\"#CompatibleApplications\">What programs can I use with Tor?</a>"
 msgstr ""
 "<a href=\"#CompatibleApplications\">ما البرامج التي يمكن أن أستخدمها مع "
 "تور؟</a>"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:23
+#: /home/runa/dev/website/docs/en/faq.wml:23
 msgid "<a href=\"#WhyCalledTor\">Why is it called Tor?</a>"
 msgstr "<a href=\"#WhyCalledTor\">لماذا سُمّي تور؟</a>"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:24
+#: /home/runa/dev/website/docs/en/faq.wml:24
 msgid "<a href=\"#Backdoor\">Is there a backdoor in Tor?</a>"
 msgstr "<a href=\"#Backdoor\">هل توجد ثغرة متعمدة (باب خلفي) في تور؟</a>"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:25
+#: /home/runa/dev/website/docs/en/faq.wml:25
 msgid "<a href=\"#DistributingTor\">Can I distribute Tor on my magazine's CD?</a>"
 msgstr ""
 "<a href=\"#DistributingTor\">هل يمكن أن أوزّع تور مع مجلتي في أسطوانة؟</a>"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:27
+#: /home/runa/dev/website/docs/en/faq.wml:27
 msgid ""
 "<a href=\"#SupportMail\">How can I get an answer to my Tor support mail?</a>"
 msgstr ""
@@ -84,51 +84,51 @@
 "لتور؟</a>"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:29
+#: /home/runa/dev/website/docs/en/faq.wml:29
 msgid "<a href=\"#WhySlow\">Why is Tor so slow?</a>"
 msgstr "<a href=\"#WhySlow\">لماذا تور بطيء جدًا؟</a>"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:30
+#: /home/runa/dev/website/docs/en/faq.wml:30
 msgid "<a href=\"#Funding\">What would The Tor Project do with more funding?</a>"
 msgstr "<a href=\"#Funding\">ماذا سيفعل مشروع تور بمزيد من التمويل؟</a>"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:32
+#: /home/runa/dev/website/docs/en/faq.wml:32
 msgid ""
 "<a href=\"#Metrics\">How many people use Tor? How many relays or exit nodes "
 "are there?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:36
+#: /home/runa/dev/website/docs/en/faq.wml:36
 msgid "Compilation and Installation:"
 msgstr "التصريف والتثبيت:"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:38
+#: /home/runa/dev/website/docs/en/faq.wml:38
 msgid "<a href=\"#HowUninstallTor\">How do I uninstall Tor?</a>"
 msgstr "<a href=\"#HowUninstallTor\">كيف أزيل تثبيت تور؟</a>"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:39
+#: /home/runa/dev/website/docs/en/faq.wml:39
 msgid "<a href=\"#PGPSigs\">What are these \"sig\" files on the download page?</a>"
 msgstr "<a href=\"#PGPSigs\">ما هي ملفات \"sig\" في صفحة التنزيل؟</a>"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:41
+#: /home/runa/dev/website/docs/en/faq.wml:41
 msgid ""
 "<a href=\"#GetTor\">Your website is blocked in my country. How do I download"
 " Tor?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:43
+#: /home/runa/dev/website/docs/en/faq.wml:43
 msgid "<a href=\"#CompileTorWindows\">How do I compile Tor under Windows?</a>"
 msgstr "<a href=\"#CompileTorWindows\">كيف أُصرّف تور على ويندوز؟</a>"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:44
+#: /home/runa/dev/website/docs/en/faq.wml:44
 msgid ""
 "<a href=\"#VirusFalsePositives\">Why does my Tor executable appear to have a"
 " virus or spyware?</a>"
@@ -137,85 +137,85 @@
 "برنامج تجسس؟</a>"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:46
+#: /home/runa/dev/website/docs/en/faq.wml:46
 msgid ""
 "<a href=\"#LiveCD\">Is there a LiveCD or other bundle that includes Tor?</a>"
 msgstr ""
 "<a href=\"#LiveCD\">هل توجد أسطوانة حية (LiveCD) أو حزمة أخرى تحتوي تور؟</a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:49
+#: /home/runa/dev/website/docs/en/faq.wml:49
 msgid "Running Tor:"
 msgstr "تشغيل تور:"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:51
+#: /home/runa/dev/website/docs/en/faq.wml:51
 msgid "<a href=\"#torrc\">I'm supposed to \"edit my torrc\". What does that mean?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:53
+#: /home/runa/dev/website/docs/en/faq.wml:53
 msgid "<a href=\"#Logs\">How do I set up logging, or see Tor's logs?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:57
+#: /home/runa/dev/website/docs/en/faq.wml:57
 msgid "Running a Tor client:"
 msgstr "تشغيل عميل تور:"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:59
+#: /home/runa/dev/website/docs/en/faq.wml:59
 msgid ""
 "<a href=\"#DoesntWork\">I installed Tor and Polipo but it's not working.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:61
+#: /home/runa/dev/website/docs/en/faq.wml:61
 msgid ""
 "<a href=\"#VidaliaPassword\">Tor/Vidalia prompts for a password at "
 "start.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:63
+#: /home/runa/dev/website/docs/en/faq.wml:63
 msgid ""
 "<a href=\"#ChooseEntryExit\">Can I control which nodes (or country)  are "
 "used for entry/exit?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:65
+#: /home/runa/dev/website/docs/en/faq.wml:65
 msgid ""
 "<a href=\"#GoogleCaptcha\">Google makes me solve a Captcha or tells me I "
 "have spyware installed.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:67
+#: /home/runa/dev/website/docs/en/faq.wml:67
 msgid ""
 "<a href=\"#GmailWarning\">Gmail warns me that my account may have been "
 "compromised.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:69
+#: /home/runa/dev/website/docs/en/faq.wml:69
 msgid ""
 "<a href=\"#FirewallPorts\">My firewall only allows a few outgoing ports.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:73
+#: /home/runa/dev/website/docs/en/faq.wml:73
 msgid "Running a Tor relay:"
 msgstr "تشغيل تحويلة تور:"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:75
+#: /home/runa/dev/website/docs/en/faq.wml:75
 msgid "<a href=\"#RelayFlexible\">How stable does my relay need to be?</a>"
 msgstr ""
 "<a href=\"#RelayFlexible\">ما مدى الثبات الذي يجب أن تكون عليه تحويلتي؟</a>"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:76
+#: /home/runa/dev/website/docs/en/faq.wml:76
 msgid ""
 "<a href=\"#ExitPolicies\">I'd run a relay, but I don't want to deal with "
 "abuse issues.</a>"
@@ -224,77 +224,77 @@
 "الاستخدام.</a>"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:78
+#: /home/runa/dev/website/docs/en/faq.wml:78
 msgid "<a href=\"#RelayOrBridge\">Should I be a normal relay or bridge relay?</a>"
 msgstr ""
 "<a href=\"#RelayOrBridge\">هل ينبغي علي أن أشغل تحويلة أو تحويلة جسرية؟</a>"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:80
+#: /home/runa/dev/website/docs/en/faq.wml:80
 msgid "<a href=\"#MultipleRelays\">I want to run more than one relay.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:81
+#: /home/runa/dev/website/docs/en/faq.wml:81
 msgid "<a href=\"#RelayMemory\">Why is my Tor relay using so much memory?</a>"
 msgstr "<a href=\"#RelayMemory\">لماذا تستخدم تحويلتي لتور الكثير من الذاكرة؟</a>"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:82
+#: /home/runa/dev/website/docs/en/faq.wml:82
 msgid "<a href=\"#WhyNotNamed\">Why is my Tor relay not named?</a>"
 msgstr "<a href=\"#WhyNotNamed\">لماذا تحويلتي لتور غير مسماة؟</a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:85
+#: /home/runa/dev/website/docs/en/faq.wml:85
 msgid "Running a Tor hidden service:"
 msgstr "تشغيل خدمات تور المخفية:"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:87
+#: /home/runa/dev/website/docs/en/faq.wml:87
 msgid "Anonymity and Security:"
 msgstr "السرية والأمان:"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:89
+#: /home/runa/dev/website/docs/en/faq.wml:89
 msgid "<a href=\"#KeyManagement\">Tell me about all the keys Tor uses.</a>"
 msgstr ""
 "<a href=\"#KeyManagement\">أخبروني المزيد عن المفاتيح التي يستخدمها تور.</a>"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:90
+#: /home/runa/dev/website/docs/en/faq.wml:90
 msgid "<a href=\"#EntryGuards\">What are Entry Guards?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:93
+#: /home/runa/dev/website/docs/en/faq.wml:93
 msgid "Alternate designs that we don't do (yet):"
 msgstr "تصاميم بديلة لم نتبعها (إلى الآن):"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:95
+#: /home/runa/dev/website/docs/en/faq.wml:95
 msgid ""
 "<a href=\"#EverybodyARelay\">You should make every Tor user be a relay.</a>"
 msgstr "<a href=\"#EverybodyARelay\">ينبغي أن تجعلوا كل مستخدم لتور تحويلة.</a>"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:97
+#: /home/runa/dev/website/docs/en/faq.wml:97
 msgid ""
 "<a href=\"#TransportIPnotTCP\">You should transport all IP packets, not just"
 " TCP packets.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:101
+#: /home/runa/dev/website/docs/en/faq.wml:101
 msgid "Abuse:"
 msgstr "إساءة الاستخدام:"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:103
+#: /home/runa/dev/website/docs/en/faq.wml:103
 msgid "<a href=\"#Criminals\">Doesn't Tor enable criminals to do bad things?</a>"
 msgstr "<a href=\"#Criminals\">ألا يتيح تور للمجرمين القيام بأفعال سيئة؟</a>"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:104
+#: /home/runa/dev/website/docs/en/faq.wml:104
 msgid ""
 "<a href=\"#RespondISP\">How do I respond to my ISP about my exit relay?</a>"
 msgstr ""
@@ -302,29 +302,29 @@
 "المخرج؟</a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:108
+#: /home/runa/dev/website/docs/en/faq.wml:108
 msgid ""
 "For other questions not yet on this version of the FAQ, see the <a "
 "href=\"<wikifaq>\">wiki FAQ</a> for now."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:111
+#: /home/runa/dev/website/docs/en/faq.wml:111
 msgid "<hr> <a id=\"General\"></a> <a id=\"WhatIsTor\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:116
+#: /home/runa/dev/website/docs/en/faq.wml:116
 msgid "<a class=\"anchor\" href=\"#WhatIsTor\">What is Tor?</a>"
 msgstr "<a class=\"anchor\" href=\"#WhatIsTor\">ما هو تور؟</a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:119
+#: /home/runa/dev/website/docs/en/faq.wml:119
 msgid "The name \"Tor\" can refer to several different components."
 msgstr "يمكن أن يشير اسم \"تور\" إلى مكونات عدة مختلفة."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:123
+#: /home/runa/dev/website/docs/en/faq.wml:123
 msgid ""
 "The Tor software is a program you can run on your computer that helps keep "
 "you safe on the Internet. Tor protects you by bouncing your communications "
@@ -337,19 +337,19 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:134
+#: /home/runa/dev/website/docs/en/faq.wml:134
 msgid ""
 "The Tor Project is a non-profit (charity) organization that maintains and "
 "develops the Tor software."
 msgstr "مشروع تور منظمة غير هادفة للربح (خيرية) ترعى وتُطوّر برمجيات تور."
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:138
+#: /home/runa/dev/website/docs/en/faq.wml:138
 msgid "<hr> <a id=\"Torisdifferent\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:141
+#: /home/runa/dev/website/docs/en/faq.wml:141
 msgid ""
 "<a class=\"anchor\" href=\"#Torisdifferent\">How is Tor different from other"
 " proxies?</a>"
@@ -358,7 +358,7 @@
 "الوسطاء (البروكسي)؟</a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:143
+#: /home/runa/dev/website/docs/en/faq.wml:143
 msgid ""
 "A typical proxy provider sets up a server somewhere on the Internet and "
 "allows you to use it to relay your traffic.  This creates a simple, easy to "
@@ -382,7 +382,7 @@
 "المتجسسين المحليين، مثل الموجودين في مقهى إنترنت فيه اتصال لاسلكي مفتوح."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:156
+#: /home/runa/dev/website/docs/en/faq.wml:156
 msgid ""
 "Simple proxy providers also create a single point of failure.  The provider "
 "knows who you are and where you browse on the Internet.  They can see your "
@@ -399,7 +399,7 @@
 "الصفحات بالإعلانات أو تسجيل بيانتك الشخصية."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:165
+#: /home/runa/dev/website/docs/en/faq.wml:165
 msgid ""
 "Tor passes your traffic through at least 3 different servers before sending "
 "it on to the destination.  Tor does not modify, or even know, what you are "
@@ -418,12 +418,12 @@
 " هو تمرير الحزم المُعمّاة بين بعضها."
 
 #. type: Content of: <div><div><p><dl><dt>
-#: /home/runa/tor/website/docs/en/faq.wml:175
+#: /home/runa/dev/website/docs/en/faq.wml:175
 msgid "Doesn't the first server see who I am?"
 msgstr "ألا يعلم الخادوم الأول من أنا؟"
 
 #. type: Content of: <div><div><p><dl><dd>
-#: /home/runa/tor/website/docs/en/faq.wml:175
+#: /home/runa/dev/website/docs/en/faq.wml:175
 msgid ""
 "Possibly. A bad first of three servers can see encrypted Tor traffic coming "
 "from your computer.  It still doesn't know who you are and what you are "
@@ -439,12 +439,12 @@
 "من أنت وإلى أين أنت متجه على الإنترنت."
 
 #. type: Content of: <div><div><p><dl><dt>
-#: /home/runa/tor/website/docs/en/faq.wml:181
+#: /home/runa/dev/website/docs/en/faq.wml:181
 msgid "Can't the third server see my traffic?"
 msgstr "ألا يمكن أن يرى الخادوم الثالث بياناتي؟"
 
 #. type: Content of: <div><div><p><dl><dd>
-#: /home/runa/tor/website/docs/en/faq.wml:181
+#: /home/runa/dev/website/docs/en/faq.wml:181
 msgid ""
 "Possibly.  A bad third of three servers can see the traffic you sent into "
 "Tor.  It won't know who sent this traffic.  If you're using encryption, such"
@@ -462,12 +462,12 @@
 "أرسلتها إلى المقصد."
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:191
+#: /home/runa/dev/website/docs/en/faq.wml:191
 msgid "<hr> <a id=\"CompatibleApplications\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:194
+#: /home/runa/dev/website/docs/en/faq.wml:194
 msgid ""
 "<a class=\"anchor\" href=\"#CompatibleApplications\">What programs can I use"
 " with Tor?</a>"
@@ -476,7 +476,7 @@
 " أستخدمها مع تور؟</a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:197
+#: /home/runa/dev/website/docs/en/faq.wml:197
 msgid ""
 "There are two pieces to \"Torifying\" a program: connection-level anonymity "
 "and application-level anonymity. Connection-level anonymity focuses on "
@@ -500,7 +500,7 @@
 "يدفعنا إلى عدم التوصية باستخدام برامج كثيرة وهو أن تستخدم تور بأمان."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:211
+#: /home/runa/dev/website/docs/en/faq.wml:211
 msgid ""
 "Most of our work so far has focused on the Firefox web browser. The bundles "
 "on the <a href=\"<page download/download>\">download page</a> automatically "
@@ -511,7 +511,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:220
+#: /home/runa/dev/website/docs/en/faq.wml:220
 msgid ""
 "There are plenty of other programs you can use with Tor, but we haven't "
 "researched the application-level anonymity issues on them well enough to be "
@@ -524,17 +524,17 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:231
+#: /home/runa/dev/website/docs/en/faq.wml:231
 msgid "<hr> <a id=\"WhyCalledTor\"></a>"
 msgstr "<hr> <a id=\"WhyCalledTor\"></a>"
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:234
+#: /home/runa/dev/website/docs/en/faq.wml:234
 msgid "<a class=\"anchor\" href=\"#WhyCalledTor\">Why is it called Tor?</a>"
 msgstr "<a class=\"anchor\" href=\"#WhyCalledTor\">لماذا سُمّي تور؟</a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:237
+#: /home/runa/dev/website/docs/en/faq.wml:237
 msgid ""
 "Because Tor is the onion routing network. When we were starting the new "
 "next-generation design and implementation of onion routing in 2001-2002, we "
@@ -551,12 +551,12 @@
 " Naval Research Lab."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:247
+#: /home/runa/dev/website/docs/en/faq.wml:247
 msgid "(It's also got a fine translation from German and Turkish.)"
 msgstr "(ولتلك الكلمة أيضًا ترجمة جيدة بالألمانية والتركية.)"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:251
+#: /home/runa/dev/website/docs/en/faq.wml:251
 msgid ""
 "Note: even though it originally came from an acronym, Tor is not spelled "
 "\"TOR\". Only the first letter is capitalized. In fact, we can usually spot "
@@ -570,19 +570,19 @@
 "الإخبارية- من طريقة كتابتهم له."
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:258
+#: /home/runa/dev/website/docs/en/faq.wml:258
 msgid "<hr> <a id=\"Backdoor\"></a>"
 msgstr "<hr> <a id=\"Backdoor\"></a>"
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:261
+#: /home/runa/dev/website/docs/en/faq.wml:261
 msgid "<a class=\"anchor\" href=\"#Backdoor\">Is there a backdoor in Tor?</a>"
 msgstr ""
 "<a class=\"anchor\" href=\"#Backdoor\">هل توجد ثغرة متعمدة (باب خلفي) في "
 "تور؟</a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:264
+#: /home/runa/dev/website/docs/en/faq.wml:264
 msgid ""
 "There is absolutely no backdoor in Tor. Nobody has asked us to put one in, "
 "and we know some smart lawyers who say that it's unlikely that anybody will "
@@ -595,7 +595,7 @@
 "ننتصر على الأرجح."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:271
+#: /home/runa/dev/website/docs/en/faq.wml:271
 msgid ""
 "We think that putting a backdoor in Tor would be tremendously irresponsible "
 "to our users, and a bad precedent for security software in general. If we "
@@ -609,7 +609,7 @@
 "برنامجنا بعد ذلك أبدًا &mdash; لسبب مشروع!"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:279
+#: /home/runa/dev/website/docs/en/faq.wml:279
 msgid ""
 "But that said, there are still plenty of subtle attacks people might try. "
 "Somebody might impersonate us, or break into our computers, or something "
@@ -622,7 +622,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:291
+#: /home/runa/dev/website/docs/en/faq.wml:291
 msgid ""
 "Also, there might be accidental bugs in Tor that could affect your "
 "anonymity. We periodically find and fix anonymity-related bugs, so make sure"
@@ -632,12 +632,12 @@
 "العلل على نحو دوري، ولذا فتأكد من أنك تستخدم آخر نسخ تور."
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:296
+#: /home/runa/dev/website/docs/en/faq.wml:296
 msgid "<hr> <a id=\"DistributingTor\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:299
+#: /home/runa/dev/website/docs/en/faq.wml:299
 msgid ""
 "<a class=\"anchor\" href=\"#DistributingTor\">Can I distribute Tor on my "
 "magazine's CD?</a>"
@@ -646,12 +646,12 @@
 "في أسطوانة؟</a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:302
+#: /home/runa/dev/website/docs/en/faq.wml:302
 msgid "Yes."
 msgstr "نعم."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:306
+#: /home/runa/dev/website/docs/en/faq.wml:306
 msgid ""
 "The Tor software is <a href=\"https://www.fsf.org/\">free software</a>. This"
 " means we give you the rights to redistribute the Tor software, either "
@@ -663,7 +663,7 @@
 " بمقابل أو دون مقابل. لست بحاجة إلى أن تطلب منا أي إذن معين."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:313
+#: /home/runa/dev/website/docs/en/faq.wml:313
 msgid ""
 "However, if you want to redistribute the Tor software you must follow our <a"
 " href=\"<gitblob>LICENSE\">LICENSE</a>.  Essentially this means that you "
@@ -675,7 +675,7 @@
 "برمجيات تور."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:320
+#: /home/runa/dev/website/docs/en/faq.wml:320
 msgid ""
 "Most people who ask us this question don't want to distribute just the Tor "
 "software, though. They want to distribute the Tor bundles, which typically "
@@ -693,7 +693,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:336
+#: /home/runa/dev/website/docs/en/faq.wml:336
 msgid ""
 "Also, you should make sure not to confuse your readers about what Tor is, "
 "who makes it, and what properties it provides (and doesn't provide). See our"
@@ -701,7 +701,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:342
+#: /home/runa/dev/website/docs/en/faq.wml:342
 msgid ""
 "Lastly, you should realize that we release new versions of the Tor software "
 "frequently, and sometimes we make backward incompatible changes. So if you "
@@ -715,12 +715,12 @@
 "وضروري لبرمجيات الأمان التي تحضع لتطوير كثيف."
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:349
+#: /home/runa/dev/website/docs/en/faq.wml:349
 msgid "<hr> <a id=\"SupportMail\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:352
+#: /home/runa/dev/website/docs/en/faq.wml:352
 msgid ""
 "<a class=\"anchor\" href=\"#SupportMail\">How can I get an answer to my Tor "
 "support mail?</a>"
@@ -729,44 +729,44 @@
 "الدعم الذي أرسلته لتور؟</a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:354
+#: /home/runa/dev/website/docs/en/faq.wml:354
 msgid ""
 "There is no official support for Tor. Your best bet is to try the following:"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:356
+#: /home/runa/dev/website/docs/en/faq.wml:356
 msgid "Read through this <a href=\"<page docs/faq>\">FAQ</a>."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:357
+#: /home/runa/dev/website/docs/en/faq.wml:357
 msgid "Read through the <a href=\"<page docs/documentation>\">documentation</a>."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:358
+#: /home/runa/dev/website/docs/en/faq.wml:358
 msgid ""
 "Read through the <a href=\"http://archives.seul.org/or/talk\">OR-TALK "
 "Archives</a> and see if your question is already answered."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:361
+#: /home/runa/dev/website/docs/en/faq.wml:361
 msgid ""
 "Join our <a href=\"irc://irc.oftc.net#tor\">irc channel</a> and state the "
 "issue and wait for help."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:363
+#: /home/runa/dev/website/docs/en/faq.wml:363
 msgid ""
 "Send an email to tor-assistants at torproject.org. These are volunteers who "
 "may be able to help you but you may not get a response for days."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:368
+#: /home/runa/dev/website/docs/en/faq.wml:368
 msgid ""
 "If you find your answer, please stick around on the IRC channel or the "
 "mailing list and answer questions from others."
@@ -775,22 +775,22 @@
 " أسئلة الآخرين."
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:371
+#: /home/runa/dev/website/docs/en/faq.wml:371
 msgid "<hr> <a id=\"WhySlow\"></a>"
 msgstr "<hr> <a id=\"WhySlow\"></a>"
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:374
+#: /home/runa/dev/website/docs/en/faq.wml:374
 msgid "<a class=\"anchor\" href=\"#WhySlow\">Why is Tor so slow?</a>"
 msgstr "<a class=\"anchor\" href=\"#WhySlow\">لماذا تور بطيء جدًا؟</a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:377
+#: /home/runa/dev/website/docs/en/faq.wml:377
 msgid "There are many reasons why the Tor network is currently slow."
 msgstr "توجد أسباب كثيرة تجعل شبكة تور حاليًا بطيئة."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:381
+#: /home/runa/dev/website/docs/en/faq.wml:381
 msgid ""
 "Before we answer, though, you should realize that Tor is never going to be "
 "blazing fast. Your traffic is bouncing through volunteers' computers in "
@@ -804,7 +804,7 @@
 "خلال شبكة تور."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:389
+#: /home/runa/dev/website/docs/en/faq.wml:389
 msgid ""
 "But that doesn't mean that it can't be improved. The current Tor network is "
 "quite small compared to the number of people trying to use it, and many of "
@@ -816,7 +816,7 @@
 "المستخدمين لا يفهمون أو يهتمون بأن تور لا يتحمل حاليًا ضغط مشاركة الملفات."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:396
+#: /home/runa/dev/website/docs/en/faq.wml:396
 msgid ""
 "For the much more in-depth answer, see <a href=\"<blog>why-tor-is-"
 "slow\">Roger's blog post on the topic</a>, which includes both a detailed "
@@ -826,12 +826,12 @@
 " الموضوع</a>، والتي تحتوي ملف PDF مُفصّل وفيديو."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:403
+#: /home/runa/dev/website/docs/en/faq.wml:403
 msgid "What can you do to help?"
 msgstr "ماذا تستطيع أن تفعل للمساعدة؟"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:409
+#: /home/runa/dev/website/docs/en/faq.wml:409
 msgid ""
 "<a href=\"<page docs/tor-doc-relay>\">Configure your Tor to relay traffic "
 "for others</a>. Help make the Tor network large enough that we can handle "
@@ -842,7 +842,7 @@
 "المستخدمين الذين يرغبون بالخصوصية والأمن على الإنترنت."
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:415
+#: /home/runa/dev/website/docs/en/faq.wml:415
 msgid ""
 "<a href=\"<page projects/vidalia>\">Help us make Tor more usable</a>. We "
 "especially need people to help make it easier to configure your Tor as a "
@@ -851,7 +851,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:422
+#: /home/runa/dev/website/docs/en/faq.wml:422
 msgid ""
 "There are some bottlenecks in the current Tor network. Help us design "
 "experiments to track down and demonstrate where the problems are, and then "
@@ -861,7 +861,7 @@
 "الاختناقات ومعرفة مواضع المشاكل ثم بعد ذلك ساعدنا في التركيز على حلها."
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:428
+#: /home/runa/dev/website/docs/en/faq.wml:428
 msgid ""
 "There are some steps that individuals can take to improve their Tor "
 "performance. <a href=\"<wiki>TheOnionRouter/FireFoxTorPerf\">You can "
@@ -874,7 +874,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:439
+#: /home/runa/dev/website/docs/en/faq.wml:439
 msgid ""
 "Tor needs some architectural changes too. One important change is to start "
 "providing <a href=\"#EverybodyARelay\">better service to people who relay "
@@ -887,7 +887,7 @@
 "عليه."
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:446
+#: /home/runa/dev/website/docs/en/faq.wml:446
 msgid ""
 "Help do other things so we can do the hard stuff. Please take a moment to "
 "figure out what your skills and interests are, and then <a href=\"<page "
@@ -895,7 +895,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:452
+#: /home/runa/dev/website/docs/en/faq.wml:452
 msgid ""
 "Help find sponsors for Tor. Do you work at a company or government agency "
 "that uses Tor or has a use for Internet privacy, e.g. to browse the "
@@ -911,7 +911,7 @@
 "يصبح تور أبطأ."
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:461
+#: /home/runa/dev/website/docs/en/faq.wml:461
 msgid ""
 "If you can't help out with any of the above, you can still help out "
 "individually by <a href=\"<page donate/donate>\">donating a bit of money to "
@@ -919,12 +919,12 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:468
+#: /home/runa/dev/website/docs/en/faq.wml:468
 msgid "<hr> <a id=\"Funding\"></a>"
 msgstr "<hr> <a id=\"Funding\"></a>"
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:471
+#: /home/runa/dev/website/docs/en/faq.wml:471
 msgid ""
 "<a class=\"anchor\" href=\"#Funding\">What would The Tor Project do with "
 "more funding?</a>"
@@ -933,7 +933,7 @@
 "التمويل؟</a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:474
+#: /home/runa/dev/website/docs/en/faq.wml:474
 msgid ""
 "We have about 1800 relays right now, pushing over 150 MB/s average traffic. "
 "We have several hundred thousand active users. But the Tor network is not "
@@ -943,12 +943,12 @@
 "آلاف المستخدمين لكن شبكة تور لا يمكنها الاكتفاء بذاتها."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:480
+#: /home/runa/dev/website/docs/en/faq.wml:480
 msgid "There are six main development/maintenance pushes that need attention:"
 msgstr "توجد ستة جوانب تتعلق بالتطوير والصيانة تحتاج الانتباه:"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:486
+#: /home/runa/dev/website/docs/en/faq.wml:486
 msgid ""
 "Scalability: We need to keep scaling and decentralizing the Tor architecture"
 " so it can handle thousands of relays and millions of users. The upcoming "
@@ -961,7 +961,7 @@
 "وثباته."
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:493
+#: /home/runa/dev/website/docs/en/faq.wml:493
 msgid ""
 "User support: With this many users, a lot of people are asking questions all"
 " the time, offering to help out with things, and so on. We need good clean "
@@ -972,24 +972,18 @@
 "من الجهد في التعاون مع المتطوعين."
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:499
+#: /home/runa/dev/website/docs/en/faq.wml:499
 msgid ""
 "Relay support: the Tor network is run by volunteers, but they still need "
 "attention with prompt bug fixes, explanations when things go wrong, "
 "reminders to upgrade, and so on. The network itself is a commons, and "
 "somebody needs to spend some energy making sure the relay operators stay "
-"happy. We also need to work on <a href=\"#RelayOS\">stability</a> on some "
-"platforms &mdash; e.g., Tor relays have problems on Win XP currently."
+"happy. We also need to work on stability on some platforms &mdash; e.g., Tor"
+" relays have problems on Win XP currently."
 msgstr ""
-"دعم التحويلات: يُشغل المتطوعون شبكة تور، لكنهم بحاجة إلى الدعم بإصلاح عاجل "
-"للعلل، وبتوضيح للأمور التي قد تسبب اللبس، وبتذكير بالترقيات، وغيرها من "
-"الأمور. إن شبكة تور بذاتها مُشاعة، لكن يجب أن يُمضي أحد ما الوقت والجهد "
-"للتأكد من أن مشغلي التحويلات سعداء. يجب أن نعمل أيضًا على <a "
-"href=\"#RelayOS\">الثبات</a> لبعض المنصات (تواجه تحويلات تور بعض المشاكل على"
-" ويندوز إكس بي حاليًا)."
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:508
+#: /home/runa/dev/website/docs/en/faq.wml:508
 msgid ""
 "Usability: Beyond documentation, we also need to work on usability of the "
 "software itself. This includes installers, clean GUIs, easy configuration to"
@@ -1000,7 +994,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:517
+#: /home/runa/dev/website/docs/en/faq.wml:517
 msgid ""
 "Incentives: We need to work on ways to encourage people to configure their "
 "Tors as relays and exit nodes rather than just clients.  <a "
@@ -1012,7 +1006,7 @@
 "نُسهّل تشغيل التحويلة وأن نحفّز الناس للقيام بذلك</a>."
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:524
+#: /home/runa/dev/website/docs/en/faq.wml:524
 msgid ""
 "Research: The anonymous communications field is full of surprises and "
 "gotchas. In our copious free time, we also help run top anonymity and "
@@ -1024,7 +1018,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:537
+#: /home/runa/dev/website/docs/en/faq.wml:537
 msgid ""
 "We're continuing to move forward on all of these, but at this rate <a "
 "href=\"#WhySlow\">the Tor network is growing faster than the developers can "
@@ -1037,14 +1031,14 @@
 "الشبكة."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:545
+#: /home/runa/dev/website/docs/en/faq.wml:545
 msgid ""
 "We are also excited about tackling related problems, such as censorship-"
 "resistance."
 msgstr "نسعد أيضًا بمعالجة بعض المشاكل المتعلقة مثل مقاومة الرقابة."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:550
+#: /home/runa/dev/website/docs/en/faq.wml:550
 msgid ""
 "We are proud to have <a href=\"<page about/sponsors>\">sponsorship and "
 "support</a> from the Omidyar Network, the International Broadcasting Bureau,"
@@ -1054,7 +1048,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:557
+#: /home/runa/dev/website/docs/en/faq.wml:557
 msgid ""
 "However, this support is not enough to keep Tor abreast of changes in the "
 "Internet privacy landscape. Please <a href=\"<page "
@@ -1064,36 +1058,36 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:563
+#: /home/runa/dev/website/docs/en/faq.wml:563
 msgid "<hr> <a id=\"Metrics\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:566
+#: /home/runa/dev/website/docs/en/faq.wml:566
 msgid ""
 "<a class=\"anchor\" href=\"#Metrics\">How many people use Tor? How many "
 "relays or exit nodes are there?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:568
+#: /home/runa/dev/website/docs/en/faq.wml:568
 msgid ""
 "All this and more about measuring Tor can be found at the <a "
 "href=\"https://metrics.torproject.org/\">Tor Metrics Portal</a>."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:570
+#: /home/runa/dev/website/docs/en/faq.wml:570
 msgid "<hr> <a id=\"HowUninstallTor\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:573
+#: /home/runa/dev/website/docs/en/faq.wml:573
 msgid "<a class=\"anchor\" href=\"#HowUninstallTor\">How do I uninstall Tor?</a>"
 msgstr "<a class=\"anchor\" href=\"#HowUninstallTor\">كيف أزيل تور؟</a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:576
+#: /home/runa/dev/website/docs/en/faq.wml:576
 msgid ""
 "This depends entirely on how you installed it and which operating system you"
 " have. If you installed a package, then hopefully your package has a way to "
@@ -1107,7 +1101,7 @@
 "تمامًا من أي نسخة من نسخ ويندوز هي اتباع التالي:"
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:584
+#: /home/runa/dev/website/docs/en/faq.wml:584
 msgid ""
 "In your taskbar, right click on Vidalia (the green onion or the black head)"
 "  and choose exit."
@@ -1116,7 +1110,7 @@
 "واختر \"اخرج\"."
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:586
+#: /home/runa/dev/website/docs/en/faq.wml:586
 msgid ""
 "Right click on the taskbar to bring up TaskManager. Look for tor.exe in the "
 "Process List. If it's running, right click and choose End Process."
@@ -1125,7 +1119,7 @@
 "قائمة العمليات. إذا وجدته فانقر بازر الأيمن وانقر \"إنهاء العملية\"."
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:588
+#: /home/runa/dev/website/docs/en/faq.wml:588
 msgid ""
 "Click the Start button, go to Programs, go to Vidalia, choose Uninstall.  "
 "This will remove the Vidalia bundle, which includes Tor and Polipo."
@@ -1134,7 +1128,7 @@
 " بإزالة حزمة فيداليا التي تحتوي تور وبولبو."
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:590
+#: /home/runa/dev/website/docs/en/faq.wml:590
 msgid ""
 "Start Firefox. Go to the Tools menu, choose Add-ons. Select Torbutton.  "
 "Click the Uninstall button."
@@ -1143,7 +1137,7 @@
 "أزِل."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:595
+#: /home/runa/dev/website/docs/en/faq.wml:595
 msgid ""
 "If you do not follow these steps (for example by trying to uninstall "
 "Vidalia, Tor, and Polipo while they are still running), you will need to "
@@ -1154,7 +1148,7 @@
 "Bundle\" يدويًا."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:601
+#: /home/runa/dev/website/docs/en/faq.wml:601
 msgid ""
 "For Mac OS X, follow the <a href=\"<page docs/tor-doc-"
 "osx>#uninstall\">uninstall directions</a>."
@@ -1163,7 +1157,7 @@
 "osx>#uninstall\">تعليمات الإزالة</a>."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:606
+#: /home/runa/dev/website/docs/en/faq.wml:606
 msgid ""
 "If you installed by source, I'm afraid there is no easy uninstall method. "
 "But on the bright side, by default it only installs into /usr/local/ and it "
@@ -1174,19 +1168,19 @@
 "إيجاد الأدلة المطلوبة هناك."
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:611
+#: /home/runa/dev/website/docs/en/faq.wml:611
 msgid "<hr> <a id=\"PGPSigs\"></a>"
 msgstr "<hr> <a id=\"PGPSigs\"></a>"
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:614
+#: /home/runa/dev/website/docs/en/faq.wml:614
 msgid ""
 "<a class=\"anchor\" href=\"#PGPSigs\">What are these \"sig\" files on the "
 "download page?</a>"
 msgstr "<a class=\"anchor\" href=\"#PGPSigs\">ما هي ملفات \"sig\" في صفحة التنزيل؟</a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:617
+#: /home/runa/dev/website/docs/en/faq.wml:617
 msgid ""
 "These are PGP signatures, so you can verify that the file you've downloaded "
 "is exactly the one that we intended you to get."
@@ -1195,26 +1189,26 @@
 "تحصل عليها."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:622
+#: /home/runa/dev/website/docs/en/faq.wml:622
 msgid ""
 "Please read the <a href=\"<page docs/verifying-signatures>\">verifying "
 "signatures</a> page for details."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:626
+#: /home/runa/dev/website/docs/en/faq.wml:626
 msgid "<hr> <a id=\"GetTor\"></a>"
 msgstr "<hr> <a id=\"GetTor\"></a>"
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:629
+#: /home/runa/dev/website/docs/en/faq.wml:629
 msgid ""
 "<a class=\"anchor\" href=\"#GetTor\">Your website is blocked in my country. "
 "How do I download Tor?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:633
+#: /home/runa/dev/website/docs/en/faq.wml:633
 msgid ""
 "Some government or corporate firewalls censor connections to Tor's website. "
 "In those cases, you have three options. First, get it from a friend &mdash; "
@@ -1229,7 +1223,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:647
+#: /home/runa/dev/website/docs/en/faq.wml:647
 msgid ""
 "Be sure to <a href=\"<page docs/verifying-signatures>\">verify the "
 "signature</a> of any package you download, especially when you get it from "
@@ -1237,12 +1231,12 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:652
+#: /home/runa/dev/website/docs/en/faq.wml:652
 msgid "<hr> <a id=\"CompileTorWindows\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:655
+#: /home/runa/dev/website/docs/en/faq.wml:655
 msgid ""
 "<a class=\"anchor\" href=\"#CompileTorWindows\">How do I compile Tor under "
 "Windows?</a>"
@@ -1251,7 +1245,7 @@
 "ويندوز؟</a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:658
+#: /home/runa/dev/website/docs/en/faq.wml:658
 msgid ""
 "Try following the steps at <a href=\"<gitblob>doc/tor-win32-mingw-"
 "creation.txt\"> tor-win32-mingw-creation.txt</a>."
@@ -1260,7 +1254,7 @@
 "creation.txt\"> tor-win32-mingw-creation.txt</a>."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:663
+#: /home/runa/dev/website/docs/en/faq.wml:663
 msgid ""
 "(Note that you don't need to compile Tor yourself in order to use it. Most "
 "people just use the packages available on the <a href=\"<page "
@@ -1268,12 +1262,12 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:668
+#: /home/runa/dev/website/docs/en/faq.wml:668
 msgid "<hr> <a id=\"VirusFalsePositives\"></a>"
 msgstr "<hr> <a id=\"VirusFalsePositives\"></a>"
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:671
+#: /home/runa/dev/website/docs/en/faq.wml:671
 msgid ""
 "<a class=\"anchor\" href=\"#VirusFalsePositives\">Why does my Tor executable"
 " appear to have a virus or spyware?</a>"
@@ -1282,7 +1276,7 @@
 "التنفيذية كفيروس أو برنامج تجسس؟</a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:674
+#: /home/runa/dev/website/docs/en/faq.wml:674
 msgid ""
 "Sometimes, overzealous Windows virus and spyware detectors trigger on some "
 "parts of the Tor Windows binary. Our best guess is that these are false "
@@ -1297,7 +1291,7 @@
 "برنامجك لتوضح له الخطأ؛ أو اختر بائعًا أفضل."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:682
+#: /home/runa/dev/website/docs/en/faq.wml:682
 msgid ""
 "In the meantime, we encourage you to not just take our word for it. Our job "
 "is to provide the source; if you're concerned, please do <a "
@@ -1308,12 +1302,12 @@
 "بنفسك</a>."
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:687
+#: /home/runa/dev/website/docs/en/faq.wml:687
 msgid "<hr> <a id=\"LiveCD\"></a>"
 msgstr "<hr> <a id=\"LiveCD\"></a>"
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:690
+#: /home/runa/dev/website/docs/en/faq.wml:690
 msgid ""
 "<a class=\"anchor\" href=\"#LiveCD\">Is there a LiveCD or other bundle that "
 "includes Tor?</a>"
@@ -1322,7 +1316,7 @@
 "أخرى تحتوي تور؟</a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:693
+#: /home/runa/dev/website/docs/en/faq.wml:693
 msgid ""
 "Yes.  Use <a href=\"https://tails.boum.org/\">The Amnesic Incognito Live "
 "System</a> or <a href=\"<page projects/torbrowser>\">the Tor Browser "
@@ -1330,19 +1324,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:698
+#: /home/runa/dev/website/docs/en/faq.wml:698
 msgid "<hr> <a id=\"torrc\"></a>"
 msgstr "<hr> <a id=\"torrc\"></a>"
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:701
+#: /home/runa/dev/website/docs/en/faq.wml:701
 msgid ""
 "<a class=\"anchor\" href=\"#torrc\">I'm supposed to \"edit my torrc\". What "
 "does that mean?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:704
+#: /home/runa/dev/website/docs/en/faq.wml:704
 msgid ""
 "Tor installs a text file called torrc that contains configuration "
 "instructions for how your Tor program should behave. The default "
@@ -1352,12 +1346,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:712
+#: /home/runa/dev/website/docs/en/faq.wml:712
 msgid "The location of your torrc file depends on the way you installed Tor:"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:716
+#: /home/runa/dev/website/docs/en/faq.wml:716
 msgid ""
 "On Windows, if you installed a Tor bundle with Vidalia, you can find your "
 "torrc file in the Start menu under Programs -&gt; Vidalia Bundle -&gt; Tor, "
@@ -1370,14 +1364,14 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:725
+#: /home/runa/dev/website/docs/en/faq.wml:725
 msgid ""
 "On OS X, if you use Vidalia, edit <code>~/.vidalia/torrc</code>. Otherwise, "
 "open your favorite text editor and load <code>/Library/Tor/torrc</code>."
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:729
+#: /home/runa/dev/website/docs/en/faq.wml:729
 msgid ""
 "On Unix, if you installed a pre-built package, look for "
 "<code>/etc/tor/torrc</code> or <code>/etc/torrc</code> or consult your "
@@ -1385,7 +1379,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:733
+#: /home/runa/dev/website/docs/en/faq.wml:733
 msgid ""
 "Finally, if you installed from source, you may not have a torrc installed "
 "yet: look in <code>/usr/local/etc/</code> and note that you may need to "
@@ -1393,14 +1387,14 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:740
+#: /home/runa/dev/website/docs/en/faq.wml:740
 msgid ""
 "If you use Vidalia, be sure to exit both Tor and Vidalia before you edit "
 "your torrc file. Otherwise Vidalia might overwrite your changes."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:745
+#: /home/runa/dev/website/docs/en/faq.wml:745
 msgid ""
 "Once you've changed your torrc, you will need to restart Tor for the changes"
 " to take effect. (For advanced users on OS X and Unix, note that you "
@@ -1408,7 +1402,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:751
+#: /home/runa/dev/website/docs/en/faq.wml:751
 msgid ""
 "For other configuration options you can use, look at the <a href=\"<page "
 "docs/tor-manual>\">Tor manual page</a>. Remember, all lines beginning with #"
@@ -1416,19 +1410,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:757
+#: /home/runa/dev/website/docs/en/faq.wml:757
 msgid "<hr> <a id=\"Logs\"></a>"
 msgstr "<hr> <a id=\"Logs\"></a>"
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:760
+#: /home/runa/dev/website/docs/en/faq.wml:760
 msgid ""
 "<a class=\"anchor\" href=\"#Logs\">How do I set up logging, or see Tor's "
 "logs?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:763
+#: /home/runa/dev/website/docs/en/faq.wml:763
 msgid ""
 "If you installed a Tor bundle that includes Vidalia, then Vidalia has a "
 "window called \"Message Log\" that will show you Tor's log messages. You can"
@@ -1437,19 +1431,19 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:770
+#: /home/runa/dev/website/docs/en/faq.wml:770
 msgid ""
 "If you're not using Vidalia, you'll have to go find the log files by hand. "
 "Here are some likely places for your logs to be:"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:775
+#: /home/runa/dev/website/docs/en/faq.wml:775
 msgid "On OS X, Debian, Red Hat, etc, the logs are in /var/log/tor/"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:777
+#: /home/runa/dev/website/docs/en/faq.wml:777
 msgid ""
 "On Windows, there are no default log files currently. If you enable logs in "
 "your torrc file, they default to <code>\\username\\Application "
@@ -1457,7 +1451,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:781
+#: /home/runa/dev/website/docs/en/faq.wml:781
 msgid ""
 "If you compiled Tor from source, by default your Tor logs to <a "
 "href=\"http://en.wikipedia.org/wiki/Standard_streams\">\"stdout\"</a> at "
@@ -1466,7 +1460,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:789
+#: /home/runa/dev/website/docs/en/faq.wml:789
 msgid ""
 "To change your logging setup by hand, <a href=\"#torrc\">edit your torrc</a>"
 " and find the section (near the top of the file) which contains the "
@@ -1474,7 +1468,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><pre>
-#: /home/runa/tor/website/docs/en/faq.wml:795
+#: /home/runa/dev/website/docs/en/faq.wml:795
 #, no-wrap
 msgid ""
 "\\## Logs go to stdout at level \"notice\" unless redirected by something\n"
@@ -1482,7 +1476,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:800
+#: /home/runa/dev/website/docs/en/faq.wml:800
 msgid ""
 "For example, if you want Tor to send complete debug, info, notice, warn, and"
 " err level messages to a file, append the following line to the end of the "
@@ -1490,32 +1484,32 @@
 msgstr ""
 
 #. type: Content of: <div><div><pre>
-#: /home/runa/tor/website/docs/en/faq.wml:806
+#: /home/runa/dev/website/docs/en/faq.wml:806
 #, no-wrap
 msgid "Log debug file c:/program files/tor/debug.log\n"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:810
+#: /home/runa/dev/website/docs/en/faq.wml:810
 msgid ""
 "Replace <code>c:/program files/tor/debug.log</code> with a directory and "
 "filename for your Tor log."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:814
+#: /home/runa/dev/website/docs/en/faq.wml:814
 msgid "<hr> <a id=\"DoesntWork\"></a>"
 msgstr "<hr> <a id=\"DoesntWork\"></a>"
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:817
+#: /home/runa/dev/website/docs/en/faq.wml:817
 msgid ""
 "<a class=\"anchor\" href=\"#DoesntWork\">I installed Tor and Polipo but it's"
 " not working.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:820
+#: /home/runa/dev/website/docs/en/faq.wml:820
 msgid ""
 "Once you've installed the Tor bundle, there are two questions to ask: first,"
 " is your Tor able to establish a circuit? Second, is your Firefox correctly "
@@ -1523,7 +1517,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:825
+#: /home/runa/dev/website/docs/en/faq.wml:825
 msgid ""
 "If Tor can establish a circuit, the onion icon in Vidalia will turn green. "
 "You can also check in the Vidalia Control Panel to make sure it says "
@@ -1533,19 +1527,19 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:835
+#: /home/runa/dev/website/docs/en/faq.wml:835
 msgid "If Tor can't establish a circuit, here are some hints:"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:839
+#: /home/runa/dev/website/docs/en/faq.wml:839
 msgid ""
 "Are you sure Tor is running? If you're using Vidalia, you may have to click "
 "on the onion and select \"Start\" to launch Tor."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:841
+#: /home/runa/dev/website/docs/en/faq.wml:841
 msgid ""
 "Check your system clock. If it's more than a few hours off, Tor will refuse "
 "to build circuits. For XP users, synchronize your clock under the clock "
@@ -1554,7 +1548,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:845
+#: /home/runa/dev/website/docs/en/faq.wml:845
 msgid ""
 "Is your Internet connection <a href=\"#FirewallPorts\">firewalled by "
 "port</a>, or do you normally need to use a <a "
@@ -1562,7 +1556,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:850
+#: /home/runa/dev/website/docs/en/faq.wml:850
 msgid ""
 "Are you running programs like Norton Internet Security or SELinux that block"
 " certain connections, even though you don't realize they do? They could be "
@@ -1570,7 +1564,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:853
+#: /home/runa/dev/website/docs/en/faq.wml:853
 msgid ""
 "Are you in China, or behind a restrictive corporate network firewall that "
 "blocks the public Tor relays? If so, you should learn about <a href=\"<page "
@@ -1578,14 +1572,14 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:856
+#: /home/runa/dev/website/docs/en/faq.wml:856
 msgid ""
 "Check your <a href=\"#Logs\">Tor logs</a>. Do they give you any hints about "
 "what's going wrong?"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:861
+#: /home/runa/dev/website/docs/en/faq.wml:861
 msgid ""
 "Step two is to confirm that Firefox is correctly configured to send its "
 "traffic through Tor. Try the <a href=\"https://check.torproject.org/\">Tor "
@@ -1595,12 +1589,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:869
+#: /home/runa/dev/website/docs/en/faq.wml:869
 msgid "If it thinks you're not using Tor, here are some hints:"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:873
+#: /home/runa/dev/website/docs/en/faq.wml:873
 msgid ""
 "Did you install the Torbutton extension for Firefox? The installation "
 "bundles include it, but sometimes people forget to install it. Make sure it "
@@ -1609,7 +1603,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:878
+#: /home/runa/dev/website/docs/en/faq.wml:878
 msgid ""
 "Do you have incompatible Firefox extensions like FoxyProxy installed? If so,"
 " uninstall them. (Note that using FoxyProxy is NOT a sufficient substitute "
@@ -1621,7 +1615,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:885
+#: /home/runa/dev/website/docs/en/faq.wml:885
 msgid ""
 "If your browser says \"The proxy server is refusing connections.\", check "
 "that Polipo (the http proxy that passes traffic between Firefox and Tor) is "
@@ -1631,7 +1625,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:890
+#: /home/runa/dev/website/docs/en/faq.wml:890
 msgid ""
 "If you're upgrading from OS X, some of the earlier OS X installers were "
 "broken in really unfortunate ways. You may find that <a href=\"<page docs"
@@ -1641,14 +1635,14 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:895
+#: /home/runa/dev/website/docs/en/faq.wml:895
 msgid ""
 "If you're on Linux, make sure Privoxy isn't running, since it will conflict "
 "with the port that our Polipo configuration file picks."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:897
+#: /home/runa/dev/website/docs/en/faq.wml:897
 msgid ""
 "If you installed Polipo yourself (not from a bundle), did you edit the "
 "config file as described? Did you restart Polipo after this change? Are you "
@@ -1656,7 +1650,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:900
+#: /home/runa/dev/website/docs/en/faq.wml:900
 msgid ""
 "For Red Hat Linux and related systems, do you have SELinux enabled? If so, "
 "it might be preventing Polipo from talking to Tor. We also run across BSD "
@@ -1665,19 +1659,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:906
+#: /home/runa/dev/website/docs/en/faq.wml:906
 msgid "<hr /> <a id=\"VidaliaPassword\"></a>"
 msgstr "<hr /> <a id=\"VidaliaPassword\"></a>"
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:909
+#: /home/runa/dev/website/docs/en/faq.wml:909
 msgid ""
 "<a class=\"anchor\" href=\"#VidaliaPassword\">Tor/Vidalia prompts for a "
 "password at start.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:912
+#: /home/runa/dev/website/docs/en/faq.wml:912
 msgid ""
 "Vidalia interacts with the Tor software via Tor's \"control port\". The "
 "control port lets Vidalia receive status updates from Tor, request a new "
@@ -1692,7 +1686,7 @@
 "التطبيقات الأخرى من الاتصال بمنفذ التحكم والتدخل في سريتك."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:921
+#: /home/runa/dev/website/docs/en/faq.wml:921
 msgid ""
 "Usually this process of generating and setting a random control password "
 "happens in the background. There are three common situations, though, where "
@@ -1702,7 +1696,7 @@
 " يمكن أن يطلب فيها فيداليا منك إدخال كلمة سر:"
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:927
+#: /home/runa/dev/website/docs/en/faq.wml:927
 msgid ""
 "You're already running Vidalia and Tor. For example, this situation can "
 "happen if you installed the Vidalia bundle and now you're trying to run the "
@@ -1714,7 +1708,7 @@
 "القديمين قبل تشغيل الحزمة الجديدة."
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:932
+#: /home/runa/dev/website/docs/en/faq.wml:932
 msgid ""
 "Vidalia crashed, but left Tor running with the last known random password. "
 "After you restart Vidalia, it generates a new random password, but Vidalia "
@@ -1736,7 +1730,7 @@
 " وسوف يعمل مجددًا."
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:945
+#: /home/runa/dev/website/docs/en/faq.wml:945
 msgid ""
 "You had previously set Tor to run as a Windows NT service. When Tor is set "
 "to run as a service, it starts up when the system boots. If you configured "
@@ -1751,12 +1745,12 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:960
+#: /home/runa/dev/website/docs/en/faq.wml:960
 msgid "<hr> <a id=\"ChooseEntryExit\"></a>"
 msgstr "<hr> <a id=\"ChooseEntryExit\"></a>"
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:963
+#: /home/runa/dev/website/docs/en/faq.wml:963
 msgid ""
 "<a class=\"anchor\" href=\"#ChooseEntryExit\">Can I control which nodes (or "
 "country) are used for entry/exit?</a>"
@@ -1765,7 +1759,7 @@
 "الدول) التي تستخدم المدخل/المخرج؟</a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:966
+#: /home/runa/dev/website/docs/en/faq.wml:966
 msgid ""
 "Yes. You can set preferred entry and exit nodes as well as inform Tor which "
 "nodes you do not want to use.  The following options can be added to your "
@@ -1774,46 +1768,46 @@
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/docs/en/faq.wml:972
+#: /home/runa/dev/website/docs/en/faq.wml:972
 msgid "<tt>EntryNodes $fingerprint,$fingerprint,...</tt>"
 msgstr "<tt>EntryNodes $بصمة_الأصبع,$بصمة_الأصبع,...</tt>"
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/docs/en/faq.wml:973
+#: /home/runa/dev/website/docs/en/faq.wml:973
 msgid ""
 "A list of preferred nodes to use for the first hop in the circuit, if "
 "possible."
 msgstr "قائمة بالعقد المفضل استخدامها كطرف أول في الحلقة ما أمكنك ذلك."
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/docs/en/faq.wml:975
+#: /home/runa/dev/website/docs/en/faq.wml:975
 msgid "<tt>ExitNodes $fingerprint,$fingerprint,...</tt>"
 msgstr "<tt>ExitNodes $بصمة_الأصبع,$بصمة_الأصبع,...</tt>"
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/docs/en/faq.wml:976
+#: /home/runa/dev/website/docs/en/faq.wml:976
 msgid ""
 "A list of preferred nodes to use for the last hop in the circuit, if "
 "possible."
 msgstr "قائمة بالعقد المفضل استخدامها كطرف أخير في الحلقة ما أمكنك ذلك."
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/docs/en/faq.wml:978
+#: /home/runa/dev/website/docs/en/faq.wml:978
 msgid "<tt>ExcludeNodes $fingerprint,$fingerprint,...</tt>"
 msgstr "<tt>ExcludeNodes $بصمة_الأصبع,$بصمة_الأصبع,...</tt>"
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/docs/en/faq.wml:979
+#: /home/runa/dev/website/docs/en/faq.wml:979
 msgid "A list of nodes to never use when building a circuit."
 msgstr "قائمة بالعقد التي لا تريد استخدامها أبدًا عند بناء حلقة."
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/docs/en/faq.wml:981
+#: /home/runa/dev/website/docs/en/faq.wml:981
 msgid "<tt>ExcludeExitNodes $fingerprint,$fingerprint,...</tt>"
 msgstr "<tt>ExcludeExitNodes $بصمة_الأصبع,$بصمة_الأصبع,...</tt>"
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/docs/en/faq.wml:982
+#: /home/runa/dev/website/docs/en/faq.wml:982
 msgid ""
 "A list of nodes to never use when picking an exit.  Nodes listed in "
 "<tt>ExcludeNodes</tt> are automatically in this list."
@@ -1822,7 +1816,7 @@
 "<tt>ExcludeNodes</tt> تضاف تلقائيًا إلى هذه القائمة."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:987
+#: /home/runa/dev/website/docs/en/faq.wml:987
 msgid ""
 "<em>We recommend you do not use these</em> &mdash; they are intended for "
 "testing and may disappear in future versions.  You get the best security "
@@ -1836,7 +1830,7 @@
 "بسريتك على نحو قد لا نعرفه."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:994
+#: /home/runa/dev/website/docs/en/faq.wml:994
 msgid ""
 "The <tt>EntryNodes</tt> and <tt>ExitNodes</tt> config options are treated as"
 " a request, meaning if the nodes are down or seem slow, Tor will still avoid"
@@ -1848,7 +1842,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1004
+#: /home/runa/dev/website/docs/en/faq.wml:1004
 msgid ""
 "Instead of <tt>$fingerprint</tt> you can also specify a 2 letter ISO3166 "
 "country code in curly braces (for example {de}), or an ip address pattern "
@@ -1857,7 +1851,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1010
+#: /home/runa/dev/website/docs/en/faq.wml:1010
 msgid ""
 "If you want to access a service directly through Tor's SOCKS interface (eg. "
 "using ssh via connect.c), another option is to set up an internal mapping in"
@@ -1869,26 +1863,26 @@
 "باستخدام <tt>MapAddress</tt>. راجع صفحة الدليل المتعلقة لمزيد من المعلومات."
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1016
+#: /home/runa/dev/website/docs/en/faq.wml:1016
 msgid "<hr> <a id=\"GoogleCaptcha\"></a>"
 msgstr "<hr> <a id=\"GoogleCaptcha\"></a>"
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1019
+#: /home/runa/dev/website/docs/en/faq.wml:1019
 msgid ""
 "<a class=\"anchor\" href=\"#GoogleCaptcha\">Google makes me solve a Captcha "
 "or tells me I have spyware installed.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1022
+#: /home/runa/dev/website/docs/en/faq.wml:1022
 msgid ""
 "This is a known and intermittent problem; it does not mean that Google "
 "considers Tor to be spyware."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1027
+#: /home/runa/dev/website/docs/en/faq.wml:1027
 msgid ""
 "When you use Tor, you are sending queries through exit relays that are also "
 "shared by thousands of other users. Tor users typically see this message "
@@ -1899,7 +1893,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1035
+#: /home/runa/dev/website/docs/en/faq.wml:1035
 msgid ""
 "An alternate explanation is that Google tries to detect certain kinds of "
 "spyware or viruses that send distinctive queries to Google Search. It notes "
@@ -1909,7 +1903,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1044
+#: /home/runa/dev/website/docs/en/faq.wml:1044
 msgid ""
 "To our knowledge, Google is not doing anything intentionally specifically to"
 " deter or block Tor use. The error message about an infected machine should "
@@ -1917,7 +1911,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1050
+#: /home/runa/dev/website/docs/en/faq.wml:1050
 msgid ""
 "Torbutton 1.2.5 (released in mid 2010) detects Google captchas and can "
 "automatically redirect you to a more Tor-friendly search engine such as "
@@ -1925,19 +1919,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1055
+#: /home/runa/dev/website/docs/en/faq.wml:1055
 msgid "<hr /> <a id=\"GmailWarning\"></a>"
 msgstr "<hr /> <a id=\"GmailWarning\"></a>"
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1058
+#: /home/runa/dev/website/docs/en/faq.wml:1058
 msgid ""
 "<a class=\"anchor\" href=\"#GmailWarning\">Gmail warns me that my account "
 "may have been compromised.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1061
+#: /home/runa/dev/website/docs/en/faq.wml:1061
 msgid ""
 "Sometimes, after you've used Gmail over Tor, Google presents a pop-up "
 "notification that your account may have been compromised.  The notification "
@@ -1946,7 +1940,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1068
+#: /home/runa/dev/website/docs/en/faq.wml:1068
 msgid ""
 "In general this is a false alarm: Google saw a bunch of logins from "
 "different places, as a result of running the service via Tor, and decided it"
@@ -1955,7 +1949,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1075
+#: /home/runa/dev/website/docs/en/faq.wml:1075
 msgid ""
 "Even though this may be a biproduct of using the service via tor, that "
 "doesn't mean you can entirely ignore the warning. It is <i>probably</i> a "
@@ -1964,7 +1958,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1082
+#: /home/runa/dev/website/docs/en/faq.wml:1082
 msgid ""
 "Cookie hijacking is possible by either physical access to your computer or "
 "by watching your network traffic.  In theory only physical access should "
@@ -1975,7 +1969,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1091
+#: /home/runa/dev/website/docs/en/faq.wml:1091
 msgid ""
 "And if somebody <i>did</i> steal your google cookie, they might end up "
 "logging in from unusual places (though of course they also might not). So "
@@ -1987,19 +1981,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1100
+#: /home/runa/dev/website/docs/en/faq.wml:1100
 msgid "<hr> <a id=\"FirewallPorts\"></a>"
 msgstr "<hr> <a id=\"FirewallPorts\"></a>"
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1103
+#: /home/runa/dev/website/docs/en/faq.wml:1103
 msgid ""
 "<a class=\"anchor\" href=\"#FirewallPorts\">My firewall only allows a few "
 "outgoing ports.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1106
+#: /home/runa/dev/website/docs/en/faq.wml:1106
 msgid ""
 "If your firewall works by blocking ports, then you can tell Tor to only use "
 "the ports that your firewall permits by adding \"FascistFirewall 1\" to your"
@@ -2009,7 +2003,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1114
+#: /home/runa/dev/website/docs/en/faq.wml:1114
 msgid ""
 "By default, when you set this Tor assumes that your firewall allows only "
 "port 80 and port 443 (HTTP and HTTPS respectively). You can select a "
@@ -2017,14 +2011,14 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1120
+#: /home/runa/dev/website/docs/en/faq.wml:1120
 msgid ""
 "If you want to be more fine-grained with your controls, you can also use the"
 " ReachableAddresses config options, e.g.:"
 msgstr ""
 
 #. type: Content of: <div><div><pre>
-#: /home/runa/tor/website/docs/en/faq.wml:1125
+#: /home/runa/dev/website/docs/en/faq.wml:1125
 #, no-wrap
 msgid ""
 "  ReachableDirAddresses *:80\n"
@@ -2032,12 +2026,12 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1129
+#: /home/runa/dev/website/docs/en/faq.wml:1129
 msgid "<hr> <a id=\"RelayFlexible\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1132
+#: /home/runa/dev/website/docs/en/faq.wml:1132
 msgid ""
 "<a class=\"anchor\" href=\"#RelayFlexible\">How stable does my relay need to"
 " be?</a>"
@@ -2046,12 +2040,12 @@
 "عليه تحويلتي؟</a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1135
+#: /home/runa/dev/website/docs/en/faq.wml:1135
 msgid "We aim to make setting up a Tor relay easy and convenient:"
 msgstr "إننا نسعى إلى أن يكون تجهيز التحويلة سهلًا وعمليًا:"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1139
+#: /home/runa/dev/website/docs/en/faq.wml:1139
 msgid ""
 "Tor has built-in support for <a "
 "href=\"<wikifaq>#WhatbandwidthshapingoptionsareavailabletoTorrelays\"> rate "
@@ -2062,7 +2056,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1147
+#: /home/runa/dev/website/docs/en/faq.wml:1147
 msgid ""
 "Each Tor relay has an <a href=\"#ExitPolicies\">exit policy</a> that "
 "specifies what sort of outbound connections are allowed or refused from that"
@@ -2074,7 +2068,7 @@
 "للناس بالخروج من تحويلتك، فبإمكانك ضبطها للاتصال بتحويلات تور الأخرى فقط."
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1152
+#: /home/runa/dev/website/docs/en/faq.wml:1152
 msgid ""
 "It's fine if the relay goes offline sometimes. The directories notice this "
 "quickly and stop advertising the relay. Just try to make sure it's not too "
@@ -2085,7 +2079,7 @@
 "تحويلتك قبل انقطاعها سوف تضيع."
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1157
+#: /home/runa/dev/website/docs/en/faq.wml:1157
 msgid ""
 "We can handle relays with dynamic IPs just fine &mdash; simply leave the "
 "Address config option blank, and Tor will try to guess."
@@ -2094,7 +2088,7 @@
 "ملف الإعداد Address فارغًا وسوف يحاول تور أن يخمن."
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1160
+#: /home/runa/dev/website/docs/en/faq.wml:1160
 msgid ""
 "If your relay is behind a NAT and it doesn't know its public IP (e.g. it has"
 " an IP of 192.168.x.y), you'll need to set up port forwarding. Forwarding "
@@ -2104,7 +2098,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1166
+#: /home/runa/dev/website/docs/en/faq.wml:1166
 msgid ""
 "Your relay will passively estimate and advertise its recent bandwidth "
 "capacity, so high-bandwidth relays will attract more users than low-"
@@ -2115,12 +2109,12 @@
 "تحويلات ذات نطاق منخفض مفيد أيضًا."
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1172
+#: /home/runa/dev/website/docs/en/faq.wml:1172
 msgid "<hr> <a id=\"RunARelayBut\"></a> <a id=\"ExitPolicies\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1176
+#: /home/runa/dev/website/docs/en/faq.wml:1176
 msgid ""
 "<a class=\"anchor\" href=\"#ExitPolicies\">I'd run a relay, but I don't want"
 " to deal with abuse issues.</a>"
@@ -2129,12 +2123,12 @@
 "أن أدعم إساءة الاستخدام.</a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1179
+#: /home/runa/dev/website/docs/en/faq.wml:1179
 msgid "Great. That's exactly why we implemented exit policies."
 msgstr "رائع. هذا تحديدًا سبب تطبيقنا لسياسات المخرج."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1183
+#: /home/runa/dev/website/docs/en/faq.wml:1183
 msgid ""
 "Each Tor relay has an exit policy that specifies what sort of outbound "
 "connections are allowed or refused from that relay. The exit policies are "
@@ -2150,7 +2144,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1197
+#: /home/runa/dev/website/docs/en/faq.wml:1197
 msgid ""
 "The default exit policy allows access to many popular services (e.g. web "
 "browsing), but <a "
@@ -2166,7 +2160,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1211
+#: /home/runa/dev/website/docs/en/faq.wml:1211
 msgid ""
 "If you do allow any exit connections, make sure name resolution works (that "
 "is, your computer can resolve Internet addresses correctly).  If there are "
@@ -2181,12 +2175,12 @@
 "يتأثر مستخدمو تور."
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1219
+#: /home/runa/dev/website/docs/en/faq.wml:1219
 msgid "<hr> <a id=\"RelayOrBridge\"></a>"
 msgstr "<hr> <a id=\"RelayOrBridge\"></a>"
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1222
+#: /home/runa/dev/website/docs/en/faq.wml:1222
 msgid ""
 "<a class=\"anchor\" href=\"#RelayOrBridge\">Should I be a normal relay or "
 "bridge relay?</a>"
@@ -2195,7 +2189,7 @@
 "تحويلة جسرية؟</a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1224
+#: /home/runa/dev/website/docs/en/faq.wml:1224
 msgid ""
 "<a href=\"<page docs/bridges>\">Bridge relays</a> (or \"bridges\" for short)"
 "  are <a href=\"<page docs/tor-doc-relay>\">Tor relays</a> that aren't "
@@ -2205,7 +2199,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1231
+#: /home/runa/dev/website/docs/en/faq.wml:1231
 msgid ""
 "Being a normal relay vs being a bridge relay is almost the same "
 "configuration: it's just a matter of whether your relay is listed publically"
@@ -2215,7 +2209,7 @@
 "سرد تحويلتك علنيًا أو عدم سردها."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1236
+#: /home/runa/dev/website/docs/en/faq.wml:1236
 msgid ""
 "Right now, there are a small number of places in the world that filter "
 "connections to the Tor network. So getting a lot of bridges running right "
@@ -2230,7 +2224,7 @@
 "بها."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1244
+#: /home/runa/dev/website/docs/en/faq.wml:1244
 msgid ""
 "So should you run a normal relay or bridge relay? If you have lots of "
 "bandwidth, you should definitely run a normal relay &mdash; bridge relays "
@@ -2247,19 +2241,19 @@
 "لك على التطوع!"
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1252
+#: /home/runa/dev/website/docs/en/faq.wml:1252
 msgid "<hr> <a id=\"MultipleRelays\"></a>"
 msgstr "<hr> <a id=\"MultipleRelays\"></a>"
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1255
+#: /home/runa/dev/website/docs/en/faq.wml:1255
 msgid ""
 "<a class=\"anchor\" href=\"#MultipleRelays\">I want to run more than one "
 "relay.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1258
+#: /home/runa/dev/website/docs/en/faq.wml:1258
 msgid ""
 "Great. If you want to run several relays to donate more to the network, "
 "we're happy with that. But please don't run more than a few dozen on the "
@@ -2268,7 +2262,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1265
+#: /home/runa/dev/website/docs/en/faq.wml:1265
 msgid ""
 "If you do decide to run more than one relay, please set the \"MyFamily\" "
 "config option in the <a href=\"#torrc\">torrc</a> of each relay, listing all"
@@ -2276,13 +2270,13 @@
 msgstr ""
 
 #. type: Content of: <div><div><pre>
-#: /home/runa/tor/website/docs/en/faq.wml:1271
+#: /home/runa/dev/website/docs/en/faq.wml:1271
 #, no-wrap
 msgid "    MyFamily $fingerprint1,$fingerprint2,$fingerprint3\n"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1275
+#: /home/runa/dev/website/docs/en/faq.wml:1275
 msgid ""
 "where each fingerprint is the 40 character identity fingerprint (without "
 "spaces). You can also list them by nickname, but fingerprint is safer. Be "
@@ -2291,7 +2285,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1282
+#: /home/runa/dev/website/docs/en/faq.wml:1282
 msgid ""
 "That way clients will know to avoid using more than one of your relays in a "
 "single circuit. You should set MyFamily if you have administrative control "
@@ -2300,12 +2294,12 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1288
+#: /home/runa/dev/website/docs/en/faq.wml:1288
 msgid "<hr> <a id=\"RelayMemory\"></a>"
 msgstr "<hr> <a id=\"RelayMemory\"></a>"
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1291
+#: /home/runa/dev/website/docs/en/faq.wml:1291
 msgid ""
 "<a class=\"anchor\" href=\"#RelayMemory\">Why is my Tor relay using so much "
 "memory?</a>"
@@ -2314,7 +2308,7 @@
 "من الذاكرة؟</a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1293
+#: /home/runa/dev/website/docs/en/faq.wml:1293
 msgid ""
 "If your Tor relay is using more memory than you'd like, here are some tips "
 "for reducing its footprint:"
@@ -2323,7 +2317,7 @@
 "ذلك:"
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1298
+#: /home/runa/dev/website/docs/en/faq.wml:1298
 msgid ""
 "If you're on Linux, you may be encountering memory fragmentation bugs in "
 "glibc's malloc implementation. That is, when Tor releases memory back to the"
@@ -2340,7 +2334,7 @@
 "من تور استخدام ذلك التنفيذ عبر: <tt>./configure --enable-openbsd-malloc</tt>"
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1306
+#: /home/runa/dev/website/docs/en/faq.wml:1306
 msgid ""
 "If you're running a fast relay, meaning you have many TLS connections open, "
 "you are probably losing a lot of memory to OpenSSL's internal buffers (38KB+"
@@ -2359,7 +2353,7 @@
 "الخاصية."
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1314
+#: /home/runa/dev/website/docs/en/faq.wml:1314
 msgid ""
 "If you're running on Solaris, OpenBSD, NetBSD, or old FreeBSD, Tor is "
 "probably forking separate processes rather than using threads. Consider "
@@ -2369,7 +2363,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1320
+#: /home/runa/dev/website/docs/en/faq.wml:1320
 msgid ""
 "If you still can't handle the memory load, consider reducing the amount of "
 "bandwidth your relay advertises. Advertising less bandwidth means you will "
@@ -2381,7 +2375,7 @@
 "تنشغل التحويلة. راجع الخيار <tt>MaxAdvertisedBandwidth</tt>  في صفحة الدليل."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1329
+#: /home/runa/dev/website/docs/en/faq.wml:1329
 msgid ""
 "All of this said, fast Tor relays do use a lot of ram. It is not unusual for"
 " a fast exit relay to use 500-1000 MB of memory."
@@ -2390,24 +2384,24 @@
 "غريبًا أن تستهلك تحويلة خروج 500-1000 م.ب من الذاكرة."
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1333
+#: /home/runa/dev/website/docs/en/faq.wml:1333
 msgid "<hr> <a id=\"WhyNotNamed\"></a>"
 msgstr "<hr> <a id=\"WhyNotNamed\"></a>"
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1336
+#: /home/runa/dev/website/docs/en/faq.wml:1336
 msgid "<a class=\"anchor\" href=\"#WhyNotNamed\">Why is my Tor relay not named?</a>"
 msgstr "<a class=\"anchor\" href=\"#WhyNotNamed\">لماذا تحويلتي لتور غير مسماة؟</a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1339
+#: /home/runa/dev/website/docs/en/faq.wml:1339
 msgid ""
 "We currently use these metrics to determine if your relay should be "
 "named:<br>"
 msgstr "نعتمد حاليا على المعايير التالية لتحديد ضرورة تسمية تحويلتك:"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1342
+#: /home/runa/dev/website/docs/en/faq.wml:1342
 msgid ""
 "The name is not currently mapped to a different key. Existing mappings are "
 "removed after 6 months of inactivity from a relay."
@@ -2416,22 +2410,22 @@
 "من عدم نشاط التحويلة."
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1344
+#: /home/runa/dev/website/docs/en/faq.wml:1344
 msgid "The relay must have been around for at least two weeks."
 msgstr "يجب أن تتواجد التحويلة لأسبوعين على الأقل."
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1345
+#: /home/runa/dev/website/docs/en/faq.wml:1345
 msgid "No other router may have wanted the same name in the past month."
 msgstr "يجب ألا يكون أي مُوجِّه طلب نفس الاسم خلال الشهر الماضي."
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1348
+#: /home/runa/dev/website/docs/en/faq.wml:1348
 msgid "<hr> <a id=\"KeyManagement\"></a>"
 msgstr "<hr> <a id=\"KeyManagement\"></a>"
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1351
+#: /home/runa/dev/website/docs/en/faq.wml:1351
 msgid ""
 "<a class=\"anchor\" href=\"#KeyManagement\">Tell me about all the keys Tor "
 "uses.</a>"
@@ -2440,7 +2434,7 @@
 "يستخدمها تور.</a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1354
+#: /home/runa/dev/website/docs/en/faq.wml:1354
 msgid ""
 "Tor uses a variety of different keys, with three goals in mind: 1)  "
 "encryption to ensure privacy of data within the Tor network, 2)  "
@@ -2453,7 +2447,7 @@
 " و(3) للتوقيع للتأكد من أن كل العملاء يعرفون نفس التحويلات."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1362
+#: /home/runa/dev/website/docs/en/faq.wml:1362
 msgid ""
 "<b>Encryption</b>: first, all connections in Tor use TLS link encryption, so"
 " observers can't look inside to see which circuit a given cell is intended "
@@ -2469,7 +2463,7 @@
 "عبر تسجيل البيانات ثم اختراق التحويلة لاستخدام المفتاح لفك البيانات."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1372
+#: /home/runa/dev/website/docs/en/faq.wml:1372
 msgid ""
 "<b>Authentication</b>: Every Tor relay has a public decryption key called "
 "the \"onion key\".  When the Tor client establishes circuits, at each step "
@@ -2485,7 +2479,7 @@
 "اكتشاف بقية المسار. تُغيّر كل تحويلة مفتاحها البصلي مرة كل أسبوع."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1382
+#: /home/runa/dev/website/docs/en/faq.wml:1382
 msgid ""
 "<b>Coordination</b>: How do clients know what the relays are, and how do "
 "they know that they have the right keys for them? Each relay has a long-term"
@@ -2500,7 +2494,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1396
+#: /home/runa/dev/website/docs/en/faq.wml:1396
 msgid ""
 "How do clients know what the directory authorities are? The Tor software "
 "comes with a built-in list of location and public key for each directory "
@@ -2513,7 +2507,7 @@
 "البرنامج."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1403
+#: /home/runa/dev/website/docs/en/faq.wml:1403
 msgid ""
 "How do users know they've got the right software? When we distribute the "
 "source code or a package, we digitally sign it with <a "
@@ -2523,7 +2517,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1411
+#: /home/runa/dev/website/docs/en/faq.wml:1411
 msgid ""
 "In order to be certain that it's really signed by us, you need to have met "
 "us in person and gotten a copy of our GPG key fingerprint, or you need to "
@@ -2536,17 +2530,17 @@
 "ذلك المستوى، فإننا نوصيك بأن تنخرط في المجتمع الأمن وأن تبدأ مقابلة الأشخاص."
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1418
+#: /home/runa/dev/website/docs/en/faq.wml:1418
 msgid "<hr> <a id=\"EntryGuards\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1421
+#: /home/runa/dev/website/docs/en/faq.wml:1421
 msgid "<a class=\"anchor\" href=\"#EntryGuards\">What are Entry Guards?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1424
+#: /home/runa/dev/website/docs/en/faq.wml:1424
 msgid ""
 "Tor (like all current practical low-latency anonymity designs) fails when "
 "the attacker can see both ends of the communications channel. For example, "
@@ -2558,7 +2552,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1434
+#: /home/runa/dev/website/docs/en/faq.wml:1434
 msgid ""
 "So, what should we do? Suppose the attacker controls, or can observe, "
 "<i>C</i> relays. Suppose there are <i>N</i> relays total. If you select new "
@@ -2572,7 +2566,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1446
+#: /home/runa/dev/website/docs/en/faq.wml:1446
 msgid ""
 "The solution is \"entry guards\": each user selects a few relays at random "
 "to use as entry points, and uses only those relays for her first hop. If "
@@ -2585,7 +2579,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1457
+#: /home/runa/dev/website/docs/en/faq.wml:1457
 msgid ""
 "You can read more at <a href=\"http://freehaven.net/anonbib/#wright02\">An "
 "Analysis of the Degradation of Anonymous Protocols</a>, <a "
@@ -2596,7 +2590,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1466
+#: /home/runa/dev/website/docs/en/faq.wml:1466
 msgid ""
 "Restricting your entry nodes may also help against attackers who want to run"
 " a few Tor nodes and easily enumerate all of the Tor user IP addresses. "
@@ -2607,12 +2601,12 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1474
+#: /home/runa/dev/website/docs/en/faq.wml:1474
 msgid "<hr> <a id=\"EverybodyARelay\"></a>"
 msgstr "<hr> <a id=\"EverybodyARelay\"></a>"
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1477
+#: /home/runa/dev/website/docs/en/faq.wml:1477
 msgid ""
 "<a class=\"anchor\" href=\"#EverybodyARelay\">You should make every Tor user"
 " be a relay.</a>"
@@ -2621,7 +2615,7 @@
 " تحويلة.</a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1480
+#: /home/runa/dev/website/docs/en/faq.wml:1480
 msgid ""
 "Requiring every Tor user to be a relay would help with scaling the network "
 "to handle all our users, and <a "
@@ -2636,7 +2630,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1493
+#: /home/runa/dev/website/docs/en/faq.wml:1493
 msgid ""
 "That said, we do want to encourage Tor users to run relays, so what we "
 "really want to do is simplify the process of setting up and maintaining a "
@@ -2652,12 +2646,12 @@
 "يمكن تقديمه."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1502
+#: /home/runa/dev/website/docs/en/faq.wml:1502
 msgid "There are five steps we need to address before we can do this though:"
 msgstr "توجد خمس خطوات نحن بحاجة إلى معالجتها قبل أن نتمكن من القيام بذلك:"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1506
+#: /home/runa/dev/website/docs/en/faq.wml:1506
 msgid ""
 "First, we need to make Tor stable as a relay on all common operating "
 "systems. The main remaining platform is Windows, and we plan to finally "
@@ -2671,7 +2665,7 @@
 "release\">خارطة التطوير</a>."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1514
+#: /home/runa/dev/website/docs/en/faq.wml:1514
 msgid ""
 "Second, we still need to get better at automatically estimating the right "
 "amount of bandwidth to allow. See item #7 on the <a href=\"<page "
@@ -2683,7 +2677,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1525
+#: /home/runa/dev/website/docs/en/faq.wml:1525
 msgid ""
 "Third, we need to work on scalability, both of the network (how to stop "
 "requiring that all Tor relays be able to connect to all Tor relays) and of "
@@ -2701,7 +2695,7 @@
 "التفاصيل. مرة أخرى، يمكن أن يفيد معيار UDP هنا أيضًا."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1535
+#: /home/runa/dev/website/docs/en/faq.wml:1535
 msgid ""
 "Fourth, we need to better understand the risks from letting the attacker "
 "send traffic through your relay while you're also initiating your own "
@@ -2719,7 +2713,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1551
+#: /home/runa/dev/website/docs/en/faq.wml:1551
 msgid ""
 "Fifth, we might need some sort of incentive scheme to encourage people to "
 "relay traffic for others, and/or to become exit nodes. Here are our <a "
@@ -2731,24 +2725,24 @@
 "الحالية لتحفيزات تور</a>."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1558
+#: /home/runa/dev/website/docs/en/faq.wml:1558
 msgid "Please help on all of these!"
 msgstr "ساعدنا على القيام بكل ذلك!"
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1561
+#: /home/runa/dev/website/docs/en/faq.wml:1561
 msgid "<hr> <a id=\"TransportIPnotTCP\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1564
+#: /home/runa/dev/website/docs/en/faq.wml:1564
 msgid ""
 "<a class=\"anchor\" href=\"#TransportIPnotTCP\">You should transport all IP "
 "packets, not just TCP packets.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1567
+#: /home/runa/dev/website/docs/en/faq.wml:1567
 msgid ""
 "This would be handy, because it would make Tor better able to handle new "
 "protocols like VoIP, it could solve the whole need to socksify applications,"
@@ -2757,7 +2751,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1574
+#: /home/runa/dev/website/docs/en/faq.wml:1574
 msgid ""
 "We're heading in this direction: see <a "
 "href=\"https://trac.torproject.org/projects/tor/ticket/1855\">this trac "
@@ -2766,7 +2760,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1581
+#: /home/runa/dev/website/docs/en/faq.wml:1581
 msgid ""
 "IP packets reveal OS characteristics. We would still need to do IP-level "
 "packet normalization, to stop things like TCP fingerprinting attacks. Given "
@@ -2777,7 +2771,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1588
+#: /home/runa/dev/website/docs/en/faq.wml:1588
 msgid ""
 "Application-level streams still need scrubbing. We will still need user-side"
 " applications like Torbutton. So it won't become just a matter of capturing "
@@ -2785,7 +2779,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1592
+#: /home/runa/dev/website/docs/en/faq.wml:1592
 msgid ""
 "Certain protocols will still leak information. For example, we must rewrite "
 "DNS requests so they are delivered to an unlinkable DNS server rather than "
@@ -2794,7 +2788,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1597
+#: /home/runa/dev/website/docs/en/faq.wml:1597
 msgid ""
 "<a "
 "href=\"http://crypto.stanford.edu/~nagendra/projects/dtls/dtls.html\">DTLS</a>"
@@ -2805,7 +2799,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1604
+#: /home/runa/dev/website/docs/en/faq.wml:1604
 msgid ""
 "Exit policies for arbitrary IP packets mean building a secure IDS. Our node "
 "operators tell us that exit policies are one of the main reasons they're "
@@ -2823,7 +2817,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1618
+#: /home/runa/dev/website/docs/en/faq.wml:1618
 msgid ""
 "The Tor-internal name spaces would need to be redesigned. We support hidden "
 "service \".onion\" addresses by intercepting the addresses when they are "
@@ -2832,12 +2826,12 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1625
+#: /home/runa/dev/website/docs/en/faq.wml:1625
 msgid "<hr> <a id=\"Criminals\"></a>"
 msgstr "<hr> <a id=\"Criminals\"></a>"
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1628
+#: /home/runa/dev/website/docs/en/faq.wml:1628
 msgid ""
 "<a class=\"anchor\" href=\"#Criminals\">Doesn't Tor enable criminals to do "
 "bad things?</a>"
@@ -2846,19 +2840,19 @@
 "سيئة؟</a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1631
+#: /home/runa/dev/website/docs/en/faq.wml:1631
 msgid ""
 "For the answer to this question and others, please see our <a href=\"<page "
 "docs/faq-abuse>\">Tor Abuse FAQ</a>."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1635
+#: /home/runa/dev/website/docs/en/faq.wml:1635
 msgid "<hr> <a id=\"RespondISP\"></a>"
 msgstr "<hr> <a id=\"RespondISP\"></a>"
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1638
+#: /home/runa/dev/website/docs/en/faq.wml:1638
 msgid ""
 "<a class=\"anchor\" href=\"#RespondISP\">How do I respond to my ISP about my"
 " exit relay?</a>"
@@ -2867,7 +2861,7 @@
 "بخصوص تحويلة المخرج؟</a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1641
+#: /home/runa/dev/website/docs/en/faq.wml:1641
 msgid ""
 "A collection of templates for successfully responding to ISPs is <a "
 "href=\"<wiki>TheOnionRouter/TorAbuseTemplates\">collected here</a>."

Modified: translation/trunk/projects/website/po/ar/docs/2-medium.installguide.po
===================================================================
--- translation/trunk/projects/website/po/ar/docs/2-medium.installguide.po	2011-04-12 16:15:00 UTC (rev 24594)
+++ translation/trunk/projects/website/po/ar/docs/2-medium.installguide.po	2011-04-12 16:19:31 UTC (rev 24595)
@@ -8,7 +8,7 @@
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
 "POT-Creation-Date: 2010-12-26 14:32+0000\n"
-"PO-Revision-Date: 2011-03-27 17:31+0000\n"
+"PO-Revision-Date: 2011-04-12 16:10+0000\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"

Modified: translation/trunk/projects/website/po/ar/docs/2-medium.tor-doc-osx.po
===================================================================
--- translation/trunk/projects/website/po/ar/docs/2-medium.tor-doc-osx.po	2011-04-12 16:15:00 UTC (rev 24594)
+++ translation/trunk/projects/website/po/ar/docs/2-medium.tor-doc-osx.po	2011-04-12 16:19:31 UTC (rev 24595)
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-02-12 12:20+0000\n"
-"PO-Revision-Date: 2011-03-27 17:34+0000\n"
+"POT-Creation-Date: 2011-03-28 12:48+0200\n"
+"PO-Revision-Date: 2011-04-12 16:11+0000\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
@@ -18,7 +18,7 @@
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5\n"
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:8
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:8
 msgid ""
 "<a href=\"<page index>\">Home &raquo; </a> <a href=\"<page "
 "docs/documentation>\">Documentation &raquo; </a> <a href=\"<page docs/tor-"
@@ -26,19 +26,19 @@
 msgstr ""
 
 #. type: Content of: <div><div><h1>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:13
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:13
 msgid "Running the <a href=\"<page index>\">Tor</a> client on Mac OS X"
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:14 /tmp/N9PceEMclo.xml:26
-#: /tmp/N9PceEMclo.xml:71 /tmp/N9PceEMclo.xml:104 /tmp/N9PceEMclo.xml:136
-#: /tmp/N9PceEMclo.xml:158
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:14 /tmp/dnqIbbGTnT.xml:26
+#: /tmp/dnqIbbGTnT.xml:71 /tmp/dnqIbbGTnT.xml:104 /tmp/dnqIbbGTnT.xml:136
+#: /tmp/dnqIbbGTnT.xml:158
 msgid "<br>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:17
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:17
 msgid ""
 "<b>Note that these are the installation instructions for running a Tor "
 "client on Mac OS X. If you want to relay traffic for others to help the "
@@ -47,19 +47,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:23
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:23
 msgid "<hr> <a id=\"installing\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:25
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:25
 msgid ""
 "<a class=\"anchor\" href=\"#installing\">Step One: Download and Install "
 "Tor</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:29
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:29
 msgid ""
 "The install for Macintosh OS X bundles <a href=\"<page index>\">Tor</a>, <a "
 "href=\"<page projects/vidalia>\">Vidalia</a> (a graphical interface for "
@@ -67,14 +67,14 @@
 "href=\"http://www.pps.jussieu.fr/~jch/software/polipo/\">Polipo</a> (a web "
 "proxy)  into one package, with the four applications pre-configured to work "
 "together.  Download either the <a href=\"<page "
-"download/download>#tor\">stable</a> or the <a href=\"<page "
-"download/download>#tor\">experimental</a> version of the OS X bundle, or "
+"download/download>#mac\">stable</a> or the <a href=\"<page "
+"download/download>#mac\">experimental</a> version of the OS X bundle, or "
 "look for more options on the <a href=\"<page download/download>\">download "
 "page</a>."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:42
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:42
 msgid ""
 "Once you've downloaded the dmg, double-click and let it mount.  Browse to "
 "the now open Vidalia Bundle in Finder.  It's easy to install the bundle; "
@@ -85,7 +85,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:49
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:49
 msgid ""
 "When you are finished installing, you can start Vidalia by selecting its "
 "icon from your Applications folder. A dark onion with a red X in your dock "
@@ -94,19 +94,19 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:55
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:55
 msgid "When Tor is running, Vidalia's dock icon will look like the following:"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:58
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:58
 msgid ""
 "<img alt=\"vidalia running tor\" src=\"$(IMGROOT)/screenshot-osx-"
 "vidalia.png\" />"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:61
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:61
 msgid ""
 "Polipo is installed as part of the Tor bundle package installer. Once it is "
 "installed, it will start automatically when your computer is restarted.  You"
@@ -115,26 +115,26 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:68
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:68
 msgid "<hr> <a id=\"using\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:70
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:70
 msgid ""
 "<a class=\"anchor\" href=\"#using\">Step Two: Configure your applications to"
 " use Tor</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:73
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:73
 msgid ""
 "After installing, 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-osx.wml:76
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:76
 msgid ""
 "You should use Tor with Firefox and Torbutton, for best safety.  Torbutton "
 "was installed for you.  Click on the red \"Tor Disabled\" toggle button to "
@@ -142,14 +142,14 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:80
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:80
 msgid ""
 "<img alt=\"Torbutton plugin for Firefox\" src=\"$(IMGROOT)/screenshot-"
 "torbutton.png\" />"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:83
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:83
 msgid ""
 "If you plan to run Firefox on a different computer than Tor, see the <a "
 "href=\"<wikifaq>#SocksListenAddress\">FAQ entry for running Tor on a "
@@ -157,7 +157,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:87
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:87
 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 "
@@ -170,24 +170,24 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:97
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:97
 msgid ""
 "For information on how to Torify other applications, check out the <a "
 "href=\"<wiki>/TheOnionRouter/TorifyHOWTO\">Torify HOWTO</a>."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:101
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:101
 msgid "<hr> <a id=\"verify\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:103
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:103
 msgid "<a class=\"anchor\" href=\"#verify\">Step Three: Make sure it's working</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:107
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:107
 msgid ""
 "Next, you should try using your browser with Tor and make sure that your IP "
 "address is being anonymized. Click on <a "
@@ -198,7 +198,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:115
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:115
 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"
@@ -208,31 +208,31 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:124
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:124
 msgid ""
 "If it's still not working, look at <a href=\"<page "
 "docs/faq>#DoesntWork\">this FAQ entry</a> for hints."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:128
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:128
 msgid ""
 "Once it's working, learn more about <a href=\"<page "
 "download/download>#Warning\">what Tor does and does not offer</a>."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:132
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:132
 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-osx.wml:135
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:135
 msgid "<a class=\"anchor\" href=\"#relay\">Step Four: Configure it as a relay</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:138
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:138
 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 "
@@ -243,7 +243,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:146
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:146
 msgid ""
 "Having relays in many different places on the Internet is what makes Tor "
 "users secure. <a href=\"<wikifaq>#RelayAnonymity\">You may also get stronger"
@@ -252,24 +252,24 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:152
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:152
 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-osx.wml:155
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:155
 msgid "<hr> <a id=\"uninstall\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:157
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:157
 msgid "<a class=\"anchor\" href=\"#uninstall\">How To Uninstall Tor and Polipo</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:160
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:160
 msgid ""
 "There are two ways to uninstall the bundle from your computer, using Finder "
 "or a command line or Terminal-based uninstaller.  If you want to remove Tor "
@@ -277,79 +277,79 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:164
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:164
 msgid ""
 "Change your application proxy settings back to their original values.  If "
 "you just want to stop using Tor, you can end at this point."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:168
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:168
 msgid ""
 "If you want to completely remove Tor, and your account has Admin Privileges,"
 " then proceed as follows:"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:172
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:172
 msgid "Open Finder and click on Applications."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:173
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:173
 msgid "Drag /Applications/Vidalia to the Trash."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:174
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:174
 msgid "Remove /Library/Torbutton from your system."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:175
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:175
 msgid ""
 "In your User or home directory, go to Library, remove the Vidalia directory"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:179
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:179
 msgid "Tor, Vidalia, and Polipo are now completely removed from your system."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:181
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:181
 msgid ""
 "If you're familiar with the command line or Terminal, you can manually type "
 "the following:"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:184
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:184
 msgid "rm -r /Applications/Vidalia.app"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:185
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:185
 msgid "rm -r /Library/Torbutton"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:186
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:186
 msgid "rm -r ~/Library/Vidalia"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:187
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:187
 msgid "rm -r ~/.tor"
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:190
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:190
 msgid "<hr>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:192
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:192
 msgid ""
 "If you have suggestions for improving this document, please <a href=\"<page "
 "about/contact>\">send them to us</a>. Thanks!"

Modified: translation/trunk/projects/website/po/ar/docs/2-medium.tor-doc-relay.po
===================================================================
--- translation/trunk/projects/website/po/ar/docs/2-medium.tor-doc-relay.po	2011-04-12 16:15:00 UTC (rev 24594)
+++ translation/trunk/projects/website/po/ar/docs/2-medium.tor-doc-relay.po	2011-04-12 16:19:31 UTC (rev 24595)
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-02-12 12:20+0000\n"
-"PO-Revision-Date: 2011-03-27 17:36+0000\n"
+"POT-Creation-Date: 2011-03-28 12:48+0200\n"
+"PO-Revision-Date: 2011-04-12 16:14+0000\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
@@ -18,7 +18,7 @@
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5\n"
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:8
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:8
 msgid ""
 "<a href=\"<page index>\">Home &raquo; </a> <a href=\"<page "
 "docs/documentation>\">Documentation &raquo; </a> <a href=\"<page docs/tor-"
@@ -26,17 +26,17 @@
 msgstr ""
 
 #. type: Content of: <div><div><h1>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:14
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:14
 msgid "Configuring a Tor relay"
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:16 /tmp/eKLg46HT7B.xml:275
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:16 /tmp/ogZUlgnLzH.xml:275
 msgid "<hr>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:19
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:19
 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 "
@@ -48,60 +48,60 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:28
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:28
 msgid ""
-"You can run a Tor relay on <a href=\"<wikifaq>#RelayOS\">pretty much any</a>"
-" operating system. Tor relays work best on Linux, OS X Tiger or later, "
-"FreeBSD 5.x+, NetBSD 5.x+, and Windows Server 2003 or later."
+"You can run a Tor relay on pretty much any operating system. Tor relays work"
+" best on Linux, OS X Tiger or later, FreeBSD 5.x+, NetBSD 5.x+, and Windows "
+"Server 2003 or later."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:33
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:33
 msgid "<hr> <a id=\"zero\"></a> <a id=\"install\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:36
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:36
 msgid "<a class=\"anchor\" href=\"#install\">Step One: Download and Install Tor</a>"
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:37 /tmp/eKLg46HT7B.xml:52
-#: /tmp/eKLg46HT7B.xml:141 /tmp/eKLg46HT7B.xml:165
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:37 /tmp/ogZUlgnLzH.xml:52
+#: /tmp/ogZUlgnLzH.xml:141 /tmp/ogZUlgnLzH.xml:165
 msgid "<br>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:39
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:39
 msgid "Before you start, you need to make sure that Tor is up and running."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:42
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:42
 msgid ""
 "Visit our <a href=\"<page download/download>\">download page</a> and install"
 " the \"Installation Bundle\" for your OS."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:46
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:46
 msgid ""
 "If it's convenient, you might also want to use it as a client for a while to"
 " make sure it's actually working."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:49
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:49
 msgid "<hr> <a id=\"setup\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:51
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:51
 msgid "<a class=\"anchor\" href=\"#setup\">Step Two: Set it up as a relay</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:54
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:54
 msgid ""
 "Verify that your clock and timezone are set correctly. If possible, "
 "synchronize your clock with public <a "
@@ -110,12 +110,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:60
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:60
 msgid "<strong>Manual Configuration</strong>:"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><ul><li>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:62
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:62
 msgid ""
 "Edit the bottom part of <a href=\"<page docs/faq>#torrc\">your torrc "
 "file</a>. If you want to be a public relay (recommended), make sure to "
@@ -127,31 +127,31 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:72
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:72
 msgid "<strong>Configuring Tor with the Vidalia Graphical Interface</strong>:"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><ol><li><dt>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:76
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:76
 msgid ""
 "Right click on the Vidalia icon in your task bar.  Choose <tt>Control "
 "Panel</tt>."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><ol><li><dd>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:77
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:77
 msgid ""
 "<img alt=\"vidalia right click menu\" src=\"$(IMGROOT)/screenshot-"
 "win32-vidalia.png\" />"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><ol><li>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:80
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:80
 msgid "Click <tt>Setup Relaying</tt>."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><ol><li><dt>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:83
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:83
 msgid ""
 "Choose <tt>Relay Traffic for the Tor network</tt> if you want to be a public"
 " relay (recommended), or choose <tt>Help censored users reach the Tor "
@@ -161,21 +161,21 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><ol><li><dd>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:88
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:88
 msgid ""
 "<img alt=\"vidalia basic settings\" src=\"$(IMGROOT)/screenshot-win32"
 "-configure-relay-1.png\" />"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><ol><li>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:91
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:91
 msgid ""
 "Enter a nickname for your relay, and enter contact information in case we "
 "need to contact you about problems."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><ol><li>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:94
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:94
 msgid ""
 "Leave <tt>Attempt to automatically configure port forwarding</tt> clicked.  "
 "Push the <tt>Test</tt> button to see if it works.  If it does work, great.  "
@@ -183,21 +183,21 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><ol><li><dt>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:98
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:98
 msgid ""
 "Choose the <tt>Bandwidth Limits</tt> tab.  Select how much bandwidth you "
 "want to provide for Tor users like yourself."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><ol><li><dd>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:99
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:99
 msgid ""
 "<img alt=\"vidalia bandwidth limits\" src=\"$(IMGROOT)/screenshot-win32"
 "-configure-relay-2.png\" />"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><ol><li><dt>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:102
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:102
 msgid ""
 "Choose the <tt>Exit Policies</tt> tab.  If you want to allow others to use "
 "your relay for these services, don't change anything.  Un-check the services"
@@ -207,21 +207,21 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><ol><li><dd>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:107
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:107
 msgid ""
 "<img alt=\"vidalia exit policies\" src=\"$(IMGROOT)/screenshot-win32"
 "-configure-relay-3.png\" />"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><ol><li>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:110
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:110
 msgid ""
 "Click the <tt>Ok</tt> button.  See Step Three below for confirmation that "
 "the relay is working correctly."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><li>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:114
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:114
 msgid ""
 "If you are using a firewall, open a hole in your firewall so incoming "
 "connections can reach the ports you configured (ORPort, plus DirPort if you "
@@ -232,14 +232,14 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><li>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:123
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:123
 msgid ""
 "Restart your relay. If it <a href=\"<page docs/faq>#Logs\">logs any "
 "warnings</a>, address them."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><li>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:128
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:128
 msgid ""
 "Subscribe to the <a href=\"http://archives.seul.org/or/announce/\">or-"
 "announce</a> mailing list. It is very low volume, and it will keep you "
@@ -249,17 +249,17 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:138
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:138
 msgid "<hr> <a id=\"check\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:140
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:140
 msgid "<a class=\"anchor\" href=\"#check\">Step Three: Make sure it is working</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:143
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:143
 msgid ""
 "As soon as your relay manages to connect to the network, it will try to "
 "determine whether the ports you configured are reachable from the outside. "
@@ -272,7 +272,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:153
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:153
 msgid ""
 "When it decides that it's reachable, it will upload a \"server descriptor\" "
 "to the directories, to let clients know what address, ports, keys, etc your "
@@ -284,22 +284,22 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:162
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:162
 msgid "<hr> <a id=\"after\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:164
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:164
 msgid "<a class=\"anchor\" href=\"#after\">Step Four: Once it is working</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:168
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:168
 msgid "We recommend the following steps as well:"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:172
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:172
 msgid ""
 "6. Read <a href=\"<wiki>TheOnionRouter/OperationalSecurity\">about "
 "operational security</a> to get ideas how you can increase the security of "
@@ -307,7 +307,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:178
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:178
 msgid ""
 "7. If you want to run more than one relay that's great, but please set <a "
 "href=\"<page docs/faq>#MultipleRelays\">the MyFamily option</a> in all your "
@@ -315,7 +315,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:184
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:184
 msgid ""
 "8. Decide about rate limiting. Cable modem, DSL, and other users who have "
 "asymmetric bandwidth (e.g. more down than up) should rate limit to their "
@@ -324,7 +324,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:192
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:192
 msgid ""
 "9. Back up your Tor relay's private key (stored in \"keys/secret_id_key\" in"
 " your DataDirectory). This is your relay's \"identity,\" and you need to "
@@ -335,7 +335,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:202
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:202
 msgid ""
 "10. If you control the name servers for your domain, consider setting your "
 "reverse DNS hostname to 'anonymous-relay', 'proxy' or 'tor-proxy', so when "
@@ -347,7 +347,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:213
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:213
 msgid ""
 "11. If your computer isn't running a webserver, please consider changing "
 "your ORPort to 443 and your DirPort to 80. Many Tor users are stuck behind "
@@ -362,7 +362,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:228
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:228
 msgid ""
 "12. If your Tor relay provides other services on the same IP address &mdash;"
 " such as a public webserver &mdash; make sure that connections to the "
@@ -374,7 +374,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:239
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:239
 msgid ""
 "13. (Unix only). Make a separate user to run the relay. If you installed the"
 " OS X package or the deb or the rpm, this is already done. Otherwise, you "
@@ -386,7 +386,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:250
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:250
 msgid ""
 "14. (Unix only.) Your operating system probably limits the number of open "
 "file descriptors per process to 1024 (or even less). If you plan to be "
@@ -398,7 +398,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:260
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:260
 msgid ""
 "15. If you installed Tor via some package or installer, it probably starts "
 "Tor for you automatically on boot. But if you installed from source, you may"
@@ -406,7 +406,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:266
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:266
 msgid ""
 "When you change your Tor configuration, remember to verify that your relay "
 "still works correctly after the change. Be sure to set your \"ContactInfo\" "
@@ -418,7 +418,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:277
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:277
 msgid ""
 "If you have suggestions for improving this document, please <a href=\"<page "
 "about/contact>\">send them to us</a>. Thanks!"

Modified: translation/trunk/projects/website/po/ar/docs/2-medium.verifying-signatures.po
===================================================================
--- translation/trunk/projects/website/po/ar/docs/2-medium.verifying-signatures.po	2011-04-12 16:15:00 UTC (rev 24594)
+++ translation/trunk/projects/website/po/ar/docs/2-medium.verifying-signatures.po	2011-04-12 16:19:31 UTC (rev 24595)
@@ -8,7 +8,7 @@
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
 "POT-Creation-Date: 2011-03-01 16:37+0000\n"
-"PO-Revision-Date: 2011-03-27 17:32+0000\n"
+"PO-Revision-Date: 2011-04-12 16:15+0000\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"

Modified: translation/trunk/projects/website/po/ar/docs/3-low.N900.po
===================================================================
--- translation/trunk/projects/website/po/ar/docs/3-low.N900.po	2011-04-12 16:15:00 UTC (rev 24594)
+++ translation/trunk/projects/website/po/ar/docs/3-low.N900.po	2011-04-12 16:19:31 UTC (rev 24595)
@@ -8,7 +8,7 @@
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
 "POT-Creation-Date: 2010-12-05 19:13+0000\n"
-"PO-Revision-Date: 2011-03-27 17:29+0000\n"
+"PO-Revision-Date: 2011-04-12 16:10+0000\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"

Modified: translation/trunk/projects/website/po/ar/docs/3-low.android.po
===================================================================
--- translation/trunk/projects/website/po/ar/docs/3-low.android.po	2011-04-12 16:15:00 UTC (rev 24594)
+++ translation/trunk/projects/website/po/ar/docs/3-low.android.po	2011-04-12 16:19:31 UTC (rev 24595)
@@ -8,7 +8,7 @@
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
 "POT-Creation-Date: 2011-03-25 16:50+0000\n"
-"PO-Revision-Date: 2011-03-27 17:27+0000\n"
+"PO-Revision-Date: 2011-04-12 16:11+0000\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"

Modified: translation/trunk/projects/website/po/ar/docs/3-low.debian-vidalia.po
===================================================================
--- translation/trunk/projects/website/po/ar/docs/3-low.debian-vidalia.po	2011-04-12 16:15:00 UTC (rev 24594)
+++ translation/trunk/projects/website/po/ar/docs/3-low.debian-vidalia.po	2011-04-12 16:19:31 UTC (rev 24595)
@@ -8,7 +8,7 @@
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
 "POT-Creation-Date: 2010-12-05 19:13+0000\n"
-"PO-Revision-Date: 2011-03-27 17:30+0000\n"
+"PO-Revision-Date: 2011-04-12 16:14+0000\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"

Modified: translation/trunk/projects/website/po/ar/docs/3-low.debian.po
===================================================================
--- translation/trunk/projects/website/po/ar/docs/3-low.debian.po	2011-04-12 16:15:00 UTC (rev 24594)
+++ translation/trunk/projects/website/po/ar/docs/3-low.debian.po	2011-04-12 16:19:31 UTC (rev 24595)
@@ -8,8 +8,8 @@
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
 "POT-Creation-Date: 2011-03-01 16:37+0000\n"
-"PO-Revision-Date: 2011-03-27 17:28+0000\n"
-"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"PO-Revision-Date: 2011-04-05 14:33+0000\n"
+"Last-Translator: Mohamed <>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -24,11 +24,14 @@
 "docs/documentation>\">Documentation &raquo; </a> <a href=\"<page "
 "docs/debian>\">Debian/Ubuntu Instructions</a>"
 msgstr ""
+"<a href=\"<page index>\">Home &raquo; </a> <a href=\"<page "
+"docs/documentation>\">Documentation &raquo; </a> <a href=\"<page "
+"docs/debian>\">Debian/Ubuntu Instructions</a>"
 
 #. type: Content of: <div><div>
 #: /home/runa/tor/website/docs/en/debian.wml:13
 msgid "<a id=\"debian\"></a>"
-msgstr ""
+msgstr "<a id=\"debian\"></a>"
 
 #. type: Content of: <div><div><h2>
 #: /home/runa/tor/website/docs/en/debian.wml:14
@@ -36,12 +39,14 @@
 "<a class=\"anchor\" href=\"#debian\">Option one: Tor on Debian lenny, Debian"
 " sid, or Debian testing</a>"
 msgstr ""
+"<a class=\"anchor\" href=\"#debian\">الخيار الأول: تور على دِبيان ليني أو "
+"دِبيان غيرالمستقرة أو دِبيان الإختبارية</a>"
 
 #. type: Content of: <div><div>
 #: /home/runa/tor/website/docs/en/debian.wml:16 /tmp/__TMvx4TV6.xml:43
 #: /tmp/__TMvx4TV6.xml:113 /tmp/__TMvx4TV6.xml:148
 msgid "<br />"
-msgstr ""
+msgstr "<br />"
 
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/docs/en/debian.wml:19
@@ -49,6 +54,9 @@
 "If you're using Debian stable (lenny), unstable (sid), or testing (squeeze),"
 " just run<br /> <tt>apt-get install tor tor-geoipdb</tt> as root."
 msgstr ""
+"إذا كنت تستعمل دِبيان المستقرة (ليني) أو غير المستقرة (sid) أو الإختبارية "
+"(سكوييز)، نفد فقط الأمر <br /> <tt>apt-get install tor tor-geoipdb</tt> "
+"بصلاحيات الجذر."
 
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/docs/en/debian.wml:26
@@ -65,16 +73,20 @@
 "Now Tor is installed and running. Move on to <a href=\"<page docs/tor-doc-"
 "unix>#polipo\">step two</a> of the \"Tor on Linux/Unix\" instructions."
 msgstr ""
+"تور الأن متبث ومشغل. إنتقل إلى <a href=\"<page docs/tor-doc-"
+"unix>#polipo\">الخطوة الثانية</a> من تعليمات \"Tor on Linux/Unix\"."
 
 #. type: Content of: <div><div>
 #: /home/runa/tor/website/docs/en/debian.wml:37
 msgid "<hr /> <a id=\"ubuntu\"></a> <a id=\"packages\"></a>"
-msgstr ""
+msgstr "<hr /> <a id=\"ubuntu\"></a> <a id=\"packages\"></a>"
 
 #. type: Content of: <div><div><h2>
 #: /home/runa/tor/website/docs/en/debian.wml:41
 msgid "<a class=\"anchor\" href=\"#ubuntu\">Option two: Tor on Ubuntu or Debian</a>"
 msgstr ""
+"<a class=\"anchor\" href=\"#ubuntu\">الخيار الثاني: تور على أوبنتو أو "
+"دِبيان</a>"
 
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/docs/en/debian.wml:46
@@ -82,6 +94,8 @@
 "<b>Do not use the packages in Ubuntu's universe.</b> They are unmaintained "
 "and out of date. That means you'll be missing stability and security fixes."
 msgstr ""
+"<b>لا تستخدم حزم أوبنتو universe.</b> فهي لم تعد مدعومة وإصداراتها قديمة. "
+"وهذا يعني إفتقادها للإستقرار والإصلاحات الأمنية. "
 
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/docs/en/debian.wml:52
@@ -95,47 +109,47 @@
 #. type: Content of: <div><div><p><ul><li>
 #: /home/runa/tor/website/docs/en/debian.wml:57
 msgid "Debian unstable (sid) is \"sid\""
-msgstr ""
+msgstr "دِبيان غير المستقرة (sid) هي \"sid\""
 
 #. type: Content of: <div><div><p><ul><li>
 #: /home/runa/tor/website/docs/en/debian.wml:58
 msgid "Debian 6.0 (squeeze) is \"squeeze\""
-msgstr ""
+msgstr "دِبيان 6.0 (سكوييز) هي \"squeeze\""
 
 #. type: Content of: <div><div><p><ul><li>
 #: /home/runa/tor/website/docs/en/debian.wml:59
 msgid "Debian 5.0 (lenny) is \"lenny\""
-msgstr ""
+msgstr "دِبيان 5.0 (ليني) هي \"lenny\""
 
 #. type: Content of: <div><div><p><ul><li>
 #: /home/runa/tor/website/docs/en/debian.wml:60
 msgid "Ubuntu 10.10 is \"maverick\""
-msgstr ""
+msgstr "أوبنتو 10.10 هي \"maverick\""
 
 #. type: Content of: <div><div><p><ul><li>
 #: /home/runa/tor/website/docs/en/debian.wml:61
 msgid "Ubuntu 10.04 or Trisquel 4.0 is \"lucid\""
-msgstr ""
+msgstr "أو 10.04 أو ترِسكال 4.0 هما \"lucid\""
 
 #. type: Content of: <div><div><p><ul><li>
 #: /home/runa/tor/website/docs/en/debian.wml:62
 msgid "Ubuntu 9.10 or Trisquel 3.5 is \"karmic\""
-msgstr ""
+msgstr "أوبنتو 9.10 أو ترِسكال 3.5 هما \"karmic\""
 
 #. type: Content of: <div><div><p><ul><li>
 #: /home/runa/tor/website/docs/en/debian.wml:63
 msgid "Ubuntu 8.04 is \"hardy\""
-msgstr ""
+msgstr "أوبنتو 8.04 هي \"hardy\""
 
 #. type: Content of: <div><div><p><ul><li>
 #: /home/runa/tor/website/docs/en/debian.wml:64
 msgid "Ubuntu 6.06 is \"dapper\""
-msgstr ""
+msgstr "أوبنتو 6.06 هي \"dapper\""
 
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/docs/en/debian.wml:67
 msgid "Then add this line to your <tt>/etc/apt/sources.list</tt> file:<br />"
-msgstr ""
+msgstr "ثم أضف هذا السطر إلى <tt>/etc/apt/sources.list</tt> الملف:<br /> "
 
 #. type: Content of: <div><div><p><pre>
 #: /home/runa/tor/website/docs/en/debian.wml:71
@@ -143,6 +157,7 @@
 msgid ""
 "deb     http://deb.torproject.org/torproject.org &lt;DISTRIBUTION&gt; main\n"
 msgstr ""
+"deb     http://deb.torproject.org/torproject.org &lt;DISTRIBUTION&gt; main\n"
 
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/docs/en/debian.wml:73
@@ -150,6 +165,8 @@
 "where you put the codename of your distribution (i.e. lenny, sid, maverick "
 "or whatever it is)  in place of &lt;DISTRIBUTION&gt;."
 msgstr ""
+"حيث يمكنك وضع الاسم الرمزى لتوزيعتك (i.e. lenny, sid, maverick أو أيا كانت) "
+"مكان &lt;DISTRIBUTION&gt;."
 
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/docs/en/debian.wml:79
@@ -157,6 +174,8 @@
 "Then add the gpg key used to sign the packages by running the following "
 "commands at your command prompt:"
 msgstr ""
+"ثم أضف مفتاح gpg المستعمل لتوقيع الحزم عن طريق تنفيذ الأوامر التالية في محث "
+"الأوامر :"
 
 #. type: Content of: <div><div><p><pre>
 #: /home/runa/tor/website/docs/en/debian.wml:82
@@ -165,6 +184,8 @@
 "gpg --keyserver keys.gnupg.net --recv 886DDD89\n"
 "gpg --export A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89 | sudo apt-key add -\n"
 msgstr ""
+"gpg --keyserver keys.gnupg.net --recv 886DDD89\n"
+"gpg --export A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89 | sudo apt-key add -\n"
 
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/docs/en/debian.wml:85
@@ -172,6 +193,8 @@
 "Now refresh your sources and install Tor by running the following commands "
 "(as root) at your command prompt:"
 msgstr ""
+"قُم الأن بإنعاش المصادر و ثبّت تور بتنفيد الأمر التالي (بصلا حيات الجدر) على"
+" محث الأوامر:"
 
 #. type: Content of: <div><div><p><pre>
 #: /home/runa/tor/website/docs/en/debian.wml:88
@@ -180,6 +203,8 @@
 "apt-get update\n"
 "apt-get install tor tor-geoipdb\n"
 msgstr ""
+"apt-get update\n"
+"apt-get install tor tor-geoipdb\n"
 
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/docs/en/debian.wml:100
@@ -194,7 +219,7 @@
 #. type: Content of: <div><div>
 #: /home/runa/tor/website/docs/en/debian.wml:108
 msgid "<hr /> <a id=\"development\"></a>"
-msgstr ""
+msgstr "<hr /> <a id=\"development\"></a>"
 
 #. type: Content of: <div><div><h2>
 #: /home/runa/tor/website/docs/en/debian.wml:111
@@ -202,6 +227,8 @@
 "<a class=\"anchor\" href=\"#development\">Option three: Using the "
 "development branch of Tor on Debian or Ubuntu</a>"
 msgstr ""
+"<a class=\"anchor\" href=\"#development\">الخيار الثالث: إستعمال فرع التطوير"
+" من تور على دِبيان أو أوبنتو.</a>"
 
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/docs/en/debian.wml:115
@@ -211,6 +238,9 @@
 " features and more bugs), you need to add a different set of lines to your "
 "<tt>/etc/apt/sources.list</tt> file:<br />"
 msgstr ""
+"إذا كنت تريد استخدام <a href=\"<page download/download>#packagediff\">فرع "
+"التطوير</a> من تور (المزيد من الميزات والمزيد من العلل)، تحتاج إلى إضافة "
+"مجموعة مختلفة من السطور إلى <tt>/etc/apt/sources.list</tt> الملف:<br />"
 
 #. type: Content of: <div><div><p><pre>
 #: /home/runa/tor/website/docs/en/debian.wml:120
@@ -219,6 +249,8 @@
 "deb     http://deb.torproject.org/torproject.org &lt;DISTRIBUTION&gt; main\n"
 "deb     http://deb.torproject.org/torproject.org experimental-&lt;DISTRIBUTION&gt; main\n"
 msgstr ""
+"deb     http://deb.torproject.org/torproject.org &lt;DISTRIBUTION&gt; main\n"
+"deb     http://deb.torproject.org/torproject.org experimental-&lt;DISTRIBUTION&gt; main\n"
 
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/docs/en/debian.wml:123
@@ -226,11 +258,13 @@
 "where you again substitute the name of your distro (lenny, sid, maverick, "
 "...) in place of &lt;DISTRIBUTION&gt;."
 msgstr ""
+"حيث يمكنك مرة أخرى إستبدال &lt;DISTRIBUTION&gt; باسم توزيعك (lenny, sid, "
+"maverick, ...)"
 
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/docs/en/debian.wml:129
 msgid "Then run the following commands at your command prompt:"
-msgstr ""
+msgstr "ثم شغّل الأوامر التالية في محث الأوامر الخاص بك :"
 
 #. type: Content of: <div><div><p><pre>
 #: /home/runa/tor/website/docs/en/debian.wml:131
@@ -241,16 +275,20 @@
 "apt-get update\n"
 "apt-get install tor tor-geoipdb\n"
 msgstr ""
+"gpg --keyserver keys.gnupg.net --recv 886DDD89\n"
+"gpg --export A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89 | sudo apt-key add -\n"
+"apt-get update\n"
+"apt-get install tor tor-geoipdb\n"
 
 #. type: Content of: <div><div>
 #: /home/runa/tor/website/docs/en/debian.wml:144
 msgid "<hr /> <a id=\"source\"></a>"
-msgstr ""
+msgstr "<hr /> <a id=\"source\"></a>"
 
 #. type: Content of: <div><div><h2>
 #: /home/runa/tor/website/docs/en/debian.wml:147
 msgid "<a class=\"anchor\" href=\"#source\">Building from source</a>"
-msgstr ""
+msgstr "<a class=\"anchor\" href=\"#source\">البناء من المصدر</a>"
 
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/docs/en/debian.wml:151
@@ -258,6 +296,8 @@
 "If you want to build your own debs from source you must first add an "
 "appropriate <tt>deb-src</tt> line to <tt>sources.list</tt>."
 msgstr ""
+"إذا كنت ترغب في بناء حزم دبيانية خاصة بك من المصدر يجب أولا إضافة سطر <tt"
+">deb-src</tt> المناسب إلى <tt>sources.list</tt>."
 
 #. PO4ASHARPBEGIN For the stable version.PO4ASHARPEND
 #. PO4ASHARPBEGIN For the unstable version.PO4ASHARPEND
@@ -272,6 +312,12 @@
 "deb-src http://deb.torproject.org/torproject.org &lt;DISTRIBUTION&gt; main\n"
 "deb-src http://deb.torproject.org/torproject.org experimental-&lt;DISTRIBUTION&gt; main\n"
 msgstr ""
+"\n"
+"deb-src http://deb.torproject.org/torproject.org &lt;DISTRIBUTION&gt; main\n"
+"\n"
+"\n"
+"deb-src http://deb.torproject.org/torproject.org &lt;DISTRIBUTION&gt; main\n"
+"deb-src http://deb.torproject.org/torproject.org experimental-&lt;DISTRIBUTION&gt; main\n"
 
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/docs/en/debian.wml:161
@@ -279,6 +325,8 @@
 "You also need to install the necessary packages to build your own debs and "
 "the packages needed to build Tor:"
 msgstr ""
+"تحتاج أيضا إلى تثبيت الحزم اللازمة لبناء الحزم الدبيانية الخاصة بك والحزم "
+"المطلوبة لبناء تور:"
 
 #. type: Content of: <div><div><p><pre>
 #: /home/runa/tor/website/docs/en/debian.wml:164
@@ -287,11 +335,13 @@
 "apt-get install build-essential fakeroot devscripts\n"
 "apt-get build-dep tor\n"
 msgstr ""
+"apt-get install build-essential fakeroot devscripts\n"
+"apt-get build-dep tor\n"
 
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/docs/en/debian.wml:167
 msgid "Then you can build Tor in ~/debian-packages:"
-msgstr ""
+msgstr "ثم يمكنك بناء تور في ~/debian-packages:"
 
 #. type: Content of: <div><div><p><pre>
 #: /home/runa/tor/website/docs/en/debian.wml:169
@@ -303,22 +353,27 @@
 "debuild -rfakeroot -uc -us\n"
 "cd ..\n"
 msgstr ""
+"mkdir ~/debian-packages; cd ~/debian-packages\n"
+"apt-get source tor\n"
+"cd tor-*\n"
+"debuild -rfakeroot -uc -us\n"
+"cd ..\n"
 
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/docs/en/debian.wml:175
 msgid "Now you can install the new package:"
-msgstr ""
+msgstr "الأن يمكنك تثبيت الحزمة الجديدة:"
 
 #. type: Content of: <div><div><p><pre>
 #: /home/runa/tor/website/docs/en/debian.wml:177
 #, no-wrap
 msgid "sudo dpkg -i tor_*.deb\n"
-msgstr ""
+msgstr "sudo dpkg -i tor_*.deb\n"
 
 #. type: Content of: <div><div>
 #: /home/runa/tor/website/docs/en/debian.wml:187
 msgid "<hr />"
-msgstr ""
+msgstr "<hr />"
 
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/docs/en/debian.wml:189
@@ -326,3 +381,5 @@
 "If you have suggestions for improving this document, please <a href=\"<page "
 "about/contact>\">send them to us</a>. Thanks!"
 msgstr ""
+"إذا كان لديك اقتراحات لتحسين هذه الوثيقة ، يرجى <a href=\"<page "
+"about/contact>\">إرسالها إلينا</a> . شكرا!"

Modified: translation/trunk/projects/website/po/ar/docs/3-low.rpms.po
===================================================================
--- translation/trunk/projects/website/po/ar/docs/3-low.rpms.po	2011-04-12 16:15:00 UTC (rev 24594)
+++ translation/trunk/projects/website/po/ar/docs/3-low.rpms.po	2011-04-12 16:19:31 UTC (rev 24595)
@@ -8,7 +8,7 @@
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
 "POT-Creation-Date: 2010-12-26 14:32+0000\n"
-"PO-Revision-Date: 2011-03-27 17:29+0000\n"
+"PO-Revision-Date: 2011-04-12 16:08+0000\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"

Modified: translation/trunk/projects/website/po/ar/docs/3-low.tor-doc-unix.po
===================================================================
--- translation/trunk/projects/website/po/ar/docs/3-low.tor-doc-unix.po	2011-04-12 16:15:00 UTC (rev 24594)
+++ translation/trunk/projects/website/po/ar/docs/3-low.tor-doc-unix.po	2011-04-12 16:19:31 UTC (rev 24595)
@@ -8,7 +8,7 @@
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
 "POT-Creation-Date: 2011-02-12 12:20+0000\n"
-"PO-Revision-Date: 2011-03-27 17:33+0000\n"
+"PO-Revision-Date: 2011-04-12 16:12+0000\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"

Modified: translation/trunk/projects/website/po/ar/docs/3-low.tor-doc-web.po
===================================================================
--- translation/trunk/projects/website/po/ar/docs/3-low.tor-doc-web.po	2011-04-12 16:15:00 UTC (rev 24594)
+++ translation/trunk/projects/website/po/ar/docs/3-low.tor-doc-web.po	2011-04-12 16:19:31 UTC (rev 24595)
@@ -8,7 +8,7 @@
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
 "POT-Creation-Date: 2011-02-12 12:20+0000\n"
-"PO-Revision-Date: 2011-03-27 17:35+0000\n"
+"PO-Revision-Date: 2011-04-12 16:10+0000\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"

Modified: translation/trunk/projects/website/po/ar/docs/3-low.tor-hidden-service.po
===================================================================
--- translation/trunk/projects/website/po/ar/docs/3-low.tor-hidden-service.po	2011-04-12 16:15:00 UTC (rev 24594)
+++ translation/trunk/projects/website/po/ar/docs/3-low.tor-hidden-service.po	2011-04-12 16:19:31 UTC (rev 24595)
@@ -8,7 +8,7 @@
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
 "POT-Creation-Date: 2011-02-12 12:20+0000\n"
-"PO-Revision-Date: 2011-03-27 17:36+0000\n"
+"PO-Revision-Date: 2011-04-12 16:09+0000\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"

Modified: translation/trunk/projects/website/po/ar/docs/3-low.trademark-faq.po
===================================================================
--- translation/trunk/projects/website/po/ar/docs/3-low.trademark-faq.po	2011-04-12 16:15:00 UTC (rev 24594)
+++ translation/trunk/projects/website/po/ar/docs/3-low.trademark-faq.po	2011-04-12 16:19:31 UTC (rev 24595)
@@ -8,7 +8,7 @@
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
 "POT-Creation-Date: 2011-03-17 18:04+0000\n"
-"PO-Revision-Date: 2011-03-27 17:33+0000\n"
+"PO-Revision-Date: 2011-04-12 16:14+0000\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"

Modified: translation/trunk/projects/website/po/ar/docs/4-optional.running-a-mirror.po
===================================================================
--- translation/trunk/projects/website/po/ar/docs/4-optional.running-a-mirror.po	2011-04-12 16:15:00 UTC (rev 24594)
+++ translation/trunk/projects/website/po/ar/docs/4-optional.running-a-mirror.po	2011-04-12 16:19:31 UTC (rev 24595)
@@ -8,7 +8,7 @@
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
 "POT-Creation-Date: 2010-12-05 19:13+0000\n"
-"PO-Revision-Date: 2011-03-27 17:37+0000\n"
+"PO-Revision-Date: 2011-04-12 16:13+0000\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"

Modified: translation/trunk/projects/website/po/ar/donate/3-low.become-sponsor.po
===================================================================
--- translation/trunk/projects/website/po/ar/donate/3-low.become-sponsor.po	2011-04-12 16:15:00 UTC (rev 24594)
+++ translation/trunk/projects/website/po/ar/donate/3-low.become-sponsor.po	2011-04-12 16:19:31 UTC (rev 24595)
@@ -8,7 +8,7 @@
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
 "POT-Creation-Date: 2010-12-26 14:32+0000\n"
-"PO-Revision-Date: 2011-03-27 17:27+0000\n"
+"PO-Revision-Date: 2011-04-12 16:14+0000\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"

Modified: translation/trunk/projects/website/po/ar/donate/3-low.donate-hardware.po
===================================================================
--- translation/trunk/projects/website/po/ar/donate/3-low.donate-hardware.po	2011-04-12 16:15:00 UTC (rev 24594)
+++ translation/trunk/projects/website/po/ar/donate/3-low.donate-hardware.po	2011-04-12 16:19:31 UTC (rev 24595)
@@ -8,7 +8,7 @@
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
 "POT-Creation-Date: 2010-12-26 14:32+0000\n"
-"PO-Revision-Date: 2011-03-27 17:35+0000\n"
+"PO-Revision-Date: 2011-04-12 16:15+0000\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"

Modified: translation/trunk/projects/website/po/ar/donate/3-low.donate-service.po
===================================================================
--- translation/trunk/projects/website/po/ar/donate/3-low.donate-service.po	2011-04-12 16:15:00 UTC (rev 24594)
+++ translation/trunk/projects/website/po/ar/donate/3-low.donate-service.po	2011-04-12 16:19:31 UTC (rev 24595)
@@ -8,7 +8,7 @@
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
 "POT-Creation-Date: 2010-12-26 14:32+0000\n"
-"PO-Revision-Date: 2011-03-27 17:37+0000\n"
+"PO-Revision-Date: 2011-04-12 16:15+0000\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"

Modified: translation/trunk/projects/website/po/ar/donate/3-low.matching-program.po
===================================================================
--- translation/trunk/projects/website/po/ar/donate/3-low.matching-program.po	2011-04-12 16:15:00 UTC (rev 24594)
+++ translation/trunk/projects/website/po/ar/donate/3-low.matching-program.po	2011-04-12 16:19:31 UTC (rev 24595)
@@ -8,7 +8,7 @@
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
 "POT-Creation-Date: 2010-12-26 14:32+0000\n"
-"PO-Revision-Date: 2011-03-27 17:29+0000\n"
+"PO-Revision-Date: 2011-04-12 16:12+0000\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"

Modified: translation/trunk/projects/website/po/ar/download/3-low.download-unix.po
===================================================================
--- translation/trunk/projects/website/po/ar/download/3-low.download-unix.po	2011-04-12 16:15:00 UTC (rev 24594)
+++ translation/trunk/projects/website/po/ar/download/3-low.download-unix.po	2011-04-12 16:19:31 UTC (rev 24595)
@@ -8,7 +8,7 @@
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
 "POT-Creation-Date: 2011-01-29 21:13+0000\n"
-"PO-Revision-Date: 2011-03-27 17:33+0000\n"
+"PO-Revision-Date: 2011-04-12 16:12+0000\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"

Modified: translation/trunk/projects/website/po/ar/download/3-low.thankyou.po
===================================================================
--- translation/trunk/projects/website/po/ar/download/3-low.thankyou.po	2011-04-12 16:15:00 UTC (rev 24594)
+++ translation/trunk/projects/website/po/ar/download/3-low.thankyou.po	2011-04-12 16:19:31 UTC (rev 24595)
@@ -8,7 +8,7 @@
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
 "POT-Creation-Date: 2010-12-26 14:31+0000\n"
-"PO-Revision-Date: 2011-03-27 17:34+0000\n"
+"PO-Revision-Date: 2011-04-12 16:12+0000\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"

Modified: translation/trunk/projects/website/po/ar/getinvolved/3-low.mirrors.po
===================================================================
--- translation/trunk/projects/website/po/ar/getinvolved/3-low.mirrors.po	2011-04-12 16:15:00 UTC (rev 24594)
+++ translation/trunk/projects/website/po/ar/getinvolved/3-low.mirrors.po	2011-04-12 16:19:31 UTC (rev 24595)
@@ -8,7 +8,7 @@
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
 "POT-Creation-Date: 2010-12-26 14:32+0000\n"
-"PO-Revision-Date: 2011-03-27 17:28+0000\n"
+"PO-Revision-Date: 2011-04-12 16:12+0000\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"

Modified: translation/trunk/projects/website/po/ar/getinvolved/3-low.tshirt.po
===================================================================
--- translation/trunk/projects/website/po/ar/getinvolved/3-low.tshirt.po	2011-04-12 16:15:00 UTC (rev 24594)
+++ translation/trunk/projects/website/po/ar/getinvolved/3-low.tshirt.po	2011-04-12 16:19:31 UTC (rev 24595)
@@ -8,7 +8,7 @@
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
 "POT-Creation-Date: 2011-02-12 12:20+0000\n"
-"PO-Revision-Date: 2011-03-27 17:28+0000\n"
+"PO-Revision-Date: 2011-04-12 16:14+0000\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"

Modified: translation/trunk/projects/website/po/ar/getinvolved/4-optional.open-positions.po
===================================================================
--- translation/trunk/projects/website/po/ar/getinvolved/4-optional.open-positions.po	2011-04-12 16:15:00 UTC (rev 24594)
+++ translation/trunk/projects/website/po/ar/getinvolved/4-optional.open-positions.po	2011-04-12 16:19:31 UTC (rev 24595)
@@ -8,7 +8,7 @@
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
 "POT-Creation-Date: 2010-12-26 14:32+0000\n"
-"PO-Revision-Date: 2011-03-27 17:35+0000\n"
+"PO-Revision-Date: 2011-04-12 16:13+0000\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"

Modified: translation/trunk/projects/website/po/ar/getinvolved/4-optional.research.po
===================================================================
--- translation/trunk/projects/website/po/ar/getinvolved/4-optional.research.po	2011-04-12 16:15:00 UTC (rev 24594)
+++ translation/trunk/projects/website/po/ar/getinvolved/4-optional.research.po	2011-04-12 16:19:31 UTC (rev 24595)
@@ -8,7 +8,7 @@
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
 "POT-Creation-Date: 2011-02-12 12:20+0000\n"
-"PO-Revision-Date: 2011-03-27 17:30+0000\n"
+"PO-Revision-Date: 2011-04-12 16:14+0000\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"

Modified: translation/trunk/projects/website/po/ar/getinvolved/4-optional.translation-overview.po
===================================================================
--- translation/trunk/projects/website/po/ar/getinvolved/4-optional.translation-overview.po	2011-04-12 16:15:00 UTC (rev 24594)
+++ translation/trunk/projects/website/po/ar/getinvolved/4-optional.translation-overview.po	2011-04-12 16:19:31 UTC (rev 24595)
@@ -8,7 +8,7 @@
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
 "POT-Creation-Date: 2011-01-03 15:54+0000\n"
-"PO-Revision-Date: 2011-03-27 17:33+0000\n"
+"PO-Revision-Date: 2011-04-12 16:11+0000\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"

Modified: translation/trunk/projects/website/po/ar/getinvolved/4-optional.translation.po
===================================================================
--- translation/trunk/projects/website/po/ar/getinvolved/4-optional.translation.po	2011-04-12 16:15:00 UTC (rev 24594)
+++ translation/trunk/projects/website/po/ar/getinvolved/4-optional.translation.po	2011-04-12 16:19:31 UTC (rev 24595)
@@ -8,7 +8,7 @@
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
 "POT-Creation-Date: 2011-01-03 14:40+0000\n"
-"PO-Revision-Date: 2011-03-27 17:27+0000\n"
+"PO-Revision-Date: 2011-04-12 16:13+0000\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"

Modified: translation/trunk/projects/website/po/ar/getinvolved/4-optional.volunteer.po
===================================================================
--- translation/trunk/projects/website/po/ar/getinvolved/4-optional.volunteer.po	2011-04-12 16:15:00 UTC (rev 24594)
+++ translation/trunk/projects/website/po/ar/getinvolved/4-optional.volunteer.po	2011-04-12 16:19:31 UTC (rev 24595)
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-03-25 16:51+0000\n"
-"PO-Revision-Date: 2011-03-27 17:31+0000\n"
+"POT-Creation-Date: 2011-03-28 12:49+0200\n"
+"PO-Revision-Date: 2011-04-12 16:11+0000\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
@@ -18,33 +18,33 @@
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5\n"
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:8
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:8
 msgid ""
 "<a href=\"<page index>\">Home &raquo; </a> <a href=\"<page "
 "getinvolved/volunteer>\">Volunteer</a>"
 msgstr ""
 
 #. type: Content of: <div><div><h1>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:13
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:13
 msgid "A few things everyone can do now:"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:15
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:15
 msgid ""
 "Please consider <a href=\"<page docs/tor-doc-relay>\">running a relay</a> to"
 " help the Tor network grow."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:17
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:17
 msgid ""
 "Tell your friends! Get them to run relays. Get them to run hidden services. "
 "Get them to tell their friends."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:19
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:19
 msgid ""
 "If you like Tor's goals, please <a href=\"<page donate/donate>\">take a "
 "moment to donate to support further Tor development</a>. We're also looking "
@@ -54,7 +54,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:24
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:24
 msgid ""
 "We're looking for more <a href=\"<page about/torusers>\">good examples of "
 "Tor users and Tor use cases</a>. If you use Tor for a scenario or purpose "
@@ -63,7 +63,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:30
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:30
 msgid ""
 "Tor has <a href=\"<page getinvolved/open-positions>\">two open "
 "positions</a>.  Please <a href=\"<page about/contact>\">contact us</a> if "
@@ -71,17 +71,17 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:33
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:33
 msgid "<a id=\"Documentation\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:34
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:34
 msgid "<a class=\"anchor\" href=\"#Documentation\">Documentation</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:36
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:36
 msgid ""
 "Help translate the web page and documentation into other languages. See the "
 "<a href=\"<page getinvolved/translation>\">translation guidelines</a> if you"
@@ -90,7 +90,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:40
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:40
 msgid ""
 "Evaluate and document <a "
 "href=\"https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorifyHOWTO\">our"
@@ -98,7 +98,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:43
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:43
 msgid ""
 "We have a huge list of <a "
 "href=\"https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/SupportPrograms\">potentially"
@@ -107,32 +107,24 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:49
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:49
 msgid "<a id=\"Advocacy\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:50
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:50
 msgid "<a class=\"anchor\" href=\"#Advocacy\">Advocacy</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:52
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:52
 msgid ""
-"Create a <a "
-"href=\"https://trac.torproject.org/projects/tor/wiki/CommunityLogos\">community"
-" logo</a> under a Creative Commons license that all can use and modify."
-msgstr ""
-
-#. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:55
-msgid ""
 "Create a presentation that can be used for various user group meetings "
 "around the world."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:57
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:54
 msgid ""
 "Create a video about the positive uses of Tor, what Tor is, or how to use "
 "it.  Some have already started on <a "
@@ -143,31 +135,31 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:63
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:60
 msgid ""
 "Create a poster, or a set of posters, around a theme, such as \"Tor for "
 "Freedom!\"."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:65
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:62
 msgid ""
 "Create a t-shirt design that incorporates \"Congratulations! You are using "
 "Tor!\" in any language."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:69
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:66
 msgid "<a id=\"Projects\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:70
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:67
 msgid "<a class=\"anchor\" href=\"#Projects\">Projects</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:73
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:70
 msgid ""
 "Below are a list of Tor related projects we're developing and/or "
 "maintaining. Most discussions happen on IRC so if you're interested in any "
@@ -178,333 +170,333 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><th>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:83
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:80
 msgid "Name"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><th>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:84
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:81
 msgid "Category"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><th>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:85
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:82
 msgid "Language"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><th>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:86
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:83
 msgid "Activity"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><th>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:87
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:84
 msgid "Contributors"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:91
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:88
 msgid "<a href=\"#project-tor\">Tor</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:92
-#: /tmp/OzLkyddxSC.xml:100
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:89
+#: /tmp/qxq11tAO2x.xml:97
 msgid "Core"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:93
-#: /tmp/OzLkyddxSC.xml:125
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:90
+#: /tmp/qxq11tAO2x.xml:122
 msgid "C"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:94
-#: /tmp/OzLkyddxSC.xml:118 /tmp/OzLkyddxSC.xml:150 /tmp/OzLkyddxSC.xml:190
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:91
+#: /tmp/qxq11tAO2x.xml:115 /tmp/qxq11tAO2x.xml:147 /tmp/qxq11tAO2x.xml:187
 msgid "Heavy"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:95
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:92
 msgid "nickm, arma, Sebastian"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:99
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:96
 msgid "*<a href=\"#project-jtor\">JTor</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:101
-#: /tmp/OzLkyddxSC.xml:157 /tmp/OzLkyddxSC.xml:189
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:98
+#: /tmp/qxq11tAO2x.xml:154 /tmp/qxq11tAO2x.xml:186
 msgid "Java"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:102
-#: /tmp/OzLkyddxSC.xml:198 /tmp/OzLkyddxSC.xml:222 /tmp/OzLkyddxSC.xml:246
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:99
+#: /tmp/qxq11tAO2x.xml:195 /tmp/qxq11tAO2x.xml:219 /tmp/qxq11tAO2x.xml:243
 msgid "None"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:107
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:104
 msgid "<a href=\"#project-tbb\">TBB</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:108
-#: /tmp/OzLkyddxSC.xml:116 /tmp/OzLkyddxSC.xml:124 /tmp/OzLkyddxSC.xml:132
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:105
+#: /tmp/qxq11tAO2x.xml:113 /tmp/qxq11tAO2x.xml:121 /tmp/qxq11tAO2x.xml:129
 msgid "Usability"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:109
-#: /tmp/OzLkyddxSC.xml:117 /tmp/OzLkyddxSC.xml:133
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:106
+#: /tmp/qxq11tAO2x.xml:114 /tmp/qxq11tAO2x.xml:130
 msgid "Sys Admin"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:110
-#: /tmp/OzLkyddxSC.xml:158 /tmp/OzLkyddxSC.xml:166 /tmp/OzLkyddxSC.xml:230
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:107
+#: /tmp/qxq11tAO2x.xml:155 /tmp/qxq11tAO2x.xml:163 /tmp/qxq11tAO2x.xml:227
 msgid "Moderate"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:111
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:108
 msgid "Erinn"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:115
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:112
 msgid "<a href=\"#project-tails\">Tails</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:119
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:116
 msgid "<a href=\"https://tails.boum.org/chat/\">#tails</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:123
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:120
 msgid "<a href=\"#project-torsocks\">Torsocks</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:126
-#: /tmp/OzLkyddxSC.xml:134 /tmp/OzLkyddxSC.xml:142 /tmp/OzLkyddxSC.xml:174
-#: /tmp/OzLkyddxSC.xml:182 /tmp/OzLkyddxSC.xml:206 /tmp/OzLkyddxSC.xml:214
-#: /tmp/OzLkyddxSC.xml:238
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:123
+#: /tmp/qxq11tAO2x.xml:131 /tmp/qxq11tAO2x.xml:139 /tmp/qxq11tAO2x.xml:171
+#: /tmp/qxq11tAO2x.xml:179 /tmp/qxq11tAO2x.xml:203 /tmp/qxq11tAO2x.xml:211
+#: /tmp/qxq11tAO2x.xml:235
 msgid "Light"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:127
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:124
 msgid "mwenge"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:131
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:128
 msgid "*<a href=\"#project-torouter\">Torouter</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:135
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:132
 msgid "ioerror, Runa"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:139
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:136
 msgid "<a href=\"#project-vidalia\">Vidalia</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:140
-#: /tmp/OzLkyddxSC.xml:148 /tmp/OzLkyddxSC.xml:156
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:137
+#: /tmp/qxq11tAO2x.xml:145 /tmp/qxq11tAO2x.xml:153
 msgid "User Interface"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:141
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:138
 msgid "C++, Qt"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:143
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:140
 msgid "chiiph"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:147
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:144
 msgid "<a href=\"#project-arm\">Arm</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:149
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:146
 msgid "Python, Curses"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:151
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:148
 msgid "atagar"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:155
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:152
 msgid "<a href=\"#project-orbot\">Orbot</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:159
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:156
 msgid "n8fr8"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:163
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:160
 msgid "<a href=\"#project-torbutton\">Torbutton</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:164
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:161
 msgid "Browser Add-on"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:165
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:162
 msgid "Javascript"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:167
-#: /tmp/OzLkyddxSC.xml:183 /tmp/OzLkyddxSC.xml:239
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:164
+#: /tmp/qxq11tAO2x.xml:180 /tmp/qxq11tAO2x.xml:236
 msgid "mikeperry"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:171
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:168
 msgid "*<a href=\"#project-thandy\">Thandy</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:172
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:169
 msgid "Updater"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:173
-#: /tmp/OzLkyddxSC.xml:181 /tmp/OzLkyddxSC.xml:205 /tmp/OzLkyddxSC.xml:213
-#: /tmp/OzLkyddxSC.xml:229 /tmp/OzLkyddxSC.xml:237 /tmp/OzLkyddxSC.xml:245
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:170
+#: /tmp/qxq11tAO2x.xml:178 /tmp/qxq11tAO2x.xml:202 /tmp/qxq11tAO2x.xml:210
+#: /tmp/qxq11tAO2x.xml:226 /tmp/qxq11tAO2x.xml:234 /tmp/qxq11tAO2x.xml:242
 msgid "Python"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:175
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:172
 msgid "Sebastian, Erinn, nickm"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:179
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:176
 msgid "<a href=\"#project-torctl\">TorCtl</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:180
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:177
 msgid "Library"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:187
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:184
 msgid "<a href=\"#project-metrics\">Metrics</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:188
-#: /tmp/OzLkyddxSC.xml:196 /tmp/OzLkyddxSC.xml:204 /tmp/OzLkyddxSC.xml:212
-#: /tmp/OzLkyddxSC.xml:220
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:185
+#: /tmp/qxq11tAO2x.xml:193 /tmp/qxq11tAO2x.xml:201 /tmp/qxq11tAO2x.xml:209
+#: /tmp/qxq11tAO2x.xml:217
 msgid "Client Service"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:191
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:188
 msgid "karsten"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:195
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:192
 msgid "<a href=\"#project-torstatus\">TorStatus</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:197
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:194
 msgid "PHP"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:203
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:200
 msgid "<a href=\"#project-weather\">Weather</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:207
-#: /tmp/OzLkyddxSC.xml:215
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:204
+#: /tmp/qxq11tAO2x.xml:212
 msgid "kaner"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:211
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:208
 msgid "<a href=\"#project-gettor\">GetTor</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:219
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:216
 msgid "<a href=\"#project-torcheck\">TorCheck</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:221
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:218
 msgid "Python, Perl"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:227
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:224
 msgid "<a href=\"#project-bridgedb\">BridgeDB</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:228
-#: /tmp/OzLkyddxSC.xml:236 /tmp/OzLkyddxSC.xml:244
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:225
+#: /tmp/qxq11tAO2x.xml:233 /tmp/qxq11tAO2x.xml:241
 msgid "Backend Service"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:231
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:228
 msgid "kaner, nickm"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:235
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:232
 msgid "<a href=\"#project-torflow\">TorFlow</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:243
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:240
 msgid "*<a href=\"#project-torbel\">TorBEL</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:247
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:244
 msgid "Sebastian"
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:251
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:248
 msgid ""
 "<sub> * Project is still in an alpha state.  </sub> <br /><br /> <a id"
 "=\"project-tor\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:258
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:255
 msgid ""
 "Tor (<a href=\"https://gitweb.torproject.org/tor.git\">code</a>, <a "
 "href=\"https://trac.torproject.org/projects/tor/query?status=accepted&status=assigned&status=needs_review&status=new&status=reopened&component=Tor+Client&component=Tor+Relay&component=vidalia&order=priority\">bug"
@@ -512,7 +504,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:263
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:260
 msgid ""
 "Central project, providing the core software for using and participating in "
 "the Tor network. Numerous people contribute to the project to varying "
@@ -520,7 +512,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:269
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:266
 msgid ""
 "<b>Project Ideas:</b><br /> <i><a href=\"#resistCensorship\">Improving Tor's"
 " ability to resist censorship</a></i><br /> <i><a "
@@ -530,12 +522,12 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:276
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:273
 msgid "<a id=\"project-jtor\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:277
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:274
 msgid ""
 "<a href=\"https://github.com/brl/JTor/wiki\">JTor</a> (<a "
 "href=\"https://github.com/brl/JTor\">code</a>, <a "
@@ -543,7 +535,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:283
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:280
 msgid ""
 "Java implementation of Tor and successor to <a "
 "href=\"http://onioncoffee.sourceforge.net/\">OnionCoffee</a>. This project "
@@ -551,12 +543,12 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:288
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:285
 msgid "<a id=\"project-tbb\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:289
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:286
 msgid ""
 "<a href=\"<page projects/torbrowser>\">Tor Browser Bundle</a> (<a "
 "href=\"https://gitweb.torproject.org/torbrowser.git\">code</a>, <a "
@@ -565,7 +557,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:295
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:292
 msgid ""
 "The Tor Browser Bundle is an easy-to-use portable package of Tor, Vidalia, "
 "and Firefox preconfigured to work together out of the box. This is actively "
@@ -573,7 +565,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:301
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:298
 msgid ""
 "<b>Project Ideas:</b><br /> <i><a href=\"#auditTBB\">Audit Tor Browser "
 "Bundles for data leaks</a></i><br /> <i><a "
@@ -581,12 +573,12 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:306
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:303
 msgid "<a id=\"project-tails\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:307
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:304
 msgid ""
 "<a href=\"https://tails.boum.org/\">The Amnesic Incognito Live System</a> "
 "(<a href=\"http://git.immerda.ch/?p=amnesia.git;a=summary\">code</a>, <a "
@@ -594,7 +586,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:313
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:310
 msgid ""
 "The Amnesic Incognito Live System is a live CD/USB distribution "
 "preconfigured so that everything is safely routed through Tor and leaves no "
@@ -604,7 +596,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:321
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:318
 msgid ""
 "<b>Project Ideas:</b><br /> <i><a href=\"#tailsStartMenu\">Custom GDM3 "
 "startup menu, aka.  tails-greeter</a></i><br /> <i><a "
@@ -614,12 +606,12 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:330
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:327
 msgid "<a id=\"project-torsocks\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:331
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:328
 msgid ""
 "<a href=\"http://code.google.com/p/torsocks/\">Torsocks</a> (<a "
 "href=\"https://gitweb.torproject.org/torsocks.git\">code</a>, <a "
@@ -628,7 +620,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:337
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:334
 msgid ""
 "Utility for adapting other applications to work with Tor. Development has "
 "slowed and compatibility issues remain with some platforms, but it's "
@@ -636,19 +628,19 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:343
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:340
 msgid ""
 "<b>Project Ideas:</b><br /> <i><a href=\"#torsocksForOSX\">Make "
 "torsocks/dsocks work on OS X</a></i>"
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:347
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:344
 msgid "<a id=\"project-torouter\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:348
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:345
 msgid ""
 "<a "
 "href=\"https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/Torouter\">Torouter</a>"
@@ -658,19 +650,19 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:354
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:351
 msgid ""
 "Project to provide an easy-to-use, embedded Tor instance for routers. This "
 "had high activity in late 2010, but has since been rather quiet."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:358
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:355
 msgid "<a id=\"project-vidalia\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:359
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:356
 msgid ""
 "<a href=\"<page projects/vidalia>\">Vidalia</a> (<a "
 "href=\"https://svn.torproject.org/vidalia/vidalia/trunk/\">code</a>, <a "
@@ -679,7 +671,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:365
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:362
 msgid ""
 "The most commonly used user interface for Tor. Matt Edman started the "
 "project in 2006 and brought it to its current stable state. Development "
@@ -688,7 +680,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:372
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:369
 msgid ""
 "<b>Project Ideas:</b><br /> <i><a href=\"#vidaliaStatusEventInterface\">Tor "
 "Controller Status Event Interface for Vidalia</a></i><br /> <i><a "
@@ -697,12 +689,12 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:377
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:374
 msgid "<a id=\"project-arm\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:378
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:375
 msgid ""
 "<a href=\"http://www.atagar.com/arm/\">Arm</a> (<a "
 "href=\"https://svn.torproject.org/svn/arm/trunk/\">code</a>, <a "
@@ -711,7 +703,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:384
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:381
 msgid ""
 "Command-line monitor for Tor. This has been under very active development by"
 " its author, Damian Johnson, since early 2009 to make it a better general-"
@@ -719,19 +711,19 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:390
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:387
 msgid ""
 "<b>Project Ideas:</b><br /> <i><a href=\"#armClientMode\">Client Mode Use "
 "Cases for Arm</a></i><br /> <i><a href=\"#armGui\">GUI for Arm</a></i>"
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:395
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:392
 msgid "<a id=\"project-orbot\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:396
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:393
 msgid ""
 "<a href=\"https://guardianproject.info/apps/orbot/\">Orbot</a> (<a "
 "href=\"https://svn.torproject.org/svn/projects/android/trunk/Orbot/\">code</a>,"
@@ -741,26 +733,30 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:402
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:399
 msgid ""
 "Provides Tor on the Android platform. This was under very active development"
 " up through Fall 2010, after which things have been quiet."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:407
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:404
 msgid ""
-"<b>Project Ideas:</b><br /> <i><a href=\"#orbotDevelopment\">More on Orbot "
-"&amp; Android OS-specific development</a></i>"
+"<b>Project Ideas:</b><br /> <i><a href=\"#orbot-torbutton\">TorButton for "
+"Mobile Firefox 4 or Custom Browser on Android</a></i><br /> <i><a href"
+"=\"#orbot-userInterface\">Build a better user interface for Orbot</a></i><br"
+" /> <i><a href=\"#orbot-optimisation\">Core Tor mobile "
+"optimisation</a></i><br /> <i><a href=\"#orbot-orlibAndOutreach\">Orbot "
+"integration library and community outreach</a></i>"
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:411
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:411
 msgid "<a id=\"project-torbutton\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:412
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:412
 msgid ""
 "<a href=\"<page torbutton/index>\">Torbutton</a> (<a "
 "href=\"https://gitweb.torproject.org/torbutton.git\">code</a>, <a "
@@ -769,7 +765,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:418
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:418
 msgid ""
 "Firefox addon that addresses many of the client-side threats to browsing the"
 " Internet anonymously. Mike has since continued to adapt it to new threats, "
@@ -779,7 +775,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:426
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:426
 msgid ""
 "<b>Project Ideas:</b><br /> <i><a "
 "href=\"#torbuttonForThunderbird\">Torbutton equivalent for "
@@ -787,17 +783,17 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:430
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:430
 msgid "<a id=\"project-thandy\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:431
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:431
 msgid "Thandy (<a href=\"https://gitweb.torproject.org/thandy.git\">code</a>)"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:435
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:435
 msgid ""
 "Updater for Tor. The project began in the Summer of 2008 but wasn't "
 "completed. Recently interest in it has been rekindled and many aspects of "
@@ -805,12 +801,12 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:440
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:440
 msgid "<a id=\"project-torctl\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:441
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:441
 msgid ""
 "TorCtl (<a href=\"https://gitweb.torproject.org/pytorctl.git\">code</a>, <a "
 "href=\"https://trac.torproject.org/projects/tor/query?status=accepted&status=assigned&status=needs_review&status=new&status=reopened&component=Torctl&order=priority\">bug"
@@ -818,19 +814,19 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:447
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:447
 msgid ""
 "Python bindings and utilities for using the Tor control port. It has been "
 "stable for several years, with only minor revisions."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:451
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:451
 msgid "<a id=\"project-metrics\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:452
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:452
 msgid ""
 "<a href=\"https://metrics.torproject.org/\">Metrics</a> (code: <a "
 "href=\"https://gitweb.torproject.org/metrics-db.git\">db</a>, <a "
@@ -841,7 +837,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:460
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:460
 msgid ""
 "Processing and analytics of consensus data, provided to users via the "
 "metrics portal. This has been under active development for several years by "
@@ -849,12 +845,12 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:465
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:465
 msgid "<a id=\"project-torstatus\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:466
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:466
 msgid ""
 "<a "
 "href=\"https://trac.torproject.org/projects/tor/wiki/projects/TorStatus\">TorStatus</a>"
@@ -862,7 +858,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:470
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:470
 msgid ""
 "Portal providing an overview of the Tor network, and details on any of its "
 "current relays. Though very actively used, this project has been "
@@ -870,12 +866,12 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:475
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:475
 msgid "<a id=\"project-weather\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:476
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:476
 msgid ""
 "<a "
 "href=\"https://trac.torproject.org/projects/tor/wiki/projects/Weather\">Weather</a>"
@@ -885,7 +881,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:482
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:482
 msgid ""
 "Provides automatic notification to subscribed relay operators when their "
 "relay's unreachable. This underwent a rewrite by the <a "
@@ -894,12 +890,12 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:488
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:488
 msgid "<a id=\"project-gettor\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:489
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:489
 msgid ""
 "<a "
 "href=\"https://trac.torproject.org/projects/tor/wiki/projects/EmailAutoResponder\">GetTor</a>"
@@ -909,19 +905,19 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:495
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:495
 msgid ""
 "E-mail autoresponder providing Tor's packages over SMTP. This has been "
 "relatively unchanged for quite a while."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:499
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:499
 msgid "<a id=\"project-torcheck\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:500
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:500
 msgid ""
 "<a "
 "href=\"https://trac.torproject.org/projects/tor/wiki/projects/TorCheck\">TorCheck</a>"
@@ -931,19 +927,19 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:506
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:506
 msgid ""
 "Provides a simple site for determining if the visitor is using Tor or not.  "
 "This has been relatively unchanged for quite a while."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:510
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:510
 msgid "<a id=\"project-bridgedb\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:511
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:511
 msgid ""
 "<a "
 "href=\"https://trac.torproject.org/projects/tor/wiki/projects/BridgeDB\">BridgeDB</a>"
@@ -953,19 +949,19 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:517
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:517
 msgid ""
 "Backend bridge distributor, handling the various pools they're distributed "
 "in. This was actively developed until Fall of 2010."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:521
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:521
 msgid "<a id=\"project-torflow\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:522
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:522
 msgid ""
 "<a "
 "href=\"https://trac.torproject.org/projects/tor/wiki/projects/TorFlow\">TorFlow</a>"
@@ -975,7 +971,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:528
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:528
 msgid ""
 "Library and collection of services for actively monitoring the Tor network."
 "  These include the Bandwidth Scanners (measuring throughput of relays) and "
@@ -986,12 +982,12 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:536
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:536
 msgid "<a id=\"project-torbel\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:537
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:537
 msgid ""
 "<a "
 "href=\"https://trac.torproject.org/projects/tor/wiki/projects/TorBulkExitlist\">TorBEL</a>"
@@ -1001,7 +997,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:544
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:544
 msgid ""
 "The Tor Bulk Exitlist provides a method of identifying if IPs belong to exit"
 " nodes or not. This is a replacement for TorDNSEL which is a stable (though "
@@ -1011,17 +1007,17 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:551
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:551
 msgid "<a id=\"Coding\"></a> <a id=\"Summer\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:553
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:553
 msgid "<a class=\"anchor\" href=\"#Coding\">Project Ideas</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:556
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:556
 msgid ""
 "You may find some of these projects to be good <a href=\"<page "
 "about/gsoc>\">Google Summer of Code 2011</a> ideas. We have labelled each "
@@ -1036,12 +1032,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:570
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:570
 msgid "<a id=\"auditTBB\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:572
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:572
 msgid ""
 "<b>Audit Tor Browser Bundles for data leaks</b> <br> Priority: <i>High</i> "
 "<br> Effort Level: <i>High</i> <br> Skill Level: <i>Medium</i> <br> Likely "
@@ -1049,7 +1045,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:581
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:581
 msgid ""
 "The Tor Browser Bundle incorporates Tor, Firefox, Polipo, and the Vidalia "
 "user interface (and optionally the <a href=\"http://pidgin.im/\">Pidgin</a> "
@@ -1060,7 +1056,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:587
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:587
 msgid ""
 "This project is to identify all of the traces left behind by using a Tor "
 "Browser Bundle on Windows, Mac OS X, or Linux.  Developing ways to stop, "
@@ -1068,7 +1064,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:590
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:590
 msgid ""
 "Students should be familiar with operating system analysis, application "
 "development on one or preferably all of Windows, Linux, and Mac OS X, and be"
@@ -1076,19 +1072,19 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:593
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:593
 msgid ""
 "If you would like to help extend or do security auditing for TBB, please "
 "contact Erinn."
 msgstr ""
 
 #. type: Content of: <div><div><ol>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:597
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:597
 msgid "<a id=\"firewallProbeTool\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:599
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:599
 msgid ""
 "<b>Develop a fully automatic firewall-probing system</b> <br> Priority: "
 "<i>High</i> <br> Effort Level: <i>Medium to High</i> <br> Skill Level: "
@@ -1096,7 +1092,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:608
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:608
 msgid ""
 "We would like to have a fully automatic firewall-probing system for blocking"
 " systems with no long-term state (i.e. firewalls that can examine each "
@@ -1105,7 +1101,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:612
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:612
 msgid ""
 "Ideally, volunteers would only need to set up one or more test servers, and "
 "run the probe client program on a publicly accessible computer behind the "
@@ -1113,38 +1109,38 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:615
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:615
 msgid "The test tool should:"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><ul><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:617
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:617
 msgid ""
 "generate packet captures on both ends (and send them out to the extent "
 "possible),"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><ul><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:619
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:619
 msgid ""
 "cycle through all the SSL configurations we might want to test through a "
 "censorship device, and"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><ul><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:621
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:621
 msgid ""
 "also test some other protocols to see whether they are allowed through the "
 "firewall (IMAP and other mail protocols, BitTorrent, DTLS, etc.)."
 msgstr ""
 
 #. type: Content of: <div><div><ol>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:627
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:627
 msgid "<a id=\"tailsStartMenu\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:629
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:629
 msgid ""
 "<b>Custom GDM3 startup menu, aka. tails-greeter</b> <br> Priority: "
 "<i>High</i> <br> Effort Level: <i>Medium</i> <br> Skill Level: <i>Medium to "
@@ -1152,14 +1148,14 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:638
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:638
 msgid ""
 "Several major upcoming Tails features need to gather user input at startup "
 "time: bridges support, persistence, MAC address anonymization, etc."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:641
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:641
 msgid ""
 "Existing boot menus lack the graphical widgets and generally user-"
 "friendliness needed. Hence it was decided to implement Tails startup menu in"
@@ -1169,7 +1165,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:646
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:646
 msgid ""
 "Anyone undertaking this project should be familiar with GNU/Linux and "
 "application development; no other skill is required, apart of the ability to"
@@ -1181,19 +1177,75 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:653
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:653
 msgid ""
 "For more information see <a "
 "href=\"https://tails.boum.org/todo/boot_menu/\">https://tails.boum.org/todo/boot_menu/</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ol>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:656
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:656
+msgid "<a id=\"orbot-torbutton\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><ol><li>
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:658
+msgid ""
+"<b>TorButton for Mobile Firefox 4 or Custom Browser on Android</b> <br> "
+"Priority: <i>High</i> <br> Effort Level: <i>High</i> <br> Skill Level: "
+"<i>High</i> <br> Likely Mentors: <i>Nathan (n8fr8), Jake, Mike Perry</i>"
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:667
+msgid ""
+"Initial work has been done on implementing a proxy-setting add-on for "
+"Firefox on Android (see <a "
+"href=\"https://github.com/guardianproject/ProxyMob\">ProxyMob</a>), but a "
+"full port of TorButton needs to be done (dependent upon Firefox 4 port of "
+"TorButton). The other approach is to implement a custom &quot;Tor "
+"Browser&quot; based on Firefox or Webkit browser. See <a "
+"href=\"http://code.google.com/p/torora/wiki/Android\">Torora</a> for "
+"progress on this so far."
+msgstr ""
+
+#. type: Content of: <div><div><ol>
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:677
+msgid "<a id=\"orbot-userInterface\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><ol><li>
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:679
+msgid ""
+"<b>Build a better user interface for Orbot</b> <br> Priority: <i>High</i> "
+"<br> Effort Level: <i>Medium</i> <br> Skill Level: <i>Medium</i> <br> Likely"
+" Mentors: <i>Nathan (n8fr8), Jake</i>"
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:688
+msgid ""
+"Improved home screen to show confirmation of connection (via a TorCheck API "
+"call), better statistics about data transferred (up/down), number of "
+"circuits connected, quality of connection and so on. The &quot;Tether "
+"Wifi&quot; Android application is a good model to follow in how it shows a "
+"realtime count of bytes transferred as well as notifications when wifi "
+"clients connect. In addition, better handling of Tor system and error "
+"messages would also be very helpful, include use of standard Android "
+"operating systems notifications. The addition of a wizard or tutorial "
+"walkthrough for novice users to explain to them exactly what is and what is "
+"not anonymized or protected would greatly improve the likelihood they will "
+"use Orbot correctly. All of this should work on the range of screens and "
+"device types now offered for Android, from 2&quot; phone to 10&quot; Tablet."
+msgstr ""
+
+#. type: Content of: <div><div><ol>
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:703
 msgid "<a id=\"resistCensorship\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:658
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:705
 msgid ""
 "<b>Improving Tor's ability to resist censorship</b> <br> Priority: <i>Medium"
 " to High</i> <br> Effort Level: <i>Medium to High</i> <br> Skill Level: "
@@ -1201,7 +1253,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:667
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:714
 msgid ""
 "The Tor 0.2.1.x series makes <a href=\"<svnprojects>design-"
 "paper/blocking.html\">significant improvements</a> in resisting national and"
@@ -1210,7 +1262,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:672
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:719
 msgid ""
 "One huge category of work is adding features to our <a "
 "href=\"https://gitweb.torproject.org/bridgedb.git?a=tree\">BridgeDB</a> "
@@ -1226,7 +1278,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:683
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:730
 msgid ""
 "If you want to get more into the guts of Tor itself (C), a more minor "
 "problem we should address is that current Tors can only listen on a single "
@@ -1237,7 +1289,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:690
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:737
 msgid ""
 "This project could involve a lot of research and design. One of the big "
 "challenges will be identifying and crafting approaches that can still resist"
@@ -1246,12 +1298,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:697
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:744
 msgid "<a id=\"geoIPUpgrade\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:699
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:746
 msgid ""
 "<b>Improve our GeoIP file format</b> <br> Priority: <i>Medium</i> <br> "
 "Effort Level: <i>Medium</i> <br> Skill Level: <i>Medium to High</i> <br> "
@@ -1259,7 +1311,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:708
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:755
 msgid ""
 "Currently, Tor bridges and relays read an entire IP->country database into "
 "memory from a text file during startup.  We would like to distribute this "
@@ -1268,7 +1320,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:713
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:760
 msgid ""
 "We have <a href='https://trac.torproject.org/projects/tor/ticket/2506'>a "
 "sketch of a design</a> for a moderately optimized format for IPv4 GeoIP "
@@ -1277,20 +1329,20 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:722
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:769
 msgid "<a id=\"armClientMode\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:724
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:771
 msgid ""
 "<b>Client Mode Use Cases for Arm</b> <br> Priority: <i>Medium</i> <br> "
 "Effort Level: <i>High</i> <br> Skill Level: <i>Medium</i> <br> Likely "
-"Mentors: <i>Damian</i>"
+"Mentors: <i>Damian (atagar)</i>"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:733
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:780
 msgid ""
 "<a href=\"<page projects/arm>\">Arm</a> is a Tor command line status monitor"
 " on *nix environments (Linux, Mac, and BSD). It functions much like top "
@@ -1301,14 +1353,14 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:741
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:788
 msgid ""
 "This would include UI design, experimenting, and a lot of python hacking. "
 "Here's some ideas for client functionality arm could provide:"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><ul><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:745
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:792
 msgid ""
 "A panel for client connections, showing each hop of the user's circuits with"
 " the ISP, country, and jurisdiction where those relays reside. Other "
@@ -1321,21 +1373,21 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><ul><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:754
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:801
 msgid ""
 "Options to let the user request new circuits (the &quot;New Identity&quot; "
 "feature in Vidalia), select the exit country, etc."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><ul><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:757
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:804
 msgid ""
 "A panel showing Internet application and if their connections are being "
 "routed through Tor or not (giving a warning if there's leaks)."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><ul><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:760
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:807
 msgid ""
 "The status of the bridges we're configured to use (ie, are they up?).  This "
 "would include adding control port functionality to Tor for <a "
@@ -1344,7 +1396,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><ul><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:765
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:812
 msgid ""
 "A one click option to set Tor to be a client, relay, or bridge. The goal "
 "would be to make it trivial for users to voluntarily contribute to the Tor "
@@ -1352,7 +1404,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><ul><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:769
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:816
 msgid ""
 "Menus as an alternative to hotkeys to make the interface more intuitive and "
 "usable for beginners (<a "
@@ -1360,13 +1412,13 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><ul><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:773
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:820
 msgid ""
 "Look at Vidalia and TorK for ideas and solicit input from the Tor community."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:777
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:824
 msgid ""
 "More information is available in the following sections of arm's dev notes: "
 "<a "
@@ -1379,12 +1431,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:781
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:828
 msgid "<a id=\"unitTesting\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:783
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:830
 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> Likely "
@@ -1392,7 +1444,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:792
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:839
 msgid ""
 "Tor needs to be tested far more thoroughly. This is a multi-part effort. To "
 "start with, our unit test coverage should rise substantially, especially in "
@@ -1402,7 +1454,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:798
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:845
 msgid ""
 "Additionally, we need to automate our performance testing. We've got "
 "buildbot to automate our regular integration and compile testing already "
@@ -1415,78 +1467,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:808
-msgid "<a id=\"orbotDevelopment\"></a>"
-msgstr ""
-
-#. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:810
-msgid ""
-"<b>More on Orbot &amp; Android OS-specific development</b> <br> Priority: "
-"<i>Medium</i> <br> Effort Level: <i>High</i> <br> Skill Level: <i>Medium to "
-"High</i> <br> Likely Mentors: <i>Nathan, Jake</i>"
-msgstr ""
-
-#. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:819
-msgid ""
-"<b>Android Java UI work:</b> Improved home screen to show better statistics "
-"about data transferred (up/down), number of circuits connected, quality of "
-"connection and so on. The \"Tether Wifi\" Android application is a good "
-"model to follow in how it shows a realtime count of bytes transferred as "
-"well as notifications when wifi clients connect. In addition, better "
-"display/handling of Tor system/error messages would also be very helpful. "
-"Finally, the addition of a wizard or tutorial walkthrough for novice users "
-"to explain to them exactly what is and what is not anonymized or protected "
-"would greatly improve the likelihood they will use Orbot correctly."
-msgstr ""
-
-#. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:831
-msgid ""
-"<b>Android Java OS/Core app work:</b> Better system-wide indication, either "
-"via the notification bar, \"Toast\" pop-up dialogs or some other indicator, "
-"that an application's traffic is indeed moving through Orbot/Tor. For "
-"instance, right now you need to first go to a torcheck web service to ensure"
-" your browser is routing via Tor. Orbot should be able to notify you that "
-"circuits are being opened, used, etc. The aforementioned data transfer "
-"tracker might provide this type of awareness as well."
-msgstr ""
-
-#. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:840
-msgid ""
-"<b>Android Java Library/Community Outreach work:</b> We need to package a "
-"simple library for use with third-party application to easily enable them to"
-" support \"Torification\" on non-rooted devices (i.e. w/o transparent "
-"proxying). This library should include a wrapper for the Apache HTTPClient "
-"library, a utility class for detecting the state of Orbot connectivity, and "
-"other relevant/useful things an Android app might need to anonymize itself. "
-"This work would include the creation of the library, documentation, and "
-"sample code. Outreach or effort to implement the library within other open-"
-"source apps would follow."
-msgstr ""
-
-#. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:851
-msgid ""
-"<b>Android OS/C/Linux work:</b> The port of Tor to Android is basically a "
-"straight cross-compile to Linux ARM. There has been no work done in looking "
-"the optimization of Tor within a mobile hardware environment, on the ARM "
-"processor or other Android hardware, or on mobile networks. It should be "
-"noted, that even without optimization, Tor is handling the mobile network "
-"environment very well, automatically detecting change in IP addresses, "
-"reconnecting circuits, etc. across switching from 2G to 3G to Wifi, and so "
-"forth."
-msgstr ""
-
-#. type: Content of: <div><div><ol>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:862
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:855
 msgid "<a id=\"simulateSlowConnections\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:864
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:857
 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> Likely"
@@ -1494,7 +1480,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:874
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:867
 msgid ""
 "Many users of Tor have poor-quality Internet connections, giving low "
 "bandwidth, high latency, and high packet loss/re-ordering. User experience "
@@ -1503,7 +1489,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:882
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:875
 msgid ""
 "This project would be to build a simulation environment which replicates the"
 " poor connectivity so that the effect on Tor performance can be measured. "
@@ -1513,7 +1499,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:890
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:883
 msgid ""
 "The tools used would be up to the student, but dummynet (for FreeBSD)  and "
 "nistnet (for Linux) are two potential components on which this project could"
@@ -1522,12 +1508,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:898
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:891
 msgid "<a id=\"torbuttonForThunderbird\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:900
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:893
 msgid ""
 "<b>Torbutton equivalent for Thunderbird</b> <br> Priority: <i>Medium</i> "
 "<br> Effort Level: <i>High</i> <br> Skill Level: <i>High</i> <br> Likely "
@@ -1535,7 +1521,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:910
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:903
 msgid ""
 "We're hearing from an increasing number of users that they want to use "
 "Thunderbird with Tor. However, there are plenty of application-level "
@@ -1545,12 +1531,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:918
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:911
 msgid "<a id=\"usabilityTesting\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:920
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:913
 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 "
@@ -1558,7 +1544,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:930
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:923
 msgid ""
 "Especially the browser bundle, ideally amongst our target demographic.  That"
 " would help a lot in knowing what needs to be done in terms of bug fixes or "
@@ -1567,19 +1553,19 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:937
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:930
 msgid ""
 "Please note that since this isn't a coding project, it isn't suitable for "
 "Google Summer of Code."
 msgstr ""
 
 #. type: Content of: <div><div><ol>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:942
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:935
 msgid "<a id=\"tailsMetadataAnonymizing\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:944
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:937
 msgid ""
 "<b>Meta-data anonymizing toolkit for file publication</b> <br> Priority: "
 "<i>Medium</i> <br> Effort Level: <i>Low to Medium</i> <br> Skill Level: "
@@ -1587,7 +1573,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:953
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:946
 msgid ""
 "Tor helps greatly in publishing files anonymously. However, much personal "
 "information can be enclosed *inside* such published files' meta-data: GPS "
@@ -1596,14 +1582,14 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:957
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:950
 msgid ""
 "A set of tools allowing users to easily inspect and clean up meta-data in "
 "files would benefit Tor users, and would e.g. be shipped in Tails."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:959
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:952
 msgid ""
 "A graphical user interface is a must, but library and command-line "
 "interfaces are most welcome so that future work can add support for cleaning"
@@ -1612,7 +1598,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:963
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:956
 msgid ""
 "This project mostly consists of writing glue between the many existing tools"
 " and libraries that provide read/write access to files' meta-data. An "
@@ -1621,7 +1607,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:967
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:960
 msgid ""
 "The meta-data cleaning toolkit would run at least on GNU/Linux; additional "
 "Windows and/or Mac OS X support would be welcome. The tools used would be up"
@@ -1630,12 +1616,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:973
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:966
 msgid "<a id=\"tailsDebianLive\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:975
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:968
 msgid ""
 "<b>Improve Debian Live support for persistence</b> <br> Priority: "
 "<i>Medium</i> <br> Effort Level: <i>Medium</i> <br> Skill Level: <i>Low to "
@@ -1643,7 +1629,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:984
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:977
 msgid ""
 "Data persistence is a somewhat tricky topic in a Live system context, "
 "especially one such as Tails, which is explicitly designed to avoid leaving "
@@ -1651,7 +1637,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:987
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:980
 msgid ""
 "Some real-life use cases, however, require some kind of data persistence. To"
 " start with, Tails should (carefully) support persistence of application-"
@@ -1661,7 +1647,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:992
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:985
 msgid ""
 "The backend work consists of improving Debian Live's existing persistence "
 "features to make them suit the specific context of Tails. A trust "
@@ -1672,7 +1658,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:998
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:991
 msgid ""
 "Anyone undertaking this project must be familiar with GNU/Linux, and "
 "preferably with Debian. Being able to (quickly learn to) write clean and "
@@ -1680,19 +1666,19 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1001
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:994
 msgid ""
 "For more information, see <a "
 "href=\"https://tails.boum.org/todo/persistence/\">https://tails.boum.org/todo/persistence/</a>."
 msgstr ""
 
 #. type: Content of: <div><div><ol>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1004
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:997
 msgid "<a id=\"torsocksForOSX\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1006
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:999
 msgid ""
 "<b>Make torsocks/dsocks work on OS X</b> <br> Priority: <i>Medium</i> <br> "
 "Effort Level: <i>Medium</i> <br> Skill Level: <i>Medium</i> <br> Likely "
@@ -1700,7 +1686,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1016
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1009
 msgid ""
 "<a href=\"https://code.google.com/p/torsocks/\">Torsocks</a> and <a "
 "href=\"https://code.google.com/p/dsocks/\">dsocks</a> are wrappers that will"
@@ -1720,12 +1706,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1035
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1028
 msgid "<a id=\"vidaliaStatusEventInterface\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1037
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1030
 msgid ""
 "<b>Tor Controller Status Event Interface for Vidalia</b> <br> Priority: "
 "<i>Medium</i> <br> Effort Level: <i>Medium</i> <br> Skill Level: <i>Low to "
@@ -1733,7 +1719,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1046
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1039
 msgid ""
 "There are a number of status changes inside Tor of which the user may need "
 "to be informed. For example, if the user is trying to set up his Tor as a "
@@ -1746,7 +1732,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1054
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1047
 msgid ""
 "Tor has the ability to inform Vidalia of many such status changes, and we "
 "recently implemented support for a couple of these events. Still, there are "
@@ -1755,7 +1741,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1059
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1052
 msgid ""
 "The goal of this project then is to design and implement a UI for displaying"
 " Tor status events to the user. For example, we might put a little badge on "
@@ -1767,7 +1753,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1067
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1060
 msgid ""
 "A person undertaking this project should have good UI design and layout "
 "skills and some C++ development experience. Previous experience with Qt and "
@@ -1779,12 +1765,91 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1076
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1069
+msgid "<a id=\"orbot-optimisation\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><ol><li>
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1071
+msgid ""
+"<b>Core Tor mobile optimisation</b> <br> Priority: <i>Medium</i> <br> Effort"
+" Level: <i>Medium</i> <br> Skill Level: <i>High</i> <br> Likely Mentors: "
+"<i>Nathan (n8fr8), Jake</i>"
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1081
+msgid ""
+"The existing port of Tor to Android is basically a straight cross-compile to"
+" Linux ARM. There has been no work done in looking at possible optimizations"
+" of Tor within a mobile hardware environment or on mobile networks. In "
+"addition, a number of additional Android OS APIs are available (such as "
+"wireless network status) that could be taken advantage of."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1090
+msgid ""
+"It should be noted, that even without optimisation, Tor is handling the "
+"mobile network environment very well, automatically detecting change in IP "
+"addresses, opening circuits, etc, as the device switches from no coverage to"
+" 2G, 3G or Wifi constantly as it changes position. However, this observation"
+" of &quot;very well&quot;, is just based on user experience, and not any "
+"detailed study of what exactly is happening, and what threats might exist "
+"because of this constantly changing network state."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1100
+msgid ""
+"Finally, the build process needs to be moved to the Android NDK from the "
+"custom GCC toolchain we are now using, and compatibility with Android 2.3 "
+"and 3.x Honeycomb OS need to be verified."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1106
+msgid ""
+"For more information see the <a "
+"href=\"https://svn.torproject.org/svn/projects/android/trunk/Orbot/BUILD\">Orbot"
+" build documentation</a>."
+msgstr ""
+
+#. type: Content of: <div><div><ol>
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1112
+msgid "<a id=\"orbot-orlibAndOutreach\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><ol><li>
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1114
+msgid ""
+"<b>Orbot integration library and community outreach</b> <br> Priority: "
+"<i>Medium</i> <br> Effort Level: <i>Low</i> <br> Skill Level: <i>Medium</i> "
+"<br> Likely Mentors: <i>Nathan (n8fr8)</i>"
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1124
+msgid ""
+"We need additional work on <a "
+"href=\"https://github.com/guardianproject/orlib\">ORLib</a>, our library for"
+" use with third-party application to easily enable them to support "
+"&quot;Torification&quot; on non-rooted devices (i.e. w/o transparent "
+"proxying). This library includes a SOCKS client, a wrapper for the Apache "
+"HTTPClient library, a utility class for detecting the state of Orbot "
+"connectivity, and other relevant/useful things an Android app might need to "
+"anonymize itself. This work would includes direct development of the "
+"library, documentation, and sample code. Outreach or effort to implement the"
+" library within other open-source apps is also needed."
+msgstr ""
+
+#. type: Content of: <div><div><ol>
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1137
 msgid "<a id=\"vidaliaNetworkMap\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1078
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1139
 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: "
@@ -1792,7 +1857,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1088
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1149
 msgid ""
 "One of Vidalia's existing features is a network map that shows the user the "
 "approximate geographic location of relays in the Tor network and plots the "
@@ -1807,7 +1872,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1102
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1163
 msgid ""
 "This project will first involve getting familiar with Vidalia and the Marble"
 " widget's API. One will then integrate the widget into Vidalia and customize"
@@ -1817,7 +1882,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1110
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1171
 msgid ""
 "A person undertaking this project should have good C++ development "
 "experience. Previous experience with Qt and CMake is helpful, but not "
@@ -1825,19 +1890,19 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1116
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1177
 msgid "<a id=\"armGui\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1118
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1179
 msgid ""
 "<b>GUI for Arm</b> <br> Priority: <i>Low</i> <br> Effort Level: <i>High</i> "
-"<br> Skill Level: <i>Medium</i> <br> Likely Mentors: <i>Damian</i>"
+"<br> Skill Level: <i>Medium</i> <br> Likely Mentors: <i>Damian (atagar)</i>"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1128
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1189
 msgid ""
 "Arm has several unique features, some of the most interesting being its "
 "connection listing (correlating netstat results against the Tor consensus)  "
@@ -1849,7 +1914,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1138
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1199
 msgid ""
 "The vast majority of arm's more interesting functionality lies in its "
 "backend <a "
@@ -1861,7 +1926,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1148
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1209
 msgid ""
 "<b>Bring up new ideas!</b> <br> Don't like any of these? Look at the <a "
 "href=\"/press/presskit/2008-12-19-roadmap-full.pdf\">Tor development "
@@ -1872,19 +1937,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1160
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1221
 msgid "<a id=\"OtherCoding\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1161
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1222
 msgid ""
 "<a class=\"anchor\" href=\"#OtherCoding\">Other Coding and Design related "
 "ideas</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1163
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1224
 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 "
@@ -1900,7 +1965,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1176
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1237
 msgid ""
 "We need to actually start building our <a href=\"<page "
 "docs/documentation>#DesignDoc\">blocking-resistance design</a>. This "
@@ -1910,7 +1975,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1182
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1243
 msgid ""
 "We need a flexible simulator framework for studying end-to-end traffic "
 "confirmation attacks. Many researchers have whipped up ad hoc simulators to "
@@ -1924,7 +1989,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1192
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1253
 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 "
@@ -1933,7 +1998,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1198
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1259
 msgid ""
 "Perform a security analysis of Tor with <a "
 "href=\"https://secure.wikimedia.org/wikipedia/en/wiki/Fuzz_testing\">\"fuzz\"</a>."
@@ -1942,7 +2007,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1203
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1264
 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 "
@@ -1955,7 +2020,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1214
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1275
 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 "
@@ -1963,7 +2028,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1218
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1279
 msgid ""
 "We need a way to generate the website diagrams (for example, the \"How Tor "
 "Works\" pictures on the <a href=\"<page about/overview>\">overview page</a> "
@@ -1974,7 +2039,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1225
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1286
 msgid ""
 "How can we make the various LiveCD/USB systems easier to maintain, improve, "
 "and document? One example is <a href=\"https://tails.boum.org/\">The Amnesic"
@@ -1982,7 +2047,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1232
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1293
 msgid ""
 "Another anti-censorship project is to try to make Tor more scanning-"
 "resistant.  Right now, an adversary can identify <a "
@@ -1996,17 +2061,17 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1246
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1307
 msgid "<a id=\"Research\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1247
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1308
 msgid "<a class=\"anchor\" href=\"#Research\">Research</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1249
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1310
 msgid ""
 "The \"end-to-end traffic confirmation attack\": by watching traffic at Alice"
 " and at Bob, we can <a "
@@ -2021,7 +2086,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1259
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1320
 msgid ""
 "A related question is: Does running a relay/bridge provide additional "
 "protection against these timing attacks? Can an external adversary that "
@@ -2041,7 +2106,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1274
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1335
 msgid ""
 "Repeat Murdoch and Danezis's <a "
 "href=\"http://www.cl.cam.ac.uk/~sjm217/projects/anon/#torta\">attack from "
@@ -2061,7 +2126,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1289
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1350
 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"
@@ -2076,7 +2141,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1299
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1360
 msgid ""
 "Other research questions regarding geographic diversity consider the "
 "tradeoff between choosing an efficient circuit and choosing a random "
@@ -2088,7 +2153,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1306
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1367
 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 "
@@ -2105,7 +2170,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1318
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1379
 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 "
@@ -2116,7 +2181,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1325
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1386
 msgid ""
 "Our censorship-resistance goals include preventing an attacker who's looking"
 " at Tor traffic on the wire from <a href=\"<svnprojects>design-"
@@ -2132,7 +2197,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1336
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1397
 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 "
@@ -2143,7 +2208,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1343
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1404
 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 "
@@ -2151,7 +2216,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1346
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1407
 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 "
@@ -2171,7 +2236,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1363
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1424
 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 "
@@ -2179,7 +2244,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1371
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1432
 msgid ""
 "<a href=\"<page about/contact>\">Let us know</a> if you've made progress on "
 "any of these!"

Modified: translation/trunk/projects/website/po/ar/press/3-low.inthemedia.po
===================================================================
--- translation/trunk/projects/website/po/ar/press/3-low.inthemedia.po	2011-04-12 16:15:00 UTC (rev 24594)
+++ translation/trunk/projects/website/po/ar/press/3-low.inthemedia.po	2011-04-12 16:19:31 UTC (rev 24595)
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-03-25 16:51+0000\n"
-"PO-Revision-Date: 2011-03-27 17:30+0000\n"
+"POT-Creation-Date: 2011-03-28 12:48+0200\n"
+"PO-Revision-Date: 2011-04-12 16:10+0000\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
@@ -18,7 +18,7 @@
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5\n"
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/press/en/inthemedia.wml:8
+#: /home/runa/dev/website/press/en/inthemedia.wml:8
 msgid ""
 "<a href=\"<page index>\">Home &raquo; </a> <a href=\"<page "
 "press/press>\">Press &raquo; </a> <a href=\"<page press/inthemedia>\">Tor in"
@@ -26,12 +26,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><h1>
-#: /home/runa/tor/website/press/en/inthemedia.wml:15
+#: /home/runa/dev/website/press/en/inthemedia.wml:15
 msgid "Media Appearances"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/press/en/inthemedia.wml:17
+#: /home/runa/dev/website/press/en/inthemedia.wml:17
 msgid ""
 "Major news organizations including the New York Times, Forbes, Al Jazeera, "
 "Washington Post, Le Monde, NPR, BBC, and more have sought out or quoted Tor "
@@ -40,7 +40,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/press/en/inthemedia.wml:21
+#: /home/runa/dev/website/press/en/inthemedia.wml:21
 msgid ""
 "Since Tor is widely used throughout the world, it is mentioned regularly in "
 "the press.  This list is not comprehensive, but illustrates some of the "
@@ -48,39 +48,39 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/press/en/inthemedia.wml:24
+#: /home/runa/dev/website/press/en/inthemedia.wml:24
 msgid ""
 "A sample of such media appearances and mentions is below in order of newest "
 "to oldest:"
 msgstr ""
 
 #. type: Content of: <div><div><table><thead><tr><th>
-#: /home/runa/tor/website/press/en/inthemedia.wml:30
+#: /home/runa/dev/website/press/en/inthemedia.wml:30
 msgid "Date"
 msgstr ""
 
 #. type: Content of: <div><div><table><thead><tr><th>
-#: /home/runa/tor/website/press/en/inthemedia.wml:31
+#: /home/runa/dev/website/press/en/inthemedia.wml:31
 msgid "Publication"
 msgstr ""
 
 #. type: Content of: <div><div><table><thead><tr><th>
-#: /home/runa/tor/website/press/en/inthemedia.wml:32
+#: /home/runa/dev/website/press/en/inthemedia.wml:32
 msgid "Topic"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:36
+#: /home/runa/dev/website/press/en/inthemedia.wml:36
 msgid "2011 March 18"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:37
+#: /home/runa/dev/website/press/en/inthemedia.wml:37
 msgid "Telegraph"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:38
+#: /home/runa/dev/website/press/en/inthemedia.wml:38
 msgid ""
 "<a href=\"http://www.telegraph.co.uk/news/worldnews/middleeast/iran/8388484"
 "/Iran-cracks-down-on-web-dissident-technology.html\">Iran cracks down on web"
@@ -88,17 +88,17 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:43
+#: /home/runa/dev/website/press/en/inthemedia.wml:43
 msgid "2011 March 17"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:44 /tmp/u3kTkswOVo.xml:241
+#: /home/runa/dev/website/press/en/inthemedia.wml:44 /tmp/Q2ndl8ZYsF.xml:228
 msgid "BusinessWeek"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:45
+#: /home/runa/dev/website/press/en/inthemedia.wml:45
 msgid ""
 "<a "
 "href=\"http://www.businessweek.com/magazine/content/11_13/b4221043353206.htm\">Social"
@@ -106,17 +106,17 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:50
+#: /home/runa/dev/website/press/en/inthemedia.wml:50
 msgid "2011 March 10"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:51
+#: /home/runa/dev/website/press/en/inthemedia.wml:51
 msgid "NyTeknik"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:52
+#: /home/runa/dev/website/press/en/inthemedia.wml:52
 msgid ""
 "<a "
 "href=\"http://www.nyteknik.se/nyheter/it_telekom/internet/article3123594.ece\">Svenska"
@@ -124,17 +124,17 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:57
+#: /home/runa/dev/website/press/en/inthemedia.wml:57
 msgid "2011 March 09"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:58
+#: /home/runa/dev/website/press/en/inthemedia.wml:58
 msgid "Washington Post"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:59
+#: /home/runa/dev/website/press/en/inthemedia.wml:59
 msgid ""
 "<a href=\"http://www.washingtonpost.com/wp-"
 "dyn/content/article/2011/03/09/AR2011030905157_pf.html\">U.S.  funding tech "
@@ -142,17 +142,17 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:65
+#: /home/runa/dev/website/press/en/inthemedia.wml:65
 msgid "2011 February 17"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:66
+#: /home/runa/dev/website/press/en/inthemedia.wml:66
 msgid "Walpole Times"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:67
+#: /home/runa/dev/website/press/en/inthemedia.wml:67
 msgid ""
 "<a href=\"http://www.wickedlocal.com/walpole/news/x95296113/Tor-Project-a"
 "-Walpole-based-company-helps-Egyptians-avoid-Internet-censorship-during-"
@@ -161,18 +161,18 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:72 /tmp/u3kTkswOVo.xml:88
-#: /tmp/u3kTkswOVo.xml:96 /tmp/u3kTkswOVo.xml:104
+#: /home/runa/dev/website/press/en/inthemedia.wml:72 /tmp/Q2ndl8ZYsF.xml:86
+#: /tmp/Q2ndl8ZYsF.xml:93 /tmp/Q2ndl8ZYsF.xml:100
 msgid "2011 January 31"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:73
+#: /home/runa/dev/website/press/en/inthemedia.wml:73
 msgid "NPR: WBUR"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:74
+#: /home/runa/dev/website/press/en/inthemedia.wml:74
 msgid ""
 "<a href=\"http://hereandnow.wbur.org/2011/01/31/egypt-internet-"
 "government\">Here &amp; Now: U.S. Activists Help Egyptian Protesters Elude "
@@ -180,74 +180,73 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:80
+#: /home/runa/dev/website/press/en/inthemedia.wml:80
 msgid "2011 February 01"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:81
+#: /home/runa/dev/website/press/en/inthemedia.wml:81
 msgid "Discovery News"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:82
+#: /home/runa/dev/website/press/en/inthemedia.wml:82
 msgid ""
 "<a href=\"http://news.discovery.com/tech/egypt-internet-online-"
-"protesters-110201.  html\">Egypt's Internet Block Incomplete But "
-"Damaging</a>"
+"protesters-110201.html\">Egypt's Internet Block Incomplete But Damaging</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:89
+#: /home/runa/dev/website/press/en/inthemedia.wml:87
 msgid "IDG Poland"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:90
+#: /home/runa/dev/website/press/en/inthemedia.wml:88
 msgid ""
 "<a "
-"href=\"http://www.idg.pl/news/366773/Egipt.blokuje.Internet.aktywisci.szukaja."
-"  alternatyw.html\">Egipt blokuje Internet, aktywiści szukają alternatyw</a>"
+"href=\"http://www.idg.pl/news/366773/Egipt.blokuje.Internet.aktywisci.szukaja.alternatyw.html\">Egipt"
+" blokuje Internet, aktywiści szukają alternatyw</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:97 /tmp/u3kTkswOVo.xml:713
+#: /home/runa/dev/website/press/en/inthemedia.wml:94 /tmp/Q2ndl8ZYsF.xml:677
 msgid "New Scientist"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:98
+#: /home/runa/dev/website/press/en/inthemedia.wml:95
 msgid ""
 "<a href=\"http://www.newscientist.com/blogs/onepercent/2011/01/egypt-"
-"remains- officially-offli.html\">How Egypt is getting online</a>"
+"remains-officially-offli.html\">How Egypt is getting online</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:105
+#: /home/runa/dev/website/press/en/inthemedia.wml:101
 msgid "El Pais"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:106
+#: /home/runa/dev/website/press/en/inthemedia.wml:102
 msgid ""
 "<a "
-"href=\"http://www.elpais.com/articulo/internacional/Sortear/censura/golpe/fax/"
-" elpepuint/20110130elpepuint_14/Tes\">Sortear la censura a golpe de fax</a>"
+"href=\"http://www.elpais.com/articulo/internacional/Sortear/censura/golpe/fax/elpepuint/20110130elpepuint_14/Tes\">Sortear"
+" la censura a golpe de fax</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:112 /tmp/u3kTkswOVo.xml:119
-#: /tmp/u3kTkswOVo.xml:126
+#: /home/runa/dev/website/press/en/inthemedia.wml:107 /tmp/Q2ndl8ZYsF.xml:114
+#: /tmp/Q2ndl8ZYsF.xml:121
 msgid "2011 January 30"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:113
+#: /home/runa/dev/website/press/en/inthemedia.wml:108
 msgid "Fox 25 News - Boston"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:114
+#: /home/runa/dev/website/press/en/inthemedia.wml:109
 msgid ""
 "<a href=\"http://www.myfoxboston.com/dpp/news/local/local-company-helps-"
 "give-egyptians-internet-access-20110130\">Local company helps give Egyptians"
@@ -255,12 +254,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:120
+#: /home/runa/dev/website/press/en/inthemedia.wml:115
 msgid "New England Cable News"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:121
+#: /home/runa/dev/website/press/en/inthemedia.wml:116
 msgid ""
 "<a href=\"http://www.necn.com/01/30/11/Mass-company-helps-activists-avoid-"
 "onlin/landing.html?blockID=400628&feedID=4213\">Mass.  company helps "
@@ -268,167 +267,166 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:127 /tmp/u3kTkswOVo.xml:269
+#: /home/runa/dev/website/press/en/inthemedia.wml:122 /tmp/Q2ndl8ZYsF.xml:253
 msgid "Boston Globe"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:128
+#: /home/runa/dev/website/press/en/inthemedia.wml:123
 msgid ""
 "<a "
-"href=\"http://www.boston.com/news/local/massachusetts/articles/2011/01/30/ "
-"mass_groups_software_helps_avoid_censorship/\">Foreign activists stay "
-"covered online</a>"
+"href=\"http://www.boston.com/news/local/massachusetts/articles/2011/01/30/mass_groups_software_helps_avoid_censorship/\">Foreign"
+" activists stay covered online</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:134 /tmp/u3kTkswOVo.xml:142
+#: /home/runa/dev/website/press/en/inthemedia.wml:128 /tmp/Q2ndl8ZYsF.xml:135
 msgid "2011 January 29"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:135
+#: /home/runa/dev/website/press/en/inthemedia.wml:129
 msgid "SvD.se"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:136
+#: /home/runa/dev/website/press/en/inthemedia.wml:130
 msgid ""
-"<a href=\"http://www.svd.se/nyheter/utrikes/tor-oppnar-dorrar-for- "
+"<a href=\"http://www.svd.se/nyheter/utrikes/tor-oppnar-dorrar-for-"
 "natdissidenter_5902693.svd\">Tor öppnar dörrar för nätdissidenter</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:143 /tmp/u3kTkswOVo.xml:351
+#: /home/runa/dev/website/press/en/inthemedia.wml:136 /tmp/Q2ndl8ZYsF.xml:329
 msgid "ComputerWorld"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:144
+#: /home/runa/dev/website/press/en/inthemedia.wml:137
 msgid ""
-"<a href=\"http://www.computerworld.com/s/article/9207058/ "
-"Without_Internet_Egyptians_find_new_ways_to_get_online?taxonomyId=16\">Without"
+"<a "
+"href=\"http://www.computerworld.com/s/article/9207058/Without_Internet_Egyptians_find_new_ways_to_get_online?taxonomyId=16\">Without"
 " Internet, Egyptians find new ways to get online.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:150
+#: /home/runa/dev/website/press/en/inthemedia.wml:142
 msgid "2011 January 28"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:151
+#: /home/runa/dev/website/press/en/inthemedia.wml:143
 msgid "Globe and Mail"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:152
+#: /home/runa/dev/website/press/en/inthemedia.wml:144
 msgid ""
 "<a href=\"https://www.theglobeandmail.com/news/technology/in-a-span-of-"
-"minutes-a- country-goes-offline/article1887207/\">In a span of minutes, a "
+"minutes-a-country-goes-offline/article1887207/\">In a span of minutes, a "
 "country goes offline</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:158
+#: /home/runa/dev/website/press/en/inthemedia.wml:149
 msgid "2010 December 22"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:159 /tmp/u3kTkswOVo.xml:235
-#: /tmp/u3kTkswOVo.xml:256 /tmp/u3kTkswOVo.xml:339 /tmp/u3kTkswOVo.xml:380
-#: /tmp/u3kTkswOVo.xml:664
+#: /home/runa/dev/website/press/en/inthemedia.wml:150 /tmp/Q2ndl8ZYsF.xml:222
+#: /tmp/Q2ndl8ZYsF.xml:241 /tmp/Q2ndl8ZYsF.xml:317 /tmp/Q2ndl8ZYsF.xml:355
+#: /tmp/Q2ndl8ZYsF.xml:628
 msgid "Technology Review"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:160
+#: /home/runa/dev/website/press/en/inthemedia.wml:151
 msgid ""
 "<a href=\"http://www.technologyreview.com/web/26981/\">Home Internet with "
 "Anonymity Built In</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:164
+#: /home/runa/dev/website/press/en/inthemedia.wml:155
 msgid "2010 December 17"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:165
+#: /home/runa/dev/website/press/en/inthemedia.wml:156
 msgid "New York Times Magazine"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:166
+#: /home/runa/dev/website/press/en/inthemedia.wml:157
 msgid ""
 "<a href=\"https://www.nytimes.com/2010/12/19/magazine/19FOB-"
 "Medium-t.html\">Granting Anonymity</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:171
+#: /home/runa/dev/website/press/en/inthemedia.wml:162
 msgid "2010 November 03"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:172
+#: /home/runa/dev/website/press/en/inthemedia.wml:163
 msgid "metro sverige"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:173
+#: /home/runa/dev/website/press/en/inthemedia.wml:164
 msgid ""
 "<a href=\"http://www.metro.se/2010/11/03/73897/sida-hjalper-utsatta-bli-"
-"anonyma-pa-n /\">Sida hjälper utsatta bli anonyma på nätet</a>"
+"anonyma-pa-n/\">Sida hjälper utsatta bli anonyma på nätet</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:178
+#: /home/runa/dev/website/press/en/inthemedia.wml:168
 msgid "2010 Sept 17"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:179
+#: /home/runa/dev/website/press/en/inthemedia.wml:169
 msgid "NPR: On the media"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:180
+#: /home/runa/dev/website/press/en/inthemedia.wml:170
 msgid ""
 "<a href=\"http://www.onthemedia.org/transcripts/2010/09/17/05\">On the "
 "Media: Interview with Jacob Appelbaum</a>."
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:184
+#: /home/runa/dev/website/press/en/inthemedia.wml:174
 msgid "2010 August 01"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:185
+#: /home/runa/dev/website/press/en/inthemedia.wml:175
 msgid "PC Format - Poland"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:186
+#: /home/runa/dev/website/press/en/inthemedia.wml:176
 msgid ""
 "<a href=\"http://www.pcformat.pl/index.php/artykul/aid/1236/t/google-"
-"facebook-nas- szpieguj-jak-chroni-prywatno-w-sieci\">Google and Facebook are"
-" spying on us</a>"
+"facebook-nas-szpieguj-jak-chroni-prywatno-w-sieci\">Google and Facebook are "
+"spying on us</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:192
+#: /home/runa/dev/website/press/en/inthemedia.wml:181
 msgid "2010 July 14"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:193
+#: /home/runa/dev/website/press/en/inthemedia.wml:182
 msgid "China Rights Forum"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:194
+#: /home/runa/dev/website/press/en/inthemedia.wml:183
 msgid ""
 "<a "
 "href=\"http://www.hrichina.org/public/contents/category?cid=175033\">China "
@@ -436,52 +434,52 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:200
+#: /home/runa/dev/website/press/en/inthemedia.wml:189
 msgid "2010 May 25"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:201
+#: /home/runa/dev/website/press/en/inthemedia.wml:190
 msgid "The Australian"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:202
+#: /home/runa/dev/website/press/en/inthemedia.wml:191
 msgid ""
 "<a href=\"http://www.theaustralian.com.au/australian-it/call-to-join-tor-"
-"network-to- fight-censorship/story-e6frgakx-1225870756466\"> Call to join "
-"Tor network to fight censorship</a>"
+"network-to-fight-censorship/story-e6frgakx-1225870756466\"> Call to join Tor"
+" network to fight censorship</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:208
+#: /home/runa/dev/website/press/en/inthemedia.wml:196
 msgid "2010 Mar 17"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:209
+#: /home/runa/dev/website/press/en/inthemedia.wml:197
 msgid "PC World Poland"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:210
+#: /home/runa/dev/website/press/en/inthemedia.wml:198
 msgid ""
 "<a href=\"http://www.idg.pl/news/356993/Anonimowosc.w.Sieci.html\">Anonymity"
 " in the Web</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:214
+#: /home/runa/dev/website/press/en/inthemedia.wml:202
 msgid "2010 Mar 11"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:215
+#: /home/runa/dev/website/press/en/inthemedia.wml:203
 msgid "ABC Australia"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:216
+#: /home/runa/dev/website/press/en/inthemedia.wml:204
 msgid ""
 "<a "
 "href=\"http://www.abc.net.au/rn/futuretense/stories/2010/2837736.htm\">Future"
@@ -489,91 +487,90 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:219
+#: /home/runa/dev/website/press/en/inthemedia.wml:207
 msgid "2010 Mar 09"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:220
+#: /home/runa/dev/website/press/en/inthemedia.wml:208
 msgid "PC Pro UK"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:221
+#: /home/runa/dev/website/press/en/inthemedia.wml:209
 msgid ""
 "<a href=\"http://www.pcpro.co.uk/features/356254/the-dark-side-of-the-"
 "web\">The dark side of the web</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:226
+#: /home/runa/dev/website/press/en/inthemedia.wml:214
 msgid "2009 Dec 29"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:227
+#: /home/runa/dev/website/press/en/inthemedia.wml:215
 msgid "Times Online"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:228
+#: /home/runa/dev/website/press/en/inthemedia.wml:216
 msgid ""
 "<a "
-"href=\"http://www.timesonline.co.uk/tol/news/world/middle_east/article6969958."
-"  ece\">When Iran’s regime falls this will be remembered as the YouTube "
-"revolution </a>"
+"href=\"http://www.timesonline.co.uk/tol/news/world/middle_east/article6969958.ece\">When"
+" Iran’s regime falls this will be remembered as the YouTube revolution </a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:234
+#: /home/runa/dev/website/press/en/inthemedia.wml:221
 msgid "2009 Oct 15"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:236
+#: /home/runa/dev/website/press/en/inthemedia.wml:223
 msgid ""
 "<a href=\"http://www.technologyreview.com/web/23736/?a=f\">China Cracks Down"
 " on Tor Anonymity Network</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:240
+#: /home/runa/dev/website/press/en/inthemedia.wml:227
 msgid "2009 Sep 30"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:242
+#: /home/runa/dev/website/press/en/inthemedia.wml:229
 msgid ""
 "<a "
-"href=\"http://www.businessweek.com/globalbiz/content/sep2009/gb20090930_620354."
-"  htm\">China's Online Censors Work Overtime</a>"
+"href=\"http://www.businessweek.com/globalbiz/content/sep2009/gb20090930_620354.htm\">China's"
+" Online Censors Work Overtime</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:247
+#: /home/runa/dev/website/press/en/inthemedia.wml:233
 msgid "2009 Aug 19"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:248
+#: /home/runa/dev/website/press/en/inthemedia.wml:234
 msgid "Reuters"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:249
+#: /home/runa/dev/website/press/en/inthemedia.wml:235
 msgid ""
-"<a href=\"http://www.reuters.com/article/internetNews/idUSTRE57I4IE20090819?"
-" pageNumber=1&amp;virtualBrandChannel=0&amp;sp=true\">Web tools help protect"
-" human rights activists</a>"
+"<a "
+"href=\"http://www.reuters.com/article/internetNews/idUSTRE57I4IE20090819?pageNumber=1&amp;virtualBrandChannel=0&amp;sp=true\">Web"
+" tools help protect human rights activists</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:255
+#: /home/runa/dev/website/press/en/inthemedia.wml:240
 msgid "2009 Aug 10"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:257
+#: /home/runa/dev/website/press/en/inthemedia.wml:242
 msgid ""
 "<a "
 "href=\"http://www.technologyreview.com/blog/editors/23958/?nlid=2255\">How "
@@ -581,162 +578,161 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:261 /tmp/u3kTkswOVo.xml:268
+#: /home/runa/dev/website/press/en/inthemedia.wml:246 /tmp/Q2ndl8ZYsF.xml:252
 msgid "2009 Jul 26"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:262 /tmp/u3kTkswOVo.xml:296
+#: /home/runa/dev/website/press/en/inthemedia.wml:247 /tmp/Q2ndl8ZYsF.xml:278
 msgid "Washington Times"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:263
+#: /home/runa/dev/website/press/en/inthemedia.wml:248
 msgid ""
 "<a href=\"http://www.washingtontimes.com/news/2009/jul/26/senate-help-iran-"
-"dodge- internet-censorship/\">Senate OKs funds to thwart Iran Web "
-"censors</a>"
+"dodge-internet-censorship/\">Senate OKs funds to thwart Iran Web censors</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:270
+#: /home/runa/dev/website/press/en/inthemedia.wml:254
 msgid ""
-"<a href=\"http://www.boston.com/news/nation/washington/articles/2009/07/26/ "
-"us_to_increase_funding_for_hackivists_aiding_iranians/\">US set to hike aid "
-"aimed at Iranians</a>"
+"<a "
+"href=\"http://www.boston.com/news/nation/washington/articles/2009/07/26/us_to_increase_funding_for_hackivists_aiding_iranians/\">US"
+" set to hike aid aimed at Iranians</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:276
+#: /home/runa/dev/website/press/en/inthemedia.wml:259
 msgid "2009 Jul 24"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:277
+#: /home/runa/dev/website/press/en/inthemedia.wml:260
 msgid "Associated Press"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:278
+#: /home/runa/dev/website/press/en/inthemedia.wml:261
 msgid ""
-"<a href=\"http://www.google.com/hostednews/ap/article/ALeqM5hTf- "
+"<a href=\"http://www.google.com/hostednews/ap/article/ALeqM5hTf-"
 "p6Iy3sWHK8BRR58npGosLC3AD99L01QO0\">Iran activists work to elude crackdown "
 "on Internet</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:284
+#: /home/runa/dev/website/press/en/inthemedia.wml:266
 msgid "2009 Jul 08"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:285
+#: /home/runa/dev/website/press/en/inthemedia.wml:267
 msgid "Tehran Bureau"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:286
+#: /home/runa/dev/website/press/en/inthemedia.wml:268
 msgid ""
 "<a href=\"http://tehranbureau.com/geeks-globe-rally-iranians-online/\">Geeks"
 " Around the Globe Rally to Help Iranians Online</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:290
+#: /home/runa/dev/website/press/en/inthemedia.wml:272
 msgid "2009 Jul 02"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:291
+#: /home/runa/dev/website/press/en/inthemedia.wml:273
 msgid "NED/CIMA"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:292
+#: /home/runa/dev/website/press/en/inthemedia.wml:274
 msgid ""
 "<a href=\"http://cima.ned.org/events/new-media-in-iran.html\">The Role of "
 "New Media in the Iranian Elections</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:295
+#: /home/runa/dev/website/press/en/inthemedia.wml:277
 msgid "2009 Jun 26"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:297
+#: /home/runa/dev/website/press/en/inthemedia.wml:279
 msgid ""
 "<a href=\"http://www.washingtontimes.com/news/2009/jun/26/protesters-use-"
-"navy- technology-to-avoid-censorship/?feat=home_headlines\">Iranian "
+"navy-technology-to-avoid-censorship/?feat=home_headlines\">Iranian "
 "protesters avoid censorship with Navy technology</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:303
+#: /home/runa/dev/website/press/en/inthemedia.wml:284
 msgid "2009 Jun 29"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:304
+#: /home/runa/dev/website/press/en/inthemedia.wml:285
 msgid "EFF"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:305
+#: /home/runa/dev/website/press/en/inthemedia.wml:286
 msgid ""
 "<a href=\"http://www.eff.org/deeplinks/2009/06/help-protesters-iran-run-tor-"
-"relays- bridges\">Help Protesters in Iran: Run a Tor Bridge or a Tor "
+"relays-bridges\">Help Protesters in Iran: Run a Tor Bridge or a Tor "
 "Relay</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:310
+#: /home/runa/dev/website/press/en/inthemedia.wml:290
 msgid "2009 Jun 24"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:311
+#: /home/runa/dev/website/press/en/inthemedia.wml:291
 msgid "Daily Finance"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:312
+#: /home/runa/dev/website/press/en/inthemedia.wml:292
 msgid ""
-"<a href=\"http://www.dailyfinance.com/2009/06/24/nokia-and-siemens-in-iran- "
+"<a href=\"http://www.dailyfinance.com/2009/06/24/nokia-and-siemens-in-iran-"
 "controversy/\">Nokia and Siemens in Iran controversy</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:317 /tmp/u3kTkswOVo.xml:332
-#: /tmp/u3kTkswOVo.xml:338
+#: /home/runa/dev/website/press/en/inthemedia.wml:296 /tmp/Q2ndl8ZYsF.xml:310
+#: /tmp/Q2ndl8ZYsF.xml:316
 msgid "2009 Jun 18"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:318 /tmp/u3kTkswOVo.xml:414
-#: /tmp/u3kTkswOVo.xml:658
+#: /home/runa/dev/website/press/en/inthemedia.wml:297 /tmp/Q2ndl8ZYsF.xml:386
+#: /tmp/Q2ndl8ZYsF.xml:622
 msgid "Wall Street Journal"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:319
+#: /home/runa/dev/website/press/en/inthemedia.wml:298
 msgid ""
 "<a href=\"http://blogs.wsj.com/digits/2009/06/18/iranians-using-tor-to-"
-"anonymize-web -use/\">Iranians Using Tor to Anonymize Web Use</a>"
+"anonymize-web-use/\">Iranians Using Tor to Anonymize Web Use</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:324
+#: /home/runa/dev/website/press/en/inthemedia.wml:302
 msgid "2009 Jun 19"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:325
+#: /home/runa/dev/website/press/en/inthemedia.wml:303
 msgid "O'Reilly Radar"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:326
+#: /home/runa/dev/website/press/en/inthemedia.wml:304
 msgid ""
 "<a href=\"http://radar.oreilly.com/2009/06/tor-and-the-legality-of-"
 "runnin.html\"> Dramatic Increase in Number of Tor Clients from Iran: "
@@ -744,98 +740,97 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:333
+#: /home/runa/dev/website/press/en/inthemedia.wml:311
 msgid "Deutsche Welle"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:334
+#: /home/runa/dev/website/press/en/inthemedia.wml:312
 msgid ""
 "<a href=\"http://www.dw-world.de/dw/article/0,,4400882,00.html\">Internet "
 "proxies let Iranians and others connect to blocked Web sites</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:340
+#: /home/runa/dev/website/press/en/inthemedia.wml:318
 msgid ""
 "<a href=\"http://www.technologyreview.com/web/22893/\">The Web vs. the "
 "Republic of Iran</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:344 /tmp/u3kTkswOVo.xml:350
+#: /home/runa/dev/website/press/en/inthemedia.wml:322 /tmp/Q2ndl8ZYsF.xml:328
 msgid "2009 Jun 17"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:345
+#: /home/runa/dev/website/press/en/inthemedia.wml:323
 msgid "CNet News"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:346
+#: /home/runa/dev/website/press/en/inthemedia.wml:324
 msgid ""
 "<a href=\"http://news.cnet.com/8301-13578_3-10267287-38.html\">Iranians find"
 " ways to bypass Net censors</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:352
+#: /home/runa/dev/website/press/en/inthemedia.wml:330
 msgid ""
 "<a "
-"href=\"http://www.computerworld.com/action/article.do?command=viewArticleBasic&"
-" amp;articleId=9134471&amp;intsrc=news_ts_head\">Iran's leaders fight "
-"Internet; Internet wins (so far)</a>"
+"href=\"http://www.computerworld.com/action/article.do?command=viewArticleBasic&amp;articleId=9134471&amp;intsrc=news_ts_head\">Iran's"
+" leaders fight Internet; Internet wins (so far)</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:358
+#: /home/runa/dev/website/press/en/inthemedia.wml:335
 msgid "2009 May 29"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:359 /tmp/u3kTkswOVo.xml:387
+#: /home/runa/dev/website/press/en/inthemedia.wml:336 /tmp/Q2ndl8ZYsF.xml:362
 msgid "Le Monde"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:360
+#: /home/runa/dev/website/press/en/inthemedia.wml:337
 msgid ""
 "<a href=\"http://www.lemonde.fr/actualite-medias/article/2009/05/29/les-"
-"censeurs-du- net_1199993_3236.html\">Les censeurs du Net</a>"
+"censeurs-du-net_1199993_3236.html\">Les censeurs du Net</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:365
+#: /home/runa/dev/website/press/en/inthemedia.wml:341
 msgid "2009 May 15"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:366
+#: /home/runa/dev/website/press/en/inthemedia.wml:342
 msgid "Mass High Tech"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:367
+#: /home/runa/dev/website/press/en/inthemedia.wml:343
 msgid ""
 "<a href=\"http://www.masshightech.com/stories/2009/05/11/newscolumn2-Tor-"
-"tackles-Net -privacy-game-makers-flock-to-Hub.html\">Tor tackles Net "
+"tackles-Net-privacy-game-makers-flock-to-Hub.html\">Tor tackles Net "
 "privacy</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:372
+#: /home/runa/dev/website/press/en/inthemedia.wml:347
 msgid "2009 May 01"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:373 /tmp/u3kTkswOVo.xml:669
-#: /tmp/u3kTkswOVo.xml:679
+#: /home/runa/dev/website/press/en/inthemedia.wml:348 /tmp/Q2ndl8ZYsF.xml:633
+#: /tmp/Q2ndl8ZYsF.xml:643
 msgid "New York Times"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:374
+#: /home/runa/dev/website/press/en/inthemedia.wml:349
 msgid ""
 "<a "
 "href=\"http://www.nytimes.com/2009/05/01/technology/01filter.html\">Iranians"
@@ -843,12 +838,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:379
+#: /home/runa/dev/website/press/en/inthemedia.wml:354
 msgid "2009 Apr 23"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:381
+#: /home/runa/dev/website/press/en/inthemedia.wml:356
 msgid ""
 "<a href=\"http://www.technologyreview.com/computing/22427/?a=f\">Dissent "
 "Made Safer: How anonymity technology could save free speech on the "
@@ -856,87 +851,87 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:386
+#: /home/runa/dev/website/press/en/inthemedia.wml:361
 msgid "2009 Apr 22"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:388
+#: /home/runa/dev/website/press/en/inthemedia.wml:363
 msgid ""
 "<a href=\"http://bugbrother.blog.lemonde.fr/2009/04/22/comment-contourner-"
-"la- cybersurveillance/\">How to circumvent cybersurveillance</a>"
+"la-cybersurveillance/\">How to circumvent cybersurveillance</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:393 /tmp/u3kTkswOVo.xml:400
+#: /home/runa/dev/website/press/en/inthemedia.wml:367 /tmp/Q2ndl8ZYsF.xml:373
 msgid "2009 Apr 06"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:394
+#: /home/runa/dev/website/press/en/inthemedia.wml:368
 msgid "Reader's Digest"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:395
+#: /home/runa/dev/website/press/en/inthemedia.wml:369
 msgid ""
 "<a href=\"http://www.rd.com/advice-and-know-how/how-to-hide-"
-"anything/article122219.  html\">How to Hide Anything</a>"
+"anything/article122219.html\">How to Hide Anything</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:401
+#: /home/runa/dev/website/press/en/inthemedia.wml:374
 msgid "Al Jazeera"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:402
+#: /home/runa/dev/website/press/en/inthemedia.wml:375
 msgid ""
 "<a href=\"http://www.youtube.com/watch?v=vuatxUN2cUQ\">Global Village Voices"
 " showcases Tor</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:406
+#: /home/runa/dev/website/press/en/inthemedia.wml:379
 msgid "2009 Mar 18"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:407
+#: /home/runa/dev/website/press/en/inthemedia.wml:380
 msgid "Marie Claire"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:408
+#: /home/runa/dev/website/press/en/inthemedia.wml:381
 msgid ""
 "<a href=\"http://www.marieclaire.com/career-money/career-coach/manage-online"
-"--web- image\">How to Manage Your Web Footprint</a>"
+"--web-image\">How to Manage Your Web Footprint</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:413
+#: /home/runa/dev/website/press/en/inthemedia.wml:385
 msgid "2009 Mar 13"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:415
+#: /home/runa/dev/website/press/en/inthemedia.wml:387
 msgid ""
 "<a href=\"http://online.wsj.com/article/SB123567809587886053.html\">The "
 "Kindness of Strangers</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:420
+#: /home/runa/dev/website/press/en/inthemedia.wml:392
 msgid "2009 Mar 12"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:421
+#: /home/runa/dev/website/press/en/inthemedia.wml:393
 msgid "BBC World Service"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:422
+#: /home/runa/dev/website/press/en/inthemedia.wml:394
 msgid ""
 "<a href=\"http://bbcworldservicetrust.wordpress.com/2009/03/12/12-march-"
 "world-day-against-cyber-censorship/\">Steven J Murdoch interviewed about Tor"
@@ -944,102 +939,102 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:425
+#: /home/runa/dev/website/press/en/inthemedia.wml:397
 msgid "2009 Mar 03"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:426
+#: /home/runa/dev/website/press/en/inthemedia.wml:398
 msgid "Orf Austria"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:427
+#: /home/runa/dev/website/press/en/inthemedia.wml:399
 msgid ""
 "<a href=\"http://futurezone.orf.at/stories/1503028/\">WIRTSCHAFTSKAMMER "
 "column</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:431
+#: /home/runa/dev/website/press/en/inthemedia.wml:403
 msgid "2009 Feb 18"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:432 /tmp/u3kTkswOVo.xml:589
+#: /home/runa/dev/website/press/en/inthemedia.wml:404 /tmp/Q2ndl8ZYsF.xml:553
 msgid "Bangkok Post"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:433
+#: /home/runa/dev/website/press/en/inthemedia.wml:405
 msgid ""
 "<a href=\"http://www.bangkokpost.com/tech/technews/11872/the-old-fake-404"
-"-not-found- routine\">The old fake \"404 not found\" routine</a>"
+"-not-found-routine\">The old fake \"404 not found\" routine</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:438
+#: /home/runa/dev/website/press/en/inthemedia.wml:409
 msgid "2009 Feb 13"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:439
+#: /home/runa/dev/website/press/en/inthemedia.wml:410
 msgid "Hearsay Culture"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:440
+#: /home/runa/dev/website/press/en/inthemedia.wml:411
 msgid ""
 "<a href=\"http://www.hearsayculture.com/?p=307\">Hearsay Culture Radio "
 "Interview/Podcast</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:443
+#: /home/runa/dev/website/press/en/inthemedia.wml:414
 msgid "2008 Dec 29"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:444
+#: /home/runa/dev/website/press/en/inthemedia.wml:415
 msgid "nu.nl"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:445
+#: /home/runa/dev/website/press/en/inthemedia.wml:416
 msgid ""
 "<a href=\"http://www.nu.nl/internet/1891289/anoniem-browsen-voor-gsm-in-de-"
 "maak.html\">Anoniem browsen voor gsm in de maak</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:449
+#: /home/runa/dev/website/press/en/inthemedia.wml:420
 msgid "2008 Dec 14"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:450
+#: /home/runa/dev/website/press/en/inthemedia.wml:421
 msgid "PC Magazine: Middle &amp; Near East"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:451
+#: /home/runa/dev/website/press/en/inthemedia.wml:422
 msgid ""
 "<a href=\"http://www.pcmag-mideast.com/FeatureDetail.aspx?ID=1039\">How To "
 "Reclaim Your Online Privacy</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:456
+#: /home/runa/dev/website/press/en/inthemedia.wml:427
 msgid "2008 Aug 21"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:457
+#: /home/runa/dev/website/press/en/inthemedia.wml:428
 msgid "CNN"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:458
+#: /home/runa/dev/website/press/en/inthemedia.wml:429
 msgid ""
 "<a "
 "href=\"http://www.cnn.com/2008/TECH/08/21/internet.filtering/index.html\">Experts:"
@@ -1047,51 +1042,51 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:463
+#: /home/runa/dev/website/press/en/inthemedia.wml:434
 msgid "2008 Aug 22"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:464
+#: /home/runa/dev/website/press/en/inthemedia.wml:435
 msgid "The Sydney Morning Herald"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:465
+#: /home/runa/dev/website/press/en/inthemedia.wml:436
 msgid ""
 "<a href=\"http://www.smh.com.au/news/web/the-china-"
-"syndrome/2008/08/20/1218911800889 .html\">The China Syndrome</a>"
+"syndrome/2008/08/20/1218911800889.html\">The China Syndrome</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:471
+#: /home/runa/dev/website/press/en/inthemedia.wml:441
 msgid "2008 Aug 20"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:472
+#: /home/runa/dev/website/press/en/inthemedia.wml:442
 msgid "Scientific American"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:473
+#: /home/runa/dev/website/press/en/inthemedia.wml:443
 msgid ""
 "<a href=\"http://www.sciam.com/article.cfm?id=cryptography-how-to-keep-your-"
-"secrets- safe\">Cryptography: How to Keep Your Secrets Safe</a>"
+"secrets-safe\">Cryptography: How to Keep Your Secrets Safe</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:479
+#: /home/runa/dev/website/press/en/inthemedia.wml:448
 msgid "2008 Aug 05"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:480
+#: /home/runa/dev/website/press/en/inthemedia.wml:449
 msgid "Guardian UK"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:481
+#: /home/runa/dev/website/press/en/inthemedia.wml:450
 msgid ""
 "<a "
 "href=\"http://www.guardian.co.uk/commentisfree/2008/aug/05/china.censorship\">"
@@ -1099,62 +1094,62 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:487
+#: /home/runa/dev/website/press/en/inthemedia.wml:456
 msgid "2008 Aug 10"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:488
+#: /home/runa/dev/website/press/en/inthemedia.wml:457
 msgid "Tech Radar UK"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:489
+#: /home/runa/dev/website/press/en/inthemedia.wml:458
 msgid ""
 "<a href=\"http://www.techradar.com/news/internet/web/freedom-stick-"
-"highlights- chinese-net-censorship-449233\">Freedom Stick highlights Chinese"
-" 'net censorship: USB drive promises anonymous surfing for the paranoid</a>"
+"highlights-chinese-net-censorship-449233\">Freedom Stick highlights Chinese "
+"'net censorship: USB drive promises anonymous surfing for the paranoid</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:497 /tmp/u3kTkswOVo.xml:505
-#: /tmp/u3kTkswOVo.xml:514 /tmp/u3kTkswOVo.xml:522
+#: /home/runa/dev/website/press/en/inthemedia.wml:465 /tmp/Q2ndl8ZYsF.xml:473
+#: /tmp/Q2ndl8ZYsF.xml:481 /tmp/Q2ndl8ZYsF.xml:489
 msgid "2008 Aug 07"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:498
+#: /home/runa/dev/website/press/en/inthemedia.wml:466
 msgid "Spiegel"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:499
+#: /home/runa/dev/website/press/en/inthemedia.wml:467
 msgid ""
 "<a href=\"http://www.spiegel.de/netzwelt/tech/0,1518,570421,00.html\">Tricks"
 " gegen Zensur und Überwachung</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:506 /tmp/u3kTkswOVo.xml:560
-#: /tmp/u3kTkswOVo.xml:628 /tmp/u3kTkswOVo.xml:742
+#: /home/runa/dev/website/press/en/inthemedia.wml:474 /tmp/Q2ndl8ZYsF.xml:524
+#: /tmp/Q2ndl8ZYsF.xml:592 /tmp/Q2ndl8ZYsF.xml:706
 msgid "PC World"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:507
+#: /home/runa/dev/website/press/en/inthemedia.wml:475
 msgid ""
 "<a "
-"href=\"http://www.pcworld.com/article/149399-3/15_great_free_privacy_downloads."
-"  html\">15 Great, Free Privacy Downloads</a>.  Tor is Number 1."
+"href=\"http://www.pcworld.com/article/149399-3/15_great_free_privacy_downloads.html\">15"
+" Great, Free Privacy Downloads</a>.  Tor is Number 1."
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:515
+#: /home/runa/dev/website/press/en/inthemedia.wml:482
 msgid "The Guardian UK"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:516
+#: /home/runa/dev/website/press/en/inthemedia.wml:483
 msgid ""
 "<a "
 "href=\"http://www.guardian.co.uk/technology/2008/aug/07/censorship.hacking\">Chaos"
@@ -1162,12 +1157,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:523
+#: /home/runa/dev/website/press/en/inthemedia.wml:490
 msgid "The Register UK"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:524
+#: /home/runa/dev/website/press/en/inthemedia.wml:491
 msgid ""
 "<a "
 "href=\"http://www.theregister.co.uk/2008/08/07/torbrowser_olympics/\">German"
@@ -1175,66 +1170,67 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:530
+#: /home/runa/dev/website/press/en/inthemedia.wml:497
 msgid "2008 May 24"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:531
+#: /home/runa/dev/website/press/en/inthemedia.wml:498
 msgid "Groupo Estado"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:532
+#: /home/runa/dev/website/press/en/inthemedia.wml:499
 msgid ""
-"<a href=\"http://blog.estadao.com.br/blog/cruz/?title= "
-"cfp08_navegacao_anonima_na_rede&amp;more=1&amp;c=1&amp;tb=1&amp;pb=1&amp;cat="
-" 525\">Interview at Computers, Freedom, and Privacy 2008 Conference</a>"
+"<a "
+"href=\"http://blog.estadao.com.br/blog/cruz/?title=cfp08_navegacao_anonima_na_rede&amp;more=1&amp;c=1&amp;tb=1&amp;pb=1&amp;cat=525\">Interview"
+" at Computers, Freedom, and Privacy 2008 Conference</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:540
+#: /home/runa/dev/website/press/en/inthemedia.wml:505
 msgid "2008 Mar 12"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:541
+#: /home/runa/dev/website/press/en/inthemedia.wml:506
 msgid "SearchSecurity.com"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:542
+#: /home/runa/dev/website/press/en/inthemedia.wml:507
 msgid ""
-"<a href=\"http://searchsecurity.techtarget.com/news/article/0,289142, "
-"sid14_gci1305120,00.html\"> Tor network 'bridges' help evade blockers</a>.  "
-"Covers new Tor features designed to overcome filtering and blocking that "
-"prevent access to the Tor network."
+"<a "
+"href=\"http://searchsecurity.techtarget.com/news/article/0,289142,sid14_gci1305120,00.html\">"
+" Tor network 'bridges' help evade blockers</a>.  Covers new Tor features "
+"designed to overcome filtering and blocking that prevent access to the Tor "
+"network."
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:552
+#: /home/runa/dev/website/press/en/inthemedia.wml:516
 msgid "2008 Feb 14"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:553
+#: /home/runa/dev/website/press/en/inthemedia.wml:517
 msgid "Wired: Compiler Blog"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:554
+#: /home/runa/dev/website/press/en/inthemedia.wml:518
 msgid ""
 "<a href=\"http://blog.wired.com/monkeybites/2008/02/how-to-set-up-a.html\"> "
 "How To: Set Up Anonymous Browsing in 30 Seconds or Less</a>."
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:559
+#: /home/runa/dev/website/press/en/inthemedia.wml:523
 msgid "2008 Feb 01"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:561
+#: /home/runa/dev/website/press/en/inthemedia.wml:525
 msgid ""
 "<a href=\"http://www.pcworld.com/article/id,142094-pg,1/article.html\"> "
 "Hackers Can Expose Masked Surfers, Study Says</a> A report on <a "
@@ -1246,17 +1242,17 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:568
+#: /home/runa/dev/website/press/en/inthemedia.wml:532
 msgid "2007 Sep 21"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:569
+#: /home/runa/dev/website/press/en/inthemedia.wml:533
 msgid "Wired HowTo Blog"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:570
+#: /home/runa/dev/website/press/en/inthemedia.wml:534
 msgid ""
 "<a "
 "href=\"http://howto.wired.com/wiredhowtos/index.cgi?page_name=be_a_whistle_blower;action=display;category=Work\">Be"
@@ -1265,17 +1261,17 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:573
+#: /home/runa/dev/website/press/en/inthemedia.wml:537
 msgid "2007 Sep 16"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:574
+#: /home/runa/dev/website/press/en/inthemedia.wml:538
 msgid "Cnet"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:575
+#: /home/runa/dev/website/press/en/inthemedia.wml:539
 msgid ""
 "<a href=\"http://news.cnet.com/8301-13739_3-9779225-46.html\">Tor anonymity "
 "server admin arrested</a>.  A Tor exit node operator from Germany was "
@@ -1290,18 +1286,18 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:578
+#: /home/runa/dev/website/press/en/inthemedia.wml:542
 msgid "2007 Sep 10"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:579 /tmp/u3kTkswOVo.xml:696
-#: /tmp/u3kTkswOVo.xml:772 /tmp/u3kTkswOVo.xml:881 /tmp/u3kTkswOVo.xml:893
+#: /home/runa/dev/website/press/en/inthemedia.wml:543 /tmp/Q2ndl8ZYsF.xml:660
+#: /tmp/Q2ndl8ZYsF.xml:736 /tmp/Q2ndl8ZYsF.xml:845 /tmp/Q2ndl8ZYsF.xml:857
 msgid "Wired"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:580
+#: /home/runa/dev/website/press/en/inthemedia.wml:544
 msgid ""
 "<a "
 "href=\"http://www.wired.com/politics/security/news/2007/09/embassy_hacks\"> "
@@ -1338,17 +1334,17 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:583
+#: /home/runa/dev/website/press/en/inthemedia.wml:547
 msgid "2007 Jul 27"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:584
+#: /home/runa/dev/website/press/en/inthemedia.wml:548
 msgid "Wired Blog"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:585
+#: /home/runa/dev/website/press/en/inthemedia.wml:549
 msgid ""
 "<a href=\"http://blog.wired.com/27bstroke6/2007/07/cyber-jihadists.html\"> "
 "Cyber Jihadists Embrace Tor</a><br/> A pointer to a <a "
@@ -1359,12 +1355,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:588
+#: /home/runa/dev/website/press/en/inthemedia.wml:552
 msgid "2007 Jun 22"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:590
+#: /home/runa/dev/website/press/en/inthemedia.wml:554
 msgid ""
 "<a href=\"http://www.asiamedia.ucla.edu/article-"
 "southeastasia.asp?parentid=72388\"> The problems with censorship</a>.  "
@@ -1373,17 +1369,17 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:593
+#: /home/runa/dev/website/press/en/inthemedia.wml:557
 msgid "2007 Mar 15"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:594
+#: /home/runa/dev/website/press/en/inthemedia.wml:558
 msgid "World Changing"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:595
+#: /home/runa/dev/website/press/en/inthemedia.wml:559
 msgid ""
 "<a href=\"http://www.worldchanging.com/archives/006309.html\"> Blogging "
 "Where Speech Isn’t Free</a><br/> Coverage of former Tor Executive Director "
@@ -1393,17 +1389,17 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:598
+#: /home/runa/dev/website/press/en/inthemedia.wml:562
 msgid "2007 Mar 8"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:599
+#: /home/runa/dev/website/press/en/inthemedia.wml:563
 msgid "Security Focus"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:600
+#: /home/runa/dev/website/press/en/inthemedia.wml:564
 msgid ""
 "<a href=\"http://www.securityfocus.com/news/11447/1\"> Tor hack proposed to "
 "catch criminals</a>.  Coverage of a toolset called \"Torment\" for "
@@ -1412,17 +1408,17 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:603
+#: /home/runa/dev/website/press/en/inthemedia.wml:567
 msgid "2007 Feb 1"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:604
+#: /home/runa/dev/website/press/en/inthemedia.wml:568
 msgid "Dr Dobb's"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:605
+#: /home/runa/dev/website/press/en/inthemedia.wml:569
 msgid ""
 "<a href=\"http://www.ddj.com/security/197002414\"> Tor Project Protects "
 "Anonymous Sources</a>.  An introduction to Tor, including technical and "
@@ -1430,17 +1426,17 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:608
+#: /home/runa/dev/website/press/en/inthemedia.wml:572
 msgid "2006 Oct 19"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:609
+#: /home/runa/dev/website/press/en/inthemedia.wml:573
 msgid "Wired Threat Level"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:610
+#: /home/runa/dev/website/press/en/inthemedia.wml:574
 msgid ""
 "<a href=\"http://blog.wired.com/27bstroke6/2006/10/the_onion_route.html\"> "
 "The Onion Router (TOR) is Leaky (Leeky)</a>.  Explains why you need "
@@ -1450,17 +1446,17 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:613
+#: /home/runa/dev/website/press/en/inthemedia.wml:577
 msgid "2006 Aug 18"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:614 /tmp/u3kTkswOVo.xml:702
+#: /home/runa/dev/website/press/en/inthemedia.wml:578 /tmp/Q2ndl8ZYsF.xml:666
 msgid "NPR"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:615
+#: /home/runa/dev/website/press/en/inthemedia.wml:579
 msgid ""
 "<a href=\"http://www.npr.org/templates/story/story.php?storyId=5168456\"> "
 "Tips for Protecting Privacy Online</a>.  Kevin Bankston of the EFF "
@@ -1469,17 +1465,17 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:618
+#: /home/runa/dev/website/press/en/inthemedia.wml:582
 msgid "2006 Jul 5"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:619
+#: /home/runa/dev/website/press/en/inthemedia.wml:583
 msgid "MSNBC"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:620
+#: /home/runa/dev/website/press/en/inthemedia.wml:584
 msgid ""
 "<a href=\"http://www.msnbc.msn.com/id/13718446/page/2/\"> Defending "
 "liberties in high-tech world</a>.  Mentions EFF funding for Tor as one of "
@@ -1487,17 +1483,17 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:622
+#: /home/runa/dev/website/press/en/inthemedia.wml:586
 msgid "2006 Apr 11"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:623
+#: /home/runa/dev/website/press/en/inthemedia.wml:587
 msgid "PBS Frontline"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:624
+#: /home/runa/dev/website/press/en/inthemedia.wml:588
 msgid ""
 "<a "
 "href=\"http://pbs.gen.in/wgbh/pages/frontline/tankman/internet/tech.html\">Chipping"
@@ -1505,12 +1501,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:627
+#: /home/runa/dev/website/press/en/inthemedia.wml:591
 msgid "2006 Feb 28"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:629
+#: /home/runa/dev/website/press/en/inthemedia.wml:593
 msgid ""
 "<a "
 "href=\"http://www.pcworld.com/article/id,124891-page,1/article.html\">Outsmarting"
@@ -1518,17 +1514,17 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:632
+#: /home/runa/dev/website/press/en/inthemedia.wml:596
 msgid "2006 Feb 27"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:633
+#: /home/runa/dev/website/press/en/inthemedia.wml:597
 msgid "Forbes"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:634
+#: /home/runa/dev/website/press/en/inthemedia.wml:598
 msgid ""
 "<a href=\"http://members.forbes.com/global/2006/0227/018A_2.html\"> Cracks "
 "In the Wall</a>.  Discussion of Tor being used for evading censorship by "
@@ -1536,35 +1532,35 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:637
+#: /home/runa/dev/website/press/en/inthemedia.wml:601
 msgid "2006 Feb 20"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:638
+#: /home/runa/dev/website/press/en/inthemedia.wml:602
 msgid "The Boston Globe"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:639
+#: /home/runa/dev/website/press/en/inthemedia.wml:603
 msgid ""
 "<a href=\"http://members.forbes.com/global/2006/0227/018A_2.html\"> Beating "
 "censorship on the Internet</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:642 /tmp/u3kTkswOVo.xml:647
-#: /tmp/u3kTkswOVo.xml:652 /tmp/u3kTkswOVo.xml:689
+#: /home/runa/dev/website/press/en/inthemedia.wml:606 /tmp/Q2ndl8ZYsF.xml:611
+#: /tmp/Q2ndl8ZYsF.xml:616 /tmp/Q2ndl8ZYsF.xml:653
 msgid "2006 Feb 15"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:643
+#: /home/runa/dev/website/press/en/inthemedia.wml:607
 msgid "CBS Evening News"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:644
+#: /home/runa/dev/website/press/en/inthemedia.wml:608
 msgid ""
 "<a "
 "href=\"http://www.cbsnews.com/stories/2006/02/15/eveningnews/main1321785.shtml?source=search_story\">"
@@ -1573,22 +1569,22 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:648
+#: /home/runa/dev/website/press/en/inthemedia.wml:612
 msgid "CNBC - Closing Bell"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:649
+#: /home/runa/dev/website/press/en/inthemedia.wml:613
 msgid "TV Appearance by Roger Dingledine at 4:25pm. (no link)"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:653
+#: /home/runa/dev/website/press/en/inthemedia.wml:617
 msgid "Network Secure"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:654
+#: /home/runa/dev/website/press/en/inthemedia.wml:618
 msgid ""
 "<a href=\"http://www.network-"
 "secure.de/index.php?option=com_content&amp;task=view&amp;id=3909\">Tor: "
@@ -1596,12 +1592,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:657
+#: /home/runa/dev/website/press/en/inthemedia.wml:621
 msgid "2006 Feb 13"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:659
+#: /home/runa/dev/website/press/en/inthemedia.wml:623
 msgid ""
 "<a href=\"http://online.wsj.com/article/SB113979965346572150.html\"> Chinese"
 " Censors Of Internet Face 'Hacktivists' in U.S.</a>Full article text can "
@@ -1610,53 +1606,53 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:663
+#: /home/runa/dev/website/press/en/inthemedia.wml:627
 msgid "2006 Jan 31"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:665
+#: /home/runa/dev/website/press/en/inthemedia.wml:629
 msgid ""
 "<a href=\"http://www.technologyreview.com/Infotech/16216/page2/\">Evading "
 "the Google Eye</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:668
+#: /home/runa/dev/website/press/en/inthemedia.wml:632
 msgid "2006 Jan 29"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:670
+#: /home/runa/dev/website/press/en/inthemedia.wml:634
 msgid ""
 "<a href=\"http://www.nytimes.com/2006/01/29/weekinreview/29basic.html\"> How"
 " to Outwit the World's Internet Censors</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:673
+#: /home/runa/dev/website/press/en/inthemedia.wml:637
 msgid "2006 Jan 27"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:674
+#: /home/runa/dev/website/press/en/inthemedia.wml:638
 msgid "Fox News/eWeek"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:675
+#: /home/runa/dev/website/press/en/inthemedia.wml:639
 msgid ""
 "<a href=\"http://www.foxnews.com/story/0,2933,183005,00.html\"> Web "
 "Anonymizers Suddenly Get Very Popular</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:678
+#: /home/runa/dev/website/press/en/inthemedia.wml:642
 msgid "2006 Jan 25"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:680
+#: /home/runa/dev/website/press/en/inthemedia.wml:644
 msgid ""
 "<a "
 "href=\"http://www.nytimes.com/2006/01/25/technology/techspecial2/25privacy.html?_r=1&amp;oref=slogin\">"
@@ -1664,17 +1660,17 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:683
+#: /home/runa/dev/website/press/en/inthemedia.wml:647
 msgid "2006 Jan 23"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:684
+#: /home/runa/dev/website/press/en/inthemedia.wml:648
 msgid "NPR Talk of the Nation"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:685
+#: /home/runa/dev/website/press/en/inthemedia.wml:649
 msgid ""
 "<a href=\"http://www.npr.org/templates/story/story.php?storyId=5168456\"> "
 "Search Engines and Privacy Rights on the Web</a><br/> <a "
@@ -1683,24 +1679,24 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:690
+#: /home/runa/dev/website/press/en/inthemedia.wml:654
 msgid "Punto Informatico"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:691
+#: /home/runa/dev/website/press/en/inthemedia.wml:655
 msgid ""
 "<a href=\"http://punto-informatico.it/p.aspx?i=1430903\"> TOR c'è</a> "
 "(Italian)"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:695 /tmp/u3kTkswOVo.xml:701
+#: /home/runa/dev/website/press/en/inthemedia.wml:659 /tmp/Q2ndl8ZYsF.xml:665
 msgid "2006 Jan 20"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:697
+#: /home/runa/dev/website/press/en/inthemedia.wml:661
 msgid ""
 "<a "
 "href=\"http://www.wired.com/science/discoveries/news/2006/01/70051?currentPage=2\">"
@@ -1708,53 +1704,53 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:703
+#: /home/runa/dev/website/press/en/inthemedia.wml:667
 msgid ""
 "<a href=\"http://www.npr.org/templates/story/story.php?storyId=5165854\"> "
 "Google Records Subpoena Raises Privacy Fears</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:707
+#: /home/runa/dev/website/press/en/inthemedia.wml:671
 msgid "2005 Sep 30"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:708
+#: /home/runa/dev/website/press/en/inthemedia.wml:672
 msgid "Viva o Linux"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:709
+#: /home/runa/dev/website/press/en/inthemedia.wml:673
 msgid ""
 "<a href=\"http://www.vivaolinux.com.br/artigos/verArtigo.php?codigo=2759\"> "
 "TOR: A Internet sem rastreabilidade</a> (Portuguese)"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:712
+#: /home/runa/dev/website/press/en/inthemedia.wml:676
 msgid "2005 Aug 6"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:714
+#: /home/runa/dev/website/press/en/inthemedia.wml:678
 msgid ""
 "<a href=\"http://www.eurekalert.org/pub_releases/2005-08/ns-"
 "wwa080305.php\">Why we all need pornography</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:717
+#: /home/runa/dev/website/press/en/inthemedia.wml:681
 msgid "2005 Jul 12"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:718
+#: /home/runa/dev/website/press/en/inthemedia.wml:682
 msgid "IEEE Computer Society's Technical Committee on Security and Privacy"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:719
+#: /home/runa/dev/website/press/en/inthemedia.wml:683
 msgid ""
 "<a href=\"http://www.ieee-"
 "security.org/Cipher/Newsbriefs/2005/071805.html#TOR\"> Onion routing "
@@ -1762,34 +1758,34 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:723
+#: /home/runa/dev/website/press/en/inthemedia.wml:687
 msgid "2005 Jun 22"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:724
+#: /home/runa/dev/website/press/en/inthemedia.wml:688
 msgid "The Unofficial Apple Blog"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:725
+#: /home/runa/dev/website/press/en/inthemedia.wml:689
 msgid ""
 "<a href=\"http://www.tuaw.com/2005/06/22/privacy-watch-tor/\"> Privacy "
 "Watch: Tor</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:729
+#: /home/runa/dev/website/press/en/inthemedia.wml:693
 msgid "2005 Jun 10"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:730
+#: /home/runa/dev/website/press/en/inthemedia.wml:694
 msgid "The New Zealand Herald"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:731
+#: /home/runa/dev/website/press/en/inthemedia.wml:695
 msgid ""
 "<a "
 "href=\"http://www.nzherald.co.nz/section/story.cfm?c_id=5&amp;objectid=10329896\">"
@@ -1797,104 +1793,104 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:735
+#: /home/runa/dev/website/press/en/inthemedia.wml:699
 msgid "2005 Jun 8"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:736
+#: /home/runa/dev/website/press/en/inthemedia.wml:700
 msgid "American Public Radio"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:737
+#: /home/runa/dev/website/press/en/inthemedia.wml:701
 msgid ""
 "<a href=\"http://www.publicradio.org/columns/futuretense/2005/06/08.shtml\">"
 " An Internet privacy tool called \"Tor\"</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:741 /tmp/u3kTkswOVo.xml:747
+#: /home/runa/dev/website/press/en/inthemedia.wml:705 /tmp/Q2ndl8ZYsF.xml:711
 msgid "2005 Jun 1"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:743
+#: /home/runa/dev/website/press/en/inthemedia.wml:707
 msgid ""
 "<a href=\"http://www.pcworld.com/article/id,120763-page,4/article.html\"> "
 "The 100 Best Products of 2005</a><br/> Tor is ranked #40 on the list."
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:748
+#: /home/runa/dev/website/press/en/inthemedia.wml:712
 msgid "Linux Weekly News"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:749
+#: /home/runa/dev/website/press/en/inthemedia.wml:713
 msgid ""
 "<a href=\"http://lwn.net/Articles/138242/\"> A Look at The Onion Router "
 "(Tor)</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:753
+#: /home/runa/dev/website/press/en/inthemedia.wml:717
 msgid "2005 May 22"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:754 /tmp/u3kTkswOVo.xml:839
+#: /home/runa/dev/website/press/en/inthemedia.wml:718 /tmp/Q2ndl8ZYsF.xml:803
 msgid "Slashdot"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:755
+#: /home/runa/dev/website/press/en/inthemedia.wml:719
 msgid ""
 "<a href=\"http://yro.slashdot.org/article.pl?sid=05/05/22/0113244\"> Tor "
 "Anonymity Network Reaches 100 Verified Nodes</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:759
+#: /home/runa/dev/website/press/en/inthemedia.wml:723
 msgid "2005 May 20"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:760
+#: /home/runa/dev/website/press/en/inthemedia.wml:724
 msgid "Security.uz"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:761
+#: /home/runa/dev/website/press/en/inthemedia.wml:725
 msgid ""
 "<a href=\"http://security.uz/news/default.asp?id=10541\"> Tor - мощный "
 "анонимайзер для всех ОС</a> (Russian)"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:765
+#: /home/runa/dev/website/press/en/inthemedia.wml:729
 msgid "2005 May 19"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:766
+#: /home/runa/dev/website/press/en/inthemedia.wml:730
 msgid "WebPlanet"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:767
+#: /home/runa/dev/website/press/en/inthemedia.wml:731
 msgid ""
 "<a href=\"http://webplanet.ru/news/security/2005/5/19/tor.html\"> Tor: "
 "распределенная система анонимного серфинга</a> (Russian)"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:771 /tmp/u3kTkswOVo.xml:778
+#: /home/runa/dev/website/press/en/inthemedia.wml:735 /tmp/Q2ndl8ZYsF.xml:742
 msgid "2005 May 17"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:773
+#: /home/runa/dev/website/press/en/inthemedia.wml:737
 msgid ""
 "<a "
 "href=\"http://www.wired.com/politics/security/news/2005/05/67542?currentPage=all\">"
@@ -1903,170 +1899,170 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:779
+#: /home/runa/dev/website/press/en/inthemedia.wml:743
 msgid "XBiz"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:780
+#: /home/runa/dev/website/press/en/inthemedia.wml:744
 msgid ""
 "<a href=\"http://xbiz.com/news/8761\"> Navy Project Allows Anonymous "
 "Browsing</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:784
+#: /home/runa/dev/website/press/en/inthemedia.wml:748
 msgid "2005 Apr 13"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:785
+#: /home/runa/dev/website/press/en/inthemedia.wml:749
 msgid "Heise online"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:786
+#: /home/runa/dev/website/press/en/inthemedia.wml:750
 msgid ""
 "<a href=\"http://www.heise.de/newsticker/meldung/58506\"> CFP: Vom "
 "kafkaesken Schwinden der Anonymität</a> (German)"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:790
+#: /home/runa/dev/website/press/en/inthemedia.wml:754
 msgid "2005 Apr 5"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:791
+#: /home/runa/dev/website/press/en/inthemedia.wml:755
 msgid "Libero"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:792
+#: /home/runa/dev/website/press/en/inthemedia.wml:756
 msgid ""
 "<a href=\"http://magazine.libero.it/internetlife/scienzaeweb/ne208.phtml\"> "
 "Anonimato on line, ecco Tor</a> (Italian)"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:796
+#: /home/runa/dev/website/press/en/inthemedia.wml:760
 msgid "2005 Jan 4"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:797
+#: /home/runa/dev/website/press/en/inthemedia.wml:761
 msgid "Internetnews"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:798
+#: /home/runa/dev/website/press/en/inthemedia.wml:762
 msgid ""
 "<a href=\"http://www.internetnews.com/dev-news/article.php/3454521\"> EFF "
 "Throws Support to 'Anonymous' Internet Project</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:802
+#: /home/runa/dev/website/press/en/inthemedia.wml:766
 msgid "2005 Mar 31"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:803
+#: /home/runa/dev/website/press/en/inthemedia.wml:767
 msgid "Linux.com"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:804
+#: /home/runa/dev/website/press/en/inthemedia.wml:768
 msgid ""
 "<a href=\"http://www.linux.com/articles/43713?tid=19&amp;tid=78\"> Securing "
 "your online privacy with Tor</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:808
+#: /home/runa/dev/website/press/en/inthemedia.wml:772
 msgid "2004 Dec 27"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:809
+#: /home/runa/dev/website/press/en/inthemedia.wml:773
 msgid "BoingBoing"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:810
+#: /home/runa/dev/website/press/en/inthemedia.wml:774
 msgid ""
 "<a href=\"http://www.boingboing.net/2004/12/27/eff-helping-produce-.html\"> "
 "EFF helping produce anonymizing software</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:814
+#: /home/runa/dev/website/press/en/inthemedia.wml:778
 msgid "2004 Dec 25"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:815
+#: /home/runa/dev/website/press/en/inthemedia.wml:779
 msgid "Kansas City infozine"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:816
+#: /home/runa/dev/website/press/en/inthemedia.wml:780
 msgid ""
 "<a href=\"http://www.infozine.com/news/stories/op/storiesView/sid/4933/\"> "
 "EFF Joins Forces with Tor Software Project</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:820 /tmp/u3kTkswOVo.xml:826
+#: /home/runa/dev/website/press/en/inthemedia.wml:784 /tmp/Q2ndl8ZYsF.xml:790
 msgid "2004 Dec 23"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:821
+#: /home/runa/dev/website/press/en/inthemedia.wml:785
 msgid "golem.de"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:822
+#: /home/runa/dev/website/press/en/inthemedia.wml:786
 msgid ""
 "<a href=\"http://www.golem.de/0412/35340.html\"> EFF unterstützt "
 "Anonymisierer Tor</a> (German)"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:827
+#: /home/runa/dev/website/press/en/inthemedia.wml:791
 msgid "SuicideGirls"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:828
+#: /home/runa/dev/website/press/en/inthemedia.wml:792
 msgid ""
 "<a href=\"http://suicidegirls.com/news/technology/6150/\"> New Routing "
 "Software Allows Anonymous Internet Use</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:832
+#: /home/runa/dev/website/press/en/inthemedia.wml:796
 msgid "2004 Dec 18"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:833
+#: /home/runa/dev/website/press/en/inthemedia.wml:797
 msgid "P2Pnet"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:834
+#: /home/runa/dev/website/press/en/inthemedia.wml:798
 msgid "<a href=\"http://p2pnet.net/story/3357\"> EFF to sponsor Tor</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:838
+#: /home/runa/dev/website/press/en/inthemedia.wml:802
 msgid "2004 Dec 22"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:840
+#: /home/runa/dev/website/press/en/inthemedia.wml:804
 msgid ""
 "<a "
 "href=\"http://yro.slashdot.org/article.pl?sid=04/12/22/2031229&amp;tid=95&amp;tid=158&amp;tid=153&amp;tid=17\">"
@@ -2074,106 +2070,106 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:844
+#: /home/runa/dev/website/press/en/inthemedia.wml:808
 msgid "2004 Nov 16"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:845
+#: /home/runa/dev/website/press/en/inthemedia.wml:809
 msgid "AlterNet"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:846
+#: /home/runa/dev/website/press/en/inthemedia.wml:810
 msgid ""
 "<a href=\"http://www.alternet.org/columnists/story/20523/\"> Heavy "
 "Traffic</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:850
+#: /home/runa/dev/website/press/en/inthemedia.wml:814
 msgid "2004 Aug 30"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:851
+#: /home/runa/dev/website/press/en/inthemedia.wml:815
 msgid "Newsweek"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:852
+#: /home/runa/dev/website/press/en/inthemedia.wml:816
 msgid "Technology: Instant Security (no link)"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:856
+#: /home/runa/dev/website/press/en/inthemedia.wml:820
 msgid "2004 Aug 16"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:857
+#: /home/runa/dev/website/press/en/inthemedia.wml:821
 msgid "Eweek"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:858
+#: /home/runa/dev/website/press/en/inthemedia.wml:822
 msgid ""
 "<a href=\"http://www.eweek.com/c/a/Security/Dont-Fear-Internet-Anonymity-"
 "Tools/\"> Don't Fear Internet Anonymity Tools</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:862 /tmp/u3kTkswOVo.xml:868
+#: /home/runa/dev/website/press/en/inthemedia.wml:826 /tmp/Q2ndl8ZYsF.xml:832
 msgid "2004 Aug 6"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:863
+#: /home/runa/dev/website/press/en/inthemedia.wml:827
 msgid "HCC magazine"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:864
+#: /home/runa/dev/website/press/en/inthemedia.wml:828
 msgid ""
 "<a href=\"http://www.hcc.nl/eCache/DEF/21/083.html\"> Anoniem surfen met "
 "hulp van marine VS</a> (Dutch)"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:869
+#: /home/runa/dev/website/press/en/inthemedia.wml:833
 msgid "Golem"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:870
+#: /home/runa/dev/website/press/en/inthemedia.wml:834
 msgid ""
 "<a href=\"http://www.golem.de/0408/32835.html\"> Tor: Anonymisierer nutzt "
 "Onion-Routing</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:874
+#: /home/runa/dev/website/press/en/inthemedia.wml:838
 msgid "2004 Aug 5"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:875
+#: /home/runa/dev/website/press/en/inthemedia.wml:839
 msgid "Network World Security"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:876
+#: /home/runa/dev/website/press/en/inthemedia.wml:840
 msgid ""
 "<a href=\"http://www.networkworld.com/details/7088.html\"> Onion routing</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:880
+#: /home/runa/dev/website/press/en/inthemedia.wml:844
 msgid "2004 May 8"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:882
+#: /home/runa/dev/website/press/en/inthemedia.wml:846
 msgid ""
 "<a href=\"http://www.wired.com/politics/security/news/2004/08/64464\"> Onion"
 " Routing Averts Prying Eyes</a>. Also in <a "
@@ -2181,29 +2177,29 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:886
+#: /home/runa/dev/website/press/en/inthemedia.wml:850
 msgid "2004 Mar 8"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:887
+#: /home/runa/dev/website/press/en/inthemedia.wml:851
 msgid "CNET Japan blog"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:888
+#: /home/runa/dev/website/press/en/inthemedia.wml:852
 msgid ""
 "<a href=\"http://japan.cnet.com/blog/umeda/2004/03/08/entry_post_126/\"> "
 "Yearning of hackers and insecurity</a> (Japanese)"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:892
+#: /home/runa/dev/website/press/en/inthemedia.wml:856
 msgid "1999 Apr 13"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:894
+#: /home/runa/dev/website/press/en/inthemedia.wml:858
 msgid ""
 "<a href=\"http://www.wired.com/science/discoveries/news/1999/04/19091\"> "
 "Anonymous Web Surfing? Uh-Uh</a>"

Modified: translation/trunk/projects/website/po/ar/press/3-low.press.po
===================================================================
--- translation/trunk/projects/website/po/ar/press/3-low.press.po	2011-04-12 16:15:00 UTC (rev 24594)
+++ translation/trunk/projects/website/po/ar/press/3-low.press.po	2011-04-12 16:19:31 UTC (rev 24595)
@@ -8,7 +8,7 @@
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
 "POT-Creation-Date: 2011-03-01 16:37+0000\n"
-"PO-Revision-Date: 2011-03-27 17:28+0000\n"
+"PO-Revision-Date: 2011-04-12 16:11+0000\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"

Modified: translation/trunk/projects/website/po/ar/press/4-optional.2008-12-19-roadmap-press-release.po
===================================================================
--- translation/trunk/projects/website/po/ar/press/4-optional.2008-12-19-roadmap-press-release.po	2011-04-12 16:15:00 UTC (rev 24594)
+++ translation/trunk/projects/website/po/ar/press/4-optional.2008-12-19-roadmap-press-release.po	2011-04-12 16:19:31 UTC (rev 24595)
@@ -8,7 +8,7 @@
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
 "POT-Creation-Date: 2010-12-26 14:32+0000\n"
-"PO-Revision-Date: 2011-03-27 17:28+0000\n"
+"PO-Revision-Date: 2011-04-12 16:09+0000\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"

Modified: translation/trunk/projects/website/po/ar/press/4-optional.2010-03-25-tor-store-press-release.po
===================================================================
--- translation/trunk/projects/website/po/ar/press/4-optional.2010-03-25-tor-store-press-release.po	2011-04-12 16:15:00 UTC (rev 24594)
+++ translation/trunk/projects/website/po/ar/press/4-optional.2010-03-25-tor-store-press-release.po	2011-04-12 16:19:31 UTC (rev 24595)
@@ -8,7 +8,7 @@
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
 "POT-Creation-Date: 2010-12-26 14:32+0000\n"
-"PO-Revision-Date: 2011-03-27 17:35+0000\n"
+"PO-Revision-Date: 2011-04-12 16:13+0000\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"

Modified: translation/trunk/projects/website/po/ar/projects/1-high.torbrowser-split.po
===================================================================
--- translation/trunk/projects/website/po/ar/projects/1-high.torbrowser-split.po	2011-04-12 16:15:00 UTC (rev 24594)
+++ translation/trunk/projects/website/po/ar/projects/1-high.torbrowser-split.po	2011-04-12 16:19:31 UTC (rev 24595)
@@ -8,7 +8,7 @@
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
 "POT-Creation-Date: 2010-12-26 14:32+0000\n"
-"PO-Revision-Date: 2011-03-27 17:37+0000\n"
+"PO-Revision-Date: 2011-04-12 16:15+0000\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"

Modified: translation/trunk/projects/website/po/ar/projects/1-high.torbrowser.po
===================================================================
--- translation/trunk/projects/website/po/ar/projects/1-high.torbrowser.po	2011-04-12 16:15:00 UTC (rev 24594)
+++ translation/trunk/projects/website/po/ar/projects/1-high.torbrowser.po	2011-04-12 16:19:31 UTC (rev 24595)
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-03-25 16:51+0000\n"
-"PO-Revision-Date: 2011-03-26 00:33+0000\n"
+"POT-Creation-Date: 2011-03-28 12:49+0200\n"
+"PO-Revision-Date: 2011-03-29 00:27+0000\n"
 "Last-Translator: OsamaK <osamak at gnu.org>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
@@ -18,7 +18,7 @@
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5\n"
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:9
+#: /home/runa/dev/website/projects/en/torbrowser.wml:9
 msgid ""
 "<a href=\"<page index>\">Home &raquo; </a> <a href=\"<page "
 "projects/projects>\">Projects &raquo; </a> <a href=\"<page "
@@ -29,17 +29,17 @@
 "projects/torbrowser>\">متصفح تور</a>"
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:17
+#: /home/runa/dev/website/projects/en/torbrowser.wml:17
 msgid "Tor Browser Bundle"
 msgstr "حزمة متصفح تور"
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:18
+#: /home/runa/dev/website/projects/en/torbrowser.wml:18
 msgid "<hr/>"
 msgstr "<hr/>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:20
+#: /home/runa/dev/website/projects/en/torbrowser.wml:20
 msgid ""
 "The <strong>Tor</strong> software protects you by bouncing your "
 "communications around a distributed network of relays run by volunteers all "
@@ -54,7 +54,7 @@
 " ويسمح لك بالاتصال بالمواقع المحجوبة."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:27
+#: /home/runa/dev/website/projects/en/torbrowser.wml:27
 msgid ""
 "The <strong>Tor Browser Bundle</strong> lets you use Tor on Windows, Mac OS "
 "X, or Linux without needing to install any software.  It can run off a USB "
@@ -72,7 +72,7 @@
 "الطرق الأخرى <a href=\"<page download/download>\">لتنزيل تور</a>."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:39
+#: /home/runa/dev/website/projects/en/torbrowser.wml:39
 msgid ""
 "Freedom House has produced a video on how to find and use the Tor Browser "
 "Bundle.  If you don't see a video below, view it at <a "
@@ -85,12 +85,12 @@
 "أفضل؟ هل لديك فيديو بلغتك؟ أبلغنا!"
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:49
+#: /home/runa/dev/website/projects/en/torbrowser.wml:49
 msgid "<a id=\"Download\"></a>"
 msgstr "<a id=\"Download\"></a>"
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:50
+#: /home/runa/dev/website/projects/en/torbrowser.wml:50
 msgid ""
 "<a class=\"anchor\" href=\"#Download\">Download Tor Browser Bundle and Tor "
 "IM Browser Bundle</a>"
@@ -99,7 +99,7 @@
 "ومراسله الفوري</a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:52
+#: /home/runa/dev/website/projects/en/torbrowser.wml:52
 msgid ""
 "To start using the Tor Browser Bundle or Tor IM Browser Bundle, download the"
 " file for your preferred language. This file can be saved wherever is "
@@ -109,7 +109,7 @@
 "ومراسله الفوري."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:56
+#: /home/runa/dev/website/projects/en/torbrowser.wml:56
 msgid ""
 "If you have an unreliable Internet connection, it may be easier for you to "
 "download the bundle edition which is <a href=\"<page projects/torbrowser-"
@@ -119,7 +119,7 @@
 "href=\"<page projects/torbrowser-split>\">المقسمة</a> إلى أجزاء صغيرة."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:58
+#: /home/runa/dev/website/projects/en/torbrowser.wml:58
 msgid ""
 "Tor Browser Bundle for Windows with Firefox (version <version-"
 "torbrowserbundle>, 16 MB)"
@@ -127,7 +127,7 @@
 "حزمة متصفح تور لوندز مع فيرفكس (النسخة <version-torbrowserbundle>، 16 م.ب)"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:62
+#: /home/runa/dev/website/projects/en/torbrowser.wml:62
 msgid ""
 "<a href=\"../dist/torbrowser/tor-browser-<version-torbrowserbundle>_en-"
 "US.exe\">English (en-US)</a> (<a href=\"../dist/torbrowser/tor-browser"
@@ -140,7 +140,7 @@
 "90%;\">التوقيع</a>)"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:64
+#: /home/runa/dev/website/projects/en/torbrowser.wml:64
 msgid ""
 "<a href=\"../dist/torbrowser/tor-browser-<version-"
 "torbrowserbundle>_ar.exe\">&#x0627;&#x0644;&#x0639;&#x0631;&#x0628;&#x064a;&#x0629;"
@@ -153,7 +153,7 @@
 "torbrowserbundle>_ar.exe.asc\" style=\"font-size: 90%;\">التوقيع</a>)"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:66
+#: /home/runa/dev/website/projects/en/torbrowser.wml:66
 msgid ""
 "<a href=\"../dist/torbrowser/tor-browser-<version-"
 "torbrowserbundle>_de.exe\">Deutsch (de)</a> (<a href=\"../dist/torbrowser"
@@ -166,7 +166,7 @@
 "90%;\">التوقيع</a>)"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:68
+#: /home/runa/dev/website/projects/en/torbrowser.wml:68
 msgid ""
 "<a href=\"../dist/torbrowser/tor-browser-<version-torbrowserbundle>_es-"
 "ES.exe\">&#x0045;&#x0073;&#x0070;&#x0061;&#x00f1;&#x006f;&#x006c; (es-"
@@ -179,7 +179,7 @@
 ">_es-ES.exe.asc\" style=\"font-size: 90%;\">التوقيع</a>)"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:70
+#: /home/runa/dev/website/projects/en/torbrowser.wml:70
 msgid ""
 "<a href=\"../dist/torbrowser/tor-browser-<version-"
 "torbrowserbundle>_fa.exe\">&#x0641;&#x0627;&#x0631;&#x0633;&#x06cc; (fa)</a>"
@@ -192,7 +192,7 @@
 "torbrowserbundle>_fa.exe.asc\" style=\"font-size: 90%;\">التوقيع</a>)"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:72
+#: /home/runa/dev/website/projects/en/torbrowser.wml:72
 msgid ""
 "<a href=\"../dist/torbrowser/tor-browser-<version-"
 "torbrowserbundle>_fr.exe\">&#x0046;&#x0072;&#x0061;&#x006e;&#x00e7;&#x0061;&#x0069;&#x0073;"
@@ -205,7 +205,7 @@
 "torbrowserbundle>_fr.exe.asc\" style=\"font-size: 90%;\">التوقيع</a>)"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:74
+#: /home/runa/dev/website/projects/en/torbrowser.wml:74
 msgid ""
 "<a href=\"../dist/torbrowser/tor-browser-<version-"
 "torbrowserbundle>_it.exe\">Italiano (it)</a> (<a href=\"../dist/torbrowser"
@@ -218,7 +218,7 @@
 "90%;\">التوقيع</a>)"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:76
+#: /home/runa/dev/website/projects/en/torbrowser.wml:76
 msgid ""
 "<a href=\"../dist/torbrowser/tor-browser-<version-"
 "torbrowserbundle>_nl.exe\">Nederlands (nl)</a> (<a href=\"../dist/torbrowser"
@@ -231,7 +231,7 @@
 "90%;\">التوقيع</a>)"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:78
+#: /home/runa/dev/website/projects/en/torbrowser.wml:78
 msgid ""
 "<a href=\"../dist/torbrowser/tor-browser-<version-"
 "torbrowserbundle>_pl.exe\">Polish (pl)</a> (<a href=\"../dist/torbrowser"
@@ -244,7 +244,7 @@
 "90%;\">التوقيع</a>)"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:80
+#: /home/runa/dev/website/projects/en/torbrowser.wml:80
 msgid ""
 "<a href=\"../dist/torbrowser/tor-browser-<version-torbrowserbundle>_pt-"
 "PT.exe\">&#x0050;&#x006f;&#x0072;&#x0074;&#x0075;&#x0067;&#x0075;&#x00ea;&#x0073;"
@@ -257,7 +257,7 @@
 "torbrowserbundle>_pt-PT.exe.asc\" style=\"font-size: 90%;\">التوقيع</a>)"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:82
+#: /home/runa/dev/website/projects/en/torbrowser.wml:82
 msgid ""
 "<a href=\"../dist/torbrowser/tor-browser-<version-"
 "torbrowserbundle>_ru.exe\">&#x0420;&#x0443;&#x0441;&#x0441;&#x043a;&#x0438;&#x0439;"
@@ -270,7 +270,7 @@
 "torbrowserbundle>_ru.exe.asc\" style=\"font-size: 90%;\">التوقيع</a>)"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:84
+#: /home/runa/dev/website/projects/en/torbrowser.wml:84
 msgid ""
 "<a href=\"../dist/torbrowser/tor-browser-<version-"
 "torbrowserbundle>_vi.exe\">Vietnamese (vi)</a> (<a href=\"../dist/torbrowser"
@@ -283,7 +283,7 @@
 "90%;\">التوقيع</a>)"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:86
+#: /home/runa/dev/website/projects/en/torbrowser.wml:86
 msgid ""
 "<a href=\"../dist/torbrowser/tor-browser-<version-torbrowserbundle>_zh-"
 "CN.exe\">&#x7b80;&#x4f53;&#x5b57; (zh-CN)</a> (<a href=\"../dist/torbrowser"
@@ -296,7 +296,7 @@
 "90%;\">التوقيع</a>)"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:90
+#: /home/runa/dev/website/projects/en/torbrowser.wml:90
 msgid ""
 "Tor IM Browser Bundle for Windows with Firefox and Pidgin (version <version-"
 "torimbrowserbundle>, 25 MB)"
@@ -305,7 +305,7 @@
 "torimbrowserbundle>، 25 م.ب)"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:94
+#: /home/runa/dev/website/projects/en/torbrowser.wml:94
 msgid ""
 "<a href=\"../dist/torbrowser/tor-im-browser-<version-torimbrowserbundle>_en-"
 "US.exe\">English (en-US)</a> (<a href=\"../dist/torbrowser/tor-im-browser"
@@ -318,7 +318,7 @@
 "90%;\">التوقيع</a>)"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:96
+#: /home/runa/dev/website/projects/en/torbrowser.wml:96
 msgid ""
 "<a href=\"../dist/torbrowser/tor-im-browser-<version-"
 "torimbrowserbundle>_ar.exe\">&#x0627;&#x0644;&#x0639;&#x0631;&#x0628;&#x064a;&#x0629;"
@@ -331,7 +331,7 @@
 "torimbrowserbundle>_ar.exe.asc\" style=\"font-size: 90%;\">التوقيع</a>)"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:98
+#: /home/runa/dev/website/projects/en/torbrowser.wml:98
 msgid ""
 "<a href=\"../dist/torbrowser/tor-im-browser-<version-"
 "torimbrowserbundle>_de.exe\">Deutsch (de)</a> (<a href=\"../dist/torbrowser"
@@ -344,7 +344,7 @@
 " 90%;\">التوقيع</a>)"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:100
+#: /home/runa/dev/website/projects/en/torbrowser.wml:100
 msgid ""
 "<a href=\"../dist/torbrowser/tor-im-browser-<version-torimbrowserbundle>_es-"
 "ES.exe\">&#x0045;&#x0073;&#x0070;&#x0061;&#x00f1;&#x006f;&#x006c; (es-"
@@ -357,7 +357,7 @@
 "torimbrowserbundle>_es-ES.exe.asc\" style=\"font-size: 90%;\">التوقيع</a>)"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:102
+#: /home/runa/dev/website/projects/en/torbrowser.wml:102
 msgid ""
 "<a href=\"../dist/torbrowser/tor-im-browser-<version-"
 "torimbrowserbundle>_fa.exe\">&#x0641;&#x0627;&#x0631;&#x0633;&#x06cc; "
@@ -370,7 +370,7 @@
 "torimbrowserbundle>_fa.exe.asc\" style=\"font-size: 90%;\">التوقيع</a>)"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:104
+#: /home/runa/dev/website/projects/en/torbrowser.wml:104
 msgid ""
 "<a href=\"../dist/torbrowser/tor-im-browser-<version-"
 "torimbrowserbundle>_fr.exe\">&#x0046;&#x0072;&#x0061;&#x006e;&#x00e7;&#x0061;&#x0069;&#x0073;"
@@ -383,7 +383,7 @@
 "torimbrowserbundle>_fr.exe.asc\" style=\"font-size: 90%;\">التوقيع</a>)"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:106
+#: /home/runa/dev/website/projects/en/torbrowser.wml:106
 msgid ""
 "<a href=\"../dist/torbrowser/tor-im-browser-<version-"
 "torimbrowserbundle>_it.exe\">Italiano (it)</a> (<a href=\"../dist/torbrowser"
@@ -396,7 +396,7 @@
 " 90%;\">التوقيع</a>)"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:108
+#: /home/runa/dev/website/projects/en/torbrowser.wml:108
 msgid ""
 "<a href=\"../dist/torbrowser/tor-im-browser-<version-"
 "torimbrowserbundle>_nl.exe\">Nederlands (nl)</a> (<a "
@@ -409,7 +409,7 @@
 "torimbrowserbundle>_nl.exe.asc\" style=\"font-size: 90%;\">التوقيع</a>)"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:110
+#: /home/runa/dev/website/projects/en/torbrowser.wml:110
 msgid ""
 "<a href=\"../dist/torbrowser/tor-im-browser-<version-"
 "torimbrowserbundle>_pl.exe\">Polish (pl)</a> (<a href=\"../dist/torbrowser"
@@ -422,7 +422,7 @@
 " 90%;\">التوقيع</a>)"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:112
+#: /home/runa/dev/website/projects/en/torbrowser.wml:112
 msgid ""
 "<a href=\"../dist/torbrowser/tor-im-browser-<version-torimbrowserbundle>_pt-"
 "PT.exe\">&#x0050;&#x006f;&#x0072;&#x0074;&#x0075;&#x0067;&#x0075;&#x00ea;&#x0073;"
@@ -435,7 +435,7 @@
 "torimbrowserbundle>_pt-PT.exe.asc\" style=\"font-size: 90%;\">التوقيع</a>)"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:114
+#: /home/runa/dev/website/projects/en/torbrowser.wml:114
 msgid ""
 "<a href=\"../dist/torbrowser/tor-im-browser-<version-"
 "torimbrowserbundle>_ru.exe\">&#x0420;&#x0443;&#x0441;&#x0441;&#x043a;&#x0438;&#x0439;"
@@ -448,7 +448,7 @@
 "torimbrowserbundle>_ru.exe.asc\" style=\"font-size: 90%;\">التوقيع</a>)"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:116
+#: /home/runa/dev/website/projects/en/torbrowser.wml:116
 msgid ""
 "<a href=\"../dist/torbrowser/tor-im-browser-<version-"
 "torimbrowserbundle>_vi.exe\">Vietnamese (vi)</a> (<a "
@@ -461,7 +461,7 @@
 "torimbrowserbundle>_vi.exe.asc\" style=\"font-size: 90%;\">التوقيع</a>)"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:118
+#: /home/runa/dev/website/projects/en/torbrowser.wml:118
 msgid ""
 "<a href=\"../dist/torbrowser/tor-im-browser-<version-torimbrowserbundle>_zh-"
 "CN.exe\">&#x7b80;&#x4f53;&#x5b57; (zh-CN)</a> (<a href=\"../dist/torbrowser"
@@ -474,16 +474,14 @@
 "size: 90%;\">التوقيع</a>)"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:122
+#: /home/runa/dev/website/projects/en/torbrowser.wml:122
 msgid ""
-"BETA: Tor Browser Bundle for Intel Mac OS X with Firefox (version <version-"
-"torbrowserbundleosx>, 28 MB)"
+"BETA: Tor Browser Bundle for Intel Mac OS X 10.5 and higher with Firefox "
+"(version <version-torbrowserbundleosx>, 28 MB)"
 msgstr ""
-"بيتا: حزمة متصفح تور لIntel Mac OS X مع فيرفكس (النسخة  <version-"
-"torbrowserbundleosx>، 28 م.ب)"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:126
+#: /home/runa/dev/website/projects/en/torbrowser.wml:126
 msgid ""
 "<a href=\"../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx"
 ">-dev-osx-i386-en-US.zip\">English (en-US)</a> (<a "
@@ -496,7 +494,7 @@
 "osx-i386-en-US.zip.asc\" style=\"font-size: 90%;\">التوقيع</a>)"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:129
+#: /home/runa/dev/website/projects/en/torbrowser.wml:129
 msgid ""
 "<a href=\"../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx"
 ">-dev-"
@@ -513,7 +511,7 @@
 "90%;\">التوقيع</a>)"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:133
+#: /home/runa/dev/website/projects/en/torbrowser.wml:133
 msgid ""
 "<a href=\"../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx"
 ">-dev-osx-i386-de.zip\">Deutsch (de)</a> (<a "
@@ -526,7 +524,7 @@
 "osx-i386-de.zip.asc\" style=\"font-size: 90%;\">التوقيع</a>)"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:136
+#: /home/runa/dev/website/projects/en/torbrowser.wml:136
 msgid ""
 "<a href=\"../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx"
 ">-dev-osx-i386-es-"
@@ -543,7 +541,7 @@
 "90%;\">التوقيع</a>)"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:140
+#: /home/runa/dev/website/projects/en/torbrowser.wml:140
 msgid ""
 "<a href=\"../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx"
 ">-dev-osx-i386-fa.zip\">&#x0641;&#x0627;&#x0631;&#x0633;&#x06cc; (fa) </a> "
@@ -556,7 +554,7 @@
 ">-dev-osx-i386-fa.zip.asc\" style=\"font-size: 90%;\">التوقيع</a>)"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:143
+#: /home/runa/dev/website/projects/en/torbrowser.wml:143
 msgid ""
 "<a href=\"../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx"
 ">-dev-"
@@ -573,7 +571,7 @@
 "90%;\">التوقيع</a>)"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:146
+#: /home/runa/dev/website/projects/en/torbrowser.wml:146
 msgid ""
 "<a href=\"../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx"
 ">-dev-osx-i386-it.zip\">Italiano (it)</a> (<a "
@@ -586,7 +584,7 @@
 "osx-i386-it.zip.asc\" style=\"font-size: 90%;\">التوقيع</a>)"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:149
+#: /home/runa/dev/website/projects/en/torbrowser.wml:149
 msgid ""
 "<a href=\"../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx"
 ">-dev-osx-i386-nl.zip\">Nederlands (nl)</a> (<a "
@@ -599,7 +597,7 @@
 "osx-i386-nl.zip.asc\" style=\"font-size: 90%;\">التوقيع</a>)"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:152
+#: /home/runa/dev/website/projects/en/torbrowser.wml:152
 msgid ""
 "<a href=\"../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx"
 ">-dev-osx-i386-pl.zip\">Polish (pl)</a> (<a "
@@ -612,7 +610,7 @@
 "osx-i386-pl.zip.asc\" style=\"font-size: 90%;\">التوقيع</a>)"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:155
+#: /home/runa/dev/website/projects/en/torbrowser.wml:155
 msgid ""
 "<a href=\"../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx"
 ">-dev-osx-i386-pt-"
@@ -629,7 +627,7 @@
 "90%;\">التوقيع</a>)"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:158
+#: /home/runa/dev/website/projects/en/torbrowser.wml:158
 msgid ""
 "<a href=\"../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx"
 ">-dev-"
@@ -646,7 +644,7 @@
 "90%;\">التوقيع</a>)"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:162
+#: /home/runa/dev/website/projects/en/torbrowser.wml:162
 msgid ""
 "<a href=\"../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx"
 ">-dev-osx-i386-zh-CN.zip\">&#x7b80;&#x4f53;&#x5b57; (zh-CN)</a> (<a "
@@ -659,7 +657,7 @@
 "osx-i386-zh-CN.zip.asc\" style=\"font-size: 90%;\">التوقيع</a>)"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:169
+#: /home/runa/dev/website/projects/en/torbrowser.wml:169
 msgid ""
 "BETA: Tor Browser Bundle for Linux with Firefox (version <version-"
 "torbrowserbundlelinux32> (32-bit), <version-torbrowserbundlelinux64> "
@@ -667,7 +665,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:172
+#: /home/runa/dev/website/projects/en/torbrowser.wml:172
 msgid ""
 "English (en-US): <a href=\"../dist/torbrowser/linux/tor-browser-gnu-"
 "linux-i686-<version-torbrowserbundlelinux32>-dev-en-US.tar.gz\">32-bit</a> "
@@ -681,7 +679,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:175
+#: /home/runa/dev/website/projects/en/torbrowser.wml:175
 msgid ""
 "&#x0627;&#x0644;&#x0639;&#x0631;&#x0628;&#x064a;&#x0629; (ar): <a "
 "href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-"
@@ -696,7 +694,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:177
+#: /home/runa/dev/website/projects/en/torbrowser.wml:177
 msgid ""
 "Deutsch (de): <a href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-i686"
 "-<version-torbrowserbundlelinux32>-dev-de.tar.gz\">32-bit</a> (<a "
@@ -710,7 +708,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:179
+#: /home/runa/dev/website/projects/en/torbrowser.wml:179
 msgid ""
 "&#x0045;&#x0073;&#x0070;&#x0061;&#x00f1;&#x006f;&#x006c; (es-ES): <a "
 "href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-"
@@ -725,7 +723,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:181
+#: /home/runa/dev/website/projects/en/torbrowser.wml:181
 msgid ""
 "&#x0641;&#x0627;&#x0631;&#x0633;&#x06cc; (fa): <a "
 "href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-"
@@ -740,7 +738,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:183
+#: /home/runa/dev/website/projects/en/torbrowser.wml:183
 msgid ""
 "&#x0046;&#x0072;&#x0061;&#x006e;&#x00e7;&#x0061;&#x0069;&#x0073; (fr): <a "
 "href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-"
@@ -755,7 +753,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:185
+#: /home/runa/dev/website/projects/en/torbrowser.wml:185
 msgid ""
 "Italiano (it): <a href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-i686"
 "-<version-torbrowserbundlelinux32>-dev-it.tar.gz\">32-bit</a> (<a "
@@ -769,7 +767,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:187
+#: /home/runa/dev/website/projects/en/torbrowser.wml:187
 msgid ""
 "Nederlands (nl): <a href=\"../dist/torbrowser/linux/tor-browser-gnu-"
 "linux-i686-<version-torbrowserbundlelinux32>-dev-nl.tar.gz\">32-bit</a> (<a "
@@ -783,7 +781,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:189
+#: /home/runa/dev/website/projects/en/torbrowser.wml:189
 msgid ""
 "Polish (pl): <a href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-i686"
 "-<version-torbrowserbundlelinux32>-dev-pl.tar.gz\">32-bit</a> (<a "
@@ -797,7 +795,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:191
+#: /home/runa/dev/website/projects/en/torbrowser.wml:191
 msgid ""
 "&#x0050;&#x006f;&#x0072;&#x0074;&#x0075;&#x0067;&#x0075;&#x00ea;&#x0073; "
 "(pt-PT): <a href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-i686"
@@ -812,7 +810,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:193
+#: /home/runa/dev/website/projects/en/torbrowser.wml:193
 msgid ""
 "&#x0420;&#x0443;&#x0441;&#x0441;&#x043a;&#x0438;&#x0439; (ru): <a "
 "href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-"
@@ -827,7 +825,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:195
+#: /home/runa/dev/website/projects/en/torbrowser.wml:195
 msgid ""
 "&#x7b80;&#x4f53;&#x5b57; (zh-CN): <a href=\"../dist/torbrowser/linux/tor-"
 "browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-zh-"
@@ -841,7 +839,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:201
+#: /home/runa/dev/website/projects/en/torbrowser.wml:201
 msgid ""
 "See our instructions on <a href=\"<page docs/verifying-signatures>\">how to "
 "verify package signatures</a>, which allows you to make sure you've "
@@ -859,17 +857,17 @@
 "حاليًا مع موزيلا لنرى إن كانت تريد أن نغير الاسم ليكون ذلك أوضح."
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:211
+#: /home/runa/dev/website/projects/en/torbrowser.wml:211
 msgid "<a id=\"MacOSX\"></a>"
 msgstr "<a id=\"MacOSX\"></a>"
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:212
+#: /home/runa/dev/website/projects/en/torbrowser.wml:212
 msgid "<a class=\"anchor\" href=\"#MacOSX\">Mac OS X instructions</a>"
 msgstr "<a class=\"anchor\" href=\"#MacOSX\">تعليمات Mac OS X</a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:213
+#: /home/runa/dev/website/projects/en/torbrowser.wml:213
 msgid ""
 "Download the file above, save it somewhere, then click on it. Mac OS X will "
 "automatically unarchive it and you will have a TorBrowser application in "
@@ -882,18 +880,25 @@
 "TorBrowser_ar.app). انقر تطبيق متصفح تور لتبدأ ڤيداليا. عندما يتصل ڤيداليا "
 "بتور سيبدأ فيرفكس."
 
+#. type: Content of: <div><div><p>
+#: /home/runa/dev/website/projects/en/torbrowser.wml:219
+msgid ""
+"<img src=\"$(IMGROOT)/screenshot-osx-torbrowser-icon.png\" alt=\"Screenshot "
+"Mac OS X bundle\" />"
+msgstr ""
+
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:219
+#: /home/runa/dev/website/projects/en/torbrowser.wml:221
 msgid "<a id=\"Linux\"></a>"
 msgstr "<a id=\"Linux\"></a>"
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:220
+#: /home/runa/dev/website/projects/en/torbrowser.wml:222
 msgid "<a class=\"anchor\" href=\"#Linux\">Linux instructions</a>"
 msgstr "<a class=\"anchor\" href=\"#Linux\">تعليمات لينكس</a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:221
+#: /home/runa/dev/website/projects/en/torbrowser.wml:223
 msgid ""
 "Download the architecture-appropriate file above, save it somewhere, then "
 "run:<br> tar -xvzf tor-browser-gnu-linux-i686-<version-"
@@ -906,17 +911,17 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:230
+#: /home/runa/dev/website/projects/en/torbrowser.wml:232
 msgid "<a id=\"Extraction\"></a>"
 msgstr "<a id=\"Extraction\"></a>"
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:231
+#: /home/runa/dev/website/projects/en/torbrowser.wml:233
 msgid "<a class=\"anchor\" href=\"#Extraction\">Extraction</a>"
 msgstr "<a class=\"anchor\" href=\"#Extraction\">الاستخراج</a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:233
+#: /home/runa/dev/website/projects/en/torbrowser.wml:235
 msgid ""
 "Download the file above, and save it somewhere, then double click on it.  "
 "Click on the button labelled <strong>\"...\"</strong> (1) and select where "
@@ -934,7 +939,7 @@
 "USB."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:241
+#: /home/runa/dev/website/projects/en/torbrowser.wml:243
 msgid ""
 "Click <strong>Extract</strong> (3) to begin extraction. This may take a few "
 "minutes to complete."
@@ -943,24 +948,24 @@
 " إلى أن يكتمل."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:244
+#: /home/runa/dev/website/projects/en/torbrowser.wml:246
 msgid ""
 "<img src=\"$(IMGROOT)/tbb-screenshot1.png\" alt=\"Screenshot of extraction "
 "process\" />"
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:247
+#: /home/runa/dev/website/projects/en/torbrowser.wml:249
 msgid "<a id=\"Usage\"></a>"
 msgstr "<a id=\"Usage\"></a>"
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:248
+#: /home/runa/dev/website/projects/en/torbrowser.wml:250
 msgid "<a class=\"anchor\" href=\"#Usage\">Usage</a>"
 msgstr "<a class=\"anchor\" href=\"#Usage\">الاستخدام</a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:250
+#: /home/runa/dev/website/projects/en/torbrowser.wml:252
 msgid ""
 "Once extraction is complete, open the folder <strong>Tor Browser</strong> "
 "from the location you saved the bundle."
@@ -969,7 +974,7 @@
 " عندما يكتمل الاستخراج."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:252
+#: /home/runa/dev/website/projects/en/torbrowser.wml:254
 msgid ""
 "Double click on the <strong>Start Tor Browser</strong> (4) application (it "
 "may be called <strong>Start Tor Browser.exe</strong> on some systems.)"
@@ -978,19 +983,19 @@
 " <strong>Start Tor Browser.exe</strong> على بعض الأنظمة.)"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:255
+#: /home/runa/dev/website/projects/en/torbrowser.wml:257
 msgid "The Vidalia window will shortly appear."
 msgstr "سوف تظهر نافذة فيداليا بعد ذلك بفترة وجيزة."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:257
+#: /home/runa/dev/website/projects/en/torbrowser.wml:259
 msgid ""
 "<img src=\"$(IMGROOT)/tbb-screenshot2.png\" alt=\"Screenshot of bundle "
 "startup\" />"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:260
+#: /home/runa/dev/website/projects/en/torbrowser.wml:262
 msgid ""
 "Once Tor is ready, Firefox will automatically be opened. Only web pages "
 "visited through the included Firefox browser will be sent via Tor. Other web"
@@ -1007,7 +1012,7 @@
 "وأغلق فيرفكس إن كام مفتوحًا قبل البدء لتتجنب الخلط بين نسخ فيرفكس."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:267
+#: /home/runa/dev/website/projects/en/torbrowser.wml:269
 msgid ""
 "If you installed the Tor IM Browser Bundle, the Pidgin instant messaging "
 "client will also be automatically opened."
@@ -1016,7 +1021,7 @@
 "بدجن تلقائيًا أيضًا."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:269
+#: /home/runa/dev/website/projects/en/torbrowser.wml:271
 msgid ""
 "Once you are finished browsing, close any open Firefox windows by clicking "
 "on the <img src=\"$(IMGROOT)/tbb-close-button.png\" alt=\"Close button "
@@ -1025,12 +1030,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:275
+#: /home/runa/dev/website/projects/en/torbrowser.wml:277
 msgid "<img src=\"$(IMGROOT)/tbb-screenshot3a.png\" alt=\"Screenshot of Firefox\" />"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:278
+#: /home/runa/dev/website/projects/en/torbrowser.wml:280
 msgid ""
 "With the Tor Browser Bundle, Vidalia and Tor will automatically close. With "
 "the Tor IM Browser Bundle you need to also close Pidgin by right-clicking on"
@@ -1040,12 +1045,12 @@
 "ومراسله الفوري فعليك إغلاق بدجن بالنقر أيقونته (7) يمينًا واختيار أنهِ (8)."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:280
+#: /home/runa/dev/website/projects/en/torbrowser.wml:282
 msgid "<img src=\"$(IMGROOT)/tbb-screenshot3b.png\" alt=\"Screenshot of Pidgin\" />"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:283
+#: /home/runa/dev/website/projects/en/torbrowser.wml:285
 msgid ""
 "To use the Tor Browser Bundle or Tor IM Browser Bundle again, repeat the "
 "steps in <a href=\"#Usage\">\"Usage\"</a>."
@@ -1054,7 +1059,7 @@
 "متصفح تور أو حزمة متصفح تور ومراسله الفوري مرة أخرى."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:285
+#: /home/runa/dev/website/projects/en/torbrowser.wml:287
 msgid ""
 "Remember that Tor anonymizes the origin of your traffic, and it encrypts "
 "everything inside the Tor network, but <a "
@@ -1071,17 +1076,17 @@
 "والاستيثاق بين النهايتين."
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:293
+#: /home/runa/dev/website/projects/en/torbrowser.wml:295
 msgid "<a id=\"Feedback\"></a>"
 msgstr "<a id=\"Feedback\"></a>"
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:294
+#: /home/runa/dev/website/projects/en/torbrowser.wml:296
 msgid "<a class=\"anchor\" href=\"#Feedback\">Comments and suggestions</a>"
 msgstr "<a class=\"anchor\" href=\"#Feedback\">التعليقات والاقتراحات</a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:296
+#: /home/runa/dev/website/projects/en/torbrowser.wml:298
 msgid ""
 "The Tor Browser Bundle is under development and not yet complete.  To "
 "discuss improvements and submit comments, please use the <a "
@@ -1092,17 +1097,17 @@
 "href=\"http://archives.seul.org/or/talk/\">or-talk</a> البريدية."
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:300
+#: /home/runa/dev/website/projects/en/torbrowser.wml:302
 msgid "<a id=\"More\"></a>"
 msgstr "<a id=\"More\"></a>"
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:301
+#: /home/runa/dev/website/projects/en/torbrowser.wml:303
 msgid "<a class=\"anchor\" href=\"#More\">More information</a>"
 msgstr "<a class=\"anchor\" href=\"#More\">مزيد من المعلومات</a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:303
+#: /home/runa/dev/website/projects/en/torbrowser.wml:305
 msgid ""
 "<strong>What is Tor and why do I need it?</strong> To learn more about Tor, "
 "visit the <a href=\"<page index>\">Tor Project website</a>."
@@ -1111,7 +1116,7 @@
 "href=\"<page index>\">موقع مشروع تور</a>."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:307
+#: /home/runa/dev/website/projects/en/torbrowser.wml:309
 msgid ""
 "<strong>What is in the Tor Browser Bundle?</strong> It contains Tor, "
 "Vidalia, Polipo, Firefox, and Torbutton (<a href=\"<page projects"
@@ -1122,7 +1127,7 @@
 "details>#contents\">تعلم المزيد</a>)."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:311
+#: /home/runa/dev/website/projects/en/torbrowser.wml:313
 msgid ""
 "<strong>What is in the Tor IM Browser Bundle?</strong> It contains Tor, "
 "Vidalia, Polipo, Firefox, Torbutton, Pidgin and OTR (<a href=\"<page "
@@ -1133,7 +1138,7 @@
 "/torbrowser-details>#contents\">تعلم المزيد</a>)."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:315
+#: /home/runa/dev/website/projects/en/torbrowser.wml:317
 msgid ""
 "<strong>How can I make my own bundle?</strong> To download the source code "
 "and learn how to build the bundle yourself, read the <a href=\"<page "
@@ -1144,7 +1149,7 @@
 "details>#build\">تعليمات البناء</a>.\n"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:319
+#: /home/runa/dev/website/projects/en/torbrowser.wml:321
 msgid ""
 "Tor Browser Bundle is partially based on <a "
 "href=\"http://portableapps.com/apps/internet/firefox_portable\">Mozilla "

Modified: translation/trunk/projects/website/po/ar/projects/3-low.gettor.po
===================================================================
--- translation/trunk/projects/website/po/ar/projects/3-low.gettor.po	2011-04-12 16:15:00 UTC (rev 24594)
+++ translation/trunk/projects/website/po/ar/projects/3-low.gettor.po	2011-04-12 16:19:31 UTC (rev 24595)
@@ -8,7 +8,7 @@
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
 "POT-Creation-Date: 2010-12-26 17:27+0000\n"
-"PO-Revision-Date: 2011-03-27 17:33+0000\n"
+"PO-Revision-Date: 2011-04-12 16:14+0000\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"

Modified: translation/trunk/projects/website/po/ar/projects/3-low.projects.po
===================================================================
--- translation/trunk/projects/website/po/ar/projects/3-low.projects.po	2011-04-12 16:15:00 UTC (rev 24594)
+++ translation/trunk/projects/website/po/ar/projects/3-low.projects.po	2011-04-12 16:19:31 UTC (rev 24595)
@@ -8,7 +8,7 @@
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
 "POT-Creation-Date: 2011-03-17 18:05+0000\n"
-"PO-Revision-Date: 2011-03-27 17:37+0000\n"
+"PO-Revision-Date: 2011-04-12 16:15+0000\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"

Modified: translation/trunk/projects/website/po/ar/projects/3-low.puppettor.po
===================================================================
--- translation/trunk/projects/website/po/ar/projects/3-low.puppettor.po	2011-04-12 16:15:00 UTC (rev 24594)
+++ translation/trunk/projects/website/po/ar/projects/3-low.puppettor.po	2011-04-12 16:19:31 UTC (rev 24595)
@@ -8,7 +8,7 @@
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
 "POT-Creation-Date: 2010-12-26 14:32+0000\n"
-"PO-Revision-Date: 2011-03-27 17:35+0000\n"
+"PO-Revision-Date: 2011-04-12 16:09+0000\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"

Modified: translation/trunk/projects/website/po/ar/projects/3-low.tordnsel.po
===================================================================
--- translation/trunk/projects/website/po/ar/projects/3-low.tordnsel.po	2011-04-12 16:15:00 UTC (rev 24594)
+++ translation/trunk/projects/website/po/ar/projects/3-low.tordnsel.po	2011-04-12 16:19:31 UTC (rev 24595)
@@ -8,7 +8,7 @@
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
 "POT-Creation-Date: 2010-12-26 14:32+0000\n"
-"PO-Revision-Date: 2011-03-27 17:36+0000\n"
+"PO-Revision-Date: 2011-04-12 16:08+0000\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"

Modified: translation/trunk/projects/website/po/ar/projects/3-low.torweather.po
===================================================================
--- translation/trunk/projects/website/po/ar/projects/3-low.torweather.po	2011-04-12 16:15:00 UTC (rev 24594)
+++ translation/trunk/projects/website/po/ar/projects/3-low.torweather.po	2011-04-12 16:19:31 UTC (rev 24595)
@@ -8,7 +8,7 @@
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
 "POT-Creation-Date: 2011-02-12 12:19+0000\n"
-"PO-Revision-Date: 2011-03-27 17:28+0000\n"
+"PO-Revision-Date: 2011-04-12 16:15+0000\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"

Modified: translation/trunk/projects/website/po/ar/projects/4-optional.arm.po
===================================================================
--- translation/trunk/projects/website/po/ar/projects/4-optional.arm.po	2011-04-12 16:15:00 UTC (rev 24594)
+++ translation/trunk/projects/website/po/ar/projects/4-optional.arm.po	2011-04-12 16:19:31 UTC (rev 24595)
@@ -8,7 +8,7 @@
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
 "POT-Creation-Date: 2010-12-26 14:32+0000\n"
-"PO-Revision-Date: 2011-03-27 17:37+0000\n"
+"PO-Revision-Date: 2011-04-12 16:15+0000\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"

Modified: translation/trunk/projects/website/po/ar/projects/4-optional.torbrowser-details.po
===================================================================
--- translation/trunk/projects/website/po/ar/projects/4-optional.torbrowser-details.po	2011-04-12 16:15:00 UTC (rev 24594)
+++ translation/trunk/projects/website/po/ar/projects/4-optional.torbrowser-details.po	2011-04-12 16:19:31 UTC (rev 24595)
@@ -8,7 +8,7 @@
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
 "POT-Creation-Date: 2010-12-26 14:32+0000\n"
-"PO-Revision-Date: 2011-03-27 17:37+0000\n"
+"PO-Revision-Date: 2011-04-12 16:11+0000\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"

Modified: translation/trunk/projects/website/po/ar/torbutton/3-low.index.po
===================================================================
--- translation/trunk/projects/website/po/ar/torbutton/3-low.index.po	2011-04-12 16:15:00 UTC (rev 24594)
+++ translation/trunk/projects/website/po/ar/torbutton/3-low.index.po	2011-04-12 16:19:31 UTC (rev 24595)
@@ -8,7 +8,7 @@
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
 "POT-Creation-Date: 2010-12-26 14:32+0000\n"
-"PO-Revision-Date: 2011-03-27 17:30+0000\n"
+"PO-Revision-Date: 2011-04-12 16:08+0000\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"

Modified: translation/trunk/projects/website/po/ar/torbutton/3-low.torbutton-faq.po
===================================================================
--- translation/trunk/projects/website/po/ar/torbutton/3-low.torbutton-faq.po	2011-04-12 16:15:00 UTC (rev 24594)
+++ translation/trunk/projects/website/po/ar/torbutton/3-low.torbutton-faq.po	2011-04-12 16:19:31 UTC (rev 24595)
@@ -8,7 +8,7 @@
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
 "POT-Creation-Date: 2011-03-17 18:05+0000\n"
-"PO-Revision-Date: 2011-03-27 17:31+0000\n"
+"PO-Revision-Date: 2011-04-12 16:12+0000\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"

Modified: translation/trunk/projects/website/po/ar/torbutton/3-low.torbutton-options.po
===================================================================
--- translation/trunk/projects/website/po/ar/torbutton/3-low.torbutton-options.po	2011-04-12 16:15:00 UTC (rev 24594)
+++ translation/trunk/projects/website/po/ar/torbutton/3-low.torbutton-options.po	2011-04-12 16:19:31 UTC (rev 24595)
@@ -8,7 +8,7 @@
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
 "POT-Creation-Date: 2010-12-26 14:32+0000\n"
-"PO-Revision-Date: 2011-03-27 17:37+0000\n"
+"PO-Revision-Date: 2011-04-12 16:13+0000\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"

Modified: translation/trunk/projects/website/po/cs/1-high.index.po
===================================================================
--- translation/trunk/projects/website/po/cs/1-high.index.po	2011-04-12 16:15:00 UTC (rev 24594)
+++ translation/trunk/projects/website/po/cs/1-high.index.po	2011-04-12 16:19:31 UTC (rev 24595)
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-03-17 18:05+0000\n"
-"PO-Revision-Date: 2011-03-22 16:15+0000\n"
+"POT-Creation-Date: 2011-03-28 12:48+0200\n"
+"PO-Revision-Date: 2011-03-29 00:25+0000\n"
 "Last-Translator: Elisa <valhalla at gishpuppy.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
@@ -18,14 +18,14 @@
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
 
 #. type: Content of: <div><div><div><div><ul><li>
-#: /home/runa/tor/website/en/index.wml:12
+#: /home/runa/dev/website/en/index.wml:12
 msgid "Tor prevents anyone from learning your location or browsing habits."
 msgstr ""
 "Tor zabraňuje komukoli, aby studoval vaše prohlížející zvyklosti nebo "
 "odhalil vaši lokaci.\n"
 
 #. type: Content of: <div><div><div><div><ul><li>
-#: /home/runa/tor/website/en/index.wml:13
+#: /home/runa/dev/website/en/index.wml:13
 msgid ""
 "Tor is for web browsers, instant messaging clients, remote logins, and more."
 msgstr ""
@@ -33,17 +33,17 @@
 "přístup a spoustu dalšího.\n"
 
 #. type: Content of: <div><div><div><div><ul><li>
-#: /home/runa/tor/website/en/index.wml:14
+#: /home/runa/dev/website/en/index.wml:14
 msgid "Tor is free and open source for Windows, Mac, Linux/Unix, and Android"
 msgstr "Tor je zdarma a otevřený kód  open source program."
 
 #. type: Content of: <div><div><div><div><h1>
-#: /home/runa/tor/website/en/index.wml:16
+#: /home/runa/dev/website/en/index.wml:16
 msgid "Anonymity Online"
 msgstr "Anonymita Online"
 
 #. type: Content of: <div><div><div><div><p>
-#: /home/runa/tor/website/en/index.wml:17
+#: /home/runa/dev/website/en/index.wml:17
 msgid ""
 "Protect your privacy. Defend yourself against network surveillance and "
 "traffic analysis."
@@ -52,7 +52,7 @@
 "přenášená data.\n"
 
 #. type: Content of: <div><div><div><div><div>
-#: /home/runa/tor/website/en/index.wml:20
+#: /home/runa/dev/website/en/index.wml:20
 msgid ""
 "<a href=\"<page download/download>\"> <span class=\"download-tor\">Download "
 "Tor</span></a>"
@@ -61,12 +61,12 @@
 "Tor</span></a>"
 
 #. type: Content of: <div><div><div><div><div><h2>
-#: /home/runa/tor/website/en/index.wml:26
+#: /home/runa/dev/website/en/index.wml:26
 msgid "What is Tor?"
 msgstr "Co je Tor ?"
 
 #. type: Content of: <div><div><div><div><div><p>
-#: /home/runa/tor/website/en/index.wml:26
+#: /home/runa/dev/website/en/index.wml:26
 msgid ""
 "Tor is free software and an open network that helps you defend against a "
 "form of network surveillance that threatens personal freedom and privacy, "
@@ -82,12 +82,12 @@
 "href=\"<page about/overview>\">Dovědět se víc o Tor &raquo;</a></span>"
 
 #. type: Content of: <div><div><div><div><div><h2>
-#: /home/runa/tor/website/en/index.wml:36
+#: /home/runa/dev/website/en/index.wml:36
 msgid "Why Anonymity Matters"
 msgstr "Proč na Anonymitě Záleží\n"
 
 #. type: Content of: <div><div><div><div><div><p>
-#: /home/runa/tor/website/en/index.wml:37
+#: /home/runa/dev/website/en/index.wml:37
 msgid ""
 "Tor protects you by bouncing your communications around a distributed "
 "network of relays run by volunteers all around the world: it prevents "
@@ -100,110 +100,110 @@
 msgstr ""
 
 #. type: Content of: <div><div><div><div><h2>
-#: /home/runa/tor/website/en/index.wml:50
+#: /home/runa/dev/website/en/index.wml:50
 msgid "Our Projects"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><table><tr><td>
-#: /home/runa/tor/website/en/index.wml:55
+#: /home/runa/dev/website/en/index.wml:55
 msgid "<img src=\"$(IMGROOT)/icon-TorButton.jpg\" alt=\"Torbutton Icon\">"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><table><tr><td><h3>
-#: /home/runa/tor/website/en/index.wml:56
+#: /home/runa/dev/website/en/index.wml:56
 msgid "<a href=\"<page torbutton/index>\">Torbutton</a>"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><table><tr><td><p>
-#: /home/runa/tor/website/en/index.wml:57
+#: /home/runa/dev/website/en/index.wml:57
 msgid ""
 "Torbutton is a 1-click way for Firefox users to enable or disable Tor in "
 "Firefox."
 msgstr ""
 
 #. type: Content of: <div><div><div><div><table><tr><td>
-#: /home/runa/tor/website/en/index.wml:61
+#: /home/runa/dev/website/en/index.wml:61
 msgid "<img src=\"$(IMGROOT)/icon-TorCheck.jpg\" alt=\"Tor Check Icon\">"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><table><tr><td><h3>
-#: /home/runa/tor/website/en/index.wml:62
+#: /home/runa/dev/website/en/index.wml:62
 msgid "<a href=\"https://check.torproject.org/\">Check</a>"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><table><tr><td><p>
-#: /home/runa/tor/website/en/index.wml:63
+#: /home/runa/dev/website/en/index.wml:63
 msgid "Check determines if you are successfully browsing with Tor."
 msgstr ""
 
 #. type: Content of: <div><div><div><div><table><tr><td>
-#: /home/runa/tor/website/en/index.wml:69
+#: /home/runa/dev/website/en/index.wml:69
 msgid "<img src=\"$(IMGROOT)/icon-Vidalia.jpg\" alt=\"Vidalia Icon\">"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><table><tr><td><h3>
-#: /home/runa/tor/website/en/index.wml:70
+#: /home/runa/dev/website/en/index.wml:70
 msgid "<a href=\"<page projects/vidalia>\">Vidalia</a>"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><table><tr><td><p>
-#: /home/runa/tor/website/en/index.wml:71
+#: /home/runa/dev/website/en/index.wml:71
 msgid ""
 "Vidalia is a graphical way to control and view Tor's connections and "
 "settings."
 msgstr ""
 
 #. type: Content of: <div><div><div><div><table><tr><td>
-#: /home/runa/tor/website/en/index.wml:75
+#: /home/runa/dev/website/en/index.wml:75
 msgid "<img src=\"$(IMGROOT)/icon-TorBrowser.jpg\" alt=\"TorBrowser Icon\">"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><table><tr><td><h3>
-#: /home/runa/tor/website/en/index.wml:76
+#: /home/runa/dev/website/en/index.wml:76
 msgid "<a href=\"<page projects/torbrowser>\">Tor Browser</a>"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><table><tr><td><p>
-#: /home/runa/tor/website/en/index.wml:78
+#: /home/runa/dev/website/en/index.wml:78
 msgid ""
 "Tor Browser contains everything you need to safely browse the Internet."
 msgstr ""
 
 #. type: Content of: <div><div><div><div><h2>
-#: /home/runa/tor/website/en/index.wml:90
+#: /home/runa/dev/website/en/index.wml:90
 msgid "Who Uses Tor?"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><div><h3>
-#: /home/runa/tor/website/en/index.wml:93
+#: /home/runa/dev/website/en/index.wml:93
 msgid ""
 "<a href=\"<page about/torusers>#normalusers\"><img "
 "src=\"$(IMGROOT)/family.jpg\" alt=\"Normal People\">Family &amp; Friends</a>"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><div><p>
-#: /home/runa/tor/website/en/index.wml:95
+#: /home/runa/dev/website/en/index.wml:95
 msgid ""
 "People like you and your family use Tor to protect themselves, their "
 "children, and their dignity while using the Internet."
 msgstr ""
 
 #. type: Content of: <div><div><div><div><div><h3>
-#: /home/runa/tor/website/en/index.wml:99
+#: /home/runa/dev/website/en/index.wml:99
 msgid ""
 "<a href=\"<page about/torusers>#executives\"><img "
 "src=\"$(IMGROOT)/consumers.jpg\" alt=\"Businesses\">Businesses</a>"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><div><p>
-#: /home/runa/tor/website/en/index.wml:101
+#: /home/runa/dev/website/en/index.wml:101
 msgid ""
 "Businesses use Tor to research competition, keep business strategies "
 "confidential, and facilitate internal accountability."
 msgstr ""
 
 #. type: Content of: <div><div><div><div><div><h3>
-#: /home/runa/tor/website/en/index.wml:105
+#: /home/runa/dev/website/en/index.wml:105
 msgid ""
 "<a href=\"<page about/torusers>#activists\"><img "
 "src=\"$(IMGROOT)/activists.jpg\" alt=\"Activists &amp; "
@@ -211,28 +211,28 @@
 msgstr ""
 
 #. type: Content of: <div><div><div><div><div><p>
-#: /home/runa/tor/website/en/index.wml:107
+#: /home/runa/dev/website/en/index.wml:107
 msgid ""
 "Activists use Tor to anonymously report abuses from danger zones.  "
 "Whistleblowers use Tor to safely report on corruption."
 msgstr ""
 
 #. type: Content of: <div><div><div><div><div><h3>
-#: /home/runa/tor/website/en/index.wml:111
+#: /home/runa/dev/website/en/index.wml:111
 msgid ""
 "<a href=\"<page about/torusers>#journalist\"><img "
 "src=\"$(IMGROOT)/media.jpg\" alt=\"Journalists and the Media\">Media</a>"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><div><p>
-#: /home/runa/tor/website/en/index.wml:113
+#: /home/runa/dev/website/en/index.wml:113
 msgid ""
 "Journalists and the media use Tor to protect their research and sources "
 "online."
 msgstr ""
 
 #. type: Content of: <div><div><div><div><div><h3>
-#: /home/runa/tor/website/en/index.wml:117
+#: /home/runa/dev/website/en/index.wml:117
 msgid ""
 "<a href=\"<page about/torusers>#military\"><img "
 "src=\"$(IMGROOT)/military.jpg\" alt=\"Military and Law "
@@ -240,24 +240,39 @@
 msgstr ""
 
 #. type: Content of: <div><div><div><div><div><p>
-#: /home/runa/tor/website/en/index.wml:119
+#: /home/runa/dev/website/en/index.wml:119
 msgid ""
 "Militaries and law enforcement use Tor to protect their communications, "
 "investigations, and intelligence gathering online."
 msgstr ""
 
 #. type: Content of: <div><div><div><div><h2>
-#: /home/runa/tor/website/en/index.wml:123
+#: /home/runa/dev/website/en/index.wml:123
 msgid "Announcements"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><table><tr><td><div>
-#: /home/runa/tor/website/en/index.wml:128
+#: /home/runa/dev/website/en/index.wml:128
+msgid "<span class=\"month\">Mar</span><br><span class=\"day\">23</span>"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><table><tr><td><p>
+#: /home/runa/dev/website/en/index.wml:129
+msgid ""
+"The Tor Project wins the \"Project of Social Benefit\" award from the Free "
+"Software Foundation and GNU Project. We are honored to win this award and to"
+" be listed amongst the former winners. <a "
+"href=\"https://blog.torproject.org/blog/tor-project-receives-fsf-"
+"award\">Read more</a> about this award."
+msgstr ""
+
+#. type: Content of: <div><div><div><div><table><tr><td><div>
+#: /home/runa/dev/website/en/index.wml:135
 msgid "<span class=\"month\">Feb</span><br><span class=\"day\">23</span>"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><table><tr><td><p>
-#: /home/runa/tor/website/en/index.wml:129
+#: /home/runa/dev/website/en/index.wml:136
 msgid ""
 "The latest stable Tor version, 0.2.1.30, is <a "
 "href=\"https://lists.torproject.org/pipermail/tor-"
@@ -267,18 +282,3 @@
 "reachable from Iran again.  We don't expect this tweak will win the arms "
 "race long-term, but it buys us time until we roll out a better solution."
 msgstr ""
-
-#. type: Content of: <div><div><div><div><table><tr><td><div>
-#: /home/runa/tor/website/en/index.wml:138
-msgid "<span class=\"month\">Jan</span><br><span class=\"day\">30</span>"
-msgstr ""
-
-#. type: Content of: <div><div><div><div><table><tr><td><p>
-#: /home/runa/tor/website/en/index.wml:139
-msgid ""
-"Tor helping with Egypt.  Here's what we've learned <a "
-"href=\"https://blog.torproject.org/blog/recent-events-egypt\">about recent "
-"events in Egypt</a>. And we're keeping our <a href=\"<page "
-"press/inthemedia>\">In the media</a> page up to date with stories about how "
-"we're helping around the world."
-msgstr ""

Added: translation/trunk/projects/website/po/da/1-high.index.po
===================================================================
--- translation/trunk/projects/website/po/da/1-high.index.po	                        (rev 0)
+++ translation/trunk/projects/website/po/da/1-high.index.po	2011-04-12 16:19:31 UTC (rev 24595)
@@ -0,0 +1,324 @@
+# 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.
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
+"POT-Creation-Date: 2011-03-28 12:48+0200\n"
+"PO-Revision-Date: 2011-03-29 00:25+0000\n"
+"Last-Translator: aputsiaq <aputtu at gmail.com>\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"
+"Language: da\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#. type: Content of: <div><div><div><div><ul><li>
+#: /home/runa/dev/website/en/index.wml:12
+msgid "Tor prevents anyone from learning your location or browsing habits."
+msgstr ""
+"Tor forhindrer enhver fra at lære din placering eller browsevaner at kende. "
+
+#. type: Content of: <div><div><div><div><ul><li>
+#: /home/runa/dev/website/en/index.wml:13
+msgid ""
+"Tor is for web browsers, instant messaging clients, remote logins, and more."
+msgstr "Tor er for browser, kvikbesked-klienter, fjerne logind og mere."
+
+#. type: Content of: <div><div><div><div><ul><li>
+#: /home/runa/dev/website/en/index.wml:14
+msgid "Tor is free and open source for Windows, Mac, Linux/Unix, and Android"
+msgstr "Tor er fri og åben kildtekst for Windows, Mac, Linux/Unix og Android"
+
+#. type: Content of: <div><div><div><div><h1>
+#: /home/runa/dev/website/en/index.wml:16
+msgid "Anonymity Online"
+msgstr "Anonymitet Online"
+
+#. type: Content of: <div><div><div><div><p>
+#: /home/runa/dev/website/en/index.wml:17
+msgid ""
+"Protect your privacy. Defend yourself against network surveillance and "
+"traffic analysis."
+msgstr ""
+"Beskyt dit privatliv. Forsvar dig mod netværksovervågning og trafikanalyse."
+
+#. type: Content of: <div><div><div><div><div>
+#: /home/runa/dev/website/en/index.wml:20
+msgid ""
+"<a href=\"<page download/download>\"> <span class=\"download-tor\">Download "
+"Tor</span></a>"
+msgstr ""
+"<a href=\"<page download/download>\"> <span class=\"download-tor\">Hent "
+"Tor</span></a>"
+
+#. type: Content of: <div><div><div><div><div><h2>
+#: /home/runa/dev/website/en/index.wml:26
+msgid "What is Tor?"
+msgstr "Hvad er Tor?"
+
+#. type: Content of: <div><div><div><div><div><p>
+#: /home/runa/dev/website/en/index.wml:26
+msgid ""
+"Tor is free software and an open network that helps you defend against a "
+"form of network surveillance that threatens personal freedom and privacy, "
+"confidential business activities and relationships, and state security known"
+" as <a href=\"<page about/overview>\">traffic analysis</a><br><span "
+"class=\"continue\"><a href=\"<page about/overview>\">Learn more about Tor "
+"&raquo;</a></span>"
+msgstr ""
+"Tor er et frit og åben kildetekst netværk, der hjælper med at forsvare dig "
+"mod en form for netværksovervågning, som truer personlig frihed og "
+"privatliv, fortrolige forretningsaktiviteter og forhold, samt "
+"tilstandssikkerhed kendt som  <a href=\"<page "
+"about/overview>\">traffikanalyse</a><br><span class=\"continue\"><a "
+"href=\"<page about/overview>\">Lær mere om Tor &raquo;</a></span>"
+
+#. type: Content of: <div><div><div><div><div><h2>
+#: /home/runa/dev/website/en/index.wml:36
+msgid "Why Anonymity Matters"
+msgstr "Betydningen af anonymitet"
+
+#. type: Content of: <div><div><div><div><div><p>
+#: /home/runa/dev/website/en/index.wml:37
+msgid ""
+"Tor protects you by bouncing your communications around a distributed "
+"network of relays run by volunteers all around the world: it prevents "
+"somebody watching your Internet connection from learning what sites you "
+"visit, and it prevents the sites you visit from learning your physical "
+"location.  Tor works with many of your existing applications, including web "
+"browsers, instant messaging clients, remote login, and other applications "
+"based on the TCP protocol.<br><span class=\"continue\"><a href=\"<page "
+"getinvolved/volunteer>\">Get involved with Tor &raquo;</a></span>"
+msgstr ""
+"Tor beskytter dig ved at kaste din kommunikation rundt i et distribueret "
+"netværk af relæer, der drives af frivillge verden over: det forhindrer "
+"andre, som ser din internetforbindelse fra at få kendskab til hvilke sider "
+"du besøger ud fra din fysiske placering.  Tor fungerer med mange af dine "
+"eksisterende applikationer, inklusive browsere, kvikbesked-klienter, "
+"programmer til fjerne logind og andre applikationer som er baseret på TCP-"
+"protokollen.<br><span class=\"continue\"><a href=\"<page "
+"getinvolved/volunteer>\">Bliv involveret med Tor &raquo;</a></span>"
+
+#. type: Content of: <div><div><div><div><h2>
+#: /home/runa/dev/website/en/index.wml:50
+msgid "Our Projects"
+msgstr "Vores projekter"
+
+#. type: Content of: <div><div><div><div><table><tr><td>
+#: /home/runa/dev/website/en/index.wml:55
+msgid "<img src=\"$(IMGROOT)/icon-TorButton.jpg\" alt=\"Torbutton Icon\">"
+msgstr "<img src=\"$(IMGROOT)/icon-TorButton.jpg\" alt=\"Torbutton Ikon\">"
+
+#. type: Content of: <div><div><div><div><table><tr><td><h3>
+#: /home/runa/dev/website/en/index.wml:56
+msgid "<a href=\"<page torbutton/index>\">Torbutton</a>"
+msgstr "<a href=\"<page torbutton/index>\">Torbutton</a>"
+
+#. type: Content of: <div><div><div><div><table><tr><td><p>
+#: /home/runa/dev/website/en/index.wml:57
+msgid ""
+"Torbutton is a 1-click way for Firefox users to enable or disable Tor in "
+"Firefox."
+msgstr ""
+"Torbutton giver Firefox-brugere mulighed for at aktivere eller deaktivere "
+"Tor i Firefox med et enkelt klik."
+
+#. type: Content of: <div><div><div><div><table><tr><td>
+#: /home/runa/dev/website/en/index.wml:61
+msgid "<img src=\"$(IMGROOT)/icon-TorCheck.jpg\" alt=\"Tor Check Icon\">"
+msgstr "<img src=\"$(IMGROOT)/icon-TorCheck.jpg\" alt=\"Tor Check Ikon\">"
+
+#. type: Content of: <div><div><div><div><table><tr><td><h3>
+#: /home/runa/dev/website/en/index.wml:62
+msgid "<a href=\"https://check.torproject.org/\">Check</a>"
+msgstr "<a href=\"https://check.torproject.org/\">Check</a>"
+
+#. type: Content of: <div><div><div><div><table><tr><td><p>
+#: /home/runa/dev/website/en/index.wml:63
+msgid "Check determines if you are successfully browsing with Tor."
+msgstr "Check afgør om du faktisk browser med Tor."
+
+#. type: Content of: <div><div><div><div><table><tr><td>
+#: /home/runa/dev/website/en/index.wml:69
+msgid "<img src=\"$(IMGROOT)/icon-Vidalia.jpg\" alt=\"Vidalia Icon\">"
+msgstr "<img src=\"$(IMGROOT)/icon-Vidalia.jpg\" alt=\"Vidalia Ikon\">"
+
+#. type: Content of: <div><div><div><div><table><tr><td><h3>
+#: /home/runa/dev/website/en/index.wml:70
+msgid "<a href=\"<page projects/vidalia>\">Vidalia</a>"
+msgstr "<a href=\"<page projects/vidalia>\">Vidalia</a>"
+
+#. type: Content of: <div><div><div><div><table><tr><td><p>
+#: /home/runa/dev/website/en/index.wml:71
+msgid ""
+"Vidalia is a graphical way to control and view Tor's connections and "
+"settings."
+msgstr ""
+"Vidalia er en grafisk måde at kontrollere og se Tors forbindelselser og "
+"indstillinger."
+
+#. type: Content of: <div><div><div><div><table><tr><td>
+#: /home/runa/dev/website/en/index.wml:75
+msgid "<img src=\"$(IMGROOT)/icon-TorBrowser.jpg\" alt=\"TorBrowser Icon\">"
+msgstr "<img src=\"$(IMGROOT)/icon-TorBrowser.jpg\" alt=\"TorBrowser Ikon\">"
+
+#. type: Content of: <div><div><div><div><table><tr><td><h3>
+#: /home/runa/dev/website/en/index.wml:76
+msgid "<a href=\"<page projects/torbrowser>\">Tor Browser</a>"
+msgstr "<a href=\"<page projects/torbrowser>\">Tor Browser</a>"
+
+#. type: Content of: <div><div><div><div><table><tr><td><p>
+#: /home/runa/dev/website/en/index.wml:78
+msgid ""
+"Tor Browser contains everything you need to safely browse the Internet."
+msgstr ""
+"Tor Browser indeholder alt du behøver til at browse sikkert på Internettet. "
+
+#. type: Content of: <div><div><div><div><h2>
+#: /home/runa/dev/website/en/index.wml:90
+msgid "Who Uses Tor?"
+msgstr "Hvem bruger Tor?"
+
+#. type: Content of: <div><div><div><div><div><h3>
+#: /home/runa/dev/website/en/index.wml:93
+msgid ""
+"<a href=\"<page about/torusers>#normalusers\"><img "
+"src=\"$(IMGROOT)/family.jpg\" alt=\"Normal People\">Family &amp; Friends</a>"
+msgstr ""
+"<a href=\"<page about/torusers>#normalusers\"><img "
+"src=\"$(IMGROOT)/family.jpg\" alt=\"Normale folk\">Familie &amp; Venner</a>"
+
+#. type: Content of: <div><div><div><div><div><p>
+#: /home/runa/dev/website/en/index.wml:95
+msgid ""
+"People like you and your family use Tor to protect themselves, their "
+"children, and their dignity while using the Internet."
+msgstr ""
+"Folk som dig og din familie bruger Tor til at beskytte sig selv, deres børn "
+"og deres værdighed mens de anvender Internettet."
+
+#. type: Content of: <div><div><div><div><div><h3>
+#: /home/runa/dev/website/en/index.wml:99
+msgid ""
+"<a href=\"<page about/torusers>#executives\"><img "
+"src=\"$(IMGROOT)/consumers.jpg\" alt=\"Businesses\">Businesses</a>"
+msgstr ""
+"<a href=\"<page about/torusers>#executives\"><img "
+"src=\"$(IMGROOT)/consumers.jpg\" alt=\"Virksomheder\">Virksomheder</a>"
+
+#. type: Content of: <div><div><div><div><div><p>
+#: /home/runa/dev/website/en/index.wml:101
+msgid ""
+"Businesses use Tor to research competition, keep business strategies "
+"confidential, and facilitate internal accountability."
+msgstr ""
+"Virksomheder bruger Tor til undersøge konkurrence, holde "
+"forretningsstrategier fortrolige og facilitere intern pålidelighed."
+
+#. type: Content of: <div><div><div><div><div><h3>
+#: /home/runa/dev/website/en/index.wml:105
+msgid ""
+"<a href=\"<page about/torusers>#activists\"><img "
+"src=\"$(IMGROOT)/activists.jpg\" alt=\"Activists &amp; "
+"Whistleblowers\">Activists</a>"
+msgstr ""
+"<a href=\"<page about/torusers>#activists\"><img "
+"src=\"$(IMGROOT)/activists.jpg\" alt=\"Aktivister &amp; "
+"Vagthunde\">Aktivister</a>"
+
+#. type: Content of: <div><div><div><div><div><p>
+#: /home/runa/dev/website/en/index.wml:107
+msgid ""
+"Activists use Tor to anonymously report abuses from danger zones.  "
+"Whistleblowers use Tor to safely report on corruption."
+msgstr ""
+"Aktivister bruger Tor til anonymt at rapportere om overgreb i farlige "
+"områder.  Vagthunde bruger Tor til, i tryghed at rapportere om korruption."
+
+#. type: Content of: <div><div><div><div><div><h3>
+#: /home/runa/dev/website/en/index.wml:111
+msgid ""
+"<a href=\"<page about/torusers>#journalist\"><img "
+"src=\"$(IMGROOT)/media.jpg\" alt=\"Journalists and the Media\">Media</a>"
+msgstr ""
+"<a href=\"<page about/torusers>#journalist\"><img "
+"src=\"$(IMGROOT)/media.jpg\" alt=\"Journaliser og medierne\">Medierne</a>"
+
+#. type: Content of: <div><div><div><div><div><p>
+#: /home/runa/dev/website/en/index.wml:113
+msgid ""
+"Journalists and the media use Tor to protect their research and sources "
+"online."
+msgstr ""
+"Journalister og medierne bruger Tor til at beskytte deres efterforskning og "
+"kilder på nettet."
+
+#. type: Content of: <div><div><div><div><div><h3>
+#: /home/runa/dev/website/en/index.wml:117
+msgid ""
+"<a href=\"<page about/torusers>#military\"><img "
+"src=\"$(IMGROOT)/military.jpg\" alt=\"Military and Law "
+"Enforcement\">Military &amp; Law Enforcement</a>"
+msgstr ""
+"<a href=\"<page about/torusers>#military\"><img "
+"src=\"$(IMGROOT)/military.jpg\" alt=\"Militær og retshåndhævere\">Militæret "
+"&amp; retshåndhævere</a>"
+
+#. type: Content of: <div><div><div><div><div><p>
+#: /home/runa/dev/website/en/index.wml:119
+msgid ""
+"Militaries and law enforcement use Tor to protect their communications, "
+"investigations, and intelligence gathering online."
+msgstr ""
+"Militæret og retshåndhævende myndigheder bruger Tor til at beskytte deres "
+"kommunikation, undersøgelser og efterretningsindsamling på nettet."
+
+#. type: Content of: <div><div><div><div><h2>
+#: /home/runa/dev/website/en/index.wml:123
+msgid "Announcements"
+msgstr "Meddelelser"
+
+#. type: Content of: <div><div><div><div><table><tr><td><div>
+#: /home/runa/dev/website/en/index.wml:128
+msgid "<span class=\"month\">Mar</span><br><span class=\"day\">23</span>"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><table><tr><td><p>
+#: /home/runa/dev/website/en/index.wml:129
+msgid ""
+"The Tor Project wins the \"Project of Social Benefit\" award from the Free "
+"Software Foundation and GNU Project. We are honored to win this award and to"
+" be listed amongst the former winners. <a "
+"href=\"https://blog.torproject.org/blog/tor-project-receives-fsf-"
+"award\">Read more</a> about this award."
+msgstr ""
+
+#. type: Content of: <div><div><div><div><table><tr><td><div>
+#: /home/runa/dev/website/en/index.wml:135
+msgid "<span class=\"month\">Feb</span><br><span class=\"day\">23</span>"
+msgstr "<span class=\"month\">Feb</span><br><span class=\"day\">23</span>"
+
+#. type: Content of: <div><div><div><div><table><tr><td><p>
+#: /home/runa/dev/website/en/index.wml:136
+msgid ""
+"The latest stable Tor version, 0.2.1.30, is <a "
+"href=\"https://lists.torproject.org/pipermail/tor-"
+"announce/2011-February/000000.html\">released</a>.  Tor 0.2.1.30 fixes a "
+"variety of less critical bugs. The main other change is a slight tweak to "
+"Tor's TLS handshake that makes relays and bridges that run this new version "
+"reachable from Iran again.  We don't expect this tweak will win the arms "
+"race long-term, but it buys us time until we roll out a better solution."
+msgstr ""
+"Den seneste stabile Tor version, 0.2.1.30, er <a "
+"href=\"https://lists.torproject.org/pipermail/tor-"
+"announce/2011-February/000000.html\">udgivet</a>.  Tor 0.2.1.30 retter en "
+"række mindre kritiske fejl. Den anden væsentlige ændring er en mindre "
+"justering af Tors TLS-håndtryk som gør relæer og broer, der kører denne nye "
+"version, tilgængelige igen fra Iran.  Vi forventer ikke at denne justering "
+"vil vinde kampløbet på lang sigt, men det køber os tid indtil vi kan udrulle"
+" en bedre løsning."

Modified: translation/trunk/projects/website/po/de/1-high.index.po
===================================================================
--- translation/trunk/projects/website/po/de/1-high.index.po	2011-04-12 16:15:00 UTC (rev 24594)
+++ translation/trunk/projects/website/po/de/1-high.index.po	2011-04-12 16:19:31 UTC (rev 24595)
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-03-17 18:05+0000\n"
-"PO-Revision-Date: 2011-03-22 16:15+0000\n"
+"POT-Creation-Date: 2011-03-28 12:48+0200\n"
+"PO-Revision-Date: 2011-03-29 00:25+0000\n"
 "Last-Translator: carolyn <carolyn at torproject.org>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
@@ -18,35 +18,35 @@
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #. type: Content of: <div><div><div><div><ul><li>
-#: /home/runa/tor/website/en/index.wml:12
+#: /home/runa/dev/website/en/index.wml:12
 msgid "Tor prevents anyone from learning your location or browsing habits."
 msgstr ""
 
 #. type: Content of: <div><div><div><div><ul><li>
-#: /home/runa/tor/website/en/index.wml:13
+#: /home/runa/dev/website/en/index.wml:13
 msgid ""
 "Tor is for web browsers, instant messaging clients, remote logins, and more."
 msgstr ""
 
 #. type: Content of: <div><div><div><div><ul><li>
-#: /home/runa/tor/website/en/index.wml:14
+#: /home/runa/dev/website/en/index.wml:14
 msgid "Tor is free and open source for Windows, Mac, Linux/Unix, and Android"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><h1>
-#: /home/runa/tor/website/en/index.wml:16
+#: /home/runa/dev/website/en/index.wml:16
 msgid "Anonymity Online"
 msgstr "Anonymität online"
 
 #. type: Content of: <div><div><div><div><p>
-#: /home/runa/tor/website/en/index.wml:17
+#: /home/runa/dev/website/en/index.wml:17
 msgid ""
 "Protect your privacy. Defend yourself against network surveillance and "
 "traffic analysis."
 msgstr ""
 
 #. type: Content of: <div><div><div><div><div>
-#: /home/runa/tor/website/en/index.wml:20
+#: /home/runa/dev/website/en/index.wml:20
 msgid ""
 "<a href=\"<page download/download>\"> <span class=\"download-tor\">Download "
 "Tor</span></a>"
@@ -55,12 +55,12 @@
 "herunter</span></a>"
 
 #. type: Content of: <div><div><div><div><div><h2>
-#: /home/runa/tor/website/en/index.wml:26
+#: /home/runa/dev/website/en/index.wml:26
 msgid "What is Tor?"
 msgstr "Was ist Tor?"
 
 #. type: Content of: <div><div><div><div><div><p>
-#: /home/runa/tor/website/en/index.wml:26
+#: /home/runa/dev/website/en/index.wml:26
 msgid ""
 "Tor is free software and an open network that helps you defend against a "
 "form of network surveillance that threatens personal freedom and privacy, "
@@ -71,12 +71,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><div><div><div><h2>
-#: /home/runa/tor/website/en/index.wml:36
+#: /home/runa/dev/website/en/index.wml:36
 msgid "Why Anonymity Matters"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><div><p>
-#: /home/runa/tor/website/en/index.wml:37
+#: /home/runa/dev/website/en/index.wml:37
 msgid ""
 "Tor protects you by bouncing your communications around a distributed "
 "network of relays run by volunteers all around the world: it prevents "
@@ -89,110 +89,110 @@
 msgstr ""
 
 #. type: Content of: <div><div><div><div><h2>
-#: /home/runa/tor/website/en/index.wml:50
+#: /home/runa/dev/website/en/index.wml:50
 msgid "Our Projects"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><table><tr><td>
-#: /home/runa/tor/website/en/index.wml:55
+#: /home/runa/dev/website/en/index.wml:55
 msgid "<img src=\"$(IMGROOT)/icon-TorButton.jpg\" alt=\"Torbutton Icon\">"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><table><tr><td><h3>
-#: /home/runa/tor/website/en/index.wml:56
+#: /home/runa/dev/website/en/index.wml:56
 msgid "<a href=\"<page torbutton/index>\">Torbutton</a>"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><table><tr><td><p>
-#: /home/runa/tor/website/en/index.wml:57
+#: /home/runa/dev/website/en/index.wml:57
 msgid ""
 "Torbutton is a 1-click way for Firefox users to enable or disable Tor in "
 "Firefox."
 msgstr ""
 
 #. type: Content of: <div><div><div><div><table><tr><td>
-#: /home/runa/tor/website/en/index.wml:61
+#: /home/runa/dev/website/en/index.wml:61
 msgid "<img src=\"$(IMGROOT)/icon-TorCheck.jpg\" alt=\"Tor Check Icon\">"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><table><tr><td><h3>
-#: /home/runa/tor/website/en/index.wml:62
+#: /home/runa/dev/website/en/index.wml:62
 msgid "<a href=\"https://check.torproject.org/\">Check</a>"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><table><tr><td><p>
-#: /home/runa/tor/website/en/index.wml:63
+#: /home/runa/dev/website/en/index.wml:63
 msgid "Check determines if you are successfully browsing with Tor."
 msgstr ""
 
 #. type: Content of: <div><div><div><div><table><tr><td>
-#: /home/runa/tor/website/en/index.wml:69
+#: /home/runa/dev/website/en/index.wml:69
 msgid "<img src=\"$(IMGROOT)/icon-Vidalia.jpg\" alt=\"Vidalia Icon\">"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><table><tr><td><h3>
-#: /home/runa/tor/website/en/index.wml:70
+#: /home/runa/dev/website/en/index.wml:70
 msgid "<a href=\"<page projects/vidalia>\">Vidalia</a>"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><table><tr><td><p>
-#: /home/runa/tor/website/en/index.wml:71
+#: /home/runa/dev/website/en/index.wml:71
 msgid ""
 "Vidalia is a graphical way to control and view Tor's connections and "
 "settings."
 msgstr ""
 
 #. type: Content of: <div><div><div><div><table><tr><td>
-#: /home/runa/tor/website/en/index.wml:75
+#: /home/runa/dev/website/en/index.wml:75
 msgid "<img src=\"$(IMGROOT)/icon-TorBrowser.jpg\" alt=\"TorBrowser Icon\">"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><table><tr><td><h3>
-#: /home/runa/tor/website/en/index.wml:76
+#: /home/runa/dev/website/en/index.wml:76
 msgid "<a href=\"<page projects/torbrowser>\">Tor Browser</a>"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><table><tr><td><p>
-#: /home/runa/tor/website/en/index.wml:78
+#: /home/runa/dev/website/en/index.wml:78
 msgid ""
 "Tor Browser contains everything you need to safely browse the Internet."
 msgstr ""
 
 #. type: Content of: <div><div><div><div><h2>
-#: /home/runa/tor/website/en/index.wml:90
+#: /home/runa/dev/website/en/index.wml:90
 msgid "Who Uses Tor?"
 msgstr "Wer benutzt Tor?"
 
 #. type: Content of: <div><div><div><div><div><h3>
-#: /home/runa/tor/website/en/index.wml:93
+#: /home/runa/dev/website/en/index.wml:93
 msgid ""
 "<a href=\"<page about/torusers>#normalusers\"><img "
 "src=\"$(IMGROOT)/family.jpg\" alt=\"Normal People\">Family &amp; Friends</a>"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><div><p>
-#: /home/runa/tor/website/en/index.wml:95
+#: /home/runa/dev/website/en/index.wml:95
 msgid ""
 "People like you and your family use Tor to protect themselves, their "
 "children, and their dignity while using the Internet."
 msgstr ""
 
 #. type: Content of: <div><div><div><div><div><h3>
-#: /home/runa/tor/website/en/index.wml:99
+#: /home/runa/dev/website/en/index.wml:99
 msgid ""
 "<a href=\"<page about/torusers>#executives\"><img "
 "src=\"$(IMGROOT)/consumers.jpg\" alt=\"Businesses\">Businesses</a>"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><div><p>
-#: /home/runa/tor/website/en/index.wml:101
+#: /home/runa/dev/website/en/index.wml:101
 msgid ""
 "Businesses use Tor to research competition, keep business strategies "
 "confidential, and facilitate internal accountability."
 msgstr ""
 
 #. type: Content of: <div><div><div><div><div><h3>
-#: /home/runa/tor/website/en/index.wml:105
+#: /home/runa/dev/website/en/index.wml:105
 msgid ""
 "<a href=\"<page about/torusers>#activists\"><img "
 "src=\"$(IMGROOT)/activists.jpg\" alt=\"Activists &amp; "
@@ -200,28 +200,28 @@
 msgstr ""
 
 #. type: Content of: <div><div><div><div><div><p>
-#: /home/runa/tor/website/en/index.wml:107
+#: /home/runa/dev/website/en/index.wml:107
 msgid ""
 "Activists use Tor to anonymously report abuses from danger zones.  "
 "Whistleblowers use Tor to safely report on corruption."
 msgstr ""
 
 #. type: Content of: <div><div><div><div><div><h3>
-#: /home/runa/tor/website/en/index.wml:111
+#: /home/runa/dev/website/en/index.wml:111
 msgid ""
 "<a href=\"<page about/torusers>#journalist\"><img "
 "src=\"$(IMGROOT)/media.jpg\" alt=\"Journalists and the Media\">Media</a>"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><div><p>
-#: /home/runa/tor/website/en/index.wml:113
+#: /home/runa/dev/website/en/index.wml:113
 msgid ""
 "Journalists and the media use Tor to protect their research and sources "
 "online."
 msgstr ""
 
 #. type: Content of: <div><div><div><div><div><h3>
-#: /home/runa/tor/website/en/index.wml:117
+#: /home/runa/dev/website/en/index.wml:117
 msgid ""
 "<a href=\"<page about/torusers>#military\"><img "
 "src=\"$(IMGROOT)/military.jpg\" alt=\"Military and Law "
@@ -229,24 +229,39 @@
 msgstr ""
 
 #. type: Content of: <div><div><div><div><div><p>
-#: /home/runa/tor/website/en/index.wml:119
+#: /home/runa/dev/website/en/index.wml:119
 msgid ""
 "Militaries and law enforcement use Tor to protect their communications, "
 "investigations, and intelligence gathering online."
 msgstr ""
 
 #. type: Content of: <div><div><div><div><h2>
-#: /home/runa/tor/website/en/index.wml:123
+#: /home/runa/dev/website/en/index.wml:123
 msgid "Announcements"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><table><tr><td><div>
-#: /home/runa/tor/website/en/index.wml:128
+#: /home/runa/dev/website/en/index.wml:128
+msgid "<span class=\"month\">Mar</span><br><span class=\"day\">23</span>"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><table><tr><td><p>
+#: /home/runa/dev/website/en/index.wml:129
+msgid ""
+"The Tor Project wins the \"Project of Social Benefit\" award from the Free "
+"Software Foundation and GNU Project. We are honored to win this award and to"
+" be listed amongst the former winners. <a "
+"href=\"https://blog.torproject.org/blog/tor-project-receives-fsf-"
+"award\">Read more</a> about this award."
+msgstr ""
+
+#. type: Content of: <div><div><div><div><table><tr><td><div>
+#: /home/runa/dev/website/en/index.wml:135
 msgid "<span class=\"month\">Feb</span><br><span class=\"day\">23</span>"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><table><tr><td><p>
-#: /home/runa/tor/website/en/index.wml:129
+#: /home/runa/dev/website/en/index.wml:136
 msgid ""
 "The latest stable Tor version, 0.2.1.30, is <a "
 "href=\"https://lists.torproject.org/pipermail/tor-"
@@ -256,18 +271,3 @@
 "reachable from Iran again.  We don't expect this tweak will win the arms "
 "race long-term, but it buys us time until we roll out a better solution."
 msgstr ""
-
-#. type: Content of: <div><div><div><div><table><tr><td><div>
-#: /home/runa/tor/website/en/index.wml:138
-msgid "<span class=\"month\">Jan</span><br><span class=\"day\">30</span>"
-msgstr ""
-
-#. type: Content of: <div><div><div><div><table><tr><td><p>
-#: /home/runa/tor/website/en/index.wml:139
-msgid ""
-"Tor helping with Egypt.  Here's what we've learned <a "
-"href=\"https://blog.torproject.org/blog/recent-events-egypt\">about recent "
-"events in Egypt</a>. And we're keeping our <a href=\"<page "
-"press/inthemedia>\">In the media</a> page up to date with stories about how "
-"we're helping around the world."
-msgstr ""

Added: translation/trunk/projects/website/po/de/docs/1-high.proxychain.po
===================================================================
--- translation/trunk/projects/website/po/de/docs/1-high.proxychain.po	                        (rev 0)
+++ translation/trunk/projects/website/po/de/docs/1-high.proxychain.po	2011-04-12 16:19:31 UTC (rev 24595)
@@ -0,0 +1,143 @@
+# 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.
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
+"POT-Creation-Date: 2011-03-28 12:48+0200\n"
+"PO-Revision-Date: 2011-04-07 18:07+0000\n"
+"Last-Translator: cosimacosa <leccefv at libero.it>\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"
+"Language: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#. type: Content of: <div><div>
+#: /home/runa/dev/website/docs/en/proxychain.wml:8
+msgid ""
+"<a href=\"<page index>\">Home &raquo; </a> <a href=\"<page "
+"docs/documentation>\">Documentation &raquo; </a> <a href=\"<page "
+"docs/proxychain>\">Configuring Tor to use a Proxy</a>"
+msgstr ""
+"<a href=\"<page index>\">Start &raquo; </a> <a href=\"<page "
+"docs/documentation>\">Dokumentation &raquo; </a> <a href=\"<page "
+"docs/proxychain>\">Tor-Konfiguration unter Verwendung eines Proxys</a>"
+
+#. type: Content of: <div><div>
+#: /home/runa/dev/website/docs/en/proxychain.wml:13
+msgid "<a id=\"proxychain\"></a>"
+msgstr "<a id=\"proxychain\"></a>"
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/dev/website/docs/en/proxychain.wml:14
+msgid ""
+"<a class=\"anchor\" href=\"#proxychain\">Tor: Configuring Tor to use a "
+"Proxy</a>"
+msgstr ""
+"<a class=\"anchor\" href=\"#proxychain\">Tor: Konfiguration Tor unter "
+"Verwendung eines Proxysy</a>"
+
+#. type: Content of: <div><div>
+#: /home/runa/dev/website/docs/en/proxychain.wml:15
+msgid "<hr>"
+msgstr "<hr>"
+
+#. type: Content of: <div><div><p>
+#: /home/runa/dev/website/docs/en/proxychain.wml:18
+msgid ""
+"The current version of Tor and the Vidalia Graphical Tor Controller support "
+"the ability to use any HTTPS or SOCKS proxy to get access to the Tor "
+"Network.  This means even if Tor is blocked by your local network, open "
+"proxies can be safely used to connect to the Tor Network and on to the "
+"uncensored Internet.  A caveat is that the open proxy host will see you are "
+"using Tor, but it will not be able to read your traffic as it is still "
+"wrapped in layers of encryption."
+msgstr ""
+"Die aktuelle Version von Tor und der Vidalia Graphical Tor Controller "
+"unterstützen jeden HTTPS oder SOCKS Proxy um sich mit dem Tor Network zu "
+"verbinden. Also selbst wenn Tor von Ihrem lokalen Netzwerk blockiert werden "
+"sollte, können Sie offene Proxys sicher verwenden um sich mit dem Tor "
+"Netzwerk und damit mit dem unzensorierten Internet zu verbinden. Einziger "
+"Nachteil: der offene Proxy Host sieht, dass Sie Tor verwenden, aber er hat "
+"keine Möglichkeit Ihren Datentraffic zu lesen, da dieser nach wie vor durch "
+"all die verschlüsselten Schichten geschützt ist. "
+
+#. type: Content of: <div><div><p>
+#: /home/runa/dev/website/docs/en/proxychain.wml:28
+msgid ""
+"These steps assume you have a functional Tor/Vidalia configuration, and you "
+"have found a list of HTTPS, SOCKS4, or SOCKS5 proxies. (To clarify, an HTTPS"
+" proxy is an HTTP proxy that also supports CONNECT requests.)"
+msgstr ""
+"Diese Schritte setzten voraus, dass Sie eine funktionierende  Tor/Vidalia "
+"Konfiguration haben, und dass Sie eine Liste an  HTTPS, SOCKS4, oder SOCKS5 "
+"Proxies gefunden haben. (Hinweis: ein HTTPS Proxy ist ein HTTP Proxy, der "
+"auch  CONNECT Anfragen unterstützt.)"
+
+#. type: Content of: <div><div><p><ol><li>
+#: /home/runa/dev/website/docs/en/proxychain.wml:33
+msgid "Open the Vidalia Control Panel, click on Settings."
+msgstr ""
+"Öffnen Sie die Vidalia Systemsteuerung, klicken Sie auf Einstellungen."
+
+#. type: Content of: <div><div><p><ol><li>
+#: /home/runa/dev/website/docs/en/proxychain.wml:34
+msgid "Click Network.  Select \"I use a proxy to access the Internet\"."
+msgstr ""
+"Klicken Sie auf Netzwerk. Wählen Sie \"I use a proxy to access the "
+"Internet\"."
+
+#. type: Content of: <div><div><p><ol><li>
+#: /home/runa/dev/website/docs/en/proxychain.wml:35
+msgid ""
+"On the Address line, enter the open proxy address.  This can be a hostname "
+"or IP Address."
+msgstr ""
+"In die Adresszeile geben Sie die Open Proxy Adresse ein. Das kann ein "
+"Hostname oder die IP-Adresse sein. "
+
+#. type: Content of: <div><div><p><ol><li>
+#: /home/runa/dev/website/docs/en/proxychain.wml:36
+msgid "Enter the port for the proxy."
+msgstr "Tragen Sie den Port für den Proxy ein."
+
+#. type: Content of: <div><div><p><ol><li>
+#: /home/runa/dev/website/docs/en/proxychain.wml:37
+msgid ""
+"Generally, you do not need a Username and Password.  If you do, enter the "
+"information in the proper fields."
+msgstr ""
+"Normalerweise benötigen Sie keinen Benutzernamen oder Passwort. Falls doch, "
+"geben Sie diese in die passenden Felder ein. "
+
+#. type: Content of: <div><div><p><ol><li>
+#: /home/runa/dev/website/docs/en/proxychain.wml:38
+msgid ""
+"Choose the Type of proxy you are using, whether HTTP/HTTPS, SOCKS4, or "
+"SOCKS5."
+msgstr ""
+"Wählen Sie den Proxy-Typ, den Sie verwenden, wie  HTTP/HTTPS, SOCKS4, oder "
+"SOCKS5."
+
+#. type: Content of: <div><div><p><ol><li>
+#: /home/runa/dev/website/docs/en/proxychain.wml:39
+msgid ""
+"Push the Ok button.  Vidalia and Tor are now configured to use a proxy to "
+"access the rest of the Tor Network."
+msgstr ""
+"Klicken Sie auf OK.  Sie haben Vidalia und Tor nun für die Verwendung eines "
+"Proxys konfiguriert und haben Zutritt zum Rest des Tor Netzwerks."
+
+#. type: Content of: <div><div>
+#: /home/runa/dev/website/docs/en/proxychain.wml:42
+msgid ""
+"<br><br> <img src=\"$(IMGROOT)/vidalia-proxy.png\" alt=\"Vidalia's Network "
+"Proxy settings page\"> <br><br>"
+msgstr ""
+"<br><br> <img src=\"$(IMGROOT)/vidalia-proxy.png\" alt=\"Vidalia's Network "
+"Proxy settings page\"> <br><br>"

Added: translation/trunk/projects/website/po/de/download/1-high.download-easy.po
===================================================================
--- translation/trunk/projects/website/po/de/download/1-high.download-easy.po	                        (rev 0)
+++ translation/trunk/projects/website/po/de/download/1-high.download-easy.po	2011-04-12 16:19:31 UTC (rev 24595)
@@ -0,0 +1,225 @@
+# 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.
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
+"POT-Creation-Date: 2011-01-29 21:13+0000\n"
+"PO-Revision-Date: 2011-04-07 17:43+0000\n"
+"Last-Translator: cosimacosa <leccefv at libero.it>\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"
+"Language: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/download/en/download-easy.wml:8
+msgid ""
+"<a href=\"<page index>\">Home &raquo; </a><a href=\"<page download/download-"
+"easy>\">Easy Download Selector</a>"
+msgstr ""
+"<a href=\"<page index>\">Start &raquo; </a><a href=\"<page download"
+"/download-easy>\">Easy Download Selector</a>"
+
+#. type: Content of: <div><div><table><tr><td><div>
+#: /home/runa/tor/website/download/en/download-easy.wml:14
+msgid "Tor Browser Bundle"
+msgstr "Tor Browser-Paket"
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/download/en/download-easy.wml:19
+msgid ""
+"The <strong>Tor Browser Bundle</strong> contains everything you need to "
+"safely browse the Internet. This package requires no installation.  Just "
+"extract it and run. <a href=\"<page projects/torbrowser>\">Learn more &amp; "
+"other languages &raquo;</a>"
+msgstr ""
+"Das <strong>Tor Browser Bundle</strong> enthält alles, das Sie benötigen, um"
+" sicher im Internet zu surfen. Dieses Paket benötigt keine Installation, "
+"nach dem Entpacken kann es gleich ausgeführt werden. <a href=\"<page "
+"projects/torbrowser>\">Mehr &amp; andere Sprachen &raquo;</a>"
+
+#. PO4ASHARPBEGIN Translators: please point to the version of TBB in your
+#. language, if there is one.PO4ASHARPEND
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/download/en/download-easy.wml:25
+msgid ""
+"<span class=\"windows\"> <a href=\"../dist/torbrowser/tor-browser-<version-"
+"torbrowserbundle>_en-US.exe\">Windows 7, Vista, XP</a>&nbsp; (<a "
+"href=\"../dist/torbrowser/tor-browser-<version-torbrowserbundle>_en-"
+"US.exe.asc\">sig</a>)  </span>"
+msgstr ""
+"<span class=\"windows\"> <a href=\"../dist/torbrowser/tor-browser-<version-"
+"torbrowserbundle>_en-US.exe\">Windows 7, Vista, XP</a>&nbsp; (<a "
+"href=\"../dist/torbrowser/tor-browser-<version-torbrowserbundle>_en-"
+"US.exe.asc\">sig</a>)  </span>"
+
+#. PO4ASHARPBEGIN Translators: please point to the version of TBB in your
+#. language, if there is one.PO4ASHARPEND
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/download/en/download-easy.wml:33
+msgid ""
+"<span class=\"mac\"> <a href=\"../dist/torbrowser/osx/TorBrowser-<version-"
+"torbrowserbundleosx>-dev-osx-i386-en-US.zip\">Apple OS X Intel</a>&nbsp; (<a"
+" href=\"../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-"
+"osx-i386-en-US.zip.asc\">sig</a>)  </span>"
+msgstr ""
+"<span class=\"mac\"> <a href=\"../dist/torbrowser/osx/TorBrowser-<version-"
+"torbrowserbundleosx>-dev-osx-i386-en-US.zip\">Apple OS X Intel</a>&nbsp; (<a"
+" href=\"../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-"
+"osx-i386-en-US.zip.asc\">sig</a>)  </span>"
+
+#. PO4ASHARPBEGIN Translators: please point to the version of TBB in your
+#. language, if there is one.PO4ASHARPEND
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/download/en/download-easy.wml:41
+msgid ""
+"<span class=\"linux\"> <a href=\"../dist/torbrowser/linux/tor-browser-gnu-"
+"linux-i686-<version-torbrowserbundlelinux32>-dev-en-US.tar.gz\">GNU/Linux "
+"i686</a>&nbsp; (<a href=\"../dist/torbrowser/linux/tor-browser-gnu-"
+"linux-i686-<version-torbrowserbundlelinux32>-dev-en-US.tar.gz.asc\">sig</a>)"
+"  </span>"
+msgstr ""
+"<span class=\"linux\"> <a href=\"../dist/torbrowser/linux/tor-browser-gnu-"
+"linux-i686-<version-torbrowserbundlelinux32>-dev-en-US.tar.gz\">GNU/Linux "
+"i686</a>&nbsp; (<a href=\"../dist/torbrowser/linux/tor-browser-gnu-"
+"linux-i686-<version-torbrowserbundlelinux32>-dev-en-US.tar.gz.asc\">sig</a>)"
+"  </span>"
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/download/en/download-easy.wml:49
+#: /tmp/iVSv3grhGK.xml:60 /tmp/iVSv3grhGK.xml:62 /tmp/iVSv3grhGK.xml:64
+msgid "<br>"
+msgstr "<br>"
+
+#. type: Content of: <div><div><div><h2>
+#: /home/runa/tor/website/download/en/download-easy.wml:52
+msgid "Want Tor to really work?"
+msgstr "Wollen Sie, dass Tor wirklich funktioniert?"
+
+#. type: Content of: <div><div><div><p>
+#: /home/runa/tor/website/download/en/download-easy.wml:53
+msgid ""
+"...then please don't just install it and go on.  You need to change some of "
+"your habits, and reconfigure your software! Tor by itself is <em>NOT</em> "
+"all you need to maintain your anonymity. Read the <a href=\"<page "
+"download/download>#warning\">full list of warnings</a>."
+msgstr ""
+"...dann genügt es nicht, es nur zu installieren. So müssen Sie nicht nur ein"
+" paar Angewohnheiten ändern, sondern auch  Ihre Software neu konfigurieren! "
+"Tor selbst ist <em>NICHT</em> alles, das Sie benötigen, um Ihre Anonymität "
+"zu wahren. Lesen Sie die <a href=\"<page "
+"download/download>#warning\">vollständige Liste mit Warnungen</a>."
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/download/en/download-easy.wml:61
+msgid ""
+"Need more download options? <a href=\"<page download/download>\">See "
+"advanced choices</a>."
+msgstr ""
+"Mehr Download-Optionen? <a href=\"<page download/download>\">Erweiterte "
+"Download-Möglichkeiten</a>."
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/download/en/download-easy.wml:63
+msgid ""
+"Interested in <a href=\"<page about/overview>\">learning more about Tor in "
+"general</a>?"
+msgstr ""
+"Möchten Sie <a href=\"<page about/overview>\">mehr über Tor im "
+"allgemeinen</a> erfahren?"
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/download/en/download-easy.wml:65
+msgid ""
+"To keep informed of security advisories and new stable releases, subscribe "
+"to the <a href=\"https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-"
+"announce\">tor-announce mailing list</a>. You can also <a "
+"href=\"http://rss.gmane.org/gmane.network.onion-routing.announce\">watch the"
+" list's RSS feed</a>."
+msgstr ""
+"Um aktuelle Sicherheitsmeldungen zu bekommen und über neue stabile Versionen"
+" informiert zu werden, abonnieren Sie die <a "
+"href=\"https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-announce"
+"\">tor-Ankündigungsmailingliste</a>. Sie können auch <a "
+"href=\"http://rss.gmane.org/gmane.network.onion-routing.announce\">den RSS-"
+"Feed der Liste</a> beobachten."
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/download/en/download-easy.wml:71
+msgid "All trademarks are the property of their respective owners."
+msgstr "Alle Warenzeichen sind das Eigentum ihrer jeweiligen Eigentümer."
+
+#. type: Content of: <div><div><div><div><h2>
+#: /home/runa/tor/website/download/en/download-easy.wml:78
+msgid "Advanced Choices:"
+msgstr "Erweiterte Auswahlmöglichkeiten:"
+
+#. type: Content of: <div><div><div><div><ul><li>
+#: /home/runa/tor/website/download/en/download-easy.wml:80
+msgid "<a href=\"<page download/download>#Windows\">Microsoft Windows</a>"
+msgstr "<a href=\"<page download/download>#Windows\">Microsoft Windows</a>"
+
+#. type: Content of: <div><div><div><div><ul><li>
+#: /home/runa/tor/website/download/en/download-easy.wml:81
+msgid "<a href=\"<page download/download>#mac\">Apple OS X</a>"
+msgstr "<a href=\"<page download/download>#mac\">Apple OS X</a>"
+
+#. type: Content of: <div><div><div><div><ul><li>
+#: /home/runa/tor/website/download/en/download-easy.wml:82
+msgid "<a href=\"<page download/download>#linux\">Linux/Unix</a>"
+msgstr "<a href=\"<page download/download>#linux\">Linux/Unix</a>"
+
+#. type: Content of: <div><div><div><div><ul><li>
+#: /home/runa/tor/website/download/en/download-easy.wml:83
+msgid "<a href=\"<page download/download>#smartphones\">Smartphones</a>"
+msgstr "<a href=\"<page download/download>#smartphones\">Smartphones</a>"
+
+#. type: Content of: <div><div><div><div><ul><li>
+#: /home/runa/tor/website/download/en/download-easy.wml:84
+msgid "<a href=\"<page download/download>#source\">Source Code</a>"
+msgstr "<a href=\"<page download/download>#source\">Quelltext</a>"
+
+#. type: Content of: <div><div><div><div><ul><li>
+#: /home/runa/tor/website/download/en/download-easy.wml:85
+msgid "<a href=\"<page donate/donate>\">Please consider a donation</a>"
+msgstr ""
+"<a href=\"<page donate/donate>\">Bitte ziehen Sie eine Spende in "
+"erwägung</a>"
+
+#. type: Content of: <div><div><div><div><h2>
+#: /home/runa/tor/website/download/en/download-easy.wml:93
+msgid "What is the (sig) link?"
+msgstr "Was bedeutet der (sig)-Link?"
+
+#. type: Content of: <div><div><div><div><p>
+#: /home/runa/tor/website/download/en/download-easy.wml:94
+msgid ""
+"These are GPG signatures to allow you to verify that your downloaded file is"
+" really from The Tor Project and not an imposter."
+msgstr ""
+"Es handelt sich um GPG-Signaturen, die es erlauben, die Integrität der von "
+"Ihnen heruntergeladenen Dateien zu überprüfen und sicherzustellen, dass sie "
+"tatsächlich vom Tor Project stammen und nicht von einem Betrüger."
+
+#. type: Content of: <div><div><div><div>
+#: /home/runa/tor/website/download/en/download-easy.wml:97
+msgid "<a href=\"<page docs/verifying-signatures>\">Learn more &raquo;</a>"
+msgstr ""
+"<a href=\"<page docs/verifying-signatures>\">Weitere Informationen "
+"&raquo;</a>"
+
+#. type: Content of: <div><div><div><div><h2>
+#: /home/runa/tor/website/download/en/download-easy.wml:103
+msgid "Having Trouble?"
+msgstr "Haben Sie Schwierigkeiten?"
+
+#. type: Content of: <div><div><div><div><ul><li>
+#: /home/runa/tor/website/download/en/download-easy.wml:105
+msgid "<a href=\"<page docs/documentation>\">Read the fine manuals</a>"
+msgstr "<a href=\"<page docs/documentation>\">Dokumentation</a>"

Added: translation/trunk/projects/website/po/de/download/3-low.download.po
===================================================================
--- translation/trunk/projects/website/po/de/download/3-low.download.po	                        (rev 0)
+++ translation/trunk/projects/website/po/de/download/3-low.download.po	2011-04-12 16:19:31 UTC (rev 24595)
@@ -0,0 +1,581 @@
+# 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.
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
+"POT-Creation-Date: 2011-03-17 18:04+0000\n"
+"PO-Revision-Date: 2011-03-23 21:12+0000\n"
+"Last-Translator: freak <transifex at gefaehrder.org>\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"
+"Language: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/download/en/download.wml:7
+msgid ""
+"<a href=\"<page index>\">Home &raquo; </a><a href=\"<page "
+"download/download>\">Download</a>"
+msgstr ""
+"<a href=\"<page index>\">Home &raquo; </a><a href=\"<page "
+"download/download>\">Download</a>"
+
+#. type: Content of: <div><div><h1>
+#: /home/runa/tor/website/download/en/download.wml:9
+msgid "Download Tor"
+msgstr "Tor herunterladen"
+
+#. type: Content of: <div><div><div><h2>
+#: /home/runa/tor/website/download/en/download.wml:12
+msgid "Want Tor to really work?"
+msgstr "Wollen Sie, das Tor wirklich funktioniert?"
+
+#. type: Content of: <div><div><div><p>
+#: /home/runa/tor/website/download/en/download.wml:13
+msgid ""
+"...then please don't just install it and go on.  You need to change some of "
+"your habits, and reconfigure your software! Tor by itself is <em>NOT</em> "
+"all you need to maintain your anonymity. Read the <a href=\"#warning\">full "
+"list of warnings</a>."
+msgstr ""
+"...dann genügt es nicht, es nur zu installieren. Sie müssen einige "
+"Gewohnheiten ändern und Ihre Software neu konfigurieren! Tor selbst ist "
+"<em>NICHT</em> alles, das Sie benötigen, um Ihre Anonymität zu wahren. Lesen"
+" Sie die <a href=\"<page download/download>#warning\">vollständige Liste mit"
+" Warnungen</a>."
+
+#. type: Content of: <div><div><table><tr><td><div>
+#: /home/runa/tor/website/download/en/download.wml:20
+msgid "<a name=\"Windows\">Microsoft Windows</a>"
+msgstr "<a name=\"Windows\">Microsoft Windows</a>"
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/download/en/download.wml:23
+msgid "The Tor Software for Windows comes bundled in three different ways:"
+msgstr "Tor für Windows ist in drei verschiedenen Paketen verfügbar:"
+
+#. type: Content of: <div><div><table><tr><td><ul><li>
+#: /home/runa/tor/website/download/en/download.wml:25 /tmp/LYAFL6nMUK.xml:82
+#: /tmp/LYAFL6nMUK.xml:120
+msgid ""
+"The <strong>Tor Browser Bundle</strong> contains everything you need to "
+"safely browse the Internet. This package requires no installation. Just "
+"extract it and run. <a href=\"<page projects/torbrowser>\">Learn more "
+"&raquo;</a>"
+msgstr ""
+"Das <strong>Tor Browser Bundle</strong> enthält alles, das Sie benötigen, um"
+" sicher im Internet zu surfen. Dieses Paket benötigt keine Installation, "
+"nach dem Entpacken kann es gleich ausgeführt werden. <a href=\"<page "
+"projects/torbrowser>\">Mehr &amp; andere Sprachen &raquo;</a>"
+
+#. type: Content of: <div><div><table><tr><td><ul><li>
+#: /home/runa/tor/website/download/en/download.wml:26 /tmp/LYAFL6nMUK.xml:83
+msgid ""
+"The <strong>Vidalia Bundle</strong> contains Tor, <a href=\"<page "
+"projects/vidalia>\">Vidalia</a>, and Polipo for installation on your system."
+"  You need to configure your applications to use Tor."
+msgstr ""
+"Das <strong>Vidalia Bundle</strong> enthält Tor, <a href=\"<page "
+"projects/vidalia>\">Vidalia</a>, und Polipo zur Installation auf Ihrem "
+"System.  Sie müssen Ihre Anwendungen konfigurieren, damit sie Tor benutzen."
+
+#. type: Content of: <div><div><table><tr><td><ul><li>
+#: /home/runa/tor/website/download/en/download.wml:27
+msgid ""
+"The <strong>Expert Package</strong> contains just Tor and nothing else.  "
+"You'll need to configure Tor and all of your applications manually."
+msgstr ""
+"Das <strong>Expert Package</strong> enthält nur Tor und sonst nichts. Sie "
+"müssen Tor und alle Ihre Anwendungen manuell konfigurieren."
+
+#. type: Content of: <div><div><table><tr><td><p>
+#: /home/runa/tor/website/download/en/download.wml:29 /tmp/LYAFL6nMUK.xml:85
+msgid ""
+"There are two versions of each package, a stable and alpha release.  Stable "
+"packages are released when we believe the features and code will not change "
+"for many months.  Alpha or unstable packages are released so you can help us"
+" test new features and bugfixes. Even though they have a higher version "
+"number than the stable versions listed above, there is a much higher chance "
+"of serious reliability and security bugs in these downloads.  Please be "
+"prepared to <a href=\"https://bugs.torproject.org/\">report bugs</a>."
+msgstr ""
+"Es gibt zwei verschiedene Versionen je Paket, eine stabile (stable) und eine"
+" Alpha-Version (alpha). Stable-Pakete werden veröffentlicht, sobald wir "
+"denken, dass sich die Funktionalitäten und der Quelltext für die nächsten "
+"Monate nicht mehr verändern werden. Alpha oder Unstable-Pakete werden "
+"veröffentlicht, damit Sie uns helfen können, neue Features und "
+"Fehlerbeseitigungen (Bugfixes) zu testen. Obwohl sie eine höhere "
+"Versionsnummer tragen als die stabilen Versionen, die oben aufgeführt sind, "
+"gibt es eine wesentlich höhere Wahrscheinlichkeit für erhöhte Stabilitäts- "
+"und Sicherheitsprobleme in diesen Versionen. Bitte melden Sie gefundene <a "
+"href=\"https://bugs.torproject.org/\">Bugs an uns</a>."
+
+#. type: Content of: <div><div><table><tr><td><p>
+#: /home/runa/tor/website/download/en/download.wml:30
+msgid ""
+"The current stable version of Tor for Windows is <version-win32-stable>.  "
+"The current alpha/unstable version of tor for Windows is <version-"
+"win32-alpha>."
+msgstr ""
+"Die aktuelle stabile Version von Tor für Windows ist <version-win32-stable>."
+" Die aktuelle Alpha/Unstable-Version von Tor für Windows ist <version-"
+"win32-alpha>."
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/download/en/download.wml:34
+msgid ""
+"<span class=\"windows\"> Tor Browser Bundle (English) version <version-"
+"torbrowserbundle>, works with Windows 7, Vista, and XP. <a "
+"href=\"../dist/torbrowser/tor-browser-<version-torbrowserbundle>_en-"
+"US.exe\">Download</a>&nbsp;(<a href=\"../dist/torbrowser/tor-browser"
+"-<version-torbrowserbundle>_en-US.exe.asc\">sig</a>)  </span>"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/download/en/download.wml:41
+msgid ""
+"<span class=\"windows\"> Tor Browser Instant Messaging Bundle (English) "
+"version <version-torimbrowserbundle>, works with Windows 7, Vista, and XP. "
+"<a href=\"../dist/torbrowser/tor-im-browser-<version-torimbrowserbundle>_en-"
+"US.exe\">Download</a>&nbsp;(<a href=\"../dist/torbrowser/tor-im-browser"
+"-<version-torimbrowserbundle>_en-US.exe.asc\">sig</a>)  </span>"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/download/en/download.wml:48
+msgid ""
+"<span class=\"windows\"> Download <a href=\"<page "
+"projects/torbrowser>\">other language versions and the source code</a> of "
+"the Tor Browser Bundle.  </span>"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/download/en/download.wml:53
+msgid ""
+"<span class=\"windows\"> Stable Vidalia Bundle works with Windows 7, Vista, "
+"XP, <a href=\"<package-win32-bundle-stable>\">Download Stable</a>&nbsp;(<a "
+"href=\"<package-win32-bundle-stable>.asc\">sig</a>)  </span>"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/download/en/download.wml:57
+msgid ""
+"<span class=\"windows\">Unstable Vidalia Bundles works with Windows 7, "
+"Vista, XP, <a href=\"<package-win32-bundle-alpha>\">Download "
+"Unstable</a>&nbsp;(<a href=\"<package-win32-bundle-"
+"alpha>.asc\">sig</a>)</span>"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/download/en/download.wml:60
+msgid ""
+"<span class=\"windows\">Stable Expert Bundle works with Windows 98SE, ME, "
+"Windows 7, Vista, XP, 2000, 2003 Server, <a href=\"../dist/win32/tor"
+"-<version-win32-stable>-win32.exe\">Download Stable</a>&nbsp;(<a "
+"href=\"../dist/win32/tor-<version-"
+"win32-stable>-win32.exe.asc\">sig</a>)</span>"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/download/en/download.wml:63
+msgid ""
+"<span class=\"windows\">Unstable Expert Bundle works with Windows 98SE, ME, "
+"Windows 7, Vista, XP, 2000, 2003 Server, <a href=\"../dist/win32/tor"
+"-<version-win32-alpha>-win32.exe\">Download Unstable</a>&nbsp;(<a "
+"href=\"../dist/win32/tor-<version-win32-alpha>-win32.exe.asc\">sig</a>)  "
+"</span>"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/download/en/download.wml:69
+msgid ""
+"<a href=\"<page docs/tor-doc-windows>\">Documentation for Microsoft Windows "
+"clients</a>"
+msgstr ""
+"<a href=\"<page docs/tor-doc-windows>\">Dokumentation für Microsoft Windows-"
+"Clients</a>"
+
+#. type: Content of: <div><div><table><tr><td><div>
+#: /home/runa/tor/website/download/en/download.wml:77
+msgid "<a name=\"mac\">Apple OS X</a>"
+msgstr "<a name=\"mac\">Apple OS X</a>"
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/download/en/download.wml:80
+msgid "The Tor Software for OS X comes bundled in two different ways:"
+msgstr "Tor für OS X ist in zwei verschiedenen Paketen verfügbar:"
+
+#. type: Content of: <div><div><table><tr><td><p>
+#: /home/runa/tor/website/download/en/download.wml:86
+msgid ""
+"The current stable version of Tor for OS X is <version-osx-x86-stable>.  The"
+" current alpha/unstable version of Tor for OS X is <version-osx-x86-alpha>."
+msgstr ""
+"Die aktuelle stabile Version von Tor für OS X ist <version-osx-x86-stable>."
+"  Die aktuelle Alpha/Unstable-Version von Tor für OS X ist <version-"
+"osx-x86-alpha>."
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/download/en/download.wml:90
+msgid ""
+"<span class=\"mac\">Tor Browser Bundle for OS X Intel (beta version), <a "
+"href=\"../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-"
+"osx-i386-en-US.zip\">Download</a>&nbsp; (<a "
+"href=\"../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-"
+"osx-i386-en-US.zip.asc\">sig</a>)  </span>"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/download/en/download.wml:97
+msgid ""
+"<span class=\"mac\">Stable Vidalia Bundle for OS X Intel, <a href"
+"=\"<package-osx-x86-bundle-stable>\">Download Stable</a>&nbsp;(<a href"
+"=\"<package-osx-x86-bundle-stable>.asc\">sig</a>)</span>"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/download/en/download.wml:100
+msgid ""
+"<span class=\"mac\">Unstable Vidalia Bundle for OS X Intel, <a href"
+"=\"<package-osx-x86-bundle-alpha>\">Download Unstable</a>&nbsp;(<a href"
+"=\"<package-osx-x86-bundle-alpha>.asc\">sig</a>)</span>"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/download/en/download.wml:103
+msgid ""
+"<span class=\"mac\">Stable Vidalia Bundle for OS X PowerPC, <a href"
+"=\"<package-osx-ppc-bundle-stable>\">Download Stable</a>&nbsp;(<a href"
+"=\"<package-osx-ppc-bundle-stable>.asc\">sig</a>)</span>"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/download/en/download.wml:106
+msgid ""
+"<span class=\"mac\">Unstable Vidalia Bundle for OS X PowerPC, <a href"
+"=\"<package-osx-ppc-bundle-alpha>\">Download Unstable</a>&nbsp;(<a href"
+"=\"<package-osx-ppc-bundle-alpha>.asc\">sig</a>)</span>"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/download/en/download.wml:109
+msgid ""
+"<a href=\"<page docs/tor-doc-osx>\">Documentation for Apple OS X "
+"clients</a>."
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td><div>
+#: /home/runa/tor/website/download/en/download.wml:116
+msgid "<a name=\"linux\">Linux/Unix</a>"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/download/en/download.wml:118
+msgid "The Tor Software comes bundled in two different ways:"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td><ul><li>
+#: /home/runa/tor/website/download/en/download.wml:121
+msgid ""
+"Read how to use <a href=\"<page download/download-unix>\">our repositories "
+"for the Tor software.</a>."
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/download/en/download.wml:126
+msgid ""
+"<span class=\"linux\">Tor Browser Bundle for GNU/Linux (beta version) on "
+"i686, <a href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-i686"
+"-<version-torbrowserbundlelinux32>-dev-en-US.tar.gz\">Download</a>&nbsp; (<a"
+" href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-"
+"torbrowserbundlelinux32>-dev-en-US.tar.gz.asc\">sig</a>)</span>"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/download/en/download.wml:131
+msgid ""
+"<span class=\"linux\">Tor Browser Bundle for GNU/Linux (beta version) on "
+"x86_64, <a href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64"
+"-<version-torbrowserbundlelinux64>-dev-en-US.tar.gz\">Download</a>&nbsp; (<a"
+" href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-"
+"torbrowserbundlelinux64>-dev-en-US.tar.gz.asc\">sig</a>)</span>"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/download/en/download.wml:136
+msgid ""
+"<span class=\"linux\">Use <a href=\"<page download/download-unix>\">our "
+"repositories</a> for all other Tor-related software.</span>"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td><div>
+#: /home/runa/tor/website/download/en/download.wml:141
+msgid "<a name=\"smartphones\">Tor for Smartphones</a>"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/download/en/download.wml:144
+msgid "Android-based phones, tablets, computers"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/download/en/download.wml:145
+msgid ""
+"<a href=\"../dist/android/<version-androidbundle-tor>-orbot-<version-"
+"androidbundle-orbot>.apk\">Android Bundle</a>"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/download/en/download.wml:146
+msgid "<a href=\"<page docs/android>\">Android Instructions</a>"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/download/en/download.wml:149
+msgid "iPhone, iPod Touch, iPad"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/download/en/download.wml:150
+msgid ""
+"<span class=\"mac\"><a href=\"http://sid77.slackware.it/iphone/\">Test "
+"packages by Marco</a></span>"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/download/en/download.wml:153
+msgid "Nokia Maemo/N900"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/download/en/download.wml:155
+msgid ""
+"<span class=\"nokia\"><a href=\"<page docs/N900>\">Experimental "
+"instructions</a></span>"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td><div>
+#: /home/runa/tor/website/download/en/download.wml:163
+msgid "<a name=\"source\">Source&nbsp;Code</a>"
+msgstr "<a name=\"source\">Quelltext</a>"
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/download/en/download.wml:166
+msgid ""
+"The current stable version of Tor is <version-stable>.  Its <a "
+"href=\"https://gitweb.torproject.org/tor.git/blob/release-0.2.1:/ChangeLog\">release"
+" notes</a> are available."
+msgstr ""
+"Die aktuelle stabile Version von Tor ist <version-stable>. <a "
+"href=\"https://gitweb.torproject.org/tor.git/blob/release-0.2.1:/ChangeLog\">Release"
+" Notes</a> sind verfügbar."
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/download/en/download.wml:169
+msgid ""
+"The current unstable/alpha version of Tor is <version-alpha>.  Its <a "
+"href=\"https://gitweb.torproject.org/tor.git/blob/refs/heads/release-0.2.2:/ChangeLog\">Changelog"
+" </a> is available."
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/download/en/download.wml:175
+msgid "Source Tarballs"
+msgstr "Tarballs mit Quellen"
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/download/en/download.wml:176
+msgid "./configure &amp;&amp; make &amp;&amp; src/or/tor"
+msgstr "./configure &amp;&amp; make &amp;&amp; src/or/tor"
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/download/en/download.wml:177
+msgid ""
+"<a href=\"../dist/tor-<version-stable>.tar.gz\">Download Stable</a> (<a "
+"href=\"../dist/tor-<version-stable>.tar.gz.asc\">sig</a>)"
+msgstr ""
+"<a href=\"../dist/tor-<version-stable>.tar.gz\">Download Stable-Version</a> "
+"(<a href=\"../dist/tor-<version-stable>.tar.gz.asc\">sig</a>)"
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/download/en/download.wml:178
+msgid ""
+"<a href=\"../dist/tor-<version-alpha>.tar.gz\">Download Unstable</a> (<a "
+"href=\"../dist/tor-<version-alpha>.tar.gz.asc\">sig</a>)"
+msgstr ""
+"<a href=\"../dist/tor-<version-alpha>.tar.gz\">Download Unstable-Version</a>"
+" (<a href=\"../dist/tor-<version-alpha>.tar.gz.asc\">sig</a>)"
+
+#. type: Content of: <div><div><div>
+#: /home/runa/tor/website/download/en/download.wml:182 /tmp/LYAFL6nMUK.xml:255
+msgid "<br>"
+msgstr ""
+
+#. type: Content of: <div><div><div>
+#: /home/runa/tor/website/download/en/download.wml:185
+msgid "<a name=\"warning\"></a> <a name=\"Warning\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><h2>
+#: /home/runa/tor/website/download/en/download.wml:187
+msgid "<a class=\"anchor\" href=\"#warning\">Want Tor to really work?</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+#: /home/runa/tor/website/download/en/download.wml:188
+msgid ""
+"...then please don't just install it and go on.  You need to change some of "
+"your habits, and reconfigure your software! Tor by itself is <em>NOT</em> "
+"all you need to maintain your anonymity. There are several major pitfalls to"
+" watch out for:"
+msgstr ""
+
+#. type: Content of: <div><div><div><ol><li>
+#: /home/runa/tor/website/download/en/download.wml:193
+msgid ""
+"Tor only protects Internet applications that are configured to send their "
+"traffic through Tor &mdash; it doesn't magically anonymize all your traffic "
+"just because you install it.  We recommend you use <a "
+"href=\"http://www.mozilla.com/en-US/firefox/all-older.html\">Firefox</a> "
+"with the <a href=\"<page torbutton/index>\">Torbutton</a> extension."
+msgstr ""
+
+#. type: Content of: <div><div><div><ol><li>
+#: /home/runa/tor/website/download/en/download.wml:201
+msgid ""
+"Torbutton blocks browser plugins such as Java, Flash, ActiveX, RealPlayer, "
+"Quicktime, Adobe's PDF plugin, and others: they can be manipulated into "
+"revealing your IP address. For example, that means Youtube is disabled. If "
+"you really need your Youtube, you can <a href=\"<page torbutton/torbutton-"
+"faq>#noflash\">reconfigure Torbutton</a> to allow it; but be aware that "
+"you're opening yourself up to potential attack. Also, extensions like Google"
+" toolbar look up more information about the websites you type in: they may "
+"bypass Tor and/or broadcast sensitive information. Some people prefer using "
+"two browsers (one for Tor, one for non-Tor browsing)."
+msgstr ""
+
+#. type: Content of: <div><div><div><ol><li>
+#: /home/runa/tor/website/download/en/download.wml:214
+msgid ""
+"Beware of cookies: if you ever browse without Tor and a site gives you a "
+"cookie, that cookie could identify you even when you start using Tor again. "
+"Torbutton tries to handle your cookies safely. <a "
+"href=\"https://addons.mozilla.org/firefox/82/\">CookieCuller</a> can help "
+"protect any cookies you do not want to lose."
+msgstr ""
+
+#. type: Content of: <div><div><div><ol><li>
+#: /home/runa/tor/website/download/en/download.wml:222
+msgid ""
+"Tor anonymizes the origin of your traffic, and it encrypts everything "
+"between you and the Tor network and everything inside the Tor network, but "
+"<a href=\"<wikifaq>#SoImtotallyanonymousifIuseTor\">it can't encrypt your "
+"traffic between the Tor network and its final destination.</a> If you are "
+"communicating sensitive information, you should use as much care as you "
+"would on the normal scary Internet &mdash; use HTTPS or other end-to-end "
+"encryption and authentication.  <a href=\"https://www.eff.org/https-"
+"everywhere\">HTTPS Everywhere</a> is a Firefox extension produced as a "
+"collaboration between The Tor Project and the Electronic Frontier "
+"Foundation. It encrypts your communications with a number of major websites."
+msgstr ""
+
+#. type: Content of: <div><div><div><ol><li>
+#: /home/runa/tor/website/download/en/download.wml:236
+msgid ""
+"While Tor blocks attackers on your local network from discovering or "
+"influencing your destination, it opens new risks: malicious or misconfigured"
+" Tor exit nodes can send you the wrong page, or even send you embedded Java "
+"applets disguised as domains you trust. Be careful opening documents or "
+"applications you download through Tor, unless you've verified their "
+"integrity."
+msgstr ""
+
+#. type: Content of: <div><div><div><ol><li>
+#: /home/runa/tor/website/download/en/download.wml:245
+msgid ""
+"Tor tries to prevent attackers from learning what destinations you connect "
+"to. It doesn't prevent somebody watching your traffic from learning that "
+"you're using Tor. You can mitigate (but not fully resolve) the risk by using"
+" a <a href=\"<page docs/bridges>\">Tor bridge relay</a> rather than "
+"connecting directly to the public Tor network, but ultimately the best "
+"protection here is a social approach: the more Tor users there are near you "
+"and the more <a href=\"<page about/torusers>\">diverse</a> their interests, "
+"the less dangerous it will be that you are one of them."
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+#: /home/runa/tor/website/download/en/download.wml:257
+msgid ""
+"Be smart and learn more. Understand what Tor does and does not offer.  This "
+"list of pitfalls isn't complete, and we need your help <a href=\"<page "
+"getinvolved/volunteer>#Documentation\">identifying and documenting all the "
+"issues</a>."
+msgstr ""
+
+#. type: Content of: <div><div><div><div><h2>
+#: /home/runa/tor/website/download/en/download.wml:269
+msgid "Jump to:"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><ul><li>
+#: /home/runa/tor/website/download/en/download.wml:271
+msgid "<a href=\"#Windows\">Microsoft Windows</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><ul><li>
+#: /home/runa/tor/website/download/en/download.wml:272
+msgid "<a href=\"#mac\">Apple OS X</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><ul><li>
+#: /home/runa/tor/website/download/en/download.wml:273
+msgid "<a href=\"#linux\">Linux/Unix</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><ul><li>
+#: /home/runa/tor/website/download/en/download.wml:274
+msgid "<a href=\"#smartphones\">Smartphones</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><ul><li>
+#: /home/runa/tor/website/download/en/download.wml:275
+msgid "<a href=\"#source\">Source Code</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><ul><li>
+#: /home/runa/tor/website/download/en/download.wml:276
+msgid "<a href=\"<page donate/donate>\">Please consider a donation</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><h2>
+#: /home/runa/tor/website/download/en/download.wml:284
+msgid "What is the (sig) link?"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><p>
+#: /home/runa/tor/website/download/en/download.wml:285
+msgid ""
+"These are GPG signatures to allow you to verify that your downloaded file is"
+" really from The Tor Project and not an imposter."
+msgstr ""
+
+#. type: Content of: <div><div><div><div>
+#: /home/runa/tor/website/download/en/download.wml:288
+msgid "<a href=\"<page docs/verifying-signatures>\">Learn more &raquo;</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><h2>
+#: /home/runa/tor/website/download/en/download.wml:294
+msgid "Having Trouble?"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><ul><li>
+#: /home/runa/tor/website/download/en/download.wml:296
+msgid "<a href=\"<page docs/documentation>\">Read the fine manuals</a>"
+msgstr ""

Modified: translation/trunk/projects/website/po/el/1-high.index.po
===================================================================
--- translation/trunk/projects/website/po/el/1-high.index.po	2011-04-12 16:15:00 UTC (rev 24594)
+++ translation/trunk/projects/website/po/el/1-high.index.po	2011-04-12 16:19:31 UTC (rev 24595)
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-03-17 18:05+0000\n"
-"PO-Revision-Date: 2011-03-22 16:15+0000\n"
+"POT-Creation-Date: 2011-03-28 12:48+0200\n"
+"PO-Revision-Date: 2011-03-29 00:25+0000\n"
 "Last-Translator: runasand <runa.sandvik at gmail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
@@ -18,47 +18,47 @@
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #. type: Content of: <div><div><div><div><ul><li>
-#: /home/runa/tor/website/en/index.wml:12
+#: /home/runa/dev/website/en/index.wml:12
 msgid "Tor prevents anyone from learning your location or browsing habits."
 msgstr ""
 
 #. type: Content of: <div><div><div><div><ul><li>
-#: /home/runa/tor/website/en/index.wml:13
+#: /home/runa/dev/website/en/index.wml:13
 msgid ""
 "Tor is for web browsers, instant messaging clients, remote logins, and more."
 msgstr ""
 
 #. type: Content of: <div><div><div><div><ul><li>
-#: /home/runa/tor/website/en/index.wml:14
+#: /home/runa/dev/website/en/index.wml:14
 msgid "Tor is free and open source for Windows, Mac, Linux/Unix, and Android"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><h1>
-#: /home/runa/tor/website/en/index.wml:16
+#: /home/runa/dev/website/en/index.wml:16
 msgid "Anonymity Online"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><p>
-#: /home/runa/tor/website/en/index.wml:17
+#: /home/runa/dev/website/en/index.wml:17
 msgid ""
 "Protect your privacy. Defend yourself against network surveillance and "
 "traffic analysis."
 msgstr ""
 
 #. type: Content of: <div><div><div><div><div>
-#: /home/runa/tor/website/en/index.wml:20
+#: /home/runa/dev/website/en/index.wml:20
 msgid ""
 "<a href=\"<page download/download>\"> <span class=\"download-tor\">Download "
 "Tor</span></a>"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><div><h2>
-#: /home/runa/tor/website/en/index.wml:26
+#: /home/runa/dev/website/en/index.wml:26
 msgid "What is Tor?"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><div><p>
-#: /home/runa/tor/website/en/index.wml:26
+#: /home/runa/dev/website/en/index.wml:26
 msgid ""
 "Tor is free software and an open network that helps you defend against a "
 "form of network surveillance that threatens personal freedom and privacy, "
@@ -69,12 +69,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><div><div><div><h2>
-#: /home/runa/tor/website/en/index.wml:36
+#: /home/runa/dev/website/en/index.wml:36
 msgid "Why Anonymity Matters"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><div><p>
-#: /home/runa/tor/website/en/index.wml:37
+#: /home/runa/dev/website/en/index.wml:37
 msgid ""
 "Tor protects you by bouncing your communications around a distributed "
 "network of relays run by volunteers all around the world: it prevents "
@@ -87,110 +87,110 @@
 msgstr ""
 
 #. type: Content of: <div><div><div><div><h2>
-#: /home/runa/tor/website/en/index.wml:50
+#: /home/runa/dev/website/en/index.wml:50
 msgid "Our Projects"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><table><tr><td>
-#: /home/runa/tor/website/en/index.wml:55
+#: /home/runa/dev/website/en/index.wml:55
 msgid "<img src=\"$(IMGROOT)/icon-TorButton.jpg\" alt=\"Torbutton Icon\">"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><table><tr><td><h3>
-#: /home/runa/tor/website/en/index.wml:56
+#: /home/runa/dev/website/en/index.wml:56
 msgid "<a href=\"<page torbutton/index>\">Torbutton</a>"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><table><tr><td><p>
-#: /home/runa/tor/website/en/index.wml:57
+#: /home/runa/dev/website/en/index.wml:57
 msgid ""
 "Torbutton is a 1-click way for Firefox users to enable or disable Tor in "
 "Firefox."
 msgstr ""
 
 #. type: Content of: <div><div><div><div><table><tr><td>
-#: /home/runa/tor/website/en/index.wml:61
+#: /home/runa/dev/website/en/index.wml:61
 msgid "<img src=\"$(IMGROOT)/icon-TorCheck.jpg\" alt=\"Tor Check Icon\">"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><table><tr><td><h3>
-#: /home/runa/tor/website/en/index.wml:62
+#: /home/runa/dev/website/en/index.wml:62
 msgid "<a href=\"https://check.torproject.org/\">Check</a>"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><table><tr><td><p>
-#: /home/runa/tor/website/en/index.wml:63
+#: /home/runa/dev/website/en/index.wml:63
 msgid "Check determines if you are successfully browsing with Tor."
 msgstr ""
 
 #. type: Content of: <div><div><div><div><table><tr><td>
-#: /home/runa/tor/website/en/index.wml:69
+#: /home/runa/dev/website/en/index.wml:69
 msgid "<img src=\"$(IMGROOT)/icon-Vidalia.jpg\" alt=\"Vidalia Icon\">"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><table><tr><td><h3>
-#: /home/runa/tor/website/en/index.wml:70
+#: /home/runa/dev/website/en/index.wml:70
 msgid "<a href=\"<page projects/vidalia>\">Vidalia</a>"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><table><tr><td><p>
-#: /home/runa/tor/website/en/index.wml:71
+#: /home/runa/dev/website/en/index.wml:71
 msgid ""
 "Vidalia is a graphical way to control and view Tor's connections and "
 "settings."
 msgstr ""
 
 #. type: Content of: <div><div><div><div><table><tr><td>
-#: /home/runa/tor/website/en/index.wml:75
+#: /home/runa/dev/website/en/index.wml:75
 msgid "<img src=\"$(IMGROOT)/icon-TorBrowser.jpg\" alt=\"TorBrowser Icon\">"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><table><tr><td><h3>
-#: /home/runa/tor/website/en/index.wml:76
+#: /home/runa/dev/website/en/index.wml:76
 msgid "<a href=\"<page projects/torbrowser>\">Tor Browser</a>"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><table><tr><td><p>
-#: /home/runa/tor/website/en/index.wml:78
+#: /home/runa/dev/website/en/index.wml:78
 msgid ""
 "Tor Browser contains everything you need to safely browse the Internet."
 msgstr ""
 
 #. type: Content of: <div><div><div><div><h2>
-#: /home/runa/tor/website/en/index.wml:90
+#: /home/runa/dev/website/en/index.wml:90
 msgid "Who Uses Tor?"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><div><h3>
-#: /home/runa/tor/website/en/index.wml:93
+#: /home/runa/dev/website/en/index.wml:93
 msgid ""
 "<a href=\"<page about/torusers>#normalusers\"><img "
 "src=\"$(IMGROOT)/family.jpg\" alt=\"Normal People\">Family &amp; Friends</a>"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><div><p>
-#: /home/runa/tor/website/en/index.wml:95
+#: /home/runa/dev/website/en/index.wml:95
 msgid ""
 "People like you and your family use Tor to protect themselves, their "
 "children, and their dignity while using the Internet."
 msgstr ""
 
 #. type: Content of: <div><div><div><div><div><h3>
-#: /home/runa/tor/website/en/index.wml:99
+#: /home/runa/dev/website/en/index.wml:99
 msgid ""
 "<a href=\"<page about/torusers>#executives\"><img "
 "src=\"$(IMGROOT)/consumers.jpg\" alt=\"Businesses\">Businesses</a>"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><div><p>
-#: /home/runa/tor/website/en/index.wml:101
+#: /home/runa/dev/website/en/index.wml:101
 msgid ""
 "Businesses use Tor to research competition, keep business strategies "
 "confidential, and facilitate internal accountability."
 msgstr ""
 
 #. type: Content of: <div><div><div><div><div><h3>
-#: /home/runa/tor/website/en/index.wml:105
+#: /home/runa/dev/website/en/index.wml:105
 msgid ""
 "<a href=\"<page about/torusers>#activists\"><img "
 "src=\"$(IMGROOT)/activists.jpg\" alt=\"Activists &amp; "
@@ -198,7 +198,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><div><div><div><p>
-#: /home/runa/tor/website/en/index.wml:107
+#: /home/runa/dev/website/en/index.wml:107
 msgid ""
 "Activists use Tor to anonymously report abuses from danger zones.  "
 "Whistleblowers use Tor to safely report on corruption."
@@ -208,14 +208,14 @@
 "αναφορά της διαφθοράς."
 
 #. type: Content of: <div><div><div><div><div><h3>
-#: /home/runa/tor/website/en/index.wml:111
+#: /home/runa/dev/website/en/index.wml:111
 msgid ""
 "<a href=\"<page about/torusers>#journalist\"><img "
 "src=\"$(IMGROOT)/media.jpg\" alt=\"Journalists and the Media\">Media</a>"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><div><p>
-#: /home/runa/tor/website/en/index.wml:113
+#: /home/runa/dev/website/en/index.wml:113
 msgid ""
 "Journalists and the media use Tor to protect their research and sources "
 "online."
@@ -224,7 +224,7 @@
 "της έρευνας και των πηγών τους στο διαδίκτυο."
 
 #. type: Content of: <div><div><div><div><div><h3>
-#: /home/runa/tor/website/en/index.wml:117
+#: /home/runa/dev/website/en/index.wml:117
 msgid ""
 "<a href=\"<page about/torusers>#military\"><img "
 "src=\"$(IMGROOT)/military.jpg\" alt=\"Military and Law "
@@ -232,24 +232,39 @@
 msgstr ""
 
 #. type: Content of: <div><div><div><div><div><p>
-#: /home/runa/tor/website/en/index.wml:119
+#: /home/runa/dev/website/en/index.wml:119
 msgid ""
 "Militaries and law enforcement use Tor to protect their communications, "
 "investigations, and intelligence gathering online."
 msgstr ""
 
 #. type: Content of: <div><div><div><div><h2>
-#: /home/runa/tor/website/en/index.wml:123
+#: /home/runa/dev/website/en/index.wml:123
 msgid "Announcements"
 msgstr "Ανακοινώσεις"
 
 #. type: Content of: <div><div><div><div><table><tr><td><div>
-#: /home/runa/tor/website/en/index.wml:128
+#: /home/runa/dev/website/en/index.wml:128
+msgid "<span class=\"month\">Mar</span><br><span class=\"day\">23</span>"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><table><tr><td><p>
+#: /home/runa/dev/website/en/index.wml:129
+msgid ""
+"The Tor Project wins the \"Project of Social Benefit\" award from the Free "
+"Software Foundation and GNU Project. We are honored to win this award and to"
+" be listed amongst the former winners. <a "
+"href=\"https://blog.torproject.org/blog/tor-project-receives-fsf-"
+"award\">Read more</a> about this award."
+msgstr ""
+
+#. type: Content of: <div><div><div><div><table><tr><td><div>
+#: /home/runa/dev/website/en/index.wml:135
 msgid "<span class=\"month\">Feb</span><br><span class=\"day\">23</span>"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><table><tr><td><p>
-#: /home/runa/tor/website/en/index.wml:129
+#: /home/runa/dev/website/en/index.wml:136
 msgid ""
 "The latest stable Tor version, 0.2.1.30, is <a "
 "href=\"https://lists.torproject.org/pipermail/tor-"
@@ -259,18 +274,3 @@
 "reachable from Iran again.  We don't expect this tweak will win the arms "
 "race long-term, but it buys us time until we roll out a better solution."
 msgstr ""
-
-#. type: Content of: <div><div><div><div><table><tr><td><div>
-#: /home/runa/tor/website/en/index.wml:138
-msgid "<span class=\"month\">Jan</span><br><span class=\"day\">30</span>"
-msgstr ""
-
-#. type: Content of: <div><div><div><div><table><tr><td><p>
-#: /home/runa/tor/website/en/index.wml:139
-msgid ""
-"Tor helping with Egypt.  Here's what we've learned <a "
-"href=\"https://blog.torproject.org/blog/recent-events-egypt\">about recent "
-"events in Egypt</a>. And we're keeping our <a href=\"<page "
-"press/inthemedia>\">In the media</a> page up to date with stories about how "
-"we're helping around the world."
-msgstr ""

Modified: translation/trunk/projects/website/po/es/1-high.index.po
===================================================================
--- translation/trunk/projects/website/po/es/1-high.index.po	2011-04-12 16:15:00 UTC (rev 24594)
+++ translation/trunk/projects/website/po/es/1-high.index.po	2011-04-12 16:19:31 UTC (rev 24595)
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-03-17 18:05+0000\n"
-"PO-Revision-Date: 2011-03-22 16:15+0000\n"
+"POT-Creation-Date: 2011-03-28 12:48+0200\n"
+"PO-Revision-Date: 2011-03-29 00:25+0000\n"
 "Last-Translator: carolyn <carolyn at torproject.org>\n"
 "Language-Team: Spanish (Castilian) <None>\n"
 "MIME-Version: 1.0\n"
@@ -18,35 +18,35 @@
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #. type: Content of: <div><div><div><div><ul><li>
-#: /home/runa/tor/website/en/index.wml:12
+#: /home/runa/dev/website/en/index.wml:12
 msgid "Tor prevents anyone from learning your location or browsing habits."
 msgstr ""
 
 #. type: Content of: <div><div><div><div><ul><li>
-#: /home/runa/tor/website/en/index.wml:13
+#: /home/runa/dev/website/en/index.wml:13
 msgid ""
 "Tor is for web browsers, instant messaging clients, remote logins, and more."
 msgstr ""
 
 #. type: Content of: <div><div><div><div><ul><li>
-#: /home/runa/tor/website/en/index.wml:14
+#: /home/runa/dev/website/en/index.wml:14
 msgid "Tor is free and open source for Windows, Mac, Linux/Unix, and Android"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><h1>
-#: /home/runa/tor/website/en/index.wml:16
+#: /home/runa/dev/website/en/index.wml:16
 msgid "Anonymity Online"
 msgstr "Anonimato online"
 
 #. type: Content of: <div><div><div><div><p>
-#: /home/runa/tor/website/en/index.wml:17
+#: /home/runa/dev/website/en/index.wml:17
 msgid ""
 "Protect your privacy. Defend yourself against network surveillance and "
 "traffic analysis."
 msgstr ""
 
 #. type: Content of: <div><div><div><div><div>
-#: /home/runa/tor/website/en/index.wml:20
+#: /home/runa/dev/website/en/index.wml:20
 msgid ""
 "<a href=\"<page download/download>\"> <span class=\"download-tor\">Download "
 "Tor</span></a>"
@@ -55,12 +55,12 @@
 " Tor</span></a>"
 
 #. type: Content of: <div><div><div><div><div><h2>
-#: /home/runa/tor/website/en/index.wml:26
+#: /home/runa/dev/website/en/index.wml:26
 msgid "What is Tor?"
 msgstr "¿Qué es Tor?"
 
 #. type: Content of: <div><div><div><div><div><p>
-#: /home/runa/tor/website/en/index.wml:26
+#: /home/runa/dev/website/en/index.wml:26
 msgid ""
 "Tor is free software and an open network that helps you defend against a "
 "form of network surveillance that threatens personal freedom and privacy, "
@@ -71,12 +71,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><div><div><div><h2>
-#: /home/runa/tor/website/en/index.wml:36
+#: /home/runa/dev/website/en/index.wml:36
 msgid "Why Anonymity Matters"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><div><p>
-#: /home/runa/tor/website/en/index.wml:37
+#: /home/runa/dev/website/en/index.wml:37
 msgid ""
 "Tor protects you by bouncing your communications around a distributed "
 "network of relays run by volunteers all around the world: it prevents "
@@ -89,110 +89,110 @@
 msgstr ""
 
 #. type: Content of: <div><div><div><div><h2>
-#: /home/runa/tor/website/en/index.wml:50
+#: /home/runa/dev/website/en/index.wml:50
 msgid "Our Projects"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><table><tr><td>
-#: /home/runa/tor/website/en/index.wml:55
+#: /home/runa/dev/website/en/index.wml:55
 msgid "<img src=\"$(IMGROOT)/icon-TorButton.jpg\" alt=\"Torbutton Icon\">"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><table><tr><td><h3>
-#: /home/runa/tor/website/en/index.wml:56
+#: /home/runa/dev/website/en/index.wml:56
 msgid "<a href=\"<page torbutton/index>\">Torbutton</a>"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><table><tr><td><p>
-#: /home/runa/tor/website/en/index.wml:57
+#: /home/runa/dev/website/en/index.wml:57
 msgid ""
 "Torbutton is a 1-click way for Firefox users to enable or disable Tor in "
 "Firefox."
 msgstr ""
 
 #. type: Content of: <div><div><div><div><table><tr><td>
-#: /home/runa/tor/website/en/index.wml:61
+#: /home/runa/dev/website/en/index.wml:61
 msgid "<img src=\"$(IMGROOT)/icon-TorCheck.jpg\" alt=\"Tor Check Icon\">"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><table><tr><td><h3>
-#: /home/runa/tor/website/en/index.wml:62
+#: /home/runa/dev/website/en/index.wml:62
 msgid "<a href=\"https://check.torproject.org/\">Check</a>"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><table><tr><td><p>
-#: /home/runa/tor/website/en/index.wml:63
+#: /home/runa/dev/website/en/index.wml:63
 msgid "Check determines if you are successfully browsing with Tor."
 msgstr ""
 
 #. type: Content of: <div><div><div><div><table><tr><td>
-#: /home/runa/tor/website/en/index.wml:69
+#: /home/runa/dev/website/en/index.wml:69
 msgid "<img src=\"$(IMGROOT)/icon-Vidalia.jpg\" alt=\"Vidalia Icon\">"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><table><tr><td><h3>
-#: /home/runa/tor/website/en/index.wml:70
+#: /home/runa/dev/website/en/index.wml:70
 msgid "<a href=\"<page projects/vidalia>\">Vidalia</a>"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><table><tr><td><p>
-#: /home/runa/tor/website/en/index.wml:71
+#: /home/runa/dev/website/en/index.wml:71
 msgid ""
 "Vidalia is a graphical way to control and view Tor's connections and "
 "settings."
 msgstr ""
 
 #. type: Content of: <div><div><div><div><table><tr><td>
-#: /home/runa/tor/website/en/index.wml:75
+#: /home/runa/dev/website/en/index.wml:75
 msgid "<img src=\"$(IMGROOT)/icon-TorBrowser.jpg\" alt=\"TorBrowser Icon\">"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><table><tr><td><h3>
-#: /home/runa/tor/website/en/index.wml:76
+#: /home/runa/dev/website/en/index.wml:76
 msgid "<a href=\"<page projects/torbrowser>\">Tor Browser</a>"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><table><tr><td><p>
-#: /home/runa/tor/website/en/index.wml:78
+#: /home/runa/dev/website/en/index.wml:78
 msgid ""
 "Tor Browser contains everything you need to safely browse the Internet."
 msgstr ""
 
 #. type: Content of: <div><div><div><div><h2>
-#: /home/runa/tor/website/en/index.wml:90
+#: /home/runa/dev/website/en/index.wml:90
 msgid "Who Uses Tor?"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><div><h3>
-#: /home/runa/tor/website/en/index.wml:93
+#: /home/runa/dev/website/en/index.wml:93
 msgid ""
 "<a href=\"<page about/torusers>#normalusers\"><img "
 "src=\"$(IMGROOT)/family.jpg\" alt=\"Normal People\">Family &amp; Friends</a>"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><div><p>
-#: /home/runa/tor/website/en/index.wml:95
+#: /home/runa/dev/website/en/index.wml:95
 msgid ""
 "People like you and your family use Tor to protect themselves, their "
 "children, and their dignity while using the Internet."
 msgstr ""
 
 #. type: Content of: <div><div><div><div><div><h3>
-#: /home/runa/tor/website/en/index.wml:99
+#: /home/runa/dev/website/en/index.wml:99
 msgid ""
 "<a href=\"<page about/torusers>#executives\"><img "
 "src=\"$(IMGROOT)/consumers.jpg\" alt=\"Businesses\">Businesses</a>"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><div><p>
-#: /home/runa/tor/website/en/index.wml:101
+#: /home/runa/dev/website/en/index.wml:101
 msgid ""
 "Businesses use Tor to research competition, keep business strategies "
 "confidential, and facilitate internal accountability."
 msgstr ""
 
 #. type: Content of: <div><div><div><div><div><h3>
-#: /home/runa/tor/website/en/index.wml:105
+#: /home/runa/dev/website/en/index.wml:105
 msgid ""
 "<a href=\"<page about/torusers>#activists\"><img "
 "src=\"$(IMGROOT)/activists.jpg\" alt=\"Activists &amp; "
@@ -200,28 +200,28 @@
 msgstr ""
 
 #. type: Content of: <div><div><div><div><div><p>
-#: /home/runa/tor/website/en/index.wml:107
+#: /home/runa/dev/website/en/index.wml:107
 msgid ""
 "Activists use Tor to anonymously report abuses from danger zones.  "
 "Whistleblowers use Tor to safely report on corruption."
 msgstr ""
 
 #. type: Content of: <div><div><div><div><div><h3>
-#: /home/runa/tor/website/en/index.wml:111
+#: /home/runa/dev/website/en/index.wml:111
 msgid ""
 "<a href=\"<page about/torusers>#journalist\"><img "
 "src=\"$(IMGROOT)/media.jpg\" alt=\"Journalists and the Media\">Media</a>"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><div><p>
-#: /home/runa/tor/website/en/index.wml:113
+#: /home/runa/dev/website/en/index.wml:113
 msgid ""
 "Journalists and the media use Tor to protect their research and sources "
 "online."
 msgstr ""
 
 #. type: Content of: <div><div><div><div><div><h3>
-#: /home/runa/tor/website/en/index.wml:117
+#: /home/runa/dev/website/en/index.wml:117
 msgid ""
 "<a href=\"<page about/torusers>#military\"><img "
 "src=\"$(IMGROOT)/military.jpg\" alt=\"Military and Law "
@@ -229,24 +229,39 @@
 msgstr ""
 
 #. type: Content of: <div><div><div><div><div><p>
-#: /home/runa/tor/website/en/index.wml:119
+#: /home/runa/dev/website/en/index.wml:119
 msgid ""
 "Militaries and law enforcement use Tor to protect their communications, "
 "investigations, and intelligence gathering online."
 msgstr ""
 
 #. type: Content of: <div><div><div><div><h2>
-#: /home/runa/tor/website/en/index.wml:123
+#: /home/runa/dev/website/en/index.wml:123
 msgid "Announcements"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><table><tr><td><div>
-#: /home/runa/tor/website/en/index.wml:128
+#: /home/runa/dev/website/en/index.wml:128
+msgid "<span class=\"month\">Mar</span><br><span class=\"day\">23</span>"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><table><tr><td><p>
+#: /home/runa/dev/website/en/index.wml:129
+msgid ""
+"The Tor Project wins the \"Project of Social Benefit\" award from the Free "
+"Software Foundation and GNU Project. We are honored to win this award and to"
+" be listed amongst the former winners. <a "
+"href=\"https://blog.torproject.org/blog/tor-project-receives-fsf-"
+"award\">Read more</a> about this award."
+msgstr ""
+
+#. type: Content of: <div><div><div><div><table><tr><td><div>
+#: /home/runa/dev/website/en/index.wml:135
 msgid "<span class=\"month\">Feb</span><br><span class=\"day\">23</span>"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><table><tr><td><p>
-#: /home/runa/tor/website/en/index.wml:129
+#: /home/runa/dev/website/en/index.wml:136
 msgid ""
 "The latest stable Tor version, 0.2.1.30, is <a "
 "href=\"https://lists.torproject.org/pipermail/tor-"
@@ -256,18 +271,3 @@
 "reachable from Iran again.  We don't expect this tweak will win the arms "
 "race long-term, but it buys us time until we roll out a better solution."
 msgstr ""
-
-#. type: Content of: <div><div><div><div><table><tr><td><div>
-#: /home/runa/tor/website/en/index.wml:138
-msgid "<span class=\"month\">Jan</span><br><span class=\"day\">30</span>"
-msgstr ""
-
-#. type: Content of: <div><div><div><div><table><tr><td><p>
-#: /home/runa/tor/website/en/index.wml:139
-msgid ""
-"Tor helping with Egypt.  Here's what we've learned <a "
-"href=\"https://blog.torproject.org/blog/recent-events-egypt\">about recent "
-"events in Egypt</a>. And we're keeping our <a href=\"<page "
-"press/inthemedia>\">In the media</a> page up to date with stories about how "
-"we're helping around the world."
-msgstr ""

Modified: translation/trunk/projects/website/po/es/about/3-low.contact.po
===================================================================
--- translation/trunk/projects/website/po/es/about/3-low.contact.po	2011-04-12 16:15:00 UTC (rev 24594)
+++ translation/trunk/projects/website/po/es/about/3-low.contact.po	2011-04-12 16:19:31 UTC (rev 24595)
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-02-12 12:19+0000\n"
-"PO-Revision-Date: 2011-03-22 16:18+0000\n"
+"POT-Creation-Date: 2011-03-28 12:49+0200\n"
+"PO-Revision-Date: 2011-03-29 00:25+0000\n"
 "Last-Translator: NinjaTuna <nort0ngh0st at hotmail.com>\n"
 "Language-Team: Spanish (Castilian) <None>\n"
 "MIME-Version: 1.0\n"
@@ -18,7 +18,7 @@
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/about/en/contact.wml:9
+#: /home/runa/dev/website/about/en/contact.wml:9
 msgid ""
 "<a href=\"<page index>\">Home &raquo; </a> <a href=\"<page "
 "about/overview>\">About &raquo; </a> <a href=\"<page "
@@ -26,12 +26,12 @@
 msgstr "Hogar » Acerca de nosotros »  Contactos"
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/about/en/contact.wml:14
+#: /home/runa/dev/website/about/en/contact.wml:14
 msgid "Tor: Contact"
 msgstr "Tor: contacto"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/about/en/contact.wml:16
+#: /home/runa/dev/website/about/en/contact.wml:16
 msgid ""
 "First, if you have a problem or question about using Tor, go look at the <a "
 "href=\"<page docs/documentation>#Support\">Support section</a> for how to "
@@ -42,30 +42,30 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/about/en/contact.wml:18
+#: /home/runa/dev/website/about/en/contact.wml:18
 msgid ""
-"If you really do need to reach us, here are some approaches. All of these "
-"addresses are @torproject.org. Please be patient and <a "
-"href=\"http://www.catb.org/~esr/faqs/smart-questions.html\">helpful</a>, and"
-" please make sure to write your mail in English."
+"If you really do need to reach us, here are some approaches. Please be "
+"patient and <a href=\"http://www.catb.org/~esr/faqs/smart-"
+"questions.html\">helpful</a>, and please make sure to write your mail in "
+"English."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/about/en/contact.wml:23
+#: /home/runa/dev/website/about/en/contact.wml:21
 msgid ""
-"<i>tor-assistants</i> is the catch-all address for everything. It can be "
-"used for:"
+"<i>tor-assistants at lists.torproject.org</i> is the catch-all address for "
+"everything. It can be used for:"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/about/en/contact.wml:27
+#: /home/runa/dev/website/about/en/contact.wml:25
 msgid ""
 "Contacting the people who manage the directory authorities. Use this if you "
 "run a Tor relay and have a question or problem with your relay."
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/about/en/contact.wml:30
+#: /home/runa/dev/website/about/en/contact.wml:28
 msgid ""
 "So we can fix typos on the website, change wrong statements or directions on"
 " the website, and add new sections and paragraphs that you send us. You "
@@ -74,7 +74,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/about/en/contact.wml:34
+#: /home/runa/dev/website/about/en/contact.wml:32
 msgid ""
 "Hearing about your documents, patches, testing, experiences with supporting "
 "applications, and so forth inspired by our <a href=\"<page "
@@ -86,58 +86,59 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/about/en/contact.wml:44
+#: /home/runa/dev/website/about/en/contact.wml:42
 msgid "A few other addresses are more specific:"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/about/en/contact.wml:47
+#: /home/runa/dev/website/about/en/contact.wml:45
 msgid ""
-"<i>tor-translation</i> can put new <a href=\"<page "
+"<i>tor-translation at lists.torproject.org</i> can put new <a href=\"<page "
 "getinvolved/translation>\">website translations</a> into place, and help "
 "answer questions about existing and new translations."
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/about/en/contact.wml:50
+#: /home/runa/dev/website/about/en/contact.wml:48
 msgid ""
-"<i>tordnsel</i> is the alias for the people responsible for the tordns "
-"exitlist."
+"<i>tordnsel at torproject.org</i> is the alias for the people responsible "
+"for the tordns exitlist."
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/about/en/contact.wml:52
+#: /home/runa/dev/website/about/en/contact.wml:50
 msgid ""
-"<i>donations</i> is for questions and comments about <a href=\"<page "
-"donate/donate>\">getting money to the developers</a>. More donations means "
-"<a href=\"<page docs/faq>#Funding\">more Tor</a>. We're happy to help think "
-"about creative ways for you to contribute."
+"<i>donations at torproject.org</i> is for questions and comments about <a "
+"href=\"<page donate/donate>\">getting money to the developers</a>. More "
+"donations means <a href=\"<page docs/faq>#Funding\">more Tor</a>. We're "
+"happy to help think about creative ways for you to contribute."
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/about/en/contact.wml:57
+#: /home/runa/dev/website/about/en/contact.wml:55
 msgid ""
-"<i>execdir</i> is for press/media, questions and comments about Tor the non-"
-"profit corporation: trademark questions, affiliation and coordination, major"
-" gifts, contract inquiries, licensing and certification, etc."
+"<i>execdir at torproject.org</i> is for press/media, questions and comments "
+"about Tor the non-profit corporation: trademark questions, affiliation and "
+"coordination, major gifts, contract inquiries, licensing and certification, "
+"etc."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/about/en/contact.wml:63
+#: /home/runa/dev/website/about/en/contact.wml:61
 msgid ""
 "<a id=\"irc\"></a> Tor users and developers can also be found in the "
 "following channels on <a href=\"http://www.oftc.net/oftc/\">oftc</a>:"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/about/en/contact.wml:68
+#: /home/runa/dev/website/about/en/contact.wml:66
 msgid ""
 "<i>#tor</i> - User and relay operation discussions. Having trouble running "
 "Tor or a question for other Tor users? Then this is the spot for you."
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/about/en/contact.wml:71
+#: /home/runa/dev/website/about/en/contact.wml:69
 msgid ""
 "<i>#tor-dev</i> - Channel for people who want to do development.  "
 "Discussions about Tor related coding, protocols, and <a href=\"<page "
@@ -145,7 +146,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/about/en/contact.wml:74
+#: /home/runa/dev/website/about/en/contact.wml:72
 msgid ""
 "<i>#nottor</i> - This is where Tor people hang out to talk about stuff that "
 "is not related to Tor."

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

Modified: translation/trunk/projects/website/po/es/about/3-low.volunteers.po
===================================================================
--- translation/trunk/projects/website/po/es/about/3-low.volunteers.po	2011-04-12 16:15:00 UTC (rev 24594)
+++ translation/trunk/projects/website/po/es/about/3-low.volunteers.po	2011-04-12 16:19:31 UTC (rev 24595)
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-02-12 12:19+0000\n"
-"PO-Revision-Date: 2011-03-22 16:23+0000\n"
+"POT-Creation-Date: 2011-03-28 12:49+0200\n"
+"PO-Revision-Date: 2011-03-29 00:25+0000\n"
 "Last-Translator: runasand <runa.sandvik at gmail.com>\n"
 "Language-Team: Spanish (Castilian) <None>\n"
 "MIME-Version: 1.0\n"
@@ -18,7 +18,7 @@
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/about/en/volunteers.wml:8
+#: /home/runa/dev/website/about/en/volunteers.wml:8
 msgid ""
 "<a href=\"<page index>\">Home &raquo; </a> <a href=\"<page "
 "about/overview>\">About &raquo; </a> <a href=\"<page "
@@ -29,27 +29,27 @@
 "about/volunteers>\">Voluntarios</a>"
 
 #. type: Content of: <div><div><h1>
-#: /home/runa/tor/website/about/en/volunteers.wml:13
+#: /home/runa/dev/website/about/en/volunteers.wml:13
 msgid "Volunteers"
 msgstr "Voluntarios"
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/volunteers.wml:15
+#: /home/runa/dev/website/about/en/volunteers.wml:15
 msgid "Anonym"
 msgstr "Anonym"
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/volunteers.wml:15
+#: /home/runa/dev/website/about/en/volunteers.wml:15
 msgid "Maintainer of the Incognito LiveCD."
 msgstr "Mantiene el Incognito LiveCD."
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/volunteers.wml:16
+#: /home/runa/dev/website/about/en/volunteers.wml:16
 msgid "Kevin Bankston"
 msgstr "Kevin Bankston"
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/volunteers.wml:16
+#: /home/runa/dev/website/about/en/volunteers.wml:16
 msgid ""
 "EFF lawyer who helped write the <a href=\"<page eff/tor-legal-faq>\">Tor "
 "Legal FAQ</a> and tirelessly answers the phone when somebody in the world "
@@ -60,22 +60,22 @@
 "en el mundo tiene una pregunta legal sobre Tor."
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/volunteers.wml:20
+#: /home/runa/dev/website/about/en/volunteers.wml:20
 msgid "Marco Bonetti"
 msgstr "Marco Bonetti"
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/volunteers.wml:20
+#: /home/runa/dev/website/about/en/volunteers.wml:20
 msgid "Focusing on MobileTor for the iPhone."
 msgstr "Está enfocado en MobileTor para el iPhone."
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/volunteers.wml:21
+#: /home/runa/dev/website/about/en/volunteers.wml:21
 msgid "Kasimir Gabert"
 msgstr "Kasimir Gabert"
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/volunteers.wml:21
+#: /home/runa/dev/website/about/en/volunteers.wml:21
 msgid ""
 "Maintains the <a href=\"https://torstatus.kgprog.com/\">TorStatus</a> "
 "statistics pages."
@@ -84,22 +84,22 @@
 "href=\"https://torstatus.kgprog.com/\">TorStatus</a>."
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/volunteers.wml:23
+#: /home/runa/dev/website/about/en/volunteers.wml:23
 msgid "Andreas Jonsson"
 msgstr "Andreas Jonsson"
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/volunteers.wml:23
+#: /home/runa/dev/website/about/en/volunteers.wml:23
 msgid "Works on OS X Tor Browser Bundle sandbox technology."
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/volunteers.wml:25
+#: /home/runa/dev/website/about/en/volunteers.wml:25
 msgid "Fabian Keil"
 msgstr "Fabian Keil"
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/volunteers.wml:25
+#: /home/runa/dev/website/about/en/volunteers.wml:25
 msgid ""
 "One of the core Privoxy developers, and also a Tor fan. He's the reason Tor "
 "and Privoxy still work well together."
@@ -108,22 +108,22 @@
 "Gracias a él Tor y Privoxy todavía funcionan bien juntos."
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/volunteers.wml:27
+#: /home/runa/dev/website/about/en/volunteers.wml:27
 msgid "Bruce Leidl"
 msgstr "Bruce Leidl"
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/volunteers.wml:27
+#: /home/runa/dev/website/about/en/volunteers.wml:27
 msgid "Working on a Tor client in Java."
 msgstr "Trabaja con un cliente de Tor en Java."
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/volunteers.wml:28
+#: /home/runa/dev/website/about/en/volunteers.wml:28
 msgid "Julius Mittenzwei"
 msgstr "Julio Mittenzwei"
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/volunteers.wml:28
+#: /home/runa/dev/website/about/en/volunteers.wml:28
 msgid ""
 "A lawyer with the CCC in Germany. Coordinates the German Tor community with "
 "respect to legal questions and concerns."
@@ -132,12 +132,12 @@
 "respecto a cuestiones y preocupaciones jurídicas."
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/volunteers.wml:31
+#: /home/runa/dev/website/about/en/volunteers.wml:31
 msgid "Shava Nerad"
 msgstr "Shava Nerad"
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/volunteers.wml:31
+#: /home/runa/dev/website/about/en/volunteers.wml:31
 msgid ""
 "Our former Development Director. She still works on PR and community "
 "relations."
@@ -146,12 +146,12 @@
 "comunitarias."
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/volunteers.wml:33
+#: /home/runa/dev/website/about/en/volunteers.wml:33
 msgid "Linus Nordberg"
 msgstr "Linus Nordberg"
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/volunteers.wml:33
+#: /home/runa/dev/website/about/en/volunteers.wml:33
 msgid ""
 "Enjoys measuring the Tor network and helps with outreach in the Nordic "
 "countries."
@@ -160,12 +160,12 @@
 "nórdicos."
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/volunteers.wml:35
+#: /home/runa/dev/website/about/en/volunteers.wml:35
 msgid "Lasse &Oslash;verlier"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/volunteers.wml:35
+#: /home/runa/dev/website/about/en/volunteers.wml:35
 msgid ""
 "Writes research papers on Tor: attacks, defenses, and resource management, "
 "especially for hidden services."
@@ -174,36 +174,26 @@
 "recursos, especialmente para servicios ocultos."
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/volunteers.wml:37
+#: /home/runa/dev/website/about/en/volunteers.wml:37
 msgid "Martin Peck"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/volunteers.wml:37
+#: /home/runa/dev/website/about/en/volunteers.wml:37
 msgid ""
 "Working on a VM-based transparent proxying approach for Tor clients on "
 "Windows."
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/volunteers.wml:39
-msgid "Robert Ransom"
-msgstr ""
-
-#. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/volunteers.wml:39
-msgid "Bug catcher and immensely helpful on irc and the email lists"
-msgstr ""
-
-#. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/volunteers.wml:41
+#: /home/runa/dev/website/about/en/volunteers.wml:39
 msgid "rovv (a pseudonym -- he's managed to stay anonymous even from us!)"
 msgstr ""
 "rovv (un seudónimo - ¡ha conseguido mantenerse en el anonimato incluso ante "
 "nosotros!)"
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/volunteers.wml:42
+#: /home/runa/dev/website/about/en/volunteers.wml:40
 msgid ""
 "The most dedicated bug reporter we've ever heard from. He must read Tor "
 "source code every day over breakfast."
@@ -212,12 +202,12 @@
 "código fuente de Tor todos los días durante el desayuno."
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/volunteers.wml:44
+#: /home/runa/dev/website/about/en/volunteers.wml:42
 msgid "tup (another pseudonym)"
 msgstr "tup (otro seudónimo)"
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/volunteers.wml:44
+#: /home/runa/dev/website/about/en/volunteers.wml:42
 msgid ""
 "Periodically adds new features for making Tor easier to use as a <a "
 "href=\"<wiki>TransparentProxy\">transparent proxy</a>. Also maintains the <a"
@@ -229,34 +219,24 @@
 "TorDNSEL</a> ."
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/volunteers.wml:49
-msgid "Tomás Touceda"
-msgstr ""
-
-#. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/volunteers.wml:49
-msgid "Fantastic developer involved with the Vidalia project"
-msgstr ""
-
-#. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/volunteers.wml:51
+#: /home/runa/dev/website/about/en/volunteers.wml:47
 msgid "Kyle Williams"
 msgstr "Kyle Williams"
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/volunteers.wml:51
+#: /home/runa/dev/website/about/en/volunteers.wml:47
 msgid ""
 "Developer for JanusVM, a VMWare-based transparent Tor proxy that makes Tor "
 "easier to set up and use."
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/volunteers.wml:54
+#: /home/runa/dev/website/about/en/volunteers.wml:50
 msgid "Ethan Zuckerman"
 msgstr "Ethan Zuckerman"
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/volunteers.wml:54
+#: /home/runa/dev/website/about/en/volunteers.wml:50
 msgid ""
 "A blogger who has written some <a "
 "href=\"http://www.ethanzuckerman.com/blog/?p=1019\">interesting</a> <a "
@@ -271,7 +251,7 @@
 "de todo el mundo sobre Tor y herramientas relacionadas."
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/volunteers.wml:59
+#: /home/runa/dev/website/about/en/volunteers.wml:55
 msgid ""
 "All our relay operators, people who write <a "
 "href=\"http://freehaven.net/anonbib/\">research papers</a> about Tor, people"

Modified: translation/trunk/projects/website/po/es/docs/1-high.proxychain.po
===================================================================
--- translation/trunk/projects/website/po/es/docs/1-high.proxychain.po	2011-04-12 16:15:00 UTC (rev 24594)
+++ translation/trunk/projects/website/po/es/docs/1-high.proxychain.po	2011-04-12 16:19:31 UTC (rev 24595)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-01-29 21:06+0000\n"
+"POT-Creation-Date: 2011-03-28 12:48+0200\n"
 "PO-Revision-Date: 2011-03-22 16:45+0000\n"
 "Last-Translator: runasand <runa.sandvik at gmail.com>\n"
 "Language-Team: Spanish (Castilian) <None>\n"
@@ -18,7 +18,7 @@
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/proxychain.wml:8
+#: /home/runa/dev/website/docs/en/proxychain.wml:8
 msgid ""
 "<a href=\"<page index>\">Home &raquo; </a> <a href=\"<page "
 "docs/documentation>\">Documentation &raquo; </a> <a href=\"<page "
@@ -26,24 +26,24 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/proxychain.wml:13
+#: /home/runa/dev/website/docs/en/proxychain.wml:13
 msgid "<a id=\"proxychain\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/docs/en/proxychain.wml:14
+#: /home/runa/dev/website/docs/en/proxychain.wml:14
 msgid ""
 "<a class=\"anchor\" href=\"#proxychain\">Tor: Configuring Tor to use a "
 "Proxy</a>"
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/proxychain.wml:15
+#: /home/runa/dev/website/docs/en/proxychain.wml:15
 msgid "<hr>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/proxychain.wml:18
+#: /home/runa/dev/website/docs/en/proxychain.wml:18
 msgid ""
 "The current version of Tor and the Vidalia Graphical Tor Controller support "
 "the ability to use any HTTPS or SOCKS proxy to get access to the Tor "
@@ -55,7 +55,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/proxychain.wml:28
+#: /home/runa/dev/website/docs/en/proxychain.wml:28
 msgid ""
 "These steps assume you have a functional Tor/Vidalia configuration, and you "
 "have found a list of HTTPS, SOCKS4, or SOCKS5 proxies. (To clarify, an HTTPS"
@@ -63,50 +63,50 @@
 msgstr ""
 
 #. type: Content of: <div><div><p><ol><li>
-#: /home/runa/tor/website/docs/en/proxychain.wml:33
+#: /home/runa/dev/website/docs/en/proxychain.wml:33
 msgid "Open the Vidalia Control Panel, click on Settings."
 msgstr ""
 
 #. type: Content of: <div><div><p><ol><li>
-#: /home/runa/tor/website/docs/en/proxychain.wml:34
+#: /home/runa/dev/website/docs/en/proxychain.wml:34
 msgid "Click Network.  Select \"I use a proxy to access the Internet\"."
 msgstr ""
 
 #. type: Content of: <div><div><p><ol><li>
-#: /home/runa/tor/website/docs/en/proxychain.wml:35
+#: /home/runa/dev/website/docs/en/proxychain.wml:35
 msgid ""
 "On the Address line, enter the open proxy address.  This can be a hostname "
 "or IP Address."
 msgstr ""
 
 #. type: Content of: <div><div><p><ol><li>
-#: /home/runa/tor/website/docs/en/proxychain.wml:36
+#: /home/runa/dev/website/docs/en/proxychain.wml:36
 msgid "Enter the port for the proxy."
 msgstr ""
 
 #. type: Content of: <div><div><p><ol><li>
-#: /home/runa/tor/website/docs/en/proxychain.wml:37
+#: /home/runa/dev/website/docs/en/proxychain.wml:37
 msgid ""
 "Generally, you do not need a Username and Password.  If you do, enter the "
 "information in the proper fields."
 msgstr ""
 
 #. type: Content of: <div><div><p><ol><li>
-#: /home/runa/tor/website/docs/en/proxychain.wml:38
+#: /home/runa/dev/website/docs/en/proxychain.wml:38
 msgid ""
 "Choose the Type of proxy you are using, whether HTTP/HTTPS, SOCKS4, or "
 "SOCKS5."
 msgstr ""
 
 #. type: Content of: <div><div><p><ol><li>
-#: /home/runa/tor/website/docs/en/proxychain.wml:39
+#: /home/runa/dev/website/docs/en/proxychain.wml:39
 msgid ""
 "Push the Ok button.  Vidalia and Tor are now configured to use a proxy to "
 "access the rest of the Tor Network."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/proxychain.wml:42
+#: /home/runa/dev/website/docs/en/proxychain.wml:42
 msgid ""
 "<br><br> <img src=\"$(IMGROOT)/vidalia-proxy.png\" alt=\"Vidalia's Network "
 "Proxy settings page\"> <br><br>"

Modified: translation/trunk/projects/website/po/es/docs/2-medium.faq.po
===================================================================
--- translation/trunk/projects/website/po/es/docs/2-medium.faq.po	2011-04-12 16:15:00 UTC (rev 24594)
+++ translation/trunk/projects/website/po/es/docs/2-medium.faq.po	2011-04-12 16:19:31 UTC (rev 24595)
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-03-17 18:04+0000\n"
-"PO-Revision-Date: 2011-03-22 16:26+0000\n"
+"POT-Creation-Date: 2011-03-28 12:48+0200\n"
+"PO-Revision-Date: 2011-03-29 00:25+0000\n"
 "Last-Translator: runasand <runa.sandvik at gmail.com>\n"
 "Language-Team: Spanish (Castilian) <None>\n"
 "MIME-Version: 1.0\n"
@@ -18,7 +18,7 @@
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:8
+#: /home/runa/dev/website/docs/en/faq.wml:8
 msgid ""
 "<a href=\"<page index>\">Home &raquo; </a> <a href=\"<page "
 "docs/documentation>\">Documentation &raquo; </a> <a href=\"<page "
@@ -26,288 +26,288 @@
 msgstr ""
 
 #. type: Content of: <div><div><h1>
-#: /home/runa/tor/website/docs/en/faq.wml:14
+#: /home/runa/dev/website/docs/en/faq.wml:14
 msgid "Tor FAQ"
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:15 /tmp/B_aDff_VuJ.xml:1646
+#: /home/runa/dev/website/docs/en/faq.wml:15 /tmp/tNikbgsymy.xml:1646
 msgid "<hr>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:17
+#: /home/runa/dev/website/docs/en/faq.wml:17
 msgid "General questions:"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:19
+#: /home/runa/dev/website/docs/en/faq.wml:19
 msgid "<a href=\"#WhatIsTor\">What is Tor?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:20
+#: /home/runa/dev/website/docs/en/faq.wml:20
 msgid "<a href=\"#Torisdifferent\">How is Tor different from other proxies?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:21
+#: /home/runa/dev/website/docs/en/faq.wml:21
 msgid "<a href=\"#CompatibleApplications\">What programs can I use with Tor?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:23
+#: /home/runa/dev/website/docs/en/faq.wml:23
 msgid "<a href=\"#WhyCalledTor\">Why is it called Tor?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:24
+#: /home/runa/dev/website/docs/en/faq.wml:24
 msgid "<a href=\"#Backdoor\">Is there a backdoor in Tor?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:25
+#: /home/runa/dev/website/docs/en/faq.wml:25
 msgid "<a href=\"#DistributingTor\">Can I distribute Tor on my magazine's CD?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:27
+#: /home/runa/dev/website/docs/en/faq.wml:27
 msgid ""
 "<a href=\"#SupportMail\">How can I get an answer to my Tor support mail?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:29
+#: /home/runa/dev/website/docs/en/faq.wml:29
 msgid "<a href=\"#WhySlow\">Why is Tor so slow?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:30
+#: /home/runa/dev/website/docs/en/faq.wml:30
 msgid "<a href=\"#Funding\">What would The Tor Project do with more funding?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:32
+#: /home/runa/dev/website/docs/en/faq.wml:32
 msgid ""
 "<a href=\"#Metrics\">How many people use Tor? How many relays or exit nodes "
 "are there?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:36
+#: /home/runa/dev/website/docs/en/faq.wml:36
 msgid "Compilation and Installation:"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:38
+#: /home/runa/dev/website/docs/en/faq.wml:38
 msgid "<a href=\"#HowUninstallTor\">How do I uninstall Tor?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:39
+#: /home/runa/dev/website/docs/en/faq.wml:39
 msgid "<a href=\"#PGPSigs\">What are these \"sig\" files on the download page?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:41
+#: /home/runa/dev/website/docs/en/faq.wml:41
 msgid ""
 "<a href=\"#GetTor\">Your website is blocked in my country. How do I download"
 " Tor?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:43
+#: /home/runa/dev/website/docs/en/faq.wml:43
 msgid "<a href=\"#CompileTorWindows\">How do I compile Tor under Windows?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:44
+#: /home/runa/dev/website/docs/en/faq.wml:44
 msgid ""
 "<a href=\"#VirusFalsePositives\">Why does my Tor executable appear to have a"
 " virus or spyware?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:46
+#: /home/runa/dev/website/docs/en/faq.wml:46
 msgid ""
 "<a href=\"#LiveCD\">Is there a LiveCD or other bundle that includes Tor?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:49
+#: /home/runa/dev/website/docs/en/faq.wml:49
 msgid "Running Tor:"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:51
+#: /home/runa/dev/website/docs/en/faq.wml:51
 msgid "<a href=\"#torrc\">I'm supposed to \"edit my torrc\". What does that mean?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:53
+#: /home/runa/dev/website/docs/en/faq.wml:53
 msgid "<a href=\"#Logs\">How do I set up logging, or see Tor's logs?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:57
+#: /home/runa/dev/website/docs/en/faq.wml:57
 msgid "Running a Tor client:"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:59
+#: /home/runa/dev/website/docs/en/faq.wml:59
 msgid ""
 "<a href=\"#DoesntWork\">I installed Tor and Polipo but it's not working.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:61
+#: /home/runa/dev/website/docs/en/faq.wml:61
 msgid ""
 "<a href=\"#VidaliaPassword\">Tor/Vidalia prompts for a password at "
 "start.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:63
+#: /home/runa/dev/website/docs/en/faq.wml:63
 msgid ""
 "<a href=\"#ChooseEntryExit\">Can I control which nodes (or country)  are "
 "used for entry/exit?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:65
+#: /home/runa/dev/website/docs/en/faq.wml:65
 msgid ""
 "<a href=\"#GoogleCaptcha\">Google makes me solve a Captcha or tells me I "
 "have spyware installed.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:67
+#: /home/runa/dev/website/docs/en/faq.wml:67
 msgid ""
 "<a href=\"#GmailWarning\">Gmail warns me that my account may have been "
 "compromised.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:69
+#: /home/runa/dev/website/docs/en/faq.wml:69
 msgid ""
 "<a href=\"#FirewallPorts\">My firewall only allows a few outgoing ports.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:73
+#: /home/runa/dev/website/docs/en/faq.wml:73
 msgid "Running a Tor relay:"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:75
+#: /home/runa/dev/website/docs/en/faq.wml:75
 msgid "<a href=\"#RelayFlexible\">How stable does my relay need to be?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:76
+#: /home/runa/dev/website/docs/en/faq.wml:76
 msgid ""
 "<a href=\"#ExitPolicies\">I'd run a relay, but I don't want to deal with "
 "abuse issues.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:78
+#: /home/runa/dev/website/docs/en/faq.wml:78
 msgid "<a href=\"#RelayOrBridge\">Should I be a normal relay or bridge relay?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:80
+#: /home/runa/dev/website/docs/en/faq.wml:80
 msgid "<a href=\"#MultipleRelays\">I want to run more than one relay.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:81
+#: /home/runa/dev/website/docs/en/faq.wml:81
 msgid "<a href=\"#RelayMemory\">Why is my Tor relay using so much memory?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:82
+#: /home/runa/dev/website/docs/en/faq.wml:82
 msgid "<a href=\"#WhyNotNamed\">Why is my Tor relay not named?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:85
+#: /home/runa/dev/website/docs/en/faq.wml:85
 msgid "Running a Tor hidden service:"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:87
+#: /home/runa/dev/website/docs/en/faq.wml:87
 msgid "Anonymity and Security:"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:89
+#: /home/runa/dev/website/docs/en/faq.wml:89
 msgid "<a href=\"#KeyManagement\">Tell me about all the keys Tor uses.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:90
+#: /home/runa/dev/website/docs/en/faq.wml:90
 msgid "<a href=\"#EntryGuards\">What are Entry Guards?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:93
+#: /home/runa/dev/website/docs/en/faq.wml:93
 msgid "Alternate designs that we don't do (yet):"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:95
+#: /home/runa/dev/website/docs/en/faq.wml:95
 msgid ""
 "<a href=\"#EverybodyARelay\">You should make every Tor user be a relay.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:97
+#: /home/runa/dev/website/docs/en/faq.wml:97
 msgid ""
 "<a href=\"#TransportIPnotTCP\">You should transport all IP packets, not just"
 " TCP packets.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:101
+#: /home/runa/dev/website/docs/en/faq.wml:101
 msgid "Abuse:"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:103
+#: /home/runa/dev/website/docs/en/faq.wml:103
 msgid "<a href=\"#Criminals\">Doesn't Tor enable criminals to do bad things?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:104
+#: /home/runa/dev/website/docs/en/faq.wml:104
 msgid ""
 "<a href=\"#RespondISP\">How do I respond to my ISP about my exit relay?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:108
+#: /home/runa/dev/website/docs/en/faq.wml:108
 msgid ""
 "For other questions not yet on this version of the FAQ, see the <a "
 "href=\"<wikifaq>\">wiki FAQ</a> for now."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:111
+#: /home/runa/dev/website/docs/en/faq.wml:111
 msgid "<hr> <a id=\"General\"></a> <a id=\"WhatIsTor\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:116
+#: /home/runa/dev/website/docs/en/faq.wml:116
 msgid "<a class=\"anchor\" href=\"#WhatIsTor\">What is Tor?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:119
+#: /home/runa/dev/website/docs/en/faq.wml:119
 msgid "The name \"Tor\" can refer to several different components."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:123
+#: /home/runa/dev/website/docs/en/faq.wml:123
 msgid ""
 "The Tor software is a program you can run on your computer that helps keep "
 "you safe on the Internet. Tor protects you by bouncing your communications "
@@ -320,26 +320,26 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:134
+#: /home/runa/dev/website/docs/en/faq.wml:134
 msgid ""
 "The Tor Project is a non-profit (charity) organization that maintains and "
 "develops the Tor software."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:138
+#: /home/runa/dev/website/docs/en/faq.wml:138
 msgid "<hr> <a id=\"Torisdifferent\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:141
+#: /home/runa/dev/website/docs/en/faq.wml:141
 msgid ""
 "<a class=\"anchor\" href=\"#Torisdifferent\">How is Tor different from other"
 " proxies?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:143
+#: /home/runa/dev/website/docs/en/faq.wml:143
 msgid ""
 "A typical proxy provider sets up a server somewhere on the Internet and "
 "allows you to use it to relay your traffic.  This creates a simple, easy to "
@@ -355,7 +355,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:156
+#: /home/runa/dev/website/docs/en/faq.wml:156
 msgid ""
 "Simple proxy providers also create a single point of failure.  The provider "
 "knows who you are and where you browse on the Internet.  They can see your "
@@ -367,7 +367,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:165
+#: /home/runa/dev/website/docs/en/faq.wml:165
 msgid ""
 "Tor passes your traffic through at least 3 different servers before sending "
 "it on to the destination.  Tor does not modify, or even know, what you are "
@@ -380,12 +380,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><p><dl><dt>
-#: /home/runa/tor/website/docs/en/faq.wml:175
+#: /home/runa/dev/website/docs/en/faq.wml:175
 msgid "Doesn't the first server see who I am?"
 msgstr ""
 
 #. type: Content of: <div><div><p><dl><dd>
-#: /home/runa/tor/website/docs/en/faq.wml:175
+#: /home/runa/dev/website/docs/en/faq.wml:175
 msgid ""
 "Possibly. A bad first of three servers can see encrypted Tor traffic coming "
 "from your computer.  It still doesn't know who you are and what you are "
@@ -396,12 +396,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><p><dl><dt>
-#: /home/runa/tor/website/docs/en/faq.wml:181
+#: /home/runa/dev/website/docs/en/faq.wml:181
 msgid "Can't the third server see my traffic?"
 msgstr ""
 
 #. type: Content of: <div><div><p><dl><dd>
-#: /home/runa/tor/website/docs/en/faq.wml:181
+#: /home/runa/dev/website/docs/en/faq.wml:181
 msgid ""
 "Possibly.  A bad third of three servers can see the traffic you sent into "
 "Tor.  It won't know who sent this traffic.  If you're using encryption, such"
@@ -413,19 +413,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:191
+#: /home/runa/dev/website/docs/en/faq.wml:191
 msgid "<hr> <a id=\"CompatibleApplications\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:194
+#: /home/runa/dev/website/docs/en/faq.wml:194
 msgid ""
 "<a class=\"anchor\" href=\"#CompatibleApplications\">What programs can I use"
 " with Tor?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:197
+#: /home/runa/dev/website/docs/en/faq.wml:197
 msgid ""
 "There are two pieces to \"Torifying\" a program: connection-level anonymity "
 "and application-level anonymity. Connection-level anonymity focuses on "
@@ -441,7 +441,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:211
+#: /home/runa/dev/website/docs/en/faq.wml:211
 msgid ""
 "Most of our work so far has focused on the Firefox web browser. The bundles "
 "on the <a href=\"<page download/download>\">download page</a> automatically "
@@ -452,7 +452,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:220
+#: /home/runa/dev/website/docs/en/faq.wml:220
 msgid ""
 "There are plenty of other programs you can use with Tor, but we haven't "
 "researched the application-level anonymity issues on them well enough to be "
@@ -465,17 +465,17 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:231
+#: /home/runa/dev/website/docs/en/faq.wml:231
 msgid "<hr> <a id=\"WhyCalledTor\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:234
+#: /home/runa/dev/website/docs/en/faq.wml:234
 msgid "<a class=\"anchor\" href=\"#WhyCalledTor\">Why is it called Tor?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:237
+#: /home/runa/dev/website/docs/en/faq.wml:237
 msgid ""
 "Because Tor is the onion routing network. When we were starting the new "
 "next-generation design and implementation of onion routing in 2001-2002, we "
@@ -486,12 +486,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:247
+#: /home/runa/dev/website/docs/en/faq.wml:247
 msgid "(It's also got a fine translation from German and Turkish.)"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:251
+#: /home/runa/dev/website/docs/en/faq.wml:251
 msgid ""
 "Note: even though it originally came from an acronym, Tor is not spelled "
 "\"TOR\". Only the first letter is capitalized. In fact, we can usually spot "
@@ -501,17 +501,17 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:258
+#: /home/runa/dev/website/docs/en/faq.wml:258
 msgid "<hr> <a id=\"Backdoor\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:261
+#: /home/runa/dev/website/docs/en/faq.wml:261
 msgid "<a class=\"anchor\" href=\"#Backdoor\">Is there a backdoor in Tor?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:264
+#: /home/runa/dev/website/docs/en/faq.wml:264
 msgid ""
 "There is absolutely no backdoor in Tor. Nobody has asked us to put one in, "
 "and we know some smart lawyers who say that it's unlikely that anybody will "
@@ -520,7 +520,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:271
+#: /home/runa/dev/website/docs/en/faq.wml:271
 msgid ""
 "We think that putting a backdoor in Tor would be tremendously irresponsible "
 "to our users, and a bad precedent for security software in general. If we "
@@ -530,7 +530,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:279
+#: /home/runa/dev/website/docs/en/faq.wml:279
 msgid ""
 "But that said, there are still plenty of subtle attacks people might try. "
 "Somebody might impersonate us, or break into our computers, or something "
@@ -543,7 +543,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:291
+#: /home/runa/dev/website/docs/en/faq.wml:291
 msgid ""
 "Also, there might be accidental bugs in Tor that could affect your "
 "anonymity. We periodically find and fix anonymity-related bugs, so make sure"
@@ -551,24 +551,24 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:296
+#: /home/runa/dev/website/docs/en/faq.wml:296
 msgid "<hr> <a id=\"DistributingTor\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:299
+#: /home/runa/dev/website/docs/en/faq.wml:299
 msgid ""
 "<a class=\"anchor\" href=\"#DistributingTor\">Can I distribute Tor on my "
 "magazine's CD?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:302
+#: /home/runa/dev/website/docs/en/faq.wml:302
 msgid "Yes."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:306
+#: /home/runa/dev/website/docs/en/faq.wml:306
 msgid ""
 "The Tor software is <a href=\"https://www.fsf.org/\">free software</a>. This"
 " means we give you the rights to redistribute the Tor software, either "
@@ -577,7 +577,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:313
+#: /home/runa/dev/website/docs/en/faq.wml:313
 msgid ""
 "However, if you want to redistribute the Tor software you must follow our <a"
 " href=\"<gitblob>LICENSE\">LICENSE</a>.  Essentially this means that you "
@@ -586,7 +586,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:320
+#: /home/runa/dev/website/docs/en/faq.wml:320
 msgid ""
 "Most people who ask us this question don't want to distribute just the Tor "
 "software, though. They want to distribute the Tor bundles, which typically "
@@ -604,7 +604,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:336
+#: /home/runa/dev/website/docs/en/faq.wml:336
 msgid ""
 "Also, you should make sure not to confuse your readers about what Tor is, "
 "who makes it, and what properties it provides (and doesn't provide). See our"
@@ -612,7 +612,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:342
+#: /home/runa/dev/website/docs/en/faq.wml:342
 msgid ""
 "Lastly, you should realize that we release new versions of the Tor software "
 "frequently, and sometimes we make backward incompatible changes. So if you "
@@ -622,78 +622,78 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:349
+#: /home/runa/dev/website/docs/en/faq.wml:349
 msgid "<hr> <a id=\"SupportMail\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:352
+#: /home/runa/dev/website/docs/en/faq.wml:352
 msgid ""
 "<a class=\"anchor\" href=\"#SupportMail\">How can I get an answer to my Tor "
 "support mail?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:354
+#: /home/runa/dev/website/docs/en/faq.wml:354
 msgid ""
 "There is no official support for Tor. Your best bet is to try the following:"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:356
+#: /home/runa/dev/website/docs/en/faq.wml:356
 msgid "Read through this <a href=\"<page docs/faq>\">FAQ</a>."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:357
+#: /home/runa/dev/website/docs/en/faq.wml:357
 msgid "Read through the <a href=\"<page docs/documentation>\">documentation</a>."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:358
+#: /home/runa/dev/website/docs/en/faq.wml:358
 msgid ""
 "Read through the <a href=\"http://archives.seul.org/or/talk\">OR-TALK "
 "Archives</a> and see if your question is already answered."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:361
+#: /home/runa/dev/website/docs/en/faq.wml:361
 msgid ""
 "Join our <a href=\"irc://irc.oftc.net#tor\">irc channel</a> and state the "
 "issue and wait for help."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:363
+#: /home/runa/dev/website/docs/en/faq.wml:363
 msgid ""
 "Send an email to tor-assistants at torproject.org. These are volunteers who "
 "may be able to help you but you may not get a response for days."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:368
+#: /home/runa/dev/website/docs/en/faq.wml:368
 msgid ""
 "If you find your answer, please stick around on the IRC channel or the "
 "mailing list and answer questions from others."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:371
+#: /home/runa/dev/website/docs/en/faq.wml:371
 msgid "<hr> <a id=\"WhySlow\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:374
+#: /home/runa/dev/website/docs/en/faq.wml:374
 msgid "<a class=\"anchor\" href=\"#WhySlow\">Why is Tor so slow?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:377
+#: /home/runa/dev/website/docs/en/faq.wml:377
 msgid "There are many reasons why the Tor network is currently slow."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:381
+#: /home/runa/dev/website/docs/en/faq.wml:381
 msgid ""
 "Before we answer, though, you should realize that Tor is never going to be "
 "blazing fast. Your traffic is bouncing through volunteers' computers in "
@@ -703,7 +703,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:389
+#: /home/runa/dev/website/docs/en/faq.wml:389
 msgid ""
 "But that doesn't mean that it can't be improved. The current Tor network is "
 "quite small compared to the number of people trying to use it, and many of "
@@ -712,7 +712,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:396
+#: /home/runa/dev/website/docs/en/faq.wml:396
 msgid ""
 "For the much more in-depth answer, see <a href=\"<blog>why-tor-is-"
 "slow\">Roger's blog post on the topic</a>, which includes both a detailed "
@@ -720,12 +720,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:403
+#: /home/runa/dev/website/docs/en/faq.wml:403
 msgid "What can you do to help?"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:409
+#: /home/runa/dev/website/docs/en/faq.wml:409
 msgid ""
 "<a href=\"<page docs/tor-doc-relay>\">Configure your Tor to relay traffic "
 "for others</a>. Help make the Tor network large enough that we can handle "
@@ -733,7 +733,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:415
+#: /home/runa/dev/website/docs/en/faq.wml:415
 msgid ""
 "<a href=\"<page projects/vidalia>\">Help us make Tor more usable</a>. We "
 "especially need people to help make it easier to configure your Tor as a "
@@ -742,7 +742,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:422
+#: /home/runa/dev/website/docs/en/faq.wml:422
 msgid ""
 "There are some bottlenecks in the current Tor network. Help us design "
 "experiments to track down and demonstrate where the problems are, and then "
@@ -750,7 +750,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:428
+#: /home/runa/dev/website/docs/en/faq.wml:428
 msgid ""
 "There are some steps that individuals can take to improve their Tor "
 "performance. <a href=\"<wiki>TheOnionRouter/FireFoxTorPerf\">You can "
@@ -763,7 +763,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:439
+#: /home/runa/dev/website/docs/en/faq.wml:439
 msgid ""
 "Tor needs some architectural changes too. One important change is to start "
 "providing <a href=\"#EverybodyARelay\">better service to people who relay "
@@ -772,7 +772,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:446
+#: /home/runa/dev/website/docs/en/faq.wml:446
 msgid ""
 "Help do other things so we can do the hard stuff. Please take a moment to "
 "figure out what your skills and interests are, and then <a href=\"<page "
@@ -780,7 +780,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:452
+#: /home/runa/dev/website/docs/en/faq.wml:452
 msgid ""
 "Help find sponsors for Tor. Do you work at a company or government agency "
 "that uses Tor or has a use for Internet privacy, e.g. to browse the "
@@ -791,7 +791,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:461
+#: /home/runa/dev/website/docs/en/faq.wml:461
 msgid ""
 "If you can't help out with any of the above, you can still help out "
 "individually by <a href=\"<page donate/donate>\">donating a bit of money to "
@@ -799,19 +799,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:468
+#: /home/runa/dev/website/docs/en/faq.wml:468
 msgid "<hr> <a id=\"Funding\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:471
+#: /home/runa/dev/website/docs/en/faq.wml:471
 msgid ""
 "<a class=\"anchor\" href=\"#Funding\">What would The Tor Project do with "
 "more funding?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:474
+#: /home/runa/dev/website/docs/en/faq.wml:474
 msgid ""
 "We have about 1800 relays right now, pushing over 150 MB/s average traffic. "
 "We have several hundred thousand active users. But the Tor network is not "
@@ -819,12 +819,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:480
+#: /home/runa/dev/website/docs/en/faq.wml:480
 msgid "There are six main development/maintenance pushes that need attention:"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:486
+#: /home/runa/dev/website/docs/en/faq.wml:486
 msgid ""
 "Scalability: We need to keep scaling and decentralizing the Tor architecture"
 " so it can handle thousands of relays and millions of users. The upcoming "
@@ -833,7 +833,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:493
+#: /home/runa/dev/website/docs/en/faq.wml:493
 msgid ""
 "User support: With this many users, a lot of people are asking questions all"
 " the time, offering to help out with things, and so on. We need good clean "
@@ -841,18 +841,18 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:499
+#: /home/runa/dev/website/docs/en/faq.wml:499
 msgid ""
 "Relay support: the Tor network is run by volunteers, but they still need "
 "attention with prompt bug fixes, explanations when things go wrong, "
 "reminders to upgrade, and so on. The network itself is a commons, and "
 "somebody needs to spend some energy making sure the relay operators stay "
-"happy. We also need to work on <a href=\"#RelayOS\">stability</a> on some "
-"platforms &mdash; e.g., Tor relays have problems on Win XP currently."
+"happy. We also need to work on stability on some platforms &mdash; e.g., Tor"
+" relays have problems on Win XP currently."
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:508
+#: /home/runa/dev/website/docs/en/faq.wml:508
 msgid ""
 "Usability: Beyond documentation, we also need to work on usability of the "
 "software itself. This includes installers, clean GUIs, easy configuration to"
@@ -863,7 +863,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:517
+#: /home/runa/dev/website/docs/en/faq.wml:517
 msgid ""
 "Incentives: We need to work on ways to encourage people to configure their "
 "Tors as relays and exit nodes rather than just clients.  <a "
@@ -872,7 +872,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:524
+#: /home/runa/dev/website/docs/en/faq.wml:524
 msgid ""
 "Research: The anonymous communications field is full of surprises and "
 "gotchas. In our copious free time, we also help run top anonymity and "
@@ -884,7 +884,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:537
+#: /home/runa/dev/website/docs/en/faq.wml:537
 msgid ""
 "We're continuing to move forward on all of these, but at this rate <a "
 "href=\"#WhySlow\">the Tor network is growing faster than the developers can "
@@ -893,14 +893,14 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:545
+#: /home/runa/dev/website/docs/en/faq.wml:545
 msgid ""
 "We are also excited about tackling related problems, such as censorship-"
 "resistance."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:550
+#: /home/runa/dev/website/docs/en/faq.wml:550
 msgid ""
 "We are proud to have <a href=\"<page about/sponsors>\">sponsorship and "
 "support</a> from the Omidyar Network, the International Broadcasting Bureau,"
@@ -910,7 +910,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:557
+#: /home/runa/dev/website/docs/en/faq.wml:557
 msgid ""
 "However, this support is not enough to keep Tor abreast of changes in the "
 "Internet privacy landscape. Please <a href=\"<page "
@@ -920,36 +920,36 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:563
+#: /home/runa/dev/website/docs/en/faq.wml:563
 msgid "<hr> <a id=\"Metrics\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:566
+#: /home/runa/dev/website/docs/en/faq.wml:566
 msgid ""
 "<a class=\"anchor\" href=\"#Metrics\">How many people use Tor? How many "
 "relays or exit nodes are there?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:568
+#: /home/runa/dev/website/docs/en/faq.wml:568
 msgid ""
 "All this and more about measuring Tor can be found at the <a "
 "href=\"https://metrics.torproject.org/\">Tor Metrics Portal</a>."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:570
+#: /home/runa/dev/website/docs/en/faq.wml:570
 msgid "<hr> <a id=\"HowUninstallTor\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:573
+#: /home/runa/dev/website/docs/en/faq.wml:573
 msgid "<a class=\"anchor\" href=\"#HowUninstallTor\">How do I uninstall Tor?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:576
+#: /home/runa/dev/website/docs/en/faq.wml:576
 msgid ""
 "This depends entirely on how you installed it and which operating system you"
 " have. If you installed a package, then hopefully your package has a way to "
@@ -959,35 +959,35 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:584
+#: /home/runa/dev/website/docs/en/faq.wml:584
 msgid ""
 "In your taskbar, right click on Vidalia (the green onion or the black head)"
 "  and choose exit."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:586
+#: /home/runa/dev/website/docs/en/faq.wml:586
 msgid ""
 "Right click on the taskbar to bring up TaskManager. Look for tor.exe in the "
 "Process List. If it's running, right click and choose End Process."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:588
+#: /home/runa/dev/website/docs/en/faq.wml:588
 msgid ""
 "Click the Start button, go to Programs, go to Vidalia, choose Uninstall.  "
 "This will remove the Vidalia bundle, which includes Tor and Polipo."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:590
+#: /home/runa/dev/website/docs/en/faq.wml:590
 msgid ""
 "Start Firefox. Go to the Tools menu, choose Add-ons. Select Torbutton.  "
 "Click the Uninstall button."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:595
+#: /home/runa/dev/website/docs/en/faq.wml:595
 msgid ""
 "If you do not follow these steps (for example by trying to uninstall "
 "Vidalia, Tor, and Polipo while they are still running), you will need to "
@@ -995,14 +995,14 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:601
+#: /home/runa/dev/website/docs/en/faq.wml:601
 msgid ""
 "For Mac OS X, follow the <a href=\"<page docs/tor-doc-"
 "osx>#uninstall\">uninstall directions</a>."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:606
+#: /home/runa/dev/website/docs/en/faq.wml:606
 msgid ""
 "If you installed by source, I'm afraid there is no easy uninstall method. "
 "But on the bright side, by default it only installs into /usr/local/ and it "
@@ -1010,45 +1010,45 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:611
+#: /home/runa/dev/website/docs/en/faq.wml:611
 msgid "<hr> <a id=\"PGPSigs\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:614
+#: /home/runa/dev/website/docs/en/faq.wml:614
 msgid ""
 "<a class=\"anchor\" href=\"#PGPSigs\">What are these \"sig\" files on the "
 "download page?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:617
+#: /home/runa/dev/website/docs/en/faq.wml:617
 msgid ""
 "These are PGP signatures, so you can verify that the file you've downloaded "
 "is exactly the one that we intended you to get."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:622
+#: /home/runa/dev/website/docs/en/faq.wml:622
 msgid ""
 "Please read the <a href=\"<page docs/verifying-signatures>\">verifying "
 "signatures</a> page for details."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:626
+#: /home/runa/dev/website/docs/en/faq.wml:626
 msgid "<hr> <a id=\"GetTor\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:629
+#: /home/runa/dev/website/docs/en/faq.wml:629
 msgid ""
 "<a class=\"anchor\" href=\"#GetTor\">Your website is blocked in my country. "
 "How do I download Tor?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:633
+#: /home/runa/dev/website/docs/en/faq.wml:633
 msgid ""
 "Some government or corporate firewalls censor connections to Tor's website. "
 "In those cases, you have three options. First, get it from a friend &mdash; "
@@ -1063,7 +1063,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:647
+#: /home/runa/dev/website/docs/en/faq.wml:647
 msgid ""
 "Be sure to <a href=\"<page docs/verifying-signatures>\">verify the "
 "signature</a> of any package you download, especially when you get it from "
@@ -1071,26 +1071,26 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:652
+#: /home/runa/dev/website/docs/en/faq.wml:652
 msgid "<hr> <a id=\"CompileTorWindows\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:655
+#: /home/runa/dev/website/docs/en/faq.wml:655
 msgid ""
 "<a class=\"anchor\" href=\"#CompileTorWindows\">How do I compile Tor under "
 "Windows?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:658
+#: /home/runa/dev/website/docs/en/faq.wml:658
 msgid ""
 "Try following the steps at <a href=\"<gitblob>doc/tor-win32-mingw-"
 "creation.txt\"> tor-win32-mingw-creation.txt</a>."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:663
+#: /home/runa/dev/website/docs/en/faq.wml:663
 msgid ""
 "(Note that you don't need to compile Tor yourself in order to use it. Most "
 "people just use the packages available on the <a href=\"<page "
@@ -1098,19 +1098,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:668
+#: /home/runa/dev/website/docs/en/faq.wml:668
 msgid "<hr> <a id=\"VirusFalsePositives\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:671
+#: /home/runa/dev/website/docs/en/faq.wml:671
 msgid ""
 "<a class=\"anchor\" href=\"#VirusFalsePositives\">Why does my Tor executable"
 " appear to have a virus or spyware?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:674
+#: /home/runa/dev/website/docs/en/faq.wml:674
 msgid ""
 "Sometimes, overzealous Windows virus and spyware detectors trigger on some "
 "parts of the Tor Windows binary. Our best guess is that these are false "
@@ -1121,7 +1121,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:682
+#: /home/runa/dev/website/docs/en/faq.wml:682
 msgid ""
 "In the meantime, we encourage you to not just take our word for it. Our job "
 "is to provide the source; if you're concerned, please do <a "
@@ -1129,19 +1129,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:687
+#: /home/runa/dev/website/docs/en/faq.wml:687
 msgid "<hr> <a id=\"LiveCD\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:690
+#: /home/runa/dev/website/docs/en/faq.wml:690
 msgid ""
 "<a class=\"anchor\" href=\"#LiveCD\">Is there a LiveCD or other bundle that "
 "includes Tor?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:693
+#: /home/runa/dev/website/docs/en/faq.wml:693
 msgid ""
 "Yes.  Use <a href=\"https://tails.boum.org/\">The Amnesic Incognito Live "
 "System</a> or <a href=\"<page projects/torbrowser>\">the Tor Browser "
@@ -1149,19 +1149,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:698
+#: /home/runa/dev/website/docs/en/faq.wml:698
 msgid "<hr> <a id=\"torrc\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:701
+#: /home/runa/dev/website/docs/en/faq.wml:701
 msgid ""
 "<a class=\"anchor\" href=\"#torrc\">I'm supposed to \"edit my torrc\". What "
 "does that mean?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:704
+#: /home/runa/dev/website/docs/en/faq.wml:704
 msgid ""
 "Tor installs a text file called torrc that contains configuration "
 "instructions for how your Tor program should behave. The default "
@@ -1171,12 +1171,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:712
+#: /home/runa/dev/website/docs/en/faq.wml:712
 msgid "The location of your torrc file depends on the way you installed Tor:"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:716
+#: /home/runa/dev/website/docs/en/faq.wml:716
 msgid ""
 "On Windows, if you installed a Tor bundle with Vidalia, you can find your "
 "torrc file in the Start menu under Programs -&gt; Vidalia Bundle -&gt; Tor, "
@@ -1189,14 +1189,14 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:725
+#: /home/runa/dev/website/docs/en/faq.wml:725
 msgid ""
 "On OS X, if you use Vidalia, edit <code>~/.vidalia/torrc</code>. Otherwise, "
 "open your favorite text editor and load <code>/Library/Tor/torrc</code>."
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:729
+#: /home/runa/dev/website/docs/en/faq.wml:729
 msgid ""
 "On Unix, if you installed a pre-built package, look for "
 "<code>/etc/tor/torrc</code> or <code>/etc/torrc</code> or consult your "
@@ -1204,7 +1204,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:733
+#: /home/runa/dev/website/docs/en/faq.wml:733
 msgid ""
 "Finally, if you installed from source, you may not have a torrc installed "
 "yet: look in <code>/usr/local/etc/</code> and note that you may need to "
@@ -1212,14 +1212,14 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:740
+#: /home/runa/dev/website/docs/en/faq.wml:740
 msgid ""
 "If you use Vidalia, be sure to exit both Tor and Vidalia before you edit "
 "your torrc file. Otherwise Vidalia might overwrite your changes."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:745
+#: /home/runa/dev/website/docs/en/faq.wml:745
 msgid ""
 "Once you've changed your torrc, you will need to restart Tor for the changes"
 " to take effect. (For advanced users on OS X and Unix, note that you "
@@ -1227,7 +1227,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:751
+#: /home/runa/dev/website/docs/en/faq.wml:751
 msgid ""
 "For other configuration options you can use, look at the <a href=\"<page "
 "docs/tor-manual>\">Tor manual page</a>. Remember, all lines beginning with #"
@@ -1235,19 +1235,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:757
+#: /home/runa/dev/website/docs/en/faq.wml:757
 msgid "<hr> <a id=\"Logs\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:760
+#: /home/runa/dev/website/docs/en/faq.wml:760
 msgid ""
 "<a class=\"anchor\" href=\"#Logs\">How do I set up logging, or see Tor's "
 "logs?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:763
+#: /home/runa/dev/website/docs/en/faq.wml:763
 msgid ""
 "If you installed a Tor bundle that includes Vidalia, then Vidalia has a "
 "window called \"Message Log\" that will show you Tor's log messages. You can"
@@ -1256,19 +1256,19 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:770
+#: /home/runa/dev/website/docs/en/faq.wml:770
 msgid ""
 "If you're not using Vidalia, you'll have to go find the log files by hand. "
 "Here are some likely places for your logs to be:"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:775
+#: /home/runa/dev/website/docs/en/faq.wml:775
 msgid "On OS X, Debian, Red Hat, etc, the logs are in /var/log/tor/"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:777
+#: /home/runa/dev/website/docs/en/faq.wml:777
 msgid ""
 "On Windows, there are no default log files currently. If you enable logs in "
 "your torrc file, they default to <code>\\username\\Application "
@@ -1276,7 +1276,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:781
+#: /home/runa/dev/website/docs/en/faq.wml:781
 msgid ""
 "If you compiled Tor from source, by default your Tor logs to <a "
 "href=\"http://en.wikipedia.org/wiki/Standard_streams\">\"stdout\"</a> at "
@@ -1285,7 +1285,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:789
+#: /home/runa/dev/website/docs/en/faq.wml:789
 msgid ""
 "To change your logging setup by hand, <a href=\"#torrc\">edit your torrc</a>"
 " and find the section (near the top of the file) which contains the "
@@ -1293,7 +1293,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><pre>
-#: /home/runa/tor/website/docs/en/faq.wml:795
+#: /home/runa/dev/website/docs/en/faq.wml:795
 #, no-wrap
 msgid ""
 "\\## Logs go to stdout at level \"notice\" unless redirected by something\n"
@@ -1301,7 +1301,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:800
+#: /home/runa/dev/website/docs/en/faq.wml:800
 msgid ""
 "For example, if you want Tor to send complete debug, info, notice, warn, and"
 " err level messages to a file, append the following line to the end of the "
@@ -1309,32 +1309,32 @@
 msgstr ""
 
 #. type: Content of: <div><div><pre>
-#: /home/runa/tor/website/docs/en/faq.wml:806
+#: /home/runa/dev/website/docs/en/faq.wml:806
 #, no-wrap
 msgid "Log debug file c:/program files/tor/debug.log\n"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:810
+#: /home/runa/dev/website/docs/en/faq.wml:810
 msgid ""
 "Replace <code>c:/program files/tor/debug.log</code> with a directory and "
 "filename for your Tor log."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:814
+#: /home/runa/dev/website/docs/en/faq.wml:814
 msgid "<hr> <a id=\"DoesntWork\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:817
+#: /home/runa/dev/website/docs/en/faq.wml:817
 msgid ""
 "<a class=\"anchor\" href=\"#DoesntWork\">I installed Tor and Polipo but it's"
 " not working.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:820
+#: /home/runa/dev/website/docs/en/faq.wml:820
 msgid ""
 "Once you've installed the Tor bundle, there are two questions to ask: first,"
 " is your Tor able to establish a circuit? Second, is your Firefox correctly "
@@ -1342,7 +1342,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:825
+#: /home/runa/dev/website/docs/en/faq.wml:825
 msgid ""
 "If Tor can establish a circuit, the onion icon in Vidalia will turn green. "
 "You can also check in the Vidalia Control Panel to make sure it says "
@@ -1352,19 +1352,19 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:835
+#: /home/runa/dev/website/docs/en/faq.wml:835
 msgid "If Tor can't establish a circuit, here are some hints:"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:839
+#: /home/runa/dev/website/docs/en/faq.wml:839
 msgid ""
 "Are you sure Tor is running? If you're using Vidalia, you may have to click "
 "on the onion and select \"Start\" to launch Tor."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:841
+#: /home/runa/dev/website/docs/en/faq.wml:841
 msgid ""
 "Check your system clock. If it's more than a few hours off, Tor will refuse "
 "to build circuits. For XP users, synchronize your clock under the clock "
@@ -1373,7 +1373,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:845
+#: /home/runa/dev/website/docs/en/faq.wml:845
 msgid ""
 "Is your Internet connection <a href=\"#FirewallPorts\">firewalled by "
 "port</a>, or do you normally need to use a <a "
@@ -1381,7 +1381,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:850
+#: /home/runa/dev/website/docs/en/faq.wml:850
 msgid ""
 "Are you running programs like Norton Internet Security or SELinux that block"
 " certain connections, even though you don't realize they do? They could be "
@@ -1389,7 +1389,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:853
+#: /home/runa/dev/website/docs/en/faq.wml:853
 msgid ""
 "Are you in China, or behind a restrictive corporate network firewall that "
 "blocks the public Tor relays? If so, you should learn about <a href=\"<page "
@@ -1397,14 +1397,14 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:856
+#: /home/runa/dev/website/docs/en/faq.wml:856
 msgid ""
 "Check your <a href=\"#Logs\">Tor logs</a>. Do they give you any hints about "
 "what's going wrong?"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:861
+#: /home/runa/dev/website/docs/en/faq.wml:861
 msgid ""
 "Step two is to confirm that Firefox is correctly configured to send its "
 "traffic through Tor. Try the <a href=\"https://check.torproject.org/\">Tor "
@@ -1414,12 +1414,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:869
+#: /home/runa/dev/website/docs/en/faq.wml:869
 msgid "If it thinks you're not using Tor, here are some hints:"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:873
+#: /home/runa/dev/website/docs/en/faq.wml:873
 msgid ""
 "Did you install the Torbutton extension for Firefox? The installation "
 "bundles include it, but sometimes people forget to install it. Make sure it "
@@ -1428,7 +1428,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:878
+#: /home/runa/dev/website/docs/en/faq.wml:878
 msgid ""
 "Do you have incompatible Firefox extensions like FoxyProxy installed? If so,"
 " uninstall them. (Note that using FoxyProxy is NOT a sufficient substitute "
@@ -1440,7 +1440,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:885
+#: /home/runa/dev/website/docs/en/faq.wml:885
 msgid ""
 "If your browser says \"The proxy server is refusing connections.\", check "
 "that Polipo (the http proxy that passes traffic between Firefox and Tor) is "
@@ -1450,7 +1450,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:890
+#: /home/runa/dev/website/docs/en/faq.wml:890
 msgid ""
 "If you're upgrading from OS X, some of the earlier OS X installers were "
 "broken in really unfortunate ways. You may find that <a href=\"<page docs"
@@ -1460,14 +1460,14 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:895
+#: /home/runa/dev/website/docs/en/faq.wml:895
 msgid ""
 "If you're on Linux, make sure Privoxy isn't running, since it will conflict "
 "with the port that our Polipo configuration file picks."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:897
+#: /home/runa/dev/website/docs/en/faq.wml:897
 msgid ""
 "If you installed Polipo yourself (not from a bundle), did you edit the "
 "config file as described? Did you restart Polipo after this change? Are you "
@@ -1475,7 +1475,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:900
+#: /home/runa/dev/website/docs/en/faq.wml:900
 msgid ""
 "For Red Hat Linux and related systems, do you have SELinux enabled? If so, "
 "it might be preventing Polipo from talking to Tor. We also run across BSD "
@@ -1484,19 +1484,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:906
+#: /home/runa/dev/website/docs/en/faq.wml:906
 msgid "<hr /> <a id=\"VidaliaPassword\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:909
+#: /home/runa/dev/website/docs/en/faq.wml:909
 msgid ""
 "<a class=\"anchor\" href=\"#VidaliaPassword\">Tor/Vidalia prompts for a "
 "password at start.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:912
+#: /home/runa/dev/website/docs/en/faq.wml:912
 msgid ""
 "Vidalia interacts with the Tor software via Tor's \"control port\". The "
 "control port lets Vidalia receive status updates from Tor, request a new "
@@ -1507,7 +1507,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:921
+#: /home/runa/dev/website/docs/en/faq.wml:921
 msgid ""
 "Usually this process of generating and setting a random control password "
 "happens in the background. There are three common situations, though, where "
@@ -1515,7 +1515,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:927
+#: /home/runa/dev/website/docs/en/faq.wml:927
 msgid ""
 "You're already running Vidalia and Tor. For example, this situation can "
 "happen if you installed the Vidalia bundle and now you're trying to run the "
@@ -1524,7 +1524,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:932
+#: /home/runa/dev/website/docs/en/faq.wml:932
 msgid ""
 "Vidalia crashed, but left Tor running with the last known random password. "
 "After you restart Vidalia, it generates a new random password, but Vidalia "
@@ -1538,7 +1538,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:945
+#: /home/runa/dev/website/docs/en/faq.wml:945
 msgid ""
 "You had previously set Tor to run as a Windows NT service. When Tor is set "
 "to run as a service, it starts up when the system boots. If you configured "
@@ -1553,19 +1553,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:960
+#: /home/runa/dev/website/docs/en/faq.wml:960
 msgid "<hr> <a id=\"ChooseEntryExit\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:963
+#: /home/runa/dev/website/docs/en/faq.wml:963
 msgid ""
 "<a class=\"anchor\" href=\"#ChooseEntryExit\">Can I control which nodes (or "
 "country) are used for entry/exit?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:966
+#: /home/runa/dev/website/docs/en/faq.wml:966
 msgid ""
 "Yes. You can set preferred entry and exit nodes as well as inform Tor which "
 "nodes you do not want to use.  The following options can be added to your "
@@ -1574,53 +1574,53 @@
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/docs/en/faq.wml:972
+#: /home/runa/dev/website/docs/en/faq.wml:972
 msgid "<tt>EntryNodes $fingerprint,$fingerprint,...</tt>"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/docs/en/faq.wml:973
+#: /home/runa/dev/website/docs/en/faq.wml:973
 msgid ""
 "A list of preferred nodes to use for the first hop in the circuit, if "
 "possible."
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/docs/en/faq.wml:975
+#: /home/runa/dev/website/docs/en/faq.wml:975
 msgid "<tt>ExitNodes $fingerprint,$fingerprint,...</tt>"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/docs/en/faq.wml:976
+#: /home/runa/dev/website/docs/en/faq.wml:976
 msgid ""
 "A list of preferred nodes to use for the last hop in the circuit, if "
 "possible."
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/docs/en/faq.wml:978
+#: /home/runa/dev/website/docs/en/faq.wml:978
 msgid "<tt>ExcludeNodes $fingerprint,$fingerprint,...</tt>"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/docs/en/faq.wml:979
+#: /home/runa/dev/website/docs/en/faq.wml:979
 msgid "A list of nodes to never use when building a circuit."
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/docs/en/faq.wml:981
+#: /home/runa/dev/website/docs/en/faq.wml:981
 msgid "<tt>ExcludeExitNodes $fingerprint,$fingerprint,...</tt>"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/docs/en/faq.wml:982
+#: /home/runa/dev/website/docs/en/faq.wml:982
 msgid ""
 "A list of nodes to never use when picking an exit.  Nodes listed in "
 "<tt>ExcludeNodes</tt> are automatically in this list."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:987
+#: /home/runa/dev/website/docs/en/faq.wml:987
 msgid ""
 "<em>We recommend you do not use these</em> &mdash; they are intended for "
 "testing and may disappear in future versions.  You get the best security "
@@ -1630,7 +1630,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:994
+#: /home/runa/dev/website/docs/en/faq.wml:994
 msgid ""
 "The <tt>EntryNodes</tt> and <tt>ExitNodes</tt> config options are treated as"
 " a request, meaning if the nodes are down or seem slow, Tor will still avoid"
@@ -1642,7 +1642,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1004
+#: /home/runa/dev/website/docs/en/faq.wml:1004
 msgid ""
 "Instead of <tt>$fingerprint</tt> you can also specify a 2 letter ISO3166 "
 "country code in curly braces (for example {de}), or an ip address pattern "
@@ -1651,7 +1651,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1010
+#: /home/runa/dev/website/docs/en/faq.wml:1010
 msgid ""
 "If you want to access a service directly through Tor's SOCKS interface (eg. "
 "using ssh via connect.c), another option is to set up an internal mapping in"
@@ -1660,26 +1660,26 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1016
+#: /home/runa/dev/website/docs/en/faq.wml:1016
 msgid "<hr> <a id=\"GoogleCaptcha\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1019
+#: /home/runa/dev/website/docs/en/faq.wml:1019
 msgid ""
 "<a class=\"anchor\" href=\"#GoogleCaptcha\">Google makes me solve a Captcha "
 "or tells me I have spyware installed.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1022
+#: /home/runa/dev/website/docs/en/faq.wml:1022
 msgid ""
 "This is a known and intermittent problem; it does not mean that Google "
 "considers Tor to be spyware."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1027
+#: /home/runa/dev/website/docs/en/faq.wml:1027
 msgid ""
 "When you use Tor, you are sending queries through exit relays that are also "
 "shared by thousands of other users. Tor users typically see this message "
@@ -1690,7 +1690,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1035
+#: /home/runa/dev/website/docs/en/faq.wml:1035
 msgid ""
 "An alternate explanation is that Google tries to detect certain kinds of "
 "spyware or viruses that send distinctive queries to Google Search. It notes "
@@ -1700,7 +1700,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1044
+#: /home/runa/dev/website/docs/en/faq.wml:1044
 msgid ""
 "To our knowledge, Google is not doing anything intentionally specifically to"
 " deter or block Tor use. The error message about an infected machine should "
@@ -1708,7 +1708,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1050
+#: /home/runa/dev/website/docs/en/faq.wml:1050
 msgid ""
 "Torbutton 1.2.5 (released in mid 2010) detects Google captchas and can "
 "automatically redirect you to a more Tor-friendly search engine such as "
@@ -1716,19 +1716,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1055
+#: /home/runa/dev/website/docs/en/faq.wml:1055
 msgid "<hr /> <a id=\"GmailWarning\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1058
+#: /home/runa/dev/website/docs/en/faq.wml:1058
 msgid ""
 "<a class=\"anchor\" href=\"#GmailWarning\">Gmail warns me that my account "
 "may have been compromised.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1061
+#: /home/runa/dev/website/docs/en/faq.wml:1061
 msgid ""
 "Sometimes, after you've used Gmail over Tor, Google presents a pop-up "
 "notification that your account may have been compromised.  The notification "
@@ -1737,7 +1737,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1068
+#: /home/runa/dev/website/docs/en/faq.wml:1068
 msgid ""
 "In general this is a false alarm: Google saw a bunch of logins from "
 "different places, as a result of running the service via Tor, and decided it"
@@ -1746,7 +1746,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1075
+#: /home/runa/dev/website/docs/en/faq.wml:1075
 msgid ""
 "Even though this may be a biproduct of using the service via tor, that "
 "doesn't mean you can entirely ignore the warning. It is <i>probably</i> a "
@@ -1755,7 +1755,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1082
+#: /home/runa/dev/website/docs/en/faq.wml:1082
 msgid ""
 "Cookie hijacking is possible by either physical access to your computer or "
 "by watching your network traffic.  In theory only physical access should "
@@ -1766,7 +1766,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1091
+#: /home/runa/dev/website/docs/en/faq.wml:1091
 msgid ""
 "And if somebody <i>did</i> steal your google cookie, they might end up "
 "logging in from unusual places (though of course they also might not). So "
@@ -1778,19 +1778,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1100
+#: /home/runa/dev/website/docs/en/faq.wml:1100
 msgid "<hr> <a id=\"FirewallPorts\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1103
+#: /home/runa/dev/website/docs/en/faq.wml:1103
 msgid ""
 "<a class=\"anchor\" href=\"#FirewallPorts\">My firewall only allows a few "
 "outgoing ports.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1106
+#: /home/runa/dev/website/docs/en/faq.wml:1106
 msgid ""
 "If your firewall works by blocking ports, then you can tell Tor to only use "
 "the ports that your firewall permits by adding \"FascistFirewall 1\" to your"
@@ -1800,7 +1800,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1114
+#: /home/runa/dev/website/docs/en/faq.wml:1114
 msgid ""
 "By default, when you set this Tor assumes that your firewall allows only "
 "port 80 and port 443 (HTTP and HTTPS respectively). You can select a "
@@ -1808,14 +1808,14 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1120
+#: /home/runa/dev/website/docs/en/faq.wml:1120
 msgid ""
 "If you want to be more fine-grained with your controls, you can also use the"
 " ReachableAddresses config options, e.g.:"
 msgstr ""
 
 #. type: Content of: <div><div><pre>
-#: /home/runa/tor/website/docs/en/faq.wml:1125
+#: /home/runa/dev/website/docs/en/faq.wml:1125
 #, no-wrap
 msgid ""
 "  ReachableDirAddresses *:80\n"
@@ -1823,24 +1823,24 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1129
+#: /home/runa/dev/website/docs/en/faq.wml:1129
 msgid "<hr> <a id=\"RelayFlexible\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1132
+#: /home/runa/dev/website/docs/en/faq.wml:1132
 msgid ""
 "<a class=\"anchor\" href=\"#RelayFlexible\">How stable does my relay need to"
 " be?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1135
+#: /home/runa/dev/website/docs/en/faq.wml:1135
 msgid "We aim to make setting up a Tor relay easy and convenient:"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1139
+#: /home/runa/dev/website/docs/en/faq.wml:1139
 msgid ""
 "Tor has built-in support for <a "
 "href=\"<wikifaq>#WhatbandwidthshapingoptionsareavailabletoTorrelays\"> rate "
@@ -1851,7 +1851,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1147
+#: /home/runa/dev/website/docs/en/faq.wml:1147
 msgid ""
 "Each Tor relay has an <a href=\"#ExitPolicies\">exit policy</a> that "
 "specifies what sort of outbound connections are allowed or refused from that"
@@ -1860,7 +1860,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1152
+#: /home/runa/dev/website/docs/en/faq.wml:1152
 msgid ""
 "It's fine if the relay goes offline sometimes. The directories notice this "
 "quickly and stop advertising the relay. Just try to make sure it's not too "
@@ -1868,14 +1868,14 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1157
+#: /home/runa/dev/website/docs/en/faq.wml:1157
 msgid ""
 "We can handle relays with dynamic IPs just fine &mdash; simply leave the "
 "Address config option blank, and Tor will try to guess."
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1160
+#: /home/runa/dev/website/docs/en/faq.wml:1160
 msgid ""
 "If your relay is behind a NAT and it doesn't know its public IP (e.g. it has"
 " an IP of 192.168.x.y), you'll need to set up port forwarding. Forwarding "
@@ -1885,7 +1885,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1166
+#: /home/runa/dev/website/docs/en/faq.wml:1166
 msgid ""
 "Your relay will passively estimate and advertise its recent bandwidth "
 "capacity, so high-bandwidth relays will attract more users than low-"
@@ -1893,24 +1893,24 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1172
+#: /home/runa/dev/website/docs/en/faq.wml:1172
 msgid "<hr> <a id=\"RunARelayBut\"></a> <a id=\"ExitPolicies\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1176
+#: /home/runa/dev/website/docs/en/faq.wml:1176
 msgid ""
 "<a class=\"anchor\" href=\"#ExitPolicies\">I'd run a relay, but I don't want"
 " to deal with abuse issues.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1179
+#: /home/runa/dev/website/docs/en/faq.wml:1179
 msgid "Great. That's exactly why we implemented exit policies."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1183
+#: /home/runa/dev/website/docs/en/faq.wml:1183
 msgid ""
 "Each Tor relay has an exit policy that specifies what sort of outbound "
 "connections are allowed or refused from that relay. The exit policies are "
@@ -1926,7 +1926,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1197
+#: /home/runa/dev/website/docs/en/faq.wml:1197
 msgid ""
 "The default exit policy allows access to many popular services (e.g. web "
 "browsing), but <a "
@@ -1942,7 +1942,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1211
+#: /home/runa/dev/website/docs/en/faq.wml:1211
 msgid ""
 "If you do allow any exit connections, make sure name resolution works (that "
 "is, your computer can resolve Internet addresses correctly).  If there are "
@@ -1952,19 +1952,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1219
+#: /home/runa/dev/website/docs/en/faq.wml:1219
 msgid "<hr> <a id=\"RelayOrBridge\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1222
+#: /home/runa/dev/website/docs/en/faq.wml:1222
 msgid ""
 "<a class=\"anchor\" href=\"#RelayOrBridge\">Should I be a normal relay or "
 "bridge relay?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1224
+#: /home/runa/dev/website/docs/en/faq.wml:1224
 msgid ""
 "<a href=\"<page docs/bridges>\">Bridge relays</a> (or \"bridges\" for short)"
 "  are <a href=\"<page docs/tor-doc-relay>\">Tor relays</a> that aren't "
@@ -1974,7 +1974,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1231
+#: /home/runa/dev/website/docs/en/faq.wml:1231
 msgid ""
 "Being a normal relay vs being a bridge relay is almost the same "
 "configuration: it's just a matter of whether your relay is listed publically"
@@ -1982,7 +1982,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1236
+#: /home/runa/dev/website/docs/en/faq.wml:1236
 msgid ""
 "Right now, there are a small number of places in the world that filter "
 "connections to the Tor network. So getting a lot of bridges running right "
@@ -1993,7 +1993,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1244
+#: /home/runa/dev/website/docs/en/faq.wml:1244
 msgid ""
 "So should you run a normal relay or bridge relay? If you have lots of "
 "bandwidth, you should definitely run a normal relay &mdash; bridge relays "
@@ -2004,19 +2004,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1252
+#: /home/runa/dev/website/docs/en/faq.wml:1252
 msgid "<hr> <a id=\"MultipleRelays\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1255
+#: /home/runa/dev/website/docs/en/faq.wml:1255
 msgid ""
 "<a class=\"anchor\" href=\"#MultipleRelays\">I want to run more than one "
 "relay.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1258
+#: /home/runa/dev/website/docs/en/faq.wml:1258
 msgid ""
 "Great. If you want to run several relays to donate more to the network, "
 "we're happy with that. But please don't run more than a few dozen on the "
@@ -2025,7 +2025,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1265
+#: /home/runa/dev/website/docs/en/faq.wml:1265
 msgid ""
 "If you do decide to run more than one relay, please set the \"MyFamily\" "
 "config option in the <a href=\"#torrc\">torrc</a> of each relay, listing all"
@@ -2033,13 +2033,13 @@
 msgstr ""
 
 #. type: Content of: <div><div><pre>
-#: /home/runa/tor/website/docs/en/faq.wml:1271
+#: /home/runa/dev/website/docs/en/faq.wml:1271
 #, no-wrap
 msgid "    MyFamily $fingerprint1,$fingerprint2,$fingerprint3\n"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1275
+#: /home/runa/dev/website/docs/en/faq.wml:1275
 msgid ""
 "where each fingerprint is the 40 character identity fingerprint (without "
 "spaces). You can also list them by nickname, but fingerprint is safer. Be "
@@ -2048,7 +2048,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1282
+#: /home/runa/dev/website/docs/en/faq.wml:1282
 msgid ""
 "That way clients will know to avoid using more than one of your relays in a "
 "single circuit. You should set MyFamily if you have administrative control "
@@ -2057,26 +2057,26 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1288
+#: /home/runa/dev/website/docs/en/faq.wml:1288
 msgid "<hr> <a id=\"RelayMemory\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1291
+#: /home/runa/dev/website/docs/en/faq.wml:1291
 msgid ""
 "<a class=\"anchor\" href=\"#RelayMemory\">Why is my Tor relay using so much "
 "memory?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1293
+#: /home/runa/dev/website/docs/en/faq.wml:1293
 msgid ""
 "If your Tor relay is using more memory than you'd like, here are some tips "
 "for reducing its footprint:"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1298
+#: /home/runa/dev/website/docs/en/faq.wml:1298
 msgid ""
 "If you're on Linux, you may be encountering memory fragmentation bugs in "
 "glibc's malloc implementation. That is, when Tor releases memory back to the"
@@ -2088,7 +2088,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1306
+#: /home/runa/dev/website/docs/en/faq.wml:1306
 msgid ""
 "If you're running a fast relay, meaning you have many TLS connections open, "
 "you are probably losing a lot of memory to OpenSSL's internal buffers (38KB+"
@@ -2100,7 +2100,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1314
+#: /home/runa/dev/website/docs/en/faq.wml:1314
 msgid ""
 "If you're running on Solaris, OpenBSD, NetBSD, or old FreeBSD, Tor is "
 "probably forking separate processes rather than using threads. Consider "
@@ -2110,7 +2110,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1320
+#: /home/runa/dev/website/docs/en/faq.wml:1320
 msgid ""
 "If you still can't handle the memory load, consider reducing the amount of "
 "bandwidth your relay advertises. Advertising less bandwidth means you will "
@@ -2119,60 +2119,60 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1329
+#: /home/runa/dev/website/docs/en/faq.wml:1329
 msgid ""
 "All of this said, fast Tor relays do use a lot of ram. It is not unusual for"
 " a fast exit relay to use 500-1000 MB of memory."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1333
+#: /home/runa/dev/website/docs/en/faq.wml:1333
 msgid "<hr> <a id=\"WhyNotNamed\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1336
+#: /home/runa/dev/website/docs/en/faq.wml:1336
 msgid "<a class=\"anchor\" href=\"#WhyNotNamed\">Why is my Tor relay not named?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1339
+#: /home/runa/dev/website/docs/en/faq.wml:1339
 msgid ""
 "We currently use these metrics to determine if your relay should be "
 "named:<br>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1342
+#: /home/runa/dev/website/docs/en/faq.wml:1342
 msgid ""
 "The name is not currently mapped to a different key. Existing mappings are "
 "removed after 6 months of inactivity from a relay."
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1344
+#: /home/runa/dev/website/docs/en/faq.wml:1344
 msgid "The relay must have been around for at least two weeks."
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1345
+#: /home/runa/dev/website/docs/en/faq.wml:1345
 msgid "No other router may have wanted the same name in the past month."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1348
+#: /home/runa/dev/website/docs/en/faq.wml:1348
 msgid "<hr> <a id=\"KeyManagement\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1351
+#: /home/runa/dev/website/docs/en/faq.wml:1351
 msgid ""
 "<a class=\"anchor\" href=\"#KeyManagement\">Tell me about all the keys Tor "
 "uses.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1354
+#: /home/runa/dev/website/docs/en/faq.wml:1354
 msgid ""
 "Tor uses a variety of different keys, with three goals in mind: 1)  "
 "encryption to ensure privacy of data within the Tor network, 2)  "
@@ -2182,7 +2182,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1362
+#: /home/runa/dev/website/docs/en/faq.wml:1362
 msgid ""
 "<b>Encryption</b>: first, all connections in Tor use TLS link encryption, so"
 " observers can't look inside to see which circuit a given cell is intended "
@@ -2193,7 +2193,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1372
+#: /home/runa/dev/website/docs/en/faq.wml:1372
 msgid ""
 "<b>Authentication</b>: Every Tor relay has a public decryption key called "
 "the \"onion key\".  When the Tor client establishes circuits, at each step "
@@ -2204,7 +2204,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1382
+#: /home/runa/dev/website/docs/en/faq.wml:1382
 msgid ""
 "<b>Coordination</b>: How do clients know what the relays are, and how do "
 "they know that they have the right keys for them? Each relay has a long-term"
@@ -2219,7 +2219,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1396
+#: /home/runa/dev/website/docs/en/faq.wml:1396
 msgid ""
 "How do clients know what the directory authorities are? The Tor software "
 "comes with a built-in list of location and public key for each directory "
@@ -2228,7 +2228,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1403
+#: /home/runa/dev/website/docs/en/faq.wml:1403
 msgid ""
 "How do users know they've got the right software? When we distribute the "
 "source code or a package, we digitally sign it with <a "
@@ -2238,7 +2238,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1411
+#: /home/runa/dev/website/docs/en/faq.wml:1411
 msgid ""
 "In order to be certain that it's really signed by us, you need to have met "
 "us in person and gotten a copy of our GPG key fingerprint, or you need to "
@@ -2248,17 +2248,17 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1418
+#: /home/runa/dev/website/docs/en/faq.wml:1418
 msgid "<hr> <a id=\"EntryGuards\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1421
+#: /home/runa/dev/website/docs/en/faq.wml:1421
 msgid "<a class=\"anchor\" href=\"#EntryGuards\">What are Entry Guards?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1424
+#: /home/runa/dev/website/docs/en/faq.wml:1424
 msgid ""
 "Tor (like all current practical low-latency anonymity designs) fails when "
 "the attacker can see both ends of the communications channel. For example, "
@@ -2270,7 +2270,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1434
+#: /home/runa/dev/website/docs/en/faq.wml:1434
 msgid ""
 "So, what should we do? Suppose the attacker controls, or can observe, "
 "<i>C</i> relays. Suppose there are <i>N</i> relays total. If you select new "
@@ -2284,7 +2284,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1446
+#: /home/runa/dev/website/docs/en/faq.wml:1446
 msgid ""
 "The solution is \"entry guards\": each user selects a few relays at random "
 "to use as entry points, and uses only those relays for her first hop. If "
@@ -2297,7 +2297,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1457
+#: /home/runa/dev/website/docs/en/faq.wml:1457
 msgid ""
 "You can read more at <a href=\"http://freehaven.net/anonbib/#wright02\">An "
 "Analysis of the Degradation of Anonymous Protocols</a>, <a "
@@ -2308,7 +2308,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1466
+#: /home/runa/dev/website/docs/en/faq.wml:1466
 msgid ""
 "Restricting your entry nodes may also help against attackers who want to run"
 " a few Tor nodes and easily enumerate all of the Tor user IP addresses. "
@@ -2319,19 +2319,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1474
+#: /home/runa/dev/website/docs/en/faq.wml:1474
 msgid "<hr> <a id=\"EverybodyARelay\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1477
+#: /home/runa/dev/website/docs/en/faq.wml:1477
 msgid ""
 "<a class=\"anchor\" href=\"#EverybodyARelay\">You should make every Tor user"
 " be a relay.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1480
+#: /home/runa/dev/website/docs/en/faq.wml:1480
 msgid ""
 "Requiring every Tor user to be a relay would help with scaling the network "
 "to handle all our users, and <a "
@@ -2346,7 +2346,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1493
+#: /home/runa/dev/website/docs/en/faq.wml:1493
 msgid ""
 "That said, we do want to encourage Tor users to run relays, so what we "
 "really want to do is simplify the process of setting up and maintaining a "
@@ -2357,12 +2357,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1502
+#: /home/runa/dev/website/docs/en/faq.wml:1502
 msgid "There are five steps we need to address before we can do this though:"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1506
+#: /home/runa/dev/website/docs/en/faq.wml:1506
 msgid ""
 "First, we need to make Tor stable as a relay on all common operating "
 "systems. The main remaining platform is Windows, and we plan to finally "
@@ -2372,7 +2372,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1514
+#: /home/runa/dev/website/docs/en/faq.wml:1514
 msgid ""
 "Second, we still need to get better at automatically estimating the right "
 "amount of bandwidth to allow. See item #7 on the <a href=\"<page "
@@ -2384,7 +2384,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1525
+#: /home/runa/dev/website/docs/en/faq.wml:1525
 msgid ""
 "Third, we need to work on scalability, both of the network (how to stop "
 "requiring that all Tor relays be able to connect to all Tor relays) and of "
@@ -2396,7 +2396,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1535
+#: /home/runa/dev/website/docs/en/faq.wml:1535
 msgid ""
 "Fourth, we need to better understand the risks from letting the attacker "
 "send traffic through your relay while you're also initiating your own "
@@ -2414,7 +2414,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1551
+#: /home/runa/dev/website/docs/en/faq.wml:1551
 msgid ""
 "Fifth, we might need some sort of incentive scheme to encourage people to "
 "relay traffic for others, and/or to become exit nodes. Here are our <a "
@@ -2423,24 +2423,24 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1558
+#: /home/runa/dev/website/docs/en/faq.wml:1558
 msgid "Please help on all of these!"
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1561
+#: /home/runa/dev/website/docs/en/faq.wml:1561
 msgid "<hr> <a id=\"TransportIPnotTCP\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1564
+#: /home/runa/dev/website/docs/en/faq.wml:1564
 msgid ""
 "<a class=\"anchor\" href=\"#TransportIPnotTCP\">You should transport all IP "
 "packets, not just TCP packets.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1567
+#: /home/runa/dev/website/docs/en/faq.wml:1567
 msgid ""
 "This would be handy, because it would make Tor better able to handle new "
 "protocols like VoIP, it could solve the whole need to socksify applications,"
@@ -2449,7 +2449,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1574
+#: /home/runa/dev/website/docs/en/faq.wml:1574
 msgid ""
 "We're heading in this direction: see <a "
 "href=\"https://trac.torproject.org/projects/tor/ticket/1855\">this trac "
@@ -2458,7 +2458,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1581
+#: /home/runa/dev/website/docs/en/faq.wml:1581
 msgid ""
 "IP packets reveal OS characteristics. We would still need to do IP-level "
 "packet normalization, to stop things like TCP fingerprinting attacks. Given "
@@ -2469,7 +2469,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1588
+#: /home/runa/dev/website/docs/en/faq.wml:1588
 msgid ""
 "Application-level streams still need scrubbing. We will still need user-side"
 " applications like Torbutton. So it won't become just a matter of capturing "
@@ -2477,7 +2477,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1592
+#: /home/runa/dev/website/docs/en/faq.wml:1592
 msgid ""
 "Certain protocols will still leak information. For example, we must rewrite "
 "DNS requests so they are delivered to an unlinkable DNS server rather than "
@@ -2486,7 +2486,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1597
+#: /home/runa/dev/website/docs/en/faq.wml:1597
 msgid ""
 "<a "
 "href=\"http://crypto.stanford.edu/~nagendra/projects/dtls/dtls.html\">DTLS</a>"
@@ -2497,7 +2497,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1604
+#: /home/runa/dev/website/docs/en/faq.wml:1604
 msgid ""
 "Exit policies for arbitrary IP packets mean building a secure IDS. Our node "
 "operators tell us that exit policies are one of the main reasons they're "
@@ -2515,7 +2515,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1618
+#: /home/runa/dev/website/docs/en/faq.wml:1618
 msgid ""
 "The Tor-internal name spaces would need to be redesigned. We support hidden "
 "service \".onion\" addresses by intercepting the addresses when they are "
@@ -2524,38 +2524,38 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1625
+#: /home/runa/dev/website/docs/en/faq.wml:1625
 msgid "<hr> <a id=\"Criminals\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1628
+#: /home/runa/dev/website/docs/en/faq.wml:1628
 msgid ""
 "<a class=\"anchor\" href=\"#Criminals\">Doesn't Tor enable criminals to do "
 "bad things?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1631
+#: /home/runa/dev/website/docs/en/faq.wml:1631
 msgid ""
 "For the answer to this question and others, please see our <a href=\"<page "
 "docs/faq-abuse>\">Tor Abuse FAQ</a>."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1635
+#: /home/runa/dev/website/docs/en/faq.wml:1635
 msgid "<hr> <a id=\"RespondISP\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1638
+#: /home/runa/dev/website/docs/en/faq.wml:1638
 msgid ""
 "<a class=\"anchor\" href=\"#RespondISP\">How do I respond to my ISP about my"
 " exit relay?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1641
+#: /home/runa/dev/website/docs/en/faq.wml:1641
 msgid ""
 "A collection of templates for successfully responding to ISPs is <a "
 "href=\"<wiki>TheOnionRouter/TorAbuseTemplates\">collected here</a>."

Modified: translation/trunk/projects/website/po/es/docs/2-medium.tor-doc-osx.po
===================================================================
--- translation/trunk/projects/website/po/es/docs/2-medium.tor-doc-osx.po	2011-04-12 16:15:00 UTC (rev 24594)
+++ translation/trunk/projects/website/po/es/docs/2-medium.tor-doc-osx.po	2011-04-12 16:19:31 UTC (rev 24595)
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-02-12 12:20+0000\n"
-"PO-Revision-Date: 2011-03-22 16:29+0000\n"
+"POT-Creation-Date: 2011-03-28 12:48+0200\n"
+"PO-Revision-Date: 2011-03-29 00:26+0000\n"
 "Last-Translator: runasand <runa.sandvik at gmail.com>\n"
 "Language-Team: Spanish (Castilian) <None>\n"
 "MIME-Version: 1.0\n"
@@ -18,7 +18,7 @@
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:8
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:8
 msgid ""
 "<a href=\"<page index>\">Home &raquo; </a> <a href=\"<page "
 "docs/documentation>\">Documentation &raquo; </a> <a href=\"<page docs/tor-"
@@ -26,19 +26,19 @@
 msgstr ""
 
 #. type: Content of: <div><div><h1>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:13
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:13
 msgid "Running the <a href=\"<page index>\">Tor</a> client on Mac OS X"
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:14 /tmp/N9PceEMclo.xml:26
-#: /tmp/N9PceEMclo.xml:71 /tmp/N9PceEMclo.xml:104 /tmp/N9PceEMclo.xml:136
-#: /tmp/N9PceEMclo.xml:158
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:14 /tmp/dnqIbbGTnT.xml:26
+#: /tmp/dnqIbbGTnT.xml:71 /tmp/dnqIbbGTnT.xml:104 /tmp/dnqIbbGTnT.xml:136
+#: /tmp/dnqIbbGTnT.xml:158
 msgid "<br>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:17
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:17
 msgid ""
 "<b>Note that these are the installation instructions for running a Tor "
 "client on Mac OS X. If you want to relay traffic for others to help the "
@@ -47,19 +47,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:23
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:23
 msgid "<hr> <a id=\"installing\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:25
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:25
 msgid ""
 "<a class=\"anchor\" href=\"#installing\">Step One: Download and Install "
 "Tor</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:29
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:29
 msgid ""
 "The install for Macintosh OS X bundles <a href=\"<page index>\">Tor</a>, <a "
 "href=\"<page projects/vidalia>\">Vidalia</a> (a graphical interface for "
@@ -67,14 +67,14 @@
 "href=\"http://www.pps.jussieu.fr/~jch/software/polipo/\">Polipo</a> (a web "
 "proxy)  into one package, with the four applications pre-configured to work "
 "together.  Download either the <a href=\"<page "
-"download/download>#tor\">stable</a> or the <a href=\"<page "
-"download/download>#tor\">experimental</a> version of the OS X bundle, or "
+"download/download>#mac\">stable</a> or the <a href=\"<page "
+"download/download>#mac\">experimental</a> version of the OS X bundle, or "
 "look for more options on the <a href=\"<page download/download>\">download "
 "page</a>."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:42
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:42
 msgid ""
 "Once you've downloaded the dmg, double-click and let it mount.  Browse to "
 "the now open Vidalia Bundle in Finder.  It's easy to install the bundle; "
@@ -85,7 +85,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:49
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:49
 msgid ""
 "When you are finished installing, you can start Vidalia by selecting its "
 "icon from your Applications folder. A dark onion with a red X in your dock "
@@ -94,19 +94,19 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:55
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:55
 msgid "When Tor is running, Vidalia's dock icon will look like the following:"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:58
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:58
 msgid ""
 "<img alt=\"vidalia running tor\" src=\"$(IMGROOT)/screenshot-osx-"
 "vidalia.png\" />"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:61
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:61
 msgid ""
 "Polipo is installed as part of the Tor bundle package installer. Once it is "
 "installed, it will start automatically when your computer is restarted.  You"
@@ -115,26 +115,26 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:68
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:68
 msgid "<hr> <a id=\"using\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:70
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:70
 msgid ""
 "<a class=\"anchor\" href=\"#using\">Step Two: Configure your applications to"
 " use Tor</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:73
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:73
 msgid ""
 "After installing, 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-osx.wml:76
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:76
 msgid ""
 "You should use Tor with Firefox and Torbutton, for best safety.  Torbutton "
 "was installed for you.  Click on the red \"Tor Disabled\" toggle button to "
@@ -142,14 +142,14 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:80
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:80
 msgid ""
 "<img alt=\"Torbutton plugin for Firefox\" src=\"$(IMGROOT)/screenshot-"
 "torbutton.png\" />"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:83
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:83
 msgid ""
 "If you plan to run Firefox on a different computer than Tor, see the <a "
 "href=\"<wikifaq>#SocksListenAddress\">FAQ entry for running Tor on a "
@@ -157,7 +157,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:87
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:87
 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 "
@@ -170,24 +170,24 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:97
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:97
 msgid ""
 "For information on how to Torify other applications, check out the <a "
 "href=\"<wiki>/TheOnionRouter/TorifyHOWTO\">Torify HOWTO</a>."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:101
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:101
 msgid "<hr> <a id=\"verify\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:103
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:103
 msgid "<a class=\"anchor\" href=\"#verify\">Step Three: Make sure it's working</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:107
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:107
 msgid ""
 "Next, you should try using your browser with Tor and make sure that your IP "
 "address is being anonymized. Click on <a "
@@ -198,7 +198,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:115
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:115
 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"
@@ -208,31 +208,31 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:124
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:124
 msgid ""
 "If it's still not working, look at <a href=\"<page "
 "docs/faq>#DoesntWork\">this FAQ entry</a> for hints."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:128
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:128
 msgid ""
 "Once it's working, learn more about <a href=\"<page "
 "download/download>#Warning\">what Tor does and does not offer</a>."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:132
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:132
 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-osx.wml:135
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:135
 msgid "<a class=\"anchor\" href=\"#relay\">Step Four: Configure it as a relay</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:138
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:138
 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 "
@@ -243,7 +243,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:146
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:146
 msgid ""
 "Having relays in many different places on the Internet is what makes Tor "
 "users secure. <a href=\"<wikifaq>#RelayAnonymity\">You may also get stronger"
@@ -252,24 +252,24 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:152
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:152
 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-osx.wml:155
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:155
 msgid "<hr> <a id=\"uninstall\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:157
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:157
 msgid "<a class=\"anchor\" href=\"#uninstall\">How To Uninstall Tor and Polipo</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:160
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:160
 msgid ""
 "There are two ways to uninstall the bundle from your computer, using Finder "
 "or a command line or Terminal-based uninstaller.  If you want to remove Tor "
@@ -277,79 +277,79 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:164
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:164
 msgid ""
 "Change your application proxy settings back to their original values.  If "
 "you just want to stop using Tor, you can end at this point."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:168
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:168
 msgid ""
 "If you want to completely remove Tor, and your account has Admin Privileges,"
 " then proceed as follows:"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:172
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:172
 msgid "Open Finder and click on Applications."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:173
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:173
 msgid "Drag /Applications/Vidalia to the Trash."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:174
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:174
 msgid "Remove /Library/Torbutton from your system."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:175
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:175
 msgid ""
 "In your User or home directory, go to Library, remove the Vidalia directory"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:179
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:179
 msgid "Tor, Vidalia, and Polipo are now completely removed from your system."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:181
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:181
 msgid ""
 "If you're familiar with the command line or Terminal, you can manually type "
 "the following:"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:184
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:184
 msgid "rm -r /Applications/Vidalia.app"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:185
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:185
 msgid "rm -r /Library/Torbutton"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:186
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:186
 msgid "rm -r ~/Library/Vidalia"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:187
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:187
 msgid "rm -r ~/.tor"
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:190
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:190
 msgid "<hr>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:192
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:192
 msgid ""
 "If you have suggestions for improving this document, please <a href=\"<page "
 "about/contact>\">send them to us</a>. Thanks!"

Modified: translation/trunk/projects/website/po/es/docs/2-medium.tor-doc-relay.po
===================================================================
--- translation/trunk/projects/website/po/es/docs/2-medium.tor-doc-relay.po	2011-04-12 16:15:00 UTC (rev 24594)
+++ translation/trunk/projects/website/po/es/docs/2-medium.tor-doc-relay.po	2011-04-12 16:19:31 UTC (rev 24595)
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-02-12 12:20+0000\n"
-"PO-Revision-Date: 2011-03-22 16:29+0000\n"
+"POT-Creation-Date: 2011-03-28 12:48+0200\n"
+"PO-Revision-Date: 2011-03-29 00:26+0000\n"
 "Last-Translator: runasand <runa.sandvik at gmail.com>\n"
 "Language-Team: Spanish (Castilian) <None>\n"
 "MIME-Version: 1.0\n"
@@ -18,7 +18,7 @@
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:8
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:8
 msgid ""
 "<a href=\"<page index>\">Home &raquo; </a> <a href=\"<page "
 "docs/documentation>\">Documentation &raquo; </a> <a href=\"<page docs/tor-"
@@ -26,17 +26,17 @@
 msgstr ""
 
 #. type: Content of: <div><div><h1>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:14
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:14
 msgid "Configuring a Tor relay"
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:16 /tmp/eKLg46HT7B.xml:275
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:16 /tmp/ogZUlgnLzH.xml:275
 msgid "<hr>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:19
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:19
 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 "
@@ -48,60 +48,60 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:28
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:28
 msgid ""
-"You can run a Tor relay on <a href=\"<wikifaq>#RelayOS\">pretty much any</a>"
-" operating system. Tor relays work best on Linux, OS X Tiger or later, "
-"FreeBSD 5.x+, NetBSD 5.x+, and Windows Server 2003 or later."
+"You can run a Tor relay on pretty much any operating system. Tor relays work"
+" best on Linux, OS X Tiger or later, FreeBSD 5.x+, NetBSD 5.x+, and Windows "
+"Server 2003 or later."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:33
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:33
 msgid "<hr> <a id=\"zero\"></a> <a id=\"install\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:36
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:36
 msgid "<a class=\"anchor\" href=\"#install\">Step One: Download and Install Tor</a>"
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:37 /tmp/eKLg46HT7B.xml:52
-#: /tmp/eKLg46HT7B.xml:141 /tmp/eKLg46HT7B.xml:165
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:37 /tmp/ogZUlgnLzH.xml:52
+#: /tmp/ogZUlgnLzH.xml:141 /tmp/ogZUlgnLzH.xml:165
 msgid "<br>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:39
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:39
 msgid "Before you start, you need to make sure that Tor is up and running."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:42
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:42
 msgid ""
 "Visit our <a href=\"<page download/download>\">download page</a> and install"
 " the \"Installation Bundle\" for your OS."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:46
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:46
 msgid ""
 "If it's convenient, you might also want to use it as a client for a while to"
 " make sure it's actually working."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:49
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:49
 msgid "<hr> <a id=\"setup\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:51
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:51
 msgid "<a class=\"anchor\" href=\"#setup\">Step Two: Set it up as a relay</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:54
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:54
 msgid ""
 "Verify that your clock and timezone are set correctly. If possible, "
 "synchronize your clock with public <a "
@@ -110,12 +110,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:60
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:60
 msgid "<strong>Manual Configuration</strong>:"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><ul><li>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:62
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:62
 msgid ""
 "Edit the bottom part of <a href=\"<page docs/faq>#torrc\">your torrc "
 "file</a>. If you want to be a public relay (recommended), make sure to "
@@ -127,31 +127,31 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:72
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:72
 msgid "<strong>Configuring Tor with the Vidalia Graphical Interface</strong>:"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><ol><li><dt>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:76
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:76
 msgid ""
 "Right click on the Vidalia icon in your task bar.  Choose <tt>Control "
 "Panel</tt>."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><ol><li><dd>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:77
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:77
 msgid ""
 "<img alt=\"vidalia right click menu\" src=\"$(IMGROOT)/screenshot-"
 "win32-vidalia.png\" />"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><ol><li>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:80
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:80
 msgid "Click <tt>Setup Relaying</tt>."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><ol><li><dt>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:83
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:83
 msgid ""
 "Choose <tt>Relay Traffic for the Tor network</tt> if you want to be a public"
 " relay (recommended), or choose <tt>Help censored users reach the Tor "
@@ -161,21 +161,21 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><ol><li><dd>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:88
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:88
 msgid ""
 "<img alt=\"vidalia basic settings\" src=\"$(IMGROOT)/screenshot-win32"
 "-configure-relay-1.png\" />"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><ol><li>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:91
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:91
 msgid ""
 "Enter a nickname for your relay, and enter contact information in case we "
 "need to contact you about problems."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><ol><li>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:94
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:94
 msgid ""
 "Leave <tt>Attempt to automatically configure port forwarding</tt> clicked.  "
 "Push the <tt>Test</tt> button to see if it works.  If it does work, great.  "
@@ -183,21 +183,21 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><ol><li><dt>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:98
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:98
 msgid ""
 "Choose the <tt>Bandwidth Limits</tt> tab.  Select how much bandwidth you "
 "want to provide for Tor users like yourself."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><ol><li><dd>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:99
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:99
 msgid ""
 "<img alt=\"vidalia bandwidth limits\" src=\"$(IMGROOT)/screenshot-win32"
 "-configure-relay-2.png\" />"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><ol><li><dt>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:102
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:102
 msgid ""
 "Choose the <tt>Exit Policies</tt> tab.  If you want to allow others to use "
 "your relay for these services, don't change anything.  Un-check the services"
@@ -207,21 +207,21 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><ol><li><dd>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:107
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:107
 msgid ""
 "<img alt=\"vidalia exit policies\" src=\"$(IMGROOT)/screenshot-win32"
 "-configure-relay-3.png\" />"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><ol><li>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:110
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:110
 msgid ""
 "Click the <tt>Ok</tt> button.  See Step Three below for confirmation that "
 "the relay is working correctly."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><li>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:114
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:114
 msgid ""
 "If you are using a firewall, open a hole in your firewall so incoming "
 "connections can reach the ports you configured (ORPort, plus DirPort if you "
@@ -232,14 +232,14 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><li>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:123
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:123
 msgid ""
 "Restart your relay. If it <a href=\"<page docs/faq>#Logs\">logs any "
 "warnings</a>, address them."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><li>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:128
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:128
 msgid ""
 "Subscribe to the <a href=\"http://archives.seul.org/or/announce/\">or-"
 "announce</a> mailing list. It is very low volume, and it will keep you "
@@ -249,17 +249,17 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:138
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:138
 msgid "<hr> <a id=\"check\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:140
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:140
 msgid "<a class=\"anchor\" href=\"#check\">Step Three: Make sure it is working</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:143
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:143
 msgid ""
 "As soon as your relay manages to connect to the network, it will try to "
 "determine whether the ports you configured are reachable from the outside. "
@@ -272,7 +272,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:153
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:153
 msgid ""
 "When it decides that it's reachable, it will upload a \"server descriptor\" "
 "to the directories, to let clients know what address, ports, keys, etc your "
@@ -284,22 +284,22 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:162
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:162
 msgid "<hr> <a id=\"after\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:164
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:164
 msgid "<a class=\"anchor\" href=\"#after\">Step Four: Once it is working</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:168
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:168
 msgid "We recommend the following steps as well:"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:172
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:172
 msgid ""
 "6. Read <a href=\"<wiki>TheOnionRouter/OperationalSecurity\">about "
 "operational security</a> to get ideas how you can increase the security of "
@@ -307,7 +307,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:178
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:178
 msgid ""
 "7. If you want to run more than one relay that's great, but please set <a "
 "href=\"<page docs/faq>#MultipleRelays\">the MyFamily option</a> in all your "
@@ -315,7 +315,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:184
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:184
 msgid ""
 "8. Decide about rate limiting. Cable modem, DSL, and other users who have "
 "asymmetric bandwidth (e.g. more down than up) should rate limit to their "
@@ -324,7 +324,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:192
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:192
 msgid ""
 "9. Back up your Tor relay's private key (stored in \"keys/secret_id_key\" in"
 " your DataDirectory). This is your relay's \"identity,\" and you need to "
@@ -335,7 +335,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:202
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:202
 msgid ""
 "10. If you control the name servers for your domain, consider setting your "
 "reverse DNS hostname to 'anonymous-relay', 'proxy' or 'tor-proxy', so when "
@@ -347,7 +347,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:213
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:213
 msgid ""
 "11. If your computer isn't running a webserver, please consider changing "
 "your ORPort to 443 and your DirPort to 80. Many Tor users are stuck behind "
@@ -362,7 +362,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:228
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:228
 msgid ""
 "12. If your Tor relay provides other services on the same IP address &mdash;"
 " such as a public webserver &mdash; make sure that connections to the "
@@ -374,7 +374,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:239
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:239
 msgid ""
 "13. (Unix only). Make a separate user to run the relay. If you installed the"
 " OS X package or the deb or the rpm, this is already done. Otherwise, you "
@@ -386,7 +386,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:250
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:250
 msgid ""
 "14. (Unix only.) Your operating system probably limits the number of open "
 "file descriptors per process to 1024 (or even less). If you plan to be "
@@ -398,7 +398,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:260
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:260
 msgid ""
 "15. If you installed Tor via some package or installer, it probably starts "
 "Tor for you automatically on boot. But if you installed from source, you may"
@@ -406,7 +406,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:266
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:266
 msgid ""
 "When you change your Tor configuration, remember to verify that your relay "
 "still works correctly after the change. Be sure to set your \"ContactInfo\" "
@@ -418,7 +418,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:277
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:277
 msgid ""
 "If you have suggestions for improving this document, please <a href=\"<page "
 "about/contact>\">send them to us</a>. Thanks!"

Modified: translation/trunk/projects/website/po/es/getinvolved/4-optional.volunteer.po
===================================================================
--- translation/trunk/projects/website/po/es/getinvolved/4-optional.volunteer.po	2011-04-12 16:15:00 UTC (rev 24594)
+++ translation/trunk/projects/website/po/es/getinvolved/4-optional.volunteer.po	2011-04-12 16:19:31 UTC (rev 24595)
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-03-25 16:51+0000\n"
-"PO-Revision-Date: 2011-03-26 00:29+0000\n"
+"POT-Creation-Date: 2011-03-28 12:49+0200\n"
+"PO-Revision-Date: 2011-03-29 00:27+0000\n"
 "Last-Translator: runasand <runa.sandvik at gmail.com>\n"
 "Language-Team: Spanish (Castilian) <None>\n"
 "MIME-Version: 1.0\n"
@@ -18,33 +18,33 @@
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:8
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:8
 msgid ""
 "<a href=\"<page index>\">Home &raquo; </a> <a href=\"<page "
 "getinvolved/volunteer>\">Volunteer</a>"
 msgstr ""
 
 #. type: Content of: <div><div><h1>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:13
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:13
 msgid "A few things everyone can do now:"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:15
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:15
 msgid ""
 "Please consider <a href=\"<page docs/tor-doc-relay>\">running a relay</a> to"
 " help the Tor network grow."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:17
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:17
 msgid ""
 "Tell your friends! Get them to run relays. Get them to run hidden services. "
 "Get them to tell their friends."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:19
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:19
 msgid ""
 "If you like Tor's goals, please <a href=\"<page donate/donate>\">take a "
 "moment to donate to support further Tor development</a>. We're also looking "
@@ -54,7 +54,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:24
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:24
 msgid ""
 "We're looking for more <a href=\"<page about/torusers>\">good examples of "
 "Tor users and Tor use cases</a>. If you use Tor for a scenario or purpose "
@@ -63,7 +63,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:30
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:30
 msgid ""
 "Tor has <a href=\"<page getinvolved/open-positions>\">two open "
 "positions</a>.  Please <a href=\"<page about/contact>\">contact us</a> if "
@@ -71,17 +71,17 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:33
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:33
 msgid "<a id=\"Documentation\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:34
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:34
 msgid "<a class=\"anchor\" href=\"#Documentation\">Documentation</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:36
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:36
 msgid ""
 "Help translate the web page and documentation into other languages. See the "
 "<a href=\"<page getinvolved/translation>\">translation guidelines</a> if you"
@@ -90,7 +90,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:40
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:40
 msgid ""
 "Evaluate and document <a "
 "href=\"https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorifyHOWTO\">our"
@@ -98,7 +98,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:43
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:43
 msgid ""
 "We have a huge list of <a "
 "href=\"https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/SupportPrograms\">potentially"
@@ -107,32 +107,24 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:49
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:49
 msgid "<a id=\"Advocacy\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:50
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:50
 msgid "<a class=\"anchor\" href=\"#Advocacy\">Advocacy</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:52
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:52
 msgid ""
-"Create a <a "
-"href=\"https://trac.torproject.org/projects/tor/wiki/CommunityLogos\">community"
-" logo</a> under a Creative Commons license that all can use and modify."
-msgstr ""
-
-#. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:55
-msgid ""
 "Create a presentation that can be used for various user group meetings "
 "around the world."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:57
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:54
 msgid ""
 "Create a video about the positive uses of Tor, what Tor is, or how to use "
 "it.  Some have already started on <a "
@@ -143,31 +135,31 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:63
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:60
 msgid ""
 "Create a poster, or a set of posters, around a theme, such as \"Tor for "
 "Freedom!\"."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:65
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:62
 msgid ""
 "Create a t-shirt design that incorporates \"Congratulations! You are using "
 "Tor!\" in any language."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:69
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:66
 msgid "<a id=\"Projects\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:70
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:67
 msgid "<a class=\"anchor\" href=\"#Projects\">Projects</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:73
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:70
 msgid ""
 "Below are a list of Tor related projects we're developing and/or "
 "maintaining. Most discussions happen on IRC so if you're interested in any "
@@ -178,333 +170,333 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><th>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:83
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:80
 msgid "Name"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><th>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:84
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:81
 msgid "Category"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><th>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:85
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:82
 msgid "Language"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><th>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:86
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:83
 msgid "Activity"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><th>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:87
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:84
 msgid "Contributors"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:91
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:88
 msgid "<a href=\"#project-tor\">Tor</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:92
-#: /tmp/OzLkyddxSC.xml:100
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:89
+#: /tmp/qxq11tAO2x.xml:97
 msgid "Core"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:93
-#: /tmp/OzLkyddxSC.xml:125
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:90
+#: /tmp/qxq11tAO2x.xml:122
 msgid "C"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:94
-#: /tmp/OzLkyddxSC.xml:118 /tmp/OzLkyddxSC.xml:150 /tmp/OzLkyddxSC.xml:190
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:91
+#: /tmp/qxq11tAO2x.xml:115 /tmp/qxq11tAO2x.xml:147 /tmp/qxq11tAO2x.xml:187
 msgid "Heavy"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:95
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:92
 msgid "nickm, arma, Sebastian"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:99
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:96
 msgid "*<a href=\"#project-jtor\">JTor</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:101
-#: /tmp/OzLkyddxSC.xml:157 /tmp/OzLkyddxSC.xml:189
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:98
+#: /tmp/qxq11tAO2x.xml:154 /tmp/qxq11tAO2x.xml:186
 msgid "Java"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:102
-#: /tmp/OzLkyddxSC.xml:198 /tmp/OzLkyddxSC.xml:222 /tmp/OzLkyddxSC.xml:246
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:99
+#: /tmp/qxq11tAO2x.xml:195 /tmp/qxq11tAO2x.xml:219 /tmp/qxq11tAO2x.xml:243
 msgid "None"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:107
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:104
 msgid "<a href=\"#project-tbb\">TBB</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:108
-#: /tmp/OzLkyddxSC.xml:116 /tmp/OzLkyddxSC.xml:124 /tmp/OzLkyddxSC.xml:132
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:105
+#: /tmp/qxq11tAO2x.xml:113 /tmp/qxq11tAO2x.xml:121 /tmp/qxq11tAO2x.xml:129
 msgid "Usability"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:109
-#: /tmp/OzLkyddxSC.xml:117 /tmp/OzLkyddxSC.xml:133
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:106
+#: /tmp/qxq11tAO2x.xml:114 /tmp/qxq11tAO2x.xml:130
 msgid "Sys Admin"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:110
-#: /tmp/OzLkyddxSC.xml:158 /tmp/OzLkyddxSC.xml:166 /tmp/OzLkyddxSC.xml:230
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:107
+#: /tmp/qxq11tAO2x.xml:155 /tmp/qxq11tAO2x.xml:163 /tmp/qxq11tAO2x.xml:227
 msgid "Moderate"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:111
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:108
 msgid "Erinn"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:115
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:112
 msgid "<a href=\"#project-tails\">Tails</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:119
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:116
 msgid "<a href=\"https://tails.boum.org/chat/\">#tails</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:123
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:120
 msgid "<a href=\"#project-torsocks\">Torsocks</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:126
-#: /tmp/OzLkyddxSC.xml:134 /tmp/OzLkyddxSC.xml:142 /tmp/OzLkyddxSC.xml:174
-#: /tmp/OzLkyddxSC.xml:182 /tmp/OzLkyddxSC.xml:206 /tmp/OzLkyddxSC.xml:214
-#: /tmp/OzLkyddxSC.xml:238
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:123
+#: /tmp/qxq11tAO2x.xml:131 /tmp/qxq11tAO2x.xml:139 /tmp/qxq11tAO2x.xml:171
+#: /tmp/qxq11tAO2x.xml:179 /tmp/qxq11tAO2x.xml:203 /tmp/qxq11tAO2x.xml:211
+#: /tmp/qxq11tAO2x.xml:235
 msgid "Light"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:127
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:124
 msgid "mwenge"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:131
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:128
 msgid "*<a href=\"#project-torouter\">Torouter</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:135
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:132
 msgid "ioerror, Runa"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:139
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:136
 msgid "<a href=\"#project-vidalia\">Vidalia</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:140
-#: /tmp/OzLkyddxSC.xml:148 /tmp/OzLkyddxSC.xml:156
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:137
+#: /tmp/qxq11tAO2x.xml:145 /tmp/qxq11tAO2x.xml:153
 msgid "User Interface"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:141
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:138
 msgid "C++, Qt"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:143
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:140
 msgid "chiiph"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:147
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:144
 msgid "<a href=\"#project-arm\">Arm</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:149
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:146
 msgid "Python, Curses"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:151
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:148
 msgid "atagar"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:155
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:152
 msgid "<a href=\"#project-orbot\">Orbot</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:159
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:156
 msgid "n8fr8"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:163
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:160
 msgid "<a href=\"#project-torbutton\">Torbutton</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:164
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:161
 msgid "Browser Add-on"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:165
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:162
 msgid "Javascript"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:167
-#: /tmp/OzLkyddxSC.xml:183 /tmp/OzLkyddxSC.xml:239
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:164
+#: /tmp/qxq11tAO2x.xml:180 /tmp/qxq11tAO2x.xml:236
 msgid "mikeperry"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:171
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:168
 msgid "*<a href=\"#project-thandy\">Thandy</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:172
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:169
 msgid "Updater"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:173
-#: /tmp/OzLkyddxSC.xml:181 /tmp/OzLkyddxSC.xml:205 /tmp/OzLkyddxSC.xml:213
-#: /tmp/OzLkyddxSC.xml:229 /tmp/OzLkyddxSC.xml:237 /tmp/OzLkyddxSC.xml:245
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:170
+#: /tmp/qxq11tAO2x.xml:178 /tmp/qxq11tAO2x.xml:202 /tmp/qxq11tAO2x.xml:210
+#: /tmp/qxq11tAO2x.xml:226 /tmp/qxq11tAO2x.xml:234 /tmp/qxq11tAO2x.xml:242
 msgid "Python"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:175
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:172
 msgid "Sebastian, Erinn, nickm"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:179
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:176
 msgid "<a href=\"#project-torctl\">TorCtl</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:180
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:177
 msgid "Library"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:187
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:184
 msgid "<a href=\"#project-metrics\">Metrics</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:188
-#: /tmp/OzLkyddxSC.xml:196 /tmp/OzLkyddxSC.xml:204 /tmp/OzLkyddxSC.xml:212
-#: /tmp/OzLkyddxSC.xml:220
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:185
+#: /tmp/qxq11tAO2x.xml:193 /tmp/qxq11tAO2x.xml:201 /tmp/qxq11tAO2x.xml:209
+#: /tmp/qxq11tAO2x.xml:217
 msgid "Client Service"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:191
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:188
 msgid "karsten"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:195
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:192
 msgid "<a href=\"#project-torstatus\">TorStatus</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:197
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:194
 msgid "PHP"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:203
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:200
 msgid "<a href=\"#project-weather\">Weather</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:207
-#: /tmp/OzLkyddxSC.xml:215
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:204
+#: /tmp/qxq11tAO2x.xml:212
 msgid "kaner"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:211
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:208
 msgid "<a href=\"#project-gettor\">GetTor</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:219
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:216
 msgid "<a href=\"#project-torcheck\">TorCheck</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:221
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:218
 msgid "Python, Perl"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:227
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:224
 msgid "<a href=\"#project-bridgedb\">BridgeDB</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:228
-#: /tmp/OzLkyddxSC.xml:236 /tmp/OzLkyddxSC.xml:244
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:225
+#: /tmp/qxq11tAO2x.xml:233 /tmp/qxq11tAO2x.xml:241
 msgid "Backend Service"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:231
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:228
 msgid "kaner, nickm"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:235
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:232
 msgid "<a href=\"#project-torflow\">TorFlow</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:243
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:240
 msgid "*<a href=\"#project-torbel\">TorBEL</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:247
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:244
 msgid "Sebastian"
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:251
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:248
 msgid ""
 "<sub> * Project is still in an alpha state.  </sub> <br /><br /> <a id"
 "=\"project-tor\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:258
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:255
 msgid ""
 "Tor (<a href=\"https://gitweb.torproject.org/tor.git\">code</a>, <a "
 "href=\"https://trac.torproject.org/projects/tor/query?status=accepted&status=assigned&status=needs_review&status=new&status=reopened&component=Tor+Client&component=Tor+Relay&component=vidalia&order=priority\">bug"
@@ -512,7 +504,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:263
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:260
 msgid ""
 "Central project, providing the core software for using and participating in "
 "the Tor network. Numerous people contribute to the project to varying "
@@ -520,7 +512,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:269
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:266
 msgid ""
 "<b>Project Ideas:</b><br /> <i><a href=\"#resistCensorship\">Improving Tor's"
 " ability to resist censorship</a></i><br /> <i><a "
@@ -530,12 +522,12 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:276
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:273
 msgid "<a id=\"project-jtor\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:277
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:274
 msgid ""
 "<a href=\"https://github.com/brl/JTor/wiki\">JTor</a> (<a "
 "href=\"https://github.com/brl/JTor\">code</a>, <a "
@@ -543,7 +535,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:283
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:280
 msgid ""
 "Java implementation of Tor and successor to <a "
 "href=\"http://onioncoffee.sourceforge.net/\">OnionCoffee</a>. This project "
@@ -551,12 +543,12 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:288
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:285
 msgid "<a id=\"project-tbb\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:289
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:286
 msgid ""
 "<a href=\"<page projects/torbrowser>\">Tor Browser Bundle</a> (<a "
 "href=\"https://gitweb.torproject.org/torbrowser.git\">code</a>, <a "
@@ -565,7 +557,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:295
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:292
 msgid ""
 "The Tor Browser Bundle is an easy-to-use portable package of Tor, Vidalia, "
 "and Firefox preconfigured to work together out of the box. This is actively "
@@ -573,7 +565,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:301
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:298
 msgid ""
 "<b>Project Ideas:</b><br /> <i><a href=\"#auditTBB\">Audit Tor Browser "
 "Bundles for data leaks</a></i><br /> <i><a "
@@ -581,12 +573,12 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:306
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:303
 msgid "<a id=\"project-tails\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:307
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:304
 msgid ""
 "<a href=\"https://tails.boum.org/\">The Amnesic Incognito Live System</a> "
 "(<a href=\"http://git.immerda.ch/?p=amnesia.git;a=summary\">code</a>, <a "
@@ -594,7 +586,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:313
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:310
 msgid ""
 "The Amnesic Incognito Live System is a live CD/USB distribution "
 "preconfigured so that everything is safely routed through Tor and leaves no "
@@ -604,7 +596,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:321
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:318
 msgid ""
 "<b>Project Ideas:</b><br /> <i><a href=\"#tailsStartMenu\">Custom GDM3 "
 "startup menu, aka.  tails-greeter</a></i><br /> <i><a "
@@ -614,12 +606,12 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:330
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:327
 msgid "<a id=\"project-torsocks\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:331
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:328
 msgid ""
 "<a href=\"http://code.google.com/p/torsocks/\">Torsocks</a> (<a "
 "href=\"https://gitweb.torproject.org/torsocks.git\">code</a>, <a "
@@ -628,7 +620,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:337
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:334
 msgid ""
 "Utility for adapting other applications to work with Tor. Development has "
 "slowed and compatibility issues remain with some platforms, but it's "
@@ -636,19 +628,19 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:343
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:340
 msgid ""
 "<b>Project Ideas:</b><br /> <i><a href=\"#torsocksForOSX\">Make "
 "torsocks/dsocks work on OS X</a></i>"
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:347
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:344
 msgid "<a id=\"project-torouter\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:348
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:345
 msgid ""
 "<a "
 "href=\"https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/Torouter\">Torouter</a>"
@@ -658,19 +650,19 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:354
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:351
 msgid ""
 "Project to provide an easy-to-use, embedded Tor instance for routers. This "
 "had high activity in late 2010, but has since been rather quiet."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:358
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:355
 msgid "<a id=\"project-vidalia\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:359
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:356
 msgid ""
 "<a href=\"<page projects/vidalia>\">Vidalia</a> (<a "
 "href=\"https://svn.torproject.org/vidalia/vidalia/trunk/\">code</a>, <a "
@@ -679,7 +671,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:365
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:362
 msgid ""
 "The most commonly used user interface for Tor. Matt Edman started the "
 "project in 2006 and brought it to its current stable state. Development "
@@ -688,7 +680,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:372
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:369
 msgid ""
 "<b>Project Ideas:</b><br /> <i><a href=\"#vidaliaStatusEventInterface\">Tor "
 "Controller Status Event Interface for Vidalia</a></i><br /> <i><a "
@@ -697,12 +689,12 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:377
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:374
 msgid "<a id=\"project-arm\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:378
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:375
 msgid ""
 "<a href=\"http://www.atagar.com/arm/\">Arm</a> (<a "
 "href=\"https://svn.torproject.org/svn/arm/trunk/\">code</a>, <a "
@@ -711,7 +703,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:384
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:381
 msgid ""
 "Command-line monitor for Tor. This has been under very active development by"
 " its author, Damian Johnson, since early 2009 to make it a better general-"
@@ -719,19 +711,19 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:390
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:387
 msgid ""
 "<b>Project Ideas:</b><br /> <i><a href=\"#armClientMode\">Client Mode Use "
 "Cases for Arm</a></i><br /> <i><a href=\"#armGui\">GUI for Arm</a></i>"
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:395
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:392
 msgid "<a id=\"project-orbot\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:396
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:393
 msgid ""
 "<a href=\"https://guardianproject.info/apps/orbot/\">Orbot</a> (<a "
 "href=\"https://svn.torproject.org/svn/projects/android/trunk/Orbot/\">code</a>,"
@@ -741,26 +733,30 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:402
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:399
 msgid ""
 "Provides Tor on the Android platform. This was under very active development"
 " up through Fall 2010, after which things have been quiet."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:407
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:404
 msgid ""
-"<b>Project Ideas:</b><br /> <i><a href=\"#orbotDevelopment\">More on Orbot "
-"&amp; Android OS-specific development</a></i>"
+"<b>Project Ideas:</b><br /> <i><a href=\"#orbot-torbutton\">TorButton for "
+"Mobile Firefox 4 or Custom Browser on Android</a></i><br /> <i><a href"
+"=\"#orbot-userInterface\">Build a better user interface for Orbot</a></i><br"
+" /> <i><a href=\"#orbot-optimisation\">Core Tor mobile "
+"optimisation</a></i><br /> <i><a href=\"#orbot-orlibAndOutreach\">Orbot "
+"integration library and community outreach</a></i>"
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:411
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:411
 msgid "<a id=\"project-torbutton\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:412
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:412
 msgid ""
 "<a href=\"<page torbutton/index>\">Torbutton</a> (<a "
 "href=\"https://gitweb.torproject.org/torbutton.git\">code</a>, <a "
@@ -769,7 +765,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:418
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:418
 msgid ""
 "Firefox addon that addresses many of the client-side threats to browsing the"
 " Internet anonymously. Mike has since continued to adapt it to new threats, "
@@ -779,7 +775,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:426
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:426
 msgid ""
 "<b>Project Ideas:</b><br /> <i><a "
 "href=\"#torbuttonForThunderbird\">Torbutton equivalent for "
@@ -787,17 +783,17 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:430
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:430
 msgid "<a id=\"project-thandy\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:431
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:431
 msgid "Thandy (<a href=\"https://gitweb.torproject.org/thandy.git\">code</a>)"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:435
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:435
 msgid ""
 "Updater for Tor. The project began in the Summer of 2008 but wasn't "
 "completed. Recently interest in it has been rekindled and many aspects of "
@@ -805,12 +801,12 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:440
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:440
 msgid "<a id=\"project-torctl\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:441
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:441
 msgid ""
 "TorCtl (<a href=\"https://gitweb.torproject.org/pytorctl.git\">code</a>, <a "
 "href=\"https://trac.torproject.org/projects/tor/query?status=accepted&status=assigned&status=needs_review&status=new&status=reopened&component=Torctl&order=priority\">bug"
@@ -818,19 +814,19 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:447
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:447
 msgid ""
 "Python bindings and utilities for using the Tor control port. It has been "
 "stable for several years, with only minor revisions."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:451
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:451
 msgid "<a id=\"project-metrics\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:452
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:452
 msgid ""
 "<a href=\"https://metrics.torproject.org/\">Metrics</a> (code: <a "
 "href=\"https://gitweb.torproject.org/metrics-db.git\">db</a>, <a "
@@ -841,7 +837,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:460
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:460
 msgid ""
 "Processing and analytics of consensus data, provided to users via the "
 "metrics portal. This has been under active development for several years by "
@@ -849,12 +845,12 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:465
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:465
 msgid "<a id=\"project-torstatus\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:466
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:466
 msgid ""
 "<a "
 "href=\"https://trac.torproject.org/projects/tor/wiki/projects/TorStatus\">TorStatus</a>"
@@ -862,7 +858,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:470
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:470
 msgid ""
 "Portal providing an overview of the Tor network, and details on any of its "
 "current relays. Though very actively used, this project has been "
@@ -870,12 +866,12 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:475
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:475
 msgid "<a id=\"project-weather\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:476
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:476
 msgid ""
 "<a "
 "href=\"https://trac.torproject.org/projects/tor/wiki/projects/Weather\">Weather</a>"
@@ -885,7 +881,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:482
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:482
 msgid ""
 "Provides automatic notification to subscribed relay operators when their "
 "relay's unreachable. This underwent a rewrite by the <a "
@@ -894,12 +890,12 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:488
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:488
 msgid "<a id=\"project-gettor\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:489
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:489
 msgid ""
 "<a "
 "href=\"https://trac.torproject.org/projects/tor/wiki/projects/EmailAutoResponder\">GetTor</a>"
@@ -909,19 +905,19 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:495
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:495
 msgid ""
 "E-mail autoresponder providing Tor's packages over SMTP. This has been "
 "relatively unchanged for quite a while."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:499
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:499
 msgid "<a id=\"project-torcheck\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:500
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:500
 msgid ""
 "<a "
 "href=\"https://trac.torproject.org/projects/tor/wiki/projects/TorCheck\">TorCheck</a>"
@@ -931,19 +927,19 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:506
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:506
 msgid ""
 "Provides a simple site for determining if the visitor is using Tor or not.  "
 "This has been relatively unchanged for quite a while."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:510
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:510
 msgid "<a id=\"project-bridgedb\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:511
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:511
 msgid ""
 "<a "
 "href=\"https://trac.torproject.org/projects/tor/wiki/projects/BridgeDB\">BridgeDB</a>"
@@ -953,19 +949,19 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:517
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:517
 msgid ""
 "Backend bridge distributor, handling the various pools they're distributed "
 "in. This was actively developed until Fall of 2010."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:521
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:521
 msgid "<a id=\"project-torflow\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:522
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:522
 msgid ""
 "<a "
 "href=\"https://trac.torproject.org/projects/tor/wiki/projects/TorFlow\">TorFlow</a>"
@@ -975,7 +971,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:528
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:528
 msgid ""
 "Library and collection of services for actively monitoring the Tor network."
 "  These include the Bandwidth Scanners (measuring throughput of relays) and "
@@ -986,12 +982,12 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:536
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:536
 msgid "<a id=\"project-torbel\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:537
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:537
 msgid ""
 "<a "
 "href=\"https://trac.torproject.org/projects/tor/wiki/projects/TorBulkExitlist\">TorBEL</a>"
@@ -1001,7 +997,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:544
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:544
 msgid ""
 "The Tor Bulk Exitlist provides a method of identifying if IPs belong to exit"
 " nodes or not. This is a replacement for TorDNSEL which is a stable (though "
@@ -1011,17 +1007,17 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:551
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:551
 msgid "<a id=\"Coding\"></a> <a id=\"Summer\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:553
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:553
 msgid "<a class=\"anchor\" href=\"#Coding\">Project Ideas</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:556
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:556
 msgid ""
 "You may find some of these projects to be good <a href=\"<page "
 "about/gsoc>\">Google Summer of Code 2011</a> ideas. We have labelled each "
@@ -1036,12 +1032,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:570
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:570
 msgid "<a id=\"auditTBB\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:572
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:572
 msgid ""
 "<b>Audit Tor Browser Bundles for data leaks</b> <br> Priority: <i>High</i> "
 "<br> Effort Level: <i>High</i> <br> Skill Level: <i>Medium</i> <br> Likely "
@@ -1049,7 +1045,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:581
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:581
 msgid ""
 "The Tor Browser Bundle incorporates Tor, Firefox, Polipo, and the Vidalia "
 "user interface (and optionally the <a href=\"http://pidgin.im/\">Pidgin</a> "
@@ -1060,7 +1056,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:587
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:587
 msgid ""
 "This project is to identify all of the traces left behind by using a Tor "
 "Browser Bundle on Windows, Mac OS X, or Linux.  Developing ways to stop, "
@@ -1068,7 +1064,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:590
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:590
 msgid ""
 "Students should be familiar with operating system analysis, application "
 "development on one or preferably all of Windows, Linux, and Mac OS X, and be"
@@ -1076,19 +1072,19 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:593
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:593
 msgid ""
 "If you would like to help extend or do security auditing for TBB, please "
 "contact Erinn."
 msgstr ""
 
 #. type: Content of: <div><div><ol>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:597
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:597
 msgid "<a id=\"firewallProbeTool\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:599
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:599
 msgid ""
 "<b>Develop a fully automatic firewall-probing system</b> <br> Priority: "
 "<i>High</i> <br> Effort Level: <i>Medium to High</i> <br> Skill Level: "
@@ -1096,7 +1092,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:608
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:608
 msgid ""
 "We would like to have a fully automatic firewall-probing system for blocking"
 " systems with no long-term state (i.e. firewalls that can examine each "
@@ -1105,7 +1101,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:612
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:612
 msgid ""
 "Ideally, volunteers would only need to set up one or more test servers, and "
 "run the probe client program on a publicly accessible computer behind the "
@@ -1113,38 +1109,38 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:615
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:615
 msgid "The test tool should:"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><ul><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:617
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:617
 msgid ""
 "generate packet captures on both ends (and send them out to the extent "
 "possible),"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><ul><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:619
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:619
 msgid ""
 "cycle through all the SSL configurations we might want to test through a "
 "censorship device, and"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><ul><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:621
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:621
 msgid ""
 "also test some other protocols to see whether they are allowed through the "
 "firewall (IMAP and other mail protocols, BitTorrent, DTLS, etc.)."
 msgstr ""
 
 #. type: Content of: <div><div><ol>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:627
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:627
 msgid "<a id=\"tailsStartMenu\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:629
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:629
 msgid ""
 "<b>Custom GDM3 startup menu, aka. tails-greeter</b> <br> Priority: "
 "<i>High</i> <br> Effort Level: <i>Medium</i> <br> Skill Level: <i>Medium to "
@@ -1152,14 +1148,14 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:638
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:638
 msgid ""
 "Several major upcoming Tails features need to gather user input at startup "
 "time: bridges support, persistence, MAC address anonymization, etc."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:641
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:641
 msgid ""
 "Existing boot menus lack the graphical widgets and generally user-"
 "friendliness needed. Hence it was decided to implement Tails startup menu in"
@@ -1169,7 +1165,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:646
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:646
 msgid ""
 "Anyone undertaking this project should be familiar with GNU/Linux and "
 "application development; no other skill is required, apart of the ability to"
@@ -1181,19 +1177,75 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:653
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:653
 msgid ""
 "For more information see <a "
 "href=\"https://tails.boum.org/todo/boot_menu/\">https://tails.boum.org/todo/boot_menu/</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ol>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:656
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:656
+msgid "<a id=\"orbot-torbutton\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><ol><li>
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:658
+msgid ""
+"<b>TorButton for Mobile Firefox 4 or Custom Browser on Android</b> <br> "
+"Priority: <i>High</i> <br> Effort Level: <i>High</i> <br> Skill Level: "
+"<i>High</i> <br> Likely Mentors: <i>Nathan (n8fr8), Jake, Mike Perry</i>"
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:667
+msgid ""
+"Initial work has been done on implementing a proxy-setting add-on for "
+"Firefox on Android (see <a "
+"href=\"https://github.com/guardianproject/ProxyMob\">ProxyMob</a>), but a "
+"full port of TorButton needs to be done (dependent upon Firefox 4 port of "
+"TorButton). The other approach is to implement a custom &quot;Tor "
+"Browser&quot; based on Firefox or Webkit browser. See <a "
+"href=\"http://code.google.com/p/torora/wiki/Android\">Torora</a> for "
+"progress on this so far."
+msgstr ""
+
+#. type: Content of: <div><div><ol>
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:677
+msgid "<a id=\"orbot-userInterface\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><ol><li>
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:679
+msgid ""
+"<b>Build a better user interface for Orbot</b> <br> Priority: <i>High</i> "
+"<br> Effort Level: <i>Medium</i> <br> Skill Level: <i>Medium</i> <br> Likely"
+" Mentors: <i>Nathan (n8fr8), Jake</i>"
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:688
+msgid ""
+"Improved home screen to show confirmation of connection (via a TorCheck API "
+"call), better statistics about data transferred (up/down), number of "
+"circuits connected, quality of connection and so on. The &quot;Tether "
+"Wifi&quot; Android application is a good model to follow in how it shows a "
+"realtime count of bytes transferred as well as notifications when wifi "
+"clients connect. In addition, better handling of Tor system and error "
+"messages would also be very helpful, include use of standard Android "
+"operating systems notifications. The addition of a wizard or tutorial "
+"walkthrough for novice users to explain to them exactly what is and what is "
+"not anonymized or protected would greatly improve the likelihood they will "
+"use Orbot correctly. All of this should work on the range of screens and "
+"device types now offered for Android, from 2&quot; phone to 10&quot; Tablet."
+msgstr ""
+
+#. type: Content of: <div><div><ol>
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:703
 msgid "<a id=\"resistCensorship\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:658
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:705
 msgid ""
 "<b>Improving Tor's ability to resist censorship</b> <br> Priority: <i>Medium"
 " to High</i> <br> Effort Level: <i>Medium to High</i> <br> Skill Level: "
@@ -1201,7 +1253,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:667
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:714
 msgid ""
 "The Tor 0.2.1.x series makes <a href=\"<svnprojects>design-"
 "paper/blocking.html\">significant improvements</a> in resisting national and"
@@ -1210,7 +1262,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:672
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:719
 msgid ""
 "One huge category of work is adding features to our <a "
 "href=\"https://gitweb.torproject.org/bridgedb.git?a=tree\">BridgeDB</a> "
@@ -1226,7 +1278,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:683
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:730
 msgid ""
 "If you want to get more into the guts of Tor itself (C), a more minor "
 "problem we should address is that current Tors can only listen on a single "
@@ -1237,7 +1289,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:690
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:737
 msgid ""
 "This project could involve a lot of research and design. One of the big "
 "challenges will be identifying and crafting approaches that can still resist"
@@ -1246,12 +1298,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:697
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:744
 msgid "<a id=\"geoIPUpgrade\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:699
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:746
 msgid ""
 "<b>Improve our GeoIP file format</b> <br> Priority: <i>Medium</i> <br> "
 "Effort Level: <i>Medium</i> <br> Skill Level: <i>Medium to High</i> <br> "
@@ -1259,7 +1311,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:708
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:755
 msgid ""
 "Currently, Tor bridges and relays read an entire IP->country database into "
 "memory from a text file during startup.  We would like to distribute this "
@@ -1268,7 +1320,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:713
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:760
 msgid ""
 "We have <a href='https://trac.torproject.org/projects/tor/ticket/2506'>a "
 "sketch of a design</a> for a moderately optimized format for IPv4 GeoIP "
@@ -1277,20 +1329,20 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:722
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:769
 msgid "<a id=\"armClientMode\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:724
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:771
 msgid ""
 "<b>Client Mode Use Cases for Arm</b> <br> Priority: <i>Medium</i> <br> "
 "Effort Level: <i>High</i> <br> Skill Level: <i>Medium</i> <br> Likely "
-"Mentors: <i>Damian</i>"
+"Mentors: <i>Damian (atagar)</i>"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:733
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:780
 msgid ""
 "<a href=\"<page projects/arm>\">Arm</a> is a Tor command line status monitor"
 " on *nix environments (Linux, Mac, and BSD). It functions much like top "
@@ -1301,14 +1353,14 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:741
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:788
 msgid ""
 "This would include UI design, experimenting, and a lot of python hacking. "
 "Here's some ideas for client functionality arm could provide:"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><ul><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:745
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:792
 msgid ""
 "A panel for client connections, showing each hop of the user's circuits with"
 " the ISP, country, and jurisdiction where those relays reside. Other "
@@ -1321,21 +1373,21 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><ul><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:754
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:801
 msgid ""
 "Options to let the user request new circuits (the &quot;New Identity&quot; "
 "feature in Vidalia), select the exit country, etc."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><ul><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:757
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:804
 msgid ""
 "A panel showing Internet application and if their connections are being "
 "routed through Tor or not (giving a warning if there's leaks)."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><ul><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:760
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:807
 msgid ""
 "The status of the bridges we're configured to use (ie, are they up?).  This "
 "would include adding control port functionality to Tor for <a "
@@ -1344,7 +1396,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><ul><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:765
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:812
 msgid ""
 "A one click option to set Tor to be a client, relay, or bridge. The goal "
 "would be to make it trivial for users to voluntarily contribute to the Tor "
@@ -1352,7 +1404,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><ul><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:769
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:816
 msgid ""
 "Menus as an alternative to hotkeys to make the interface more intuitive and "
 "usable for beginners (<a "
@@ -1360,13 +1412,13 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><ul><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:773
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:820
 msgid ""
 "Look at Vidalia and TorK for ideas and solicit input from the Tor community."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:777
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:824
 msgid ""
 "More information is available in the following sections of arm's dev notes: "
 "<a "
@@ -1379,12 +1431,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:781
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:828
 msgid "<a id=\"unitTesting\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:783
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:830
 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> Likely "
@@ -1392,7 +1444,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:792
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:839
 msgid ""
 "Tor needs to be tested far more thoroughly. This is a multi-part effort. To "
 "start with, our unit test coverage should rise substantially, especially in "
@@ -1402,7 +1454,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:798
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:845
 msgid ""
 "Additionally, we need to automate our performance testing. We've got "
 "buildbot to automate our regular integration and compile testing already "
@@ -1415,78 +1467,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:808
-msgid "<a id=\"orbotDevelopment\"></a>"
-msgstr ""
-
-#. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:810
-msgid ""
-"<b>More on Orbot &amp; Android OS-specific development</b> <br> Priority: "
-"<i>Medium</i> <br> Effort Level: <i>High</i> <br> Skill Level: <i>Medium to "
-"High</i> <br> Likely Mentors: <i>Nathan, Jake</i>"
-msgstr ""
-
-#. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:819
-msgid ""
-"<b>Android Java UI work:</b> Improved home screen to show better statistics "
-"about data transferred (up/down), number of circuits connected, quality of "
-"connection and so on. The \"Tether Wifi\" Android application is a good "
-"model to follow in how it shows a realtime count of bytes transferred as "
-"well as notifications when wifi clients connect. In addition, better "
-"display/handling of Tor system/error messages would also be very helpful. "
-"Finally, the addition of a wizard or tutorial walkthrough for novice users "
-"to explain to them exactly what is and what is not anonymized or protected "
-"would greatly improve the likelihood they will use Orbot correctly."
-msgstr ""
-
-#. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:831
-msgid ""
-"<b>Android Java OS/Core app work:</b> Better system-wide indication, either "
-"via the notification bar, \"Toast\" pop-up dialogs or some other indicator, "
-"that an application's traffic is indeed moving through Orbot/Tor. For "
-"instance, right now you need to first go to a torcheck web service to ensure"
-" your browser is routing via Tor. Orbot should be able to notify you that "
-"circuits are being opened, used, etc. The aforementioned data transfer "
-"tracker might provide this type of awareness as well."
-msgstr ""
-
-#. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:840
-msgid ""
-"<b>Android Java Library/Community Outreach work:</b> We need to package a "
-"simple library for use with third-party application to easily enable them to"
-" support \"Torification\" on non-rooted devices (i.e. w/o transparent "
-"proxying). This library should include a wrapper for the Apache HTTPClient "
-"library, a utility class for detecting the state of Orbot connectivity, and "
-"other relevant/useful things an Android app might need to anonymize itself. "
-"This work would include the creation of the library, documentation, and "
-"sample code. Outreach or effort to implement the library within other open-"
-"source apps would follow."
-msgstr ""
-
-#. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:851
-msgid ""
-"<b>Android OS/C/Linux work:</b> The port of Tor to Android is basically a "
-"straight cross-compile to Linux ARM. There has been no work done in looking "
-"the optimization of Tor within a mobile hardware environment, on the ARM "
-"processor or other Android hardware, or on mobile networks. It should be "
-"noted, that even without optimization, Tor is handling the mobile network "
-"environment very well, automatically detecting change in IP addresses, "
-"reconnecting circuits, etc. across switching from 2G to 3G to Wifi, and so "
-"forth."
-msgstr ""
-
-#. type: Content of: <div><div><ol>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:862
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:855
 msgid "<a id=\"simulateSlowConnections\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:864
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:857
 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> Likely"
@@ -1494,7 +1480,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:874
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:867
 msgid ""
 "Many users of Tor have poor-quality Internet connections, giving low "
 "bandwidth, high latency, and high packet loss/re-ordering. User experience "
@@ -1503,7 +1489,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:882
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:875
 msgid ""
 "This project would be to build a simulation environment which replicates the"
 " poor connectivity so that the effect on Tor performance can be measured. "
@@ -1513,7 +1499,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:890
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:883
 msgid ""
 "The tools used would be up to the student, but dummynet (for FreeBSD)  and "
 "nistnet (for Linux) are two potential components on which this project could"
@@ -1522,12 +1508,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:898
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:891
 msgid "<a id=\"torbuttonForThunderbird\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:900
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:893
 msgid ""
 "<b>Torbutton equivalent for Thunderbird</b> <br> Priority: <i>Medium</i> "
 "<br> Effort Level: <i>High</i> <br> Skill Level: <i>High</i> <br> Likely "
@@ -1535,7 +1521,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:910
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:903
 msgid ""
 "We're hearing from an increasing number of users that they want to use "
 "Thunderbird with Tor. However, there are plenty of application-level "
@@ -1545,12 +1531,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:918
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:911
 msgid "<a id=\"usabilityTesting\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:920
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:913
 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 "
@@ -1558,7 +1544,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:930
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:923
 msgid ""
 "Especially the browser bundle, ideally amongst our target demographic.  That"
 " would help a lot in knowing what needs to be done in terms of bug fixes or "
@@ -1567,19 +1553,19 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:937
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:930
 msgid ""
 "Please note that since this isn't a coding project, it isn't suitable for "
 "Google Summer of Code."
 msgstr ""
 
 #. type: Content of: <div><div><ol>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:942
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:935
 msgid "<a id=\"tailsMetadataAnonymizing\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:944
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:937
 msgid ""
 "<b>Meta-data anonymizing toolkit for file publication</b> <br> Priority: "
 "<i>Medium</i> <br> Effort Level: <i>Low to Medium</i> <br> Skill Level: "
@@ -1587,7 +1573,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:953
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:946
 msgid ""
 "Tor helps greatly in publishing files anonymously. However, much personal "
 "information can be enclosed *inside* such published files' meta-data: GPS "
@@ -1596,14 +1582,14 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:957
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:950
 msgid ""
 "A set of tools allowing users to easily inspect and clean up meta-data in "
 "files would benefit Tor users, and would e.g. be shipped in Tails."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:959
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:952
 msgid ""
 "A graphical user interface is a must, but library and command-line "
 "interfaces are most welcome so that future work can add support for cleaning"
@@ -1612,7 +1598,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:963
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:956
 msgid ""
 "This project mostly consists of writing glue between the many existing tools"
 " and libraries that provide read/write access to files' meta-data. An "
@@ -1621,7 +1607,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:967
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:960
 msgid ""
 "The meta-data cleaning toolkit would run at least on GNU/Linux; additional "
 "Windows and/or Mac OS X support would be welcome. The tools used would be up"
@@ -1630,12 +1616,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:973
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:966
 msgid "<a id=\"tailsDebianLive\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:975
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:968
 msgid ""
 "<b>Improve Debian Live support for persistence</b> <br> Priority: "
 "<i>Medium</i> <br> Effort Level: <i>Medium</i> <br> Skill Level: <i>Low to "
@@ -1643,7 +1629,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:984
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:977
 msgid ""
 "Data persistence is a somewhat tricky topic in a Live system context, "
 "especially one such as Tails, which is explicitly designed to avoid leaving "
@@ -1651,7 +1637,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:987
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:980
 msgid ""
 "Some real-life use cases, however, require some kind of data persistence. To"
 " start with, Tails should (carefully) support persistence of application-"
@@ -1661,7 +1647,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:992
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:985
 msgid ""
 "The backend work consists of improving Debian Live's existing persistence "
 "features to make them suit the specific context of Tails. A trust "
@@ -1672,7 +1658,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:998
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:991
 msgid ""
 "Anyone undertaking this project must be familiar with GNU/Linux, and "
 "preferably with Debian. Being able to (quickly learn to) write clean and "
@@ -1680,19 +1666,19 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1001
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:994
 msgid ""
 "For more information, see <a "
 "href=\"https://tails.boum.org/todo/persistence/\">https://tails.boum.org/todo/persistence/</a>."
 msgstr ""
 
 #. type: Content of: <div><div><ol>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1004
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:997
 msgid "<a id=\"torsocksForOSX\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1006
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:999
 msgid ""
 "<b>Make torsocks/dsocks work on OS X</b> <br> Priority: <i>Medium</i> <br> "
 "Effort Level: <i>Medium</i> <br> Skill Level: <i>Medium</i> <br> Likely "
@@ -1700,7 +1686,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1016
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1009
 msgid ""
 "<a href=\"https://code.google.com/p/torsocks/\">Torsocks</a> and <a "
 "href=\"https://code.google.com/p/dsocks/\">dsocks</a> are wrappers that will"
@@ -1720,12 +1706,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1035
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1028
 msgid "<a id=\"vidaliaStatusEventInterface\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1037
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1030
 msgid ""
 "<b>Tor Controller Status Event Interface for Vidalia</b> <br> Priority: "
 "<i>Medium</i> <br> Effort Level: <i>Medium</i> <br> Skill Level: <i>Low to "
@@ -1733,7 +1719,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1046
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1039
 msgid ""
 "There are a number of status changes inside Tor of which the user may need "
 "to be informed. For example, if the user is trying to set up his Tor as a "
@@ -1746,7 +1732,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1054
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1047
 msgid ""
 "Tor has the ability to inform Vidalia of many such status changes, and we "
 "recently implemented support for a couple of these events. Still, there are "
@@ -1755,7 +1741,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1059
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1052
 msgid ""
 "The goal of this project then is to design and implement a UI for displaying"
 " Tor status events to the user. For example, we might put a little badge on "
@@ -1767,7 +1753,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1067
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1060
 msgid ""
 "A person undertaking this project should have good UI design and layout "
 "skills and some C++ development experience. Previous experience with Qt and "
@@ -1779,12 +1765,91 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1076
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1069
+msgid "<a id=\"orbot-optimisation\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><ol><li>
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1071
+msgid ""
+"<b>Core Tor mobile optimisation</b> <br> Priority: <i>Medium</i> <br> Effort"
+" Level: <i>Medium</i> <br> Skill Level: <i>High</i> <br> Likely Mentors: "
+"<i>Nathan (n8fr8), Jake</i>"
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1081
+msgid ""
+"The existing port of Tor to Android is basically a straight cross-compile to"
+" Linux ARM. There has been no work done in looking at possible optimizations"
+" of Tor within a mobile hardware environment or on mobile networks. In "
+"addition, a number of additional Android OS APIs are available (such as "
+"wireless network status) that could be taken advantage of."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1090
+msgid ""
+"It should be noted, that even without optimisation, Tor is handling the "
+"mobile network environment very well, automatically detecting change in IP "
+"addresses, opening circuits, etc, as the device switches from no coverage to"
+" 2G, 3G or Wifi constantly as it changes position. However, this observation"
+" of &quot;very well&quot;, is just based on user experience, and not any "
+"detailed study of what exactly is happening, and what threats might exist "
+"because of this constantly changing network state."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1100
+msgid ""
+"Finally, the build process needs to be moved to the Android NDK from the "
+"custom GCC toolchain we are now using, and compatibility with Android 2.3 "
+"and 3.x Honeycomb OS need to be verified."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1106
+msgid ""
+"For more information see the <a "
+"href=\"https://svn.torproject.org/svn/projects/android/trunk/Orbot/BUILD\">Orbot"
+" build documentation</a>."
+msgstr ""
+
+#. type: Content of: <div><div><ol>
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1112
+msgid "<a id=\"orbot-orlibAndOutreach\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><ol><li>
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1114
+msgid ""
+"<b>Orbot integration library and community outreach</b> <br> Priority: "
+"<i>Medium</i> <br> Effort Level: <i>Low</i> <br> Skill Level: <i>Medium</i> "
+"<br> Likely Mentors: <i>Nathan (n8fr8)</i>"
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1124
+msgid ""
+"We need additional work on <a "
+"href=\"https://github.com/guardianproject/orlib\">ORLib</a>, our library for"
+" use with third-party application to easily enable them to support "
+"&quot;Torification&quot; on non-rooted devices (i.e. w/o transparent "
+"proxying). This library includes a SOCKS client, a wrapper for the Apache "
+"HTTPClient library, a utility class for detecting the state of Orbot "
+"connectivity, and other relevant/useful things an Android app might need to "
+"anonymize itself. This work would includes direct development of the "
+"library, documentation, and sample code. Outreach or effort to implement the"
+" library within other open-source apps is also needed."
+msgstr ""
+
+#. type: Content of: <div><div><ol>
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1137
 msgid "<a id=\"vidaliaNetworkMap\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1078
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1139
 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: "
@@ -1792,7 +1857,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1088
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1149
 msgid ""
 "One of Vidalia's existing features is a network map that shows the user the "
 "approximate geographic location of relays in the Tor network and plots the "
@@ -1807,7 +1872,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1102
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1163
 msgid ""
 "This project will first involve getting familiar with Vidalia and the Marble"
 " widget's API. One will then integrate the widget into Vidalia and customize"
@@ -1817,7 +1882,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1110
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1171
 msgid ""
 "A person undertaking this project should have good C++ development "
 "experience. Previous experience with Qt and CMake is helpful, but not "
@@ -1825,19 +1890,19 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1116
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1177
 msgid "<a id=\"armGui\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1118
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1179
 msgid ""
 "<b>GUI for Arm</b> <br> Priority: <i>Low</i> <br> Effort Level: <i>High</i> "
-"<br> Skill Level: <i>Medium</i> <br> Likely Mentors: <i>Damian</i>"
+"<br> Skill Level: <i>Medium</i> <br> Likely Mentors: <i>Damian (atagar)</i>"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1128
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1189
 msgid ""
 "Arm has several unique features, some of the most interesting being its "
 "connection listing (correlating netstat results against the Tor consensus)  "
@@ -1849,7 +1914,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1138
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1199
 msgid ""
 "The vast majority of arm's more interesting functionality lies in its "
 "backend <a "
@@ -1861,7 +1926,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1148
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1209
 msgid ""
 "<b>Bring up new ideas!</b> <br> Don't like any of these? Look at the <a "
 "href=\"/press/presskit/2008-12-19-roadmap-full.pdf\">Tor development "
@@ -1872,19 +1937,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1160
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1221
 msgid "<a id=\"OtherCoding\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1161
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1222
 msgid ""
 "<a class=\"anchor\" href=\"#OtherCoding\">Other Coding and Design related "
 "ideas</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1163
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1224
 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 "
@@ -1900,7 +1965,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1176
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1237
 msgid ""
 "We need to actually start building our <a href=\"<page "
 "docs/documentation>#DesignDoc\">blocking-resistance design</a>. This "
@@ -1910,7 +1975,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1182
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1243
 msgid ""
 "We need a flexible simulator framework for studying end-to-end traffic "
 "confirmation attacks. Many researchers have whipped up ad hoc simulators to "
@@ -1924,7 +1989,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1192
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1253
 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 "
@@ -1933,7 +1998,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1198
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1259
 msgid ""
 "Perform a security analysis of Tor with <a "
 "href=\"https://secure.wikimedia.org/wikipedia/en/wiki/Fuzz_testing\">\"fuzz\"</a>."
@@ -1942,7 +2007,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1203
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1264
 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 "
@@ -1955,7 +2020,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1214
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1275
 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 "
@@ -1963,7 +2028,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1218
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1279
 msgid ""
 "We need a way to generate the website diagrams (for example, the \"How Tor "
 "Works\" pictures on the <a href=\"<page about/overview>\">overview page</a> "
@@ -1974,7 +2039,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1225
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1286
 msgid ""
 "How can we make the various LiveCD/USB systems easier to maintain, improve, "
 "and document? One example is <a href=\"https://tails.boum.org/\">The Amnesic"
@@ -1982,7 +2047,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1232
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1293
 msgid ""
 "Another anti-censorship project is to try to make Tor more scanning-"
 "resistant.  Right now, an adversary can identify <a "
@@ -1996,17 +2061,17 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1246
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1307
 msgid "<a id=\"Research\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1247
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1308
 msgid "<a class=\"anchor\" href=\"#Research\">Research</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1249
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1310
 msgid ""
 "The \"end-to-end traffic confirmation attack\": by watching traffic at Alice"
 " and at Bob, we can <a "
@@ -2021,7 +2086,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1259
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1320
 msgid ""
 "A related question is: Does running a relay/bridge provide additional "
 "protection against these timing attacks? Can an external adversary that "
@@ -2041,7 +2106,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1274
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1335
 msgid ""
 "Repeat Murdoch and Danezis's <a "
 "href=\"http://www.cl.cam.ac.uk/~sjm217/projects/anon/#torta\">attack from "
@@ -2061,7 +2126,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1289
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1350
 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"
@@ -2076,7 +2141,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1299
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1360
 msgid ""
 "Other research questions regarding geographic diversity consider the "
 "tradeoff between choosing an efficient circuit and choosing a random "
@@ -2088,7 +2153,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1306
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1367
 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 "
@@ -2105,7 +2170,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1318
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1379
 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 "
@@ -2116,7 +2181,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1325
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1386
 msgid ""
 "Our censorship-resistance goals include preventing an attacker who's looking"
 " at Tor traffic on the wire from <a href=\"<svnprojects>design-"
@@ -2132,7 +2197,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1336
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1397
 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 "
@@ -2143,7 +2208,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1343
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1404
 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 "
@@ -2151,7 +2216,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1346
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1407
 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 "
@@ -2171,7 +2236,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1363
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1424
 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 "
@@ -2179,7 +2244,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1371
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1432
 msgid ""
 "<a href=\"<page about/contact>\">Let us know</a> if you've made progress on "
 "any of these!"

Modified: translation/trunk/projects/website/po/es/press/3-low.inthemedia.po
===================================================================
--- translation/trunk/projects/website/po/es/press/3-low.inthemedia.po	2011-04-12 16:15:00 UTC (rev 24594)
+++ translation/trunk/projects/website/po/es/press/3-low.inthemedia.po	2011-04-12 16:19:31 UTC (rev 24595)
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-03-25 16:51+0000\n"
-"PO-Revision-Date: 2011-03-26 00:32+0000\n"
+"POT-Creation-Date: 2011-03-28 12:48+0200\n"
+"PO-Revision-Date: 2011-03-29 00:27+0000\n"
 "Last-Translator: runasand <runa.sandvik at gmail.com>\n"
 "Language-Team: Spanish (Castilian) <None>\n"
 "MIME-Version: 1.0\n"
@@ -18,7 +18,7 @@
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/press/en/inthemedia.wml:8
+#: /home/runa/dev/website/press/en/inthemedia.wml:8
 msgid ""
 "<a href=\"<page index>\">Home &raquo; </a> <a href=\"<page "
 "press/press>\">Press &raquo; </a> <a href=\"<page press/inthemedia>\">Tor in"
@@ -26,12 +26,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><h1>
-#: /home/runa/tor/website/press/en/inthemedia.wml:15
+#: /home/runa/dev/website/press/en/inthemedia.wml:15
 msgid "Media Appearances"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/press/en/inthemedia.wml:17
+#: /home/runa/dev/website/press/en/inthemedia.wml:17
 msgid ""
 "Major news organizations including the New York Times, Forbes, Al Jazeera, "
 "Washington Post, Le Monde, NPR, BBC, and more have sought out or quoted Tor "
@@ -40,7 +40,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/press/en/inthemedia.wml:21
+#: /home/runa/dev/website/press/en/inthemedia.wml:21
 msgid ""
 "Since Tor is widely used throughout the world, it is mentioned regularly in "
 "the press.  This list is not comprehensive, but illustrates some of the "
@@ -48,39 +48,39 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/press/en/inthemedia.wml:24
+#: /home/runa/dev/website/press/en/inthemedia.wml:24
 msgid ""
 "A sample of such media appearances and mentions is below in order of newest "
 "to oldest:"
 msgstr ""
 
 #. type: Content of: <div><div><table><thead><tr><th>
-#: /home/runa/tor/website/press/en/inthemedia.wml:30
+#: /home/runa/dev/website/press/en/inthemedia.wml:30
 msgid "Date"
 msgstr ""
 
 #. type: Content of: <div><div><table><thead><tr><th>
-#: /home/runa/tor/website/press/en/inthemedia.wml:31
+#: /home/runa/dev/website/press/en/inthemedia.wml:31
 msgid "Publication"
 msgstr ""
 
 #. type: Content of: <div><div><table><thead><tr><th>
-#: /home/runa/tor/website/press/en/inthemedia.wml:32
+#: /home/runa/dev/website/press/en/inthemedia.wml:32
 msgid "Topic"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:36
+#: /home/runa/dev/website/press/en/inthemedia.wml:36
 msgid "2011 March 18"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:37
+#: /home/runa/dev/website/press/en/inthemedia.wml:37
 msgid "Telegraph"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:38
+#: /home/runa/dev/website/press/en/inthemedia.wml:38
 msgid ""
 "<a href=\"http://www.telegraph.co.uk/news/worldnews/middleeast/iran/8388484"
 "/Iran-cracks-down-on-web-dissident-technology.html\">Iran cracks down on web"
@@ -88,17 +88,17 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:43
+#: /home/runa/dev/website/press/en/inthemedia.wml:43
 msgid "2011 March 17"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:44 /tmp/u3kTkswOVo.xml:241
+#: /home/runa/dev/website/press/en/inthemedia.wml:44 /tmp/Q2ndl8ZYsF.xml:228
 msgid "BusinessWeek"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:45
+#: /home/runa/dev/website/press/en/inthemedia.wml:45
 msgid ""
 "<a "
 "href=\"http://www.businessweek.com/magazine/content/11_13/b4221043353206.htm\">Social"
@@ -106,17 +106,17 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:50
+#: /home/runa/dev/website/press/en/inthemedia.wml:50
 msgid "2011 March 10"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:51
+#: /home/runa/dev/website/press/en/inthemedia.wml:51
 msgid "NyTeknik"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:52
+#: /home/runa/dev/website/press/en/inthemedia.wml:52
 msgid ""
 "<a "
 "href=\"http://www.nyteknik.se/nyheter/it_telekom/internet/article3123594.ece\">Svenska"
@@ -124,17 +124,17 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:57
+#: /home/runa/dev/website/press/en/inthemedia.wml:57
 msgid "2011 March 09"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:58
+#: /home/runa/dev/website/press/en/inthemedia.wml:58
 msgid "Washington Post"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:59
+#: /home/runa/dev/website/press/en/inthemedia.wml:59
 msgid ""
 "<a href=\"http://www.washingtonpost.com/wp-"
 "dyn/content/article/2011/03/09/AR2011030905157_pf.html\">U.S.  funding tech "
@@ -142,17 +142,17 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:65
+#: /home/runa/dev/website/press/en/inthemedia.wml:65
 msgid "2011 February 17"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:66
+#: /home/runa/dev/website/press/en/inthemedia.wml:66
 msgid "Walpole Times"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:67
+#: /home/runa/dev/website/press/en/inthemedia.wml:67
 msgid ""
 "<a href=\"http://www.wickedlocal.com/walpole/news/x95296113/Tor-Project-a"
 "-Walpole-based-company-helps-Egyptians-avoid-Internet-censorship-during-"
@@ -161,18 +161,18 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:72 /tmp/u3kTkswOVo.xml:88
-#: /tmp/u3kTkswOVo.xml:96 /tmp/u3kTkswOVo.xml:104
+#: /home/runa/dev/website/press/en/inthemedia.wml:72 /tmp/Q2ndl8ZYsF.xml:86
+#: /tmp/Q2ndl8ZYsF.xml:93 /tmp/Q2ndl8ZYsF.xml:100
 msgid "2011 January 31"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:73
+#: /home/runa/dev/website/press/en/inthemedia.wml:73
 msgid "NPR: WBUR"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:74
+#: /home/runa/dev/website/press/en/inthemedia.wml:74
 msgid ""
 "<a href=\"http://hereandnow.wbur.org/2011/01/31/egypt-internet-"
 "government\">Here &amp; Now: U.S. Activists Help Egyptian Protesters Elude "
@@ -180,74 +180,73 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:80
+#: /home/runa/dev/website/press/en/inthemedia.wml:80
 msgid "2011 February 01"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:81
+#: /home/runa/dev/website/press/en/inthemedia.wml:81
 msgid "Discovery News"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:82
+#: /home/runa/dev/website/press/en/inthemedia.wml:82
 msgid ""
 "<a href=\"http://news.discovery.com/tech/egypt-internet-online-"
-"protesters-110201.  html\">Egypt's Internet Block Incomplete But "
-"Damaging</a>"
+"protesters-110201.html\">Egypt's Internet Block Incomplete But Damaging</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:89
+#: /home/runa/dev/website/press/en/inthemedia.wml:87
 msgid "IDG Poland"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:90
+#: /home/runa/dev/website/press/en/inthemedia.wml:88
 msgid ""
 "<a "
-"href=\"http://www.idg.pl/news/366773/Egipt.blokuje.Internet.aktywisci.szukaja."
-"  alternatyw.html\">Egipt blokuje Internet, aktywiści szukają alternatyw</a>"
+"href=\"http://www.idg.pl/news/366773/Egipt.blokuje.Internet.aktywisci.szukaja.alternatyw.html\">Egipt"
+" blokuje Internet, aktywiści szukają alternatyw</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:97 /tmp/u3kTkswOVo.xml:713
+#: /home/runa/dev/website/press/en/inthemedia.wml:94 /tmp/Q2ndl8ZYsF.xml:677
 msgid "New Scientist"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:98
+#: /home/runa/dev/website/press/en/inthemedia.wml:95
 msgid ""
 "<a href=\"http://www.newscientist.com/blogs/onepercent/2011/01/egypt-"
-"remains- officially-offli.html\">How Egypt is getting online</a>"
+"remains-officially-offli.html\">How Egypt is getting online</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:105
+#: /home/runa/dev/website/press/en/inthemedia.wml:101
 msgid "El Pais"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:106
+#: /home/runa/dev/website/press/en/inthemedia.wml:102
 msgid ""
 "<a "
-"href=\"http://www.elpais.com/articulo/internacional/Sortear/censura/golpe/fax/"
-" elpepuint/20110130elpepuint_14/Tes\">Sortear la censura a golpe de fax</a>"
+"href=\"http://www.elpais.com/articulo/internacional/Sortear/censura/golpe/fax/elpepuint/20110130elpepuint_14/Tes\">Sortear"
+" la censura a golpe de fax</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:112 /tmp/u3kTkswOVo.xml:119
-#: /tmp/u3kTkswOVo.xml:126
+#: /home/runa/dev/website/press/en/inthemedia.wml:107 /tmp/Q2ndl8ZYsF.xml:114
+#: /tmp/Q2ndl8ZYsF.xml:121
 msgid "2011 January 30"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:113
+#: /home/runa/dev/website/press/en/inthemedia.wml:108
 msgid "Fox 25 News - Boston"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:114
+#: /home/runa/dev/website/press/en/inthemedia.wml:109
 msgid ""
 "<a href=\"http://www.myfoxboston.com/dpp/news/local/local-company-helps-"
 "give-egyptians-internet-access-20110130\">Local company helps give Egyptians"
@@ -255,12 +254,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:120
+#: /home/runa/dev/website/press/en/inthemedia.wml:115
 msgid "New England Cable News"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:121
+#: /home/runa/dev/website/press/en/inthemedia.wml:116
 msgid ""
 "<a href=\"http://www.necn.com/01/30/11/Mass-company-helps-activists-avoid-"
 "onlin/landing.html?blockID=400628&feedID=4213\">Mass.  company helps "
@@ -268,167 +267,166 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:127 /tmp/u3kTkswOVo.xml:269
+#: /home/runa/dev/website/press/en/inthemedia.wml:122 /tmp/Q2ndl8ZYsF.xml:253
 msgid "Boston Globe"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:128
+#: /home/runa/dev/website/press/en/inthemedia.wml:123
 msgid ""
 "<a "
-"href=\"http://www.boston.com/news/local/massachusetts/articles/2011/01/30/ "
-"mass_groups_software_helps_avoid_censorship/\">Foreign activists stay "
-"covered online</a>"
+"href=\"http://www.boston.com/news/local/massachusetts/articles/2011/01/30/mass_groups_software_helps_avoid_censorship/\">Foreign"
+" activists stay covered online</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:134 /tmp/u3kTkswOVo.xml:142
+#: /home/runa/dev/website/press/en/inthemedia.wml:128 /tmp/Q2ndl8ZYsF.xml:135
 msgid "2011 January 29"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:135
+#: /home/runa/dev/website/press/en/inthemedia.wml:129
 msgid "SvD.se"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:136
+#: /home/runa/dev/website/press/en/inthemedia.wml:130
 msgid ""
-"<a href=\"http://www.svd.se/nyheter/utrikes/tor-oppnar-dorrar-for- "
+"<a href=\"http://www.svd.se/nyheter/utrikes/tor-oppnar-dorrar-for-"
 "natdissidenter_5902693.svd\">Tor öppnar dörrar för nätdissidenter</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:143 /tmp/u3kTkswOVo.xml:351
+#: /home/runa/dev/website/press/en/inthemedia.wml:136 /tmp/Q2ndl8ZYsF.xml:329
 msgid "ComputerWorld"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:144
+#: /home/runa/dev/website/press/en/inthemedia.wml:137
 msgid ""
-"<a href=\"http://www.computerworld.com/s/article/9207058/ "
-"Without_Internet_Egyptians_find_new_ways_to_get_online?taxonomyId=16\">Without"
+"<a "
+"href=\"http://www.computerworld.com/s/article/9207058/Without_Internet_Egyptians_find_new_ways_to_get_online?taxonomyId=16\">Without"
 " Internet, Egyptians find new ways to get online.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:150
+#: /home/runa/dev/website/press/en/inthemedia.wml:142
 msgid "2011 January 28"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:151
+#: /home/runa/dev/website/press/en/inthemedia.wml:143
 msgid "Globe and Mail"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:152
+#: /home/runa/dev/website/press/en/inthemedia.wml:144
 msgid ""
 "<a href=\"https://www.theglobeandmail.com/news/technology/in-a-span-of-"
-"minutes-a- country-goes-offline/article1887207/\">In a span of minutes, a "
+"minutes-a-country-goes-offline/article1887207/\">In a span of minutes, a "
 "country goes offline</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:158
+#: /home/runa/dev/website/press/en/inthemedia.wml:149
 msgid "2010 December 22"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:159 /tmp/u3kTkswOVo.xml:235
-#: /tmp/u3kTkswOVo.xml:256 /tmp/u3kTkswOVo.xml:339 /tmp/u3kTkswOVo.xml:380
-#: /tmp/u3kTkswOVo.xml:664
+#: /home/runa/dev/website/press/en/inthemedia.wml:150 /tmp/Q2ndl8ZYsF.xml:222
+#: /tmp/Q2ndl8ZYsF.xml:241 /tmp/Q2ndl8ZYsF.xml:317 /tmp/Q2ndl8ZYsF.xml:355
+#: /tmp/Q2ndl8ZYsF.xml:628
 msgid "Technology Review"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:160
+#: /home/runa/dev/website/press/en/inthemedia.wml:151
 msgid ""
 "<a href=\"http://www.technologyreview.com/web/26981/\">Home Internet with "
 "Anonymity Built In</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:164
+#: /home/runa/dev/website/press/en/inthemedia.wml:155
 msgid "2010 December 17"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:165
+#: /home/runa/dev/website/press/en/inthemedia.wml:156
 msgid "New York Times Magazine"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:166
+#: /home/runa/dev/website/press/en/inthemedia.wml:157
 msgid ""
 "<a href=\"https://www.nytimes.com/2010/12/19/magazine/19FOB-"
 "Medium-t.html\">Granting Anonymity</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:171
+#: /home/runa/dev/website/press/en/inthemedia.wml:162
 msgid "2010 November 03"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:172
+#: /home/runa/dev/website/press/en/inthemedia.wml:163
 msgid "metro sverige"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:173
+#: /home/runa/dev/website/press/en/inthemedia.wml:164
 msgid ""
 "<a href=\"http://www.metro.se/2010/11/03/73897/sida-hjalper-utsatta-bli-"
-"anonyma-pa-n /\">Sida hjälper utsatta bli anonyma på nätet</a>"
+"anonyma-pa-n/\">Sida hjälper utsatta bli anonyma på nätet</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:178
+#: /home/runa/dev/website/press/en/inthemedia.wml:168
 msgid "2010 Sept 17"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:179
+#: /home/runa/dev/website/press/en/inthemedia.wml:169
 msgid "NPR: On the media"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:180
+#: /home/runa/dev/website/press/en/inthemedia.wml:170
 msgid ""
 "<a href=\"http://www.onthemedia.org/transcripts/2010/09/17/05\">On the "
 "Media: Interview with Jacob Appelbaum</a>."
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:184
+#: /home/runa/dev/website/press/en/inthemedia.wml:174
 msgid "2010 August 01"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:185
+#: /home/runa/dev/website/press/en/inthemedia.wml:175
 msgid "PC Format - Poland"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:186
+#: /home/runa/dev/website/press/en/inthemedia.wml:176
 msgid ""
 "<a href=\"http://www.pcformat.pl/index.php/artykul/aid/1236/t/google-"
-"facebook-nas- szpieguj-jak-chroni-prywatno-w-sieci\">Google and Facebook are"
-" spying on us</a>"
+"facebook-nas-szpieguj-jak-chroni-prywatno-w-sieci\">Google and Facebook are "
+"spying on us</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:192
+#: /home/runa/dev/website/press/en/inthemedia.wml:181
 msgid "2010 July 14"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:193
+#: /home/runa/dev/website/press/en/inthemedia.wml:182
 msgid "China Rights Forum"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:194
+#: /home/runa/dev/website/press/en/inthemedia.wml:183
 msgid ""
 "<a "
 "href=\"http://www.hrichina.org/public/contents/category?cid=175033\">China "
@@ -436,52 +434,52 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:200
+#: /home/runa/dev/website/press/en/inthemedia.wml:189
 msgid "2010 May 25"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:201
+#: /home/runa/dev/website/press/en/inthemedia.wml:190
 msgid "The Australian"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:202
+#: /home/runa/dev/website/press/en/inthemedia.wml:191
 msgid ""
 "<a href=\"http://www.theaustralian.com.au/australian-it/call-to-join-tor-"
-"network-to- fight-censorship/story-e6frgakx-1225870756466\"> Call to join "
-"Tor network to fight censorship</a>"
+"network-to-fight-censorship/story-e6frgakx-1225870756466\"> Call to join Tor"
+" network to fight censorship</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:208
+#: /home/runa/dev/website/press/en/inthemedia.wml:196
 msgid "2010 Mar 17"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:209
+#: /home/runa/dev/website/press/en/inthemedia.wml:197
 msgid "PC World Poland"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:210
+#: /home/runa/dev/website/press/en/inthemedia.wml:198
 msgid ""
 "<a href=\"http://www.idg.pl/news/356993/Anonimowosc.w.Sieci.html\">Anonymity"
 " in the Web</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:214
+#: /home/runa/dev/website/press/en/inthemedia.wml:202
 msgid "2010 Mar 11"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:215
+#: /home/runa/dev/website/press/en/inthemedia.wml:203
 msgid "ABC Australia"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:216
+#: /home/runa/dev/website/press/en/inthemedia.wml:204
 msgid ""
 "<a "
 "href=\"http://www.abc.net.au/rn/futuretense/stories/2010/2837736.htm\">Future"
@@ -489,91 +487,90 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:219
+#: /home/runa/dev/website/press/en/inthemedia.wml:207
 msgid "2010 Mar 09"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:220
+#: /home/runa/dev/website/press/en/inthemedia.wml:208
 msgid "PC Pro UK"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:221
+#: /home/runa/dev/website/press/en/inthemedia.wml:209
 msgid ""
 "<a href=\"http://www.pcpro.co.uk/features/356254/the-dark-side-of-the-"
 "web\">The dark side of the web</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:226
+#: /home/runa/dev/website/press/en/inthemedia.wml:214
 msgid "2009 Dec 29"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:227
+#: /home/runa/dev/website/press/en/inthemedia.wml:215
 msgid "Times Online"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:228
+#: /home/runa/dev/website/press/en/inthemedia.wml:216
 msgid ""
 "<a "
-"href=\"http://www.timesonline.co.uk/tol/news/world/middle_east/article6969958."
-"  ece\">When Iran’s regime falls this will be remembered as the YouTube "
-"revolution </a>"
+"href=\"http://www.timesonline.co.uk/tol/news/world/middle_east/article6969958.ece\">When"
+" Iran’s regime falls this will be remembered as the YouTube revolution </a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:234
+#: /home/runa/dev/website/press/en/inthemedia.wml:221
 msgid "2009 Oct 15"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:236
+#: /home/runa/dev/website/press/en/inthemedia.wml:223
 msgid ""
 "<a href=\"http://www.technologyreview.com/web/23736/?a=f\">China Cracks Down"
 " on Tor Anonymity Network</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:240
+#: /home/runa/dev/website/press/en/inthemedia.wml:227
 msgid "2009 Sep 30"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:242
+#: /home/runa/dev/website/press/en/inthemedia.wml:229
 msgid ""
 "<a "
-"href=\"http://www.businessweek.com/globalbiz/content/sep2009/gb20090930_620354."
-"  htm\">China's Online Censors Work Overtime</a>"
+"href=\"http://www.businessweek.com/globalbiz/content/sep2009/gb20090930_620354.htm\">China's"
+" Online Censors Work Overtime</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:247
+#: /home/runa/dev/website/press/en/inthemedia.wml:233
 msgid "2009 Aug 19"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:248
+#: /home/runa/dev/website/press/en/inthemedia.wml:234
 msgid "Reuters"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:249
+#: /home/runa/dev/website/press/en/inthemedia.wml:235
 msgid ""
-"<a href=\"http://www.reuters.com/article/internetNews/idUSTRE57I4IE20090819?"
-" pageNumber=1&amp;virtualBrandChannel=0&amp;sp=true\">Web tools help protect"
-" human rights activists</a>"
+"<a "
+"href=\"http://www.reuters.com/article/internetNews/idUSTRE57I4IE20090819?pageNumber=1&amp;virtualBrandChannel=0&amp;sp=true\">Web"
+" tools help protect human rights activists</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:255
+#: /home/runa/dev/website/press/en/inthemedia.wml:240
 msgid "2009 Aug 10"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:257
+#: /home/runa/dev/website/press/en/inthemedia.wml:242
 msgid ""
 "<a "
 "href=\"http://www.technologyreview.com/blog/editors/23958/?nlid=2255\">How "
@@ -581,162 +578,161 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:261 /tmp/u3kTkswOVo.xml:268
+#: /home/runa/dev/website/press/en/inthemedia.wml:246 /tmp/Q2ndl8ZYsF.xml:252
 msgid "2009 Jul 26"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:262 /tmp/u3kTkswOVo.xml:296
+#: /home/runa/dev/website/press/en/inthemedia.wml:247 /tmp/Q2ndl8ZYsF.xml:278
 msgid "Washington Times"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:263
+#: /home/runa/dev/website/press/en/inthemedia.wml:248
 msgid ""
 "<a href=\"http://www.washingtontimes.com/news/2009/jul/26/senate-help-iran-"
-"dodge- internet-censorship/\">Senate OKs funds to thwart Iran Web "
-"censors</a>"
+"dodge-internet-censorship/\">Senate OKs funds to thwart Iran Web censors</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:270
+#: /home/runa/dev/website/press/en/inthemedia.wml:254
 msgid ""
-"<a href=\"http://www.boston.com/news/nation/washington/articles/2009/07/26/ "
-"us_to_increase_funding_for_hackivists_aiding_iranians/\">US set to hike aid "
-"aimed at Iranians</a>"
+"<a "
+"href=\"http://www.boston.com/news/nation/washington/articles/2009/07/26/us_to_increase_funding_for_hackivists_aiding_iranians/\">US"
+" set to hike aid aimed at Iranians</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:276
+#: /home/runa/dev/website/press/en/inthemedia.wml:259
 msgid "2009 Jul 24"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:277
+#: /home/runa/dev/website/press/en/inthemedia.wml:260
 msgid "Associated Press"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:278
+#: /home/runa/dev/website/press/en/inthemedia.wml:261
 msgid ""
-"<a href=\"http://www.google.com/hostednews/ap/article/ALeqM5hTf- "
+"<a href=\"http://www.google.com/hostednews/ap/article/ALeqM5hTf-"
 "p6Iy3sWHK8BRR58npGosLC3AD99L01QO0\">Iran activists work to elude crackdown "
 "on Internet</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:284
+#: /home/runa/dev/website/press/en/inthemedia.wml:266
 msgid "2009 Jul 08"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:285
+#: /home/runa/dev/website/press/en/inthemedia.wml:267
 msgid "Tehran Bureau"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:286
+#: /home/runa/dev/website/press/en/inthemedia.wml:268
 msgid ""
 "<a href=\"http://tehranbureau.com/geeks-globe-rally-iranians-online/\">Geeks"
 " Around the Globe Rally to Help Iranians Online</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:290
+#: /home/runa/dev/website/press/en/inthemedia.wml:272
 msgid "2009 Jul 02"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:291
+#: /home/runa/dev/website/press/en/inthemedia.wml:273
 msgid "NED/CIMA"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:292
+#: /home/runa/dev/website/press/en/inthemedia.wml:274
 msgid ""
 "<a href=\"http://cima.ned.org/events/new-media-in-iran.html\">The Role of "
 "New Media in the Iranian Elections</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:295
+#: /home/runa/dev/website/press/en/inthemedia.wml:277
 msgid "2009 Jun 26"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:297
+#: /home/runa/dev/website/press/en/inthemedia.wml:279
 msgid ""
 "<a href=\"http://www.washingtontimes.com/news/2009/jun/26/protesters-use-"
-"navy- technology-to-avoid-censorship/?feat=home_headlines\">Iranian "
+"navy-technology-to-avoid-censorship/?feat=home_headlines\">Iranian "
 "protesters avoid censorship with Navy technology</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:303
+#: /home/runa/dev/website/press/en/inthemedia.wml:284
 msgid "2009 Jun 29"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:304
+#: /home/runa/dev/website/press/en/inthemedia.wml:285
 msgid "EFF"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:305
+#: /home/runa/dev/website/press/en/inthemedia.wml:286
 msgid ""
 "<a href=\"http://www.eff.org/deeplinks/2009/06/help-protesters-iran-run-tor-"
-"relays- bridges\">Help Protesters in Iran: Run a Tor Bridge or a Tor "
+"relays-bridges\">Help Protesters in Iran: Run a Tor Bridge or a Tor "
 "Relay</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:310
+#: /home/runa/dev/website/press/en/inthemedia.wml:290
 msgid "2009 Jun 24"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:311
+#: /home/runa/dev/website/press/en/inthemedia.wml:291
 msgid "Daily Finance"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:312
+#: /home/runa/dev/website/press/en/inthemedia.wml:292
 msgid ""
-"<a href=\"http://www.dailyfinance.com/2009/06/24/nokia-and-siemens-in-iran- "
+"<a href=\"http://www.dailyfinance.com/2009/06/24/nokia-and-siemens-in-iran-"
 "controversy/\">Nokia and Siemens in Iran controversy</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:317 /tmp/u3kTkswOVo.xml:332
-#: /tmp/u3kTkswOVo.xml:338
+#: /home/runa/dev/website/press/en/inthemedia.wml:296 /tmp/Q2ndl8ZYsF.xml:310
+#: /tmp/Q2ndl8ZYsF.xml:316
 msgid "2009 Jun 18"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:318 /tmp/u3kTkswOVo.xml:414
-#: /tmp/u3kTkswOVo.xml:658
+#: /home/runa/dev/website/press/en/inthemedia.wml:297 /tmp/Q2ndl8ZYsF.xml:386
+#: /tmp/Q2ndl8ZYsF.xml:622
 msgid "Wall Street Journal"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:319
+#: /home/runa/dev/website/press/en/inthemedia.wml:298
 msgid ""
 "<a href=\"http://blogs.wsj.com/digits/2009/06/18/iranians-using-tor-to-"
-"anonymize-web -use/\">Iranians Using Tor to Anonymize Web Use</a>"
+"anonymize-web-use/\">Iranians Using Tor to Anonymize Web Use</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:324
+#: /home/runa/dev/website/press/en/inthemedia.wml:302
 msgid "2009 Jun 19"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:325
+#: /home/runa/dev/website/press/en/inthemedia.wml:303
 msgid "O'Reilly Radar"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:326
+#: /home/runa/dev/website/press/en/inthemedia.wml:304
 msgid ""
 "<a href=\"http://radar.oreilly.com/2009/06/tor-and-the-legality-of-"
 "runnin.html\"> Dramatic Increase in Number of Tor Clients from Iran: "
@@ -744,98 +740,97 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:333
+#: /home/runa/dev/website/press/en/inthemedia.wml:311
 msgid "Deutsche Welle"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:334
+#: /home/runa/dev/website/press/en/inthemedia.wml:312
 msgid ""
 "<a href=\"http://www.dw-world.de/dw/article/0,,4400882,00.html\">Internet "
 "proxies let Iranians and others connect to blocked Web sites</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:340
+#: /home/runa/dev/website/press/en/inthemedia.wml:318
 msgid ""
 "<a href=\"http://www.technologyreview.com/web/22893/\">The Web vs. the "
 "Republic of Iran</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:344 /tmp/u3kTkswOVo.xml:350
+#: /home/runa/dev/website/press/en/inthemedia.wml:322 /tmp/Q2ndl8ZYsF.xml:328
 msgid "2009 Jun 17"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:345
+#: /home/runa/dev/website/press/en/inthemedia.wml:323
 msgid "CNet News"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:346
+#: /home/runa/dev/website/press/en/inthemedia.wml:324
 msgid ""
 "<a href=\"http://news.cnet.com/8301-13578_3-10267287-38.html\">Iranians find"
 " ways to bypass Net censors</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:352
+#: /home/runa/dev/website/press/en/inthemedia.wml:330
 msgid ""
 "<a "
-"href=\"http://www.computerworld.com/action/article.do?command=viewArticleBasic&"
-" amp;articleId=9134471&amp;intsrc=news_ts_head\">Iran's leaders fight "
-"Internet; Internet wins (so far)</a>"
+"href=\"http://www.computerworld.com/action/article.do?command=viewArticleBasic&amp;articleId=9134471&amp;intsrc=news_ts_head\">Iran's"
+" leaders fight Internet; Internet wins (so far)</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:358
+#: /home/runa/dev/website/press/en/inthemedia.wml:335
 msgid "2009 May 29"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:359 /tmp/u3kTkswOVo.xml:387
+#: /home/runa/dev/website/press/en/inthemedia.wml:336 /tmp/Q2ndl8ZYsF.xml:362
 msgid "Le Monde"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:360
+#: /home/runa/dev/website/press/en/inthemedia.wml:337
 msgid ""
 "<a href=\"http://www.lemonde.fr/actualite-medias/article/2009/05/29/les-"
-"censeurs-du- net_1199993_3236.html\">Les censeurs du Net</a>"
+"censeurs-du-net_1199993_3236.html\">Les censeurs du Net</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:365
+#: /home/runa/dev/website/press/en/inthemedia.wml:341
 msgid "2009 May 15"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:366
+#: /home/runa/dev/website/press/en/inthemedia.wml:342
 msgid "Mass High Tech"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:367
+#: /home/runa/dev/website/press/en/inthemedia.wml:343
 msgid ""
 "<a href=\"http://www.masshightech.com/stories/2009/05/11/newscolumn2-Tor-"
-"tackles-Net -privacy-game-makers-flock-to-Hub.html\">Tor tackles Net "
+"tackles-Net-privacy-game-makers-flock-to-Hub.html\">Tor tackles Net "
 "privacy</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:372
+#: /home/runa/dev/website/press/en/inthemedia.wml:347
 msgid "2009 May 01"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:373 /tmp/u3kTkswOVo.xml:669
-#: /tmp/u3kTkswOVo.xml:679
+#: /home/runa/dev/website/press/en/inthemedia.wml:348 /tmp/Q2ndl8ZYsF.xml:633
+#: /tmp/Q2ndl8ZYsF.xml:643
 msgid "New York Times"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:374
+#: /home/runa/dev/website/press/en/inthemedia.wml:349
 msgid ""
 "<a "
 "href=\"http://www.nytimes.com/2009/05/01/technology/01filter.html\">Iranians"
@@ -843,12 +838,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:379
+#: /home/runa/dev/website/press/en/inthemedia.wml:354
 msgid "2009 Apr 23"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:381
+#: /home/runa/dev/website/press/en/inthemedia.wml:356
 msgid ""
 "<a href=\"http://www.technologyreview.com/computing/22427/?a=f\">Dissent "
 "Made Safer: How anonymity technology could save free speech on the "
@@ -856,87 +851,87 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:386
+#: /home/runa/dev/website/press/en/inthemedia.wml:361
 msgid "2009 Apr 22"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:388
+#: /home/runa/dev/website/press/en/inthemedia.wml:363
 msgid ""
 "<a href=\"http://bugbrother.blog.lemonde.fr/2009/04/22/comment-contourner-"
-"la- cybersurveillance/\">How to circumvent cybersurveillance</a>"
+"la-cybersurveillance/\">How to circumvent cybersurveillance</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:393 /tmp/u3kTkswOVo.xml:400
+#: /home/runa/dev/website/press/en/inthemedia.wml:367 /tmp/Q2ndl8ZYsF.xml:373
 msgid "2009 Apr 06"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:394
+#: /home/runa/dev/website/press/en/inthemedia.wml:368
 msgid "Reader's Digest"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:395
+#: /home/runa/dev/website/press/en/inthemedia.wml:369
 msgid ""
 "<a href=\"http://www.rd.com/advice-and-know-how/how-to-hide-"
-"anything/article122219.  html\">How to Hide Anything</a>"
+"anything/article122219.html\">How to Hide Anything</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:401
+#: /home/runa/dev/website/press/en/inthemedia.wml:374
 msgid "Al Jazeera"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:402
+#: /home/runa/dev/website/press/en/inthemedia.wml:375
 msgid ""
 "<a href=\"http://www.youtube.com/watch?v=vuatxUN2cUQ\">Global Village Voices"
 " showcases Tor</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:406
+#: /home/runa/dev/website/press/en/inthemedia.wml:379
 msgid "2009 Mar 18"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:407
+#: /home/runa/dev/website/press/en/inthemedia.wml:380
 msgid "Marie Claire"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:408
+#: /home/runa/dev/website/press/en/inthemedia.wml:381
 msgid ""
 "<a href=\"http://www.marieclaire.com/career-money/career-coach/manage-online"
-"--web- image\">How to Manage Your Web Footprint</a>"
+"--web-image\">How to Manage Your Web Footprint</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:413
+#: /home/runa/dev/website/press/en/inthemedia.wml:385
 msgid "2009 Mar 13"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:415
+#: /home/runa/dev/website/press/en/inthemedia.wml:387
 msgid ""
 "<a href=\"http://online.wsj.com/article/SB123567809587886053.html\">The "
 "Kindness of Strangers</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:420
+#: /home/runa/dev/website/press/en/inthemedia.wml:392
 msgid "2009 Mar 12"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:421
+#: /home/runa/dev/website/press/en/inthemedia.wml:393
 msgid "BBC World Service"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:422
+#: /home/runa/dev/website/press/en/inthemedia.wml:394
 msgid ""
 "<a href=\"http://bbcworldservicetrust.wordpress.com/2009/03/12/12-march-"
 "world-day-against-cyber-censorship/\">Steven J Murdoch interviewed about Tor"
@@ -944,102 +939,102 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:425
+#: /home/runa/dev/website/press/en/inthemedia.wml:397
 msgid "2009 Mar 03"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:426
+#: /home/runa/dev/website/press/en/inthemedia.wml:398
 msgid "Orf Austria"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:427
+#: /home/runa/dev/website/press/en/inthemedia.wml:399
 msgid ""
 "<a href=\"http://futurezone.orf.at/stories/1503028/\">WIRTSCHAFTSKAMMER "
 "column</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:431
+#: /home/runa/dev/website/press/en/inthemedia.wml:403
 msgid "2009 Feb 18"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:432 /tmp/u3kTkswOVo.xml:589
+#: /home/runa/dev/website/press/en/inthemedia.wml:404 /tmp/Q2ndl8ZYsF.xml:553
 msgid "Bangkok Post"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:433
+#: /home/runa/dev/website/press/en/inthemedia.wml:405
 msgid ""
 "<a href=\"http://www.bangkokpost.com/tech/technews/11872/the-old-fake-404"
-"-not-found- routine\">The old fake \"404 not found\" routine</a>"
+"-not-found-routine\">The old fake \"404 not found\" routine</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:438
+#: /home/runa/dev/website/press/en/inthemedia.wml:409
 msgid "2009 Feb 13"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:439
+#: /home/runa/dev/website/press/en/inthemedia.wml:410
 msgid "Hearsay Culture"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:440
+#: /home/runa/dev/website/press/en/inthemedia.wml:411
 msgid ""
 "<a href=\"http://www.hearsayculture.com/?p=307\">Hearsay Culture Radio "
 "Interview/Podcast</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:443
+#: /home/runa/dev/website/press/en/inthemedia.wml:414
 msgid "2008 Dec 29"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:444
+#: /home/runa/dev/website/press/en/inthemedia.wml:415
 msgid "nu.nl"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:445
+#: /home/runa/dev/website/press/en/inthemedia.wml:416
 msgid ""
 "<a href=\"http://www.nu.nl/internet/1891289/anoniem-browsen-voor-gsm-in-de-"
 "maak.html\">Anoniem browsen voor gsm in de maak</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:449
+#: /home/runa/dev/website/press/en/inthemedia.wml:420
 msgid "2008 Dec 14"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:450
+#: /home/runa/dev/website/press/en/inthemedia.wml:421
 msgid "PC Magazine: Middle &amp; Near East"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:451
+#: /home/runa/dev/website/press/en/inthemedia.wml:422
 msgid ""
 "<a href=\"http://www.pcmag-mideast.com/FeatureDetail.aspx?ID=1039\">How To "
 "Reclaim Your Online Privacy</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:456
+#: /home/runa/dev/website/press/en/inthemedia.wml:427
 msgid "2008 Aug 21"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:457
+#: /home/runa/dev/website/press/en/inthemedia.wml:428
 msgid "CNN"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:458
+#: /home/runa/dev/website/press/en/inthemedia.wml:429
 msgid ""
 "<a "
 "href=\"http://www.cnn.com/2008/TECH/08/21/internet.filtering/index.html\">Experts:"
@@ -1047,51 +1042,51 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:463
+#: /home/runa/dev/website/press/en/inthemedia.wml:434
 msgid "2008 Aug 22"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:464
+#: /home/runa/dev/website/press/en/inthemedia.wml:435
 msgid "The Sydney Morning Herald"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:465
+#: /home/runa/dev/website/press/en/inthemedia.wml:436
 msgid ""
 "<a href=\"http://www.smh.com.au/news/web/the-china-"
-"syndrome/2008/08/20/1218911800889 .html\">The China Syndrome</a>"
+"syndrome/2008/08/20/1218911800889.html\">The China Syndrome</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:471
+#: /home/runa/dev/website/press/en/inthemedia.wml:441
 msgid "2008 Aug 20"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:472
+#: /home/runa/dev/website/press/en/inthemedia.wml:442
 msgid "Scientific American"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:473
+#: /home/runa/dev/website/press/en/inthemedia.wml:443
 msgid ""
 "<a href=\"http://www.sciam.com/article.cfm?id=cryptography-how-to-keep-your-"
-"secrets- safe\">Cryptography: How to Keep Your Secrets Safe</a>"
+"secrets-safe\">Cryptography: How to Keep Your Secrets Safe</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:479
+#: /home/runa/dev/website/press/en/inthemedia.wml:448
 msgid "2008 Aug 05"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:480
+#: /home/runa/dev/website/press/en/inthemedia.wml:449
 msgid "Guardian UK"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:481
+#: /home/runa/dev/website/press/en/inthemedia.wml:450
 msgid ""
 "<a "
 "href=\"http://www.guardian.co.uk/commentisfree/2008/aug/05/china.censorship\">"
@@ -1099,62 +1094,62 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:487
+#: /home/runa/dev/website/press/en/inthemedia.wml:456
 msgid "2008 Aug 10"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:488
+#: /home/runa/dev/website/press/en/inthemedia.wml:457
 msgid "Tech Radar UK"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:489
+#: /home/runa/dev/website/press/en/inthemedia.wml:458
 msgid ""
 "<a href=\"http://www.techradar.com/news/internet/web/freedom-stick-"
-"highlights- chinese-net-censorship-449233\">Freedom Stick highlights Chinese"
-" 'net censorship: USB drive promises anonymous surfing for the paranoid</a>"
+"highlights-chinese-net-censorship-449233\">Freedom Stick highlights Chinese "
+"'net censorship: USB drive promises anonymous surfing for the paranoid</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:497 /tmp/u3kTkswOVo.xml:505
-#: /tmp/u3kTkswOVo.xml:514 /tmp/u3kTkswOVo.xml:522
+#: /home/runa/dev/website/press/en/inthemedia.wml:465 /tmp/Q2ndl8ZYsF.xml:473
+#: /tmp/Q2ndl8ZYsF.xml:481 /tmp/Q2ndl8ZYsF.xml:489
 msgid "2008 Aug 07"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:498
+#: /home/runa/dev/website/press/en/inthemedia.wml:466
 msgid "Spiegel"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:499
+#: /home/runa/dev/website/press/en/inthemedia.wml:467
 msgid ""
 "<a href=\"http://www.spiegel.de/netzwelt/tech/0,1518,570421,00.html\">Tricks"
 " gegen Zensur und Überwachung</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:506 /tmp/u3kTkswOVo.xml:560
-#: /tmp/u3kTkswOVo.xml:628 /tmp/u3kTkswOVo.xml:742
+#: /home/runa/dev/website/press/en/inthemedia.wml:474 /tmp/Q2ndl8ZYsF.xml:524
+#: /tmp/Q2ndl8ZYsF.xml:592 /tmp/Q2ndl8ZYsF.xml:706
 msgid "PC World"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:507
+#: /home/runa/dev/website/press/en/inthemedia.wml:475
 msgid ""
 "<a "
-"href=\"http://www.pcworld.com/article/149399-3/15_great_free_privacy_downloads."
-"  html\">15 Great, Free Privacy Downloads</a>.  Tor is Number 1."
+"href=\"http://www.pcworld.com/article/149399-3/15_great_free_privacy_downloads.html\">15"
+" Great, Free Privacy Downloads</a>.  Tor is Number 1."
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:515
+#: /home/runa/dev/website/press/en/inthemedia.wml:482
 msgid "The Guardian UK"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:516
+#: /home/runa/dev/website/press/en/inthemedia.wml:483
 msgid ""
 "<a "
 "href=\"http://www.guardian.co.uk/technology/2008/aug/07/censorship.hacking\">Chaos"
@@ -1162,12 +1157,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:523
+#: /home/runa/dev/website/press/en/inthemedia.wml:490
 msgid "The Register UK"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:524
+#: /home/runa/dev/website/press/en/inthemedia.wml:491
 msgid ""
 "<a "
 "href=\"http://www.theregister.co.uk/2008/08/07/torbrowser_olympics/\">German"
@@ -1175,66 +1170,67 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:530
+#: /home/runa/dev/website/press/en/inthemedia.wml:497
 msgid "2008 May 24"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:531
+#: /home/runa/dev/website/press/en/inthemedia.wml:498
 msgid "Groupo Estado"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:532
+#: /home/runa/dev/website/press/en/inthemedia.wml:499
 msgid ""
-"<a href=\"http://blog.estadao.com.br/blog/cruz/?title= "
-"cfp08_navegacao_anonima_na_rede&amp;more=1&amp;c=1&amp;tb=1&amp;pb=1&amp;cat="
-" 525\">Interview at Computers, Freedom, and Privacy 2008 Conference</a>"
+"<a "
+"href=\"http://blog.estadao.com.br/blog/cruz/?title=cfp08_navegacao_anonima_na_rede&amp;more=1&amp;c=1&amp;tb=1&amp;pb=1&amp;cat=525\">Interview"
+" at Computers, Freedom, and Privacy 2008 Conference</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:540
+#: /home/runa/dev/website/press/en/inthemedia.wml:505
 msgid "2008 Mar 12"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:541
+#: /home/runa/dev/website/press/en/inthemedia.wml:506
 msgid "SearchSecurity.com"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:542
+#: /home/runa/dev/website/press/en/inthemedia.wml:507
 msgid ""
-"<a href=\"http://searchsecurity.techtarget.com/news/article/0,289142, "
-"sid14_gci1305120,00.html\"> Tor network 'bridges' help evade blockers</a>.  "
-"Covers new Tor features designed to overcome filtering and blocking that "
-"prevent access to the Tor network."
+"<a "
+"href=\"http://searchsecurity.techtarget.com/news/article/0,289142,sid14_gci1305120,00.html\">"
+" Tor network 'bridges' help evade blockers</a>.  Covers new Tor features "
+"designed to overcome filtering and blocking that prevent access to the Tor "
+"network."
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:552
+#: /home/runa/dev/website/press/en/inthemedia.wml:516
 msgid "2008 Feb 14"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:553
+#: /home/runa/dev/website/press/en/inthemedia.wml:517
 msgid "Wired: Compiler Blog"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:554
+#: /home/runa/dev/website/press/en/inthemedia.wml:518
 msgid ""
 "<a href=\"http://blog.wired.com/monkeybites/2008/02/how-to-set-up-a.html\"> "
 "How To: Set Up Anonymous Browsing in 30 Seconds or Less</a>."
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:559
+#: /home/runa/dev/website/press/en/inthemedia.wml:523
 msgid "2008 Feb 01"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:561
+#: /home/runa/dev/website/press/en/inthemedia.wml:525
 msgid ""
 "<a href=\"http://www.pcworld.com/article/id,142094-pg,1/article.html\"> "
 "Hackers Can Expose Masked Surfers, Study Says</a> A report on <a "
@@ -1246,17 +1242,17 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:568
+#: /home/runa/dev/website/press/en/inthemedia.wml:532
 msgid "2007 Sep 21"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:569
+#: /home/runa/dev/website/press/en/inthemedia.wml:533
 msgid "Wired HowTo Blog"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:570
+#: /home/runa/dev/website/press/en/inthemedia.wml:534
 msgid ""
 "<a "
 "href=\"http://howto.wired.com/wiredhowtos/index.cgi?page_name=be_a_whistle_blower;action=display;category=Work\">Be"
@@ -1265,17 +1261,17 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:573
+#: /home/runa/dev/website/press/en/inthemedia.wml:537
 msgid "2007 Sep 16"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:574
+#: /home/runa/dev/website/press/en/inthemedia.wml:538
 msgid "Cnet"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:575
+#: /home/runa/dev/website/press/en/inthemedia.wml:539
 msgid ""
 "<a href=\"http://news.cnet.com/8301-13739_3-9779225-46.html\">Tor anonymity "
 "server admin arrested</a>.  A Tor exit node operator from Germany was "
@@ -1290,18 +1286,18 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:578
+#: /home/runa/dev/website/press/en/inthemedia.wml:542
 msgid "2007 Sep 10"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:579 /tmp/u3kTkswOVo.xml:696
-#: /tmp/u3kTkswOVo.xml:772 /tmp/u3kTkswOVo.xml:881 /tmp/u3kTkswOVo.xml:893
+#: /home/runa/dev/website/press/en/inthemedia.wml:543 /tmp/Q2ndl8ZYsF.xml:660
+#: /tmp/Q2ndl8ZYsF.xml:736 /tmp/Q2ndl8ZYsF.xml:845 /tmp/Q2ndl8ZYsF.xml:857
 msgid "Wired"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:580
+#: /home/runa/dev/website/press/en/inthemedia.wml:544
 msgid ""
 "<a "
 "href=\"http://www.wired.com/politics/security/news/2007/09/embassy_hacks\"> "
@@ -1338,17 +1334,17 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:583
+#: /home/runa/dev/website/press/en/inthemedia.wml:547
 msgid "2007 Jul 27"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:584
+#: /home/runa/dev/website/press/en/inthemedia.wml:548
 msgid "Wired Blog"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:585
+#: /home/runa/dev/website/press/en/inthemedia.wml:549
 msgid ""
 "<a href=\"http://blog.wired.com/27bstroke6/2007/07/cyber-jihadists.html\"> "
 "Cyber Jihadists Embrace Tor</a><br/> A pointer to a <a "
@@ -1359,12 +1355,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:588
+#: /home/runa/dev/website/press/en/inthemedia.wml:552
 msgid "2007 Jun 22"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:590
+#: /home/runa/dev/website/press/en/inthemedia.wml:554
 msgid ""
 "<a href=\"http://www.asiamedia.ucla.edu/article-"
 "southeastasia.asp?parentid=72388\"> The problems with censorship</a>.  "
@@ -1373,17 +1369,17 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:593
+#: /home/runa/dev/website/press/en/inthemedia.wml:557
 msgid "2007 Mar 15"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:594
+#: /home/runa/dev/website/press/en/inthemedia.wml:558
 msgid "World Changing"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:595
+#: /home/runa/dev/website/press/en/inthemedia.wml:559
 msgid ""
 "<a href=\"http://www.worldchanging.com/archives/006309.html\"> Blogging "
 "Where Speech Isn’t Free</a><br/> Coverage of former Tor Executive Director "
@@ -1393,17 +1389,17 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:598
+#: /home/runa/dev/website/press/en/inthemedia.wml:562
 msgid "2007 Mar 8"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:599
+#: /home/runa/dev/website/press/en/inthemedia.wml:563
 msgid "Security Focus"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:600
+#: /home/runa/dev/website/press/en/inthemedia.wml:564
 msgid ""
 "<a href=\"http://www.securityfocus.com/news/11447/1\"> Tor hack proposed to "
 "catch criminals</a>.  Coverage of a toolset called \"Torment\" for "
@@ -1412,17 +1408,17 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:603
+#: /home/runa/dev/website/press/en/inthemedia.wml:567
 msgid "2007 Feb 1"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:604
+#: /home/runa/dev/website/press/en/inthemedia.wml:568
 msgid "Dr Dobb's"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:605
+#: /home/runa/dev/website/press/en/inthemedia.wml:569
 msgid ""
 "<a href=\"http://www.ddj.com/security/197002414\"> Tor Project Protects "
 "Anonymous Sources</a>.  An introduction to Tor, including technical and "
@@ -1430,17 +1426,17 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:608
+#: /home/runa/dev/website/press/en/inthemedia.wml:572
 msgid "2006 Oct 19"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:609
+#: /home/runa/dev/website/press/en/inthemedia.wml:573
 msgid "Wired Threat Level"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:610
+#: /home/runa/dev/website/press/en/inthemedia.wml:574
 msgid ""
 "<a href=\"http://blog.wired.com/27bstroke6/2006/10/the_onion_route.html\"> "
 "The Onion Router (TOR) is Leaky (Leeky)</a>.  Explains why you need "
@@ -1450,17 +1446,17 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:613
+#: /home/runa/dev/website/press/en/inthemedia.wml:577
 msgid "2006 Aug 18"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:614 /tmp/u3kTkswOVo.xml:702
+#: /home/runa/dev/website/press/en/inthemedia.wml:578 /tmp/Q2ndl8ZYsF.xml:666
 msgid "NPR"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:615
+#: /home/runa/dev/website/press/en/inthemedia.wml:579
 msgid ""
 "<a href=\"http://www.npr.org/templates/story/story.php?storyId=5168456\"> "
 "Tips for Protecting Privacy Online</a>.  Kevin Bankston of the EFF "
@@ -1469,17 +1465,17 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:618
+#: /home/runa/dev/website/press/en/inthemedia.wml:582
 msgid "2006 Jul 5"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:619
+#: /home/runa/dev/website/press/en/inthemedia.wml:583
 msgid "MSNBC"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:620
+#: /home/runa/dev/website/press/en/inthemedia.wml:584
 msgid ""
 "<a href=\"http://www.msnbc.msn.com/id/13718446/page/2/\"> Defending "
 "liberties in high-tech world</a>.  Mentions EFF funding for Tor as one of "
@@ -1487,17 +1483,17 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:622
+#: /home/runa/dev/website/press/en/inthemedia.wml:586
 msgid "2006 Apr 11"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:623
+#: /home/runa/dev/website/press/en/inthemedia.wml:587
 msgid "PBS Frontline"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:624
+#: /home/runa/dev/website/press/en/inthemedia.wml:588
 msgid ""
 "<a "
 "href=\"http://pbs.gen.in/wgbh/pages/frontline/tankman/internet/tech.html\">Chipping"
@@ -1505,12 +1501,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:627
+#: /home/runa/dev/website/press/en/inthemedia.wml:591
 msgid "2006 Feb 28"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:629
+#: /home/runa/dev/website/press/en/inthemedia.wml:593
 msgid ""
 "<a "
 "href=\"http://www.pcworld.com/article/id,124891-page,1/article.html\">Outsmarting"
@@ -1518,17 +1514,17 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:632
+#: /home/runa/dev/website/press/en/inthemedia.wml:596
 msgid "2006 Feb 27"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:633
+#: /home/runa/dev/website/press/en/inthemedia.wml:597
 msgid "Forbes"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:634
+#: /home/runa/dev/website/press/en/inthemedia.wml:598
 msgid ""
 "<a href=\"http://members.forbes.com/global/2006/0227/018A_2.html\"> Cracks "
 "In the Wall</a>.  Discussion of Tor being used for evading censorship by "
@@ -1536,35 +1532,35 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:637
+#: /home/runa/dev/website/press/en/inthemedia.wml:601
 msgid "2006 Feb 20"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:638
+#: /home/runa/dev/website/press/en/inthemedia.wml:602
 msgid "The Boston Globe"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:639
+#: /home/runa/dev/website/press/en/inthemedia.wml:603
 msgid ""
 "<a href=\"http://members.forbes.com/global/2006/0227/018A_2.html\"> Beating "
 "censorship on the Internet</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:642 /tmp/u3kTkswOVo.xml:647
-#: /tmp/u3kTkswOVo.xml:652 /tmp/u3kTkswOVo.xml:689
+#: /home/runa/dev/website/press/en/inthemedia.wml:606 /tmp/Q2ndl8ZYsF.xml:611
+#: /tmp/Q2ndl8ZYsF.xml:616 /tmp/Q2ndl8ZYsF.xml:653
 msgid "2006 Feb 15"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:643
+#: /home/runa/dev/website/press/en/inthemedia.wml:607
 msgid "CBS Evening News"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:644
+#: /home/runa/dev/website/press/en/inthemedia.wml:608
 msgid ""
 "<a "
 "href=\"http://www.cbsnews.com/stories/2006/02/15/eveningnews/main1321785.shtml?source=search_story\">"
@@ -1573,22 +1569,22 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:648
+#: /home/runa/dev/website/press/en/inthemedia.wml:612
 msgid "CNBC - Closing Bell"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:649
+#: /home/runa/dev/website/press/en/inthemedia.wml:613
 msgid "TV Appearance by Roger Dingledine at 4:25pm. (no link)"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:653
+#: /home/runa/dev/website/press/en/inthemedia.wml:617
 msgid "Network Secure"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:654
+#: /home/runa/dev/website/press/en/inthemedia.wml:618
 msgid ""
 "<a href=\"http://www.network-"
 "secure.de/index.php?option=com_content&amp;task=view&amp;id=3909\">Tor: "
@@ -1596,12 +1592,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:657
+#: /home/runa/dev/website/press/en/inthemedia.wml:621
 msgid "2006 Feb 13"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:659
+#: /home/runa/dev/website/press/en/inthemedia.wml:623
 msgid ""
 "<a href=\"http://online.wsj.com/article/SB113979965346572150.html\"> Chinese"
 " Censors Of Internet Face 'Hacktivists' in U.S.</a>Full article text can "
@@ -1610,53 +1606,53 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:663
+#: /home/runa/dev/website/press/en/inthemedia.wml:627
 msgid "2006 Jan 31"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:665
+#: /home/runa/dev/website/press/en/inthemedia.wml:629
 msgid ""
 "<a href=\"http://www.technologyreview.com/Infotech/16216/page2/\">Evading "
 "the Google Eye</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:668
+#: /home/runa/dev/website/press/en/inthemedia.wml:632
 msgid "2006 Jan 29"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:670
+#: /home/runa/dev/website/press/en/inthemedia.wml:634
 msgid ""
 "<a href=\"http://www.nytimes.com/2006/01/29/weekinreview/29basic.html\"> How"
 " to Outwit the World's Internet Censors</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:673
+#: /home/runa/dev/website/press/en/inthemedia.wml:637
 msgid "2006 Jan 27"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:674
+#: /home/runa/dev/website/press/en/inthemedia.wml:638
 msgid "Fox News/eWeek"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:675
+#: /home/runa/dev/website/press/en/inthemedia.wml:639
 msgid ""
 "<a href=\"http://www.foxnews.com/story/0,2933,183005,00.html\"> Web "
 "Anonymizers Suddenly Get Very Popular</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:678
+#: /home/runa/dev/website/press/en/inthemedia.wml:642
 msgid "2006 Jan 25"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:680
+#: /home/runa/dev/website/press/en/inthemedia.wml:644
 msgid ""
 "<a "
 "href=\"http://www.nytimes.com/2006/01/25/technology/techspecial2/25privacy.html?_r=1&amp;oref=slogin\">"
@@ -1664,17 +1660,17 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:683
+#: /home/runa/dev/website/press/en/inthemedia.wml:647
 msgid "2006 Jan 23"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:684
+#: /home/runa/dev/website/press/en/inthemedia.wml:648
 msgid "NPR Talk of the Nation"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:685
+#: /home/runa/dev/website/press/en/inthemedia.wml:649
 msgid ""
 "<a href=\"http://www.npr.org/templates/story/story.php?storyId=5168456\"> "
 "Search Engines and Privacy Rights on the Web</a><br/> <a "
@@ -1683,24 +1679,24 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:690
+#: /home/runa/dev/website/press/en/inthemedia.wml:654
 msgid "Punto Informatico"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:691
+#: /home/runa/dev/website/press/en/inthemedia.wml:655
 msgid ""
 "<a href=\"http://punto-informatico.it/p.aspx?i=1430903\"> TOR c'è</a> "
 "(Italian)"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:695 /tmp/u3kTkswOVo.xml:701
+#: /home/runa/dev/website/press/en/inthemedia.wml:659 /tmp/Q2ndl8ZYsF.xml:665
 msgid "2006 Jan 20"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:697
+#: /home/runa/dev/website/press/en/inthemedia.wml:661
 msgid ""
 "<a "
 "href=\"http://www.wired.com/science/discoveries/news/2006/01/70051?currentPage=2\">"
@@ -1708,53 +1704,53 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:703
+#: /home/runa/dev/website/press/en/inthemedia.wml:667
 msgid ""
 "<a href=\"http://www.npr.org/templates/story/story.php?storyId=5165854\"> "
 "Google Records Subpoena Raises Privacy Fears</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:707
+#: /home/runa/dev/website/press/en/inthemedia.wml:671
 msgid "2005 Sep 30"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:708
+#: /home/runa/dev/website/press/en/inthemedia.wml:672
 msgid "Viva o Linux"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:709
+#: /home/runa/dev/website/press/en/inthemedia.wml:673
 msgid ""
 "<a href=\"http://www.vivaolinux.com.br/artigos/verArtigo.php?codigo=2759\"> "
 "TOR: A Internet sem rastreabilidade</a> (Portuguese)"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:712
+#: /home/runa/dev/website/press/en/inthemedia.wml:676
 msgid "2005 Aug 6"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:714
+#: /home/runa/dev/website/press/en/inthemedia.wml:678
 msgid ""
 "<a href=\"http://www.eurekalert.org/pub_releases/2005-08/ns-"
 "wwa080305.php\">Why we all need pornography</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:717
+#: /home/runa/dev/website/press/en/inthemedia.wml:681
 msgid "2005 Jul 12"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:718
+#: /home/runa/dev/website/press/en/inthemedia.wml:682
 msgid "IEEE Computer Society's Technical Committee on Security and Privacy"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:719
+#: /home/runa/dev/website/press/en/inthemedia.wml:683
 msgid ""
 "<a href=\"http://www.ieee-"
 "security.org/Cipher/Newsbriefs/2005/071805.html#TOR\"> Onion routing "
@@ -1762,34 +1758,34 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:723
+#: /home/runa/dev/website/press/en/inthemedia.wml:687
 msgid "2005 Jun 22"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:724
+#: /home/runa/dev/website/press/en/inthemedia.wml:688
 msgid "The Unofficial Apple Blog"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:725
+#: /home/runa/dev/website/press/en/inthemedia.wml:689
 msgid ""
 "<a href=\"http://www.tuaw.com/2005/06/22/privacy-watch-tor/\"> Privacy "
 "Watch: Tor</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:729
+#: /home/runa/dev/website/press/en/inthemedia.wml:693
 msgid "2005 Jun 10"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:730
+#: /home/runa/dev/website/press/en/inthemedia.wml:694
 msgid "The New Zealand Herald"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:731
+#: /home/runa/dev/website/press/en/inthemedia.wml:695
 msgid ""
 "<a "
 "href=\"http://www.nzherald.co.nz/section/story.cfm?c_id=5&amp;objectid=10329896\">"
@@ -1797,104 +1793,104 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:735
+#: /home/runa/dev/website/press/en/inthemedia.wml:699
 msgid "2005 Jun 8"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:736
+#: /home/runa/dev/website/press/en/inthemedia.wml:700
 msgid "American Public Radio"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:737
+#: /home/runa/dev/website/press/en/inthemedia.wml:701
 msgid ""
 "<a href=\"http://www.publicradio.org/columns/futuretense/2005/06/08.shtml\">"
 " An Internet privacy tool called \"Tor\"</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:741 /tmp/u3kTkswOVo.xml:747
+#: /home/runa/dev/website/press/en/inthemedia.wml:705 /tmp/Q2ndl8ZYsF.xml:711
 msgid "2005 Jun 1"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:743
+#: /home/runa/dev/website/press/en/inthemedia.wml:707
 msgid ""
 "<a href=\"http://www.pcworld.com/article/id,120763-page,4/article.html\"> "
 "The 100 Best Products of 2005</a><br/> Tor is ranked #40 on the list."
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:748
+#: /home/runa/dev/website/press/en/inthemedia.wml:712
 msgid "Linux Weekly News"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:749
+#: /home/runa/dev/website/press/en/inthemedia.wml:713
 msgid ""
 "<a href=\"http://lwn.net/Articles/138242/\"> A Look at The Onion Router "
 "(Tor)</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:753
+#: /home/runa/dev/website/press/en/inthemedia.wml:717
 msgid "2005 May 22"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:754 /tmp/u3kTkswOVo.xml:839
+#: /home/runa/dev/website/press/en/inthemedia.wml:718 /tmp/Q2ndl8ZYsF.xml:803
 msgid "Slashdot"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:755
+#: /home/runa/dev/website/press/en/inthemedia.wml:719
 msgid ""
 "<a href=\"http://yro.slashdot.org/article.pl?sid=05/05/22/0113244\"> Tor "
 "Anonymity Network Reaches 100 Verified Nodes</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:759
+#: /home/runa/dev/website/press/en/inthemedia.wml:723
 msgid "2005 May 20"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:760
+#: /home/runa/dev/website/press/en/inthemedia.wml:724
 msgid "Security.uz"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:761
+#: /home/runa/dev/website/press/en/inthemedia.wml:725
 msgid ""
 "<a href=\"http://security.uz/news/default.asp?id=10541\"> Tor - мощный "
 "анонимайзер для всех ОС</a> (Russian)"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:765
+#: /home/runa/dev/website/press/en/inthemedia.wml:729
 msgid "2005 May 19"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:766
+#: /home/runa/dev/website/press/en/inthemedia.wml:730
 msgid "WebPlanet"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:767
+#: /home/runa/dev/website/press/en/inthemedia.wml:731
 msgid ""
 "<a href=\"http://webplanet.ru/news/security/2005/5/19/tor.html\"> Tor: "
 "распределенная система анонимного серфинга</a> (Russian)"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:771 /tmp/u3kTkswOVo.xml:778
+#: /home/runa/dev/website/press/en/inthemedia.wml:735 /tmp/Q2ndl8ZYsF.xml:742
 msgid "2005 May 17"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:773
+#: /home/runa/dev/website/press/en/inthemedia.wml:737
 msgid ""
 "<a "
 "href=\"http://www.wired.com/politics/security/news/2005/05/67542?currentPage=all\">"
@@ -1903,170 +1899,170 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:779
+#: /home/runa/dev/website/press/en/inthemedia.wml:743
 msgid "XBiz"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:780
+#: /home/runa/dev/website/press/en/inthemedia.wml:744
 msgid ""
 "<a href=\"http://xbiz.com/news/8761\"> Navy Project Allows Anonymous "
 "Browsing</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:784
+#: /home/runa/dev/website/press/en/inthemedia.wml:748
 msgid "2005 Apr 13"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:785
+#: /home/runa/dev/website/press/en/inthemedia.wml:749
 msgid "Heise online"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:786
+#: /home/runa/dev/website/press/en/inthemedia.wml:750
 msgid ""
 "<a href=\"http://www.heise.de/newsticker/meldung/58506\"> CFP: Vom "
 "kafkaesken Schwinden der Anonymität</a> (German)"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:790
+#: /home/runa/dev/website/press/en/inthemedia.wml:754
 msgid "2005 Apr 5"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:791
+#: /home/runa/dev/website/press/en/inthemedia.wml:755
 msgid "Libero"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:792
+#: /home/runa/dev/website/press/en/inthemedia.wml:756
 msgid ""
 "<a href=\"http://magazine.libero.it/internetlife/scienzaeweb/ne208.phtml\"> "
 "Anonimato on line, ecco Tor</a> (Italian)"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:796
+#: /home/runa/dev/website/press/en/inthemedia.wml:760
 msgid "2005 Jan 4"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:797
+#: /home/runa/dev/website/press/en/inthemedia.wml:761
 msgid "Internetnews"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:798
+#: /home/runa/dev/website/press/en/inthemedia.wml:762
 msgid ""
 "<a href=\"http://www.internetnews.com/dev-news/article.php/3454521\"> EFF "
 "Throws Support to 'Anonymous' Internet Project</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:802
+#: /home/runa/dev/website/press/en/inthemedia.wml:766
 msgid "2005 Mar 31"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:803
+#: /home/runa/dev/website/press/en/inthemedia.wml:767
 msgid "Linux.com"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:804
+#: /home/runa/dev/website/press/en/inthemedia.wml:768
 msgid ""
 "<a href=\"http://www.linux.com/articles/43713?tid=19&amp;tid=78\"> Securing "
 "your online privacy with Tor</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:808
+#: /home/runa/dev/website/press/en/inthemedia.wml:772
 msgid "2004 Dec 27"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:809
+#: /home/runa/dev/website/press/en/inthemedia.wml:773
 msgid "BoingBoing"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:810
+#: /home/runa/dev/website/press/en/inthemedia.wml:774
 msgid ""
 "<a href=\"http://www.boingboing.net/2004/12/27/eff-helping-produce-.html\"> "
 "EFF helping produce anonymizing software</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:814
+#: /home/runa/dev/website/press/en/inthemedia.wml:778
 msgid "2004 Dec 25"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:815
+#: /home/runa/dev/website/press/en/inthemedia.wml:779
 msgid "Kansas City infozine"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:816
+#: /home/runa/dev/website/press/en/inthemedia.wml:780
 msgid ""
 "<a href=\"http://www.infozine.com/news/stories/op/storiesView/sid/4933/\"> "
 "EFF Joins Forces with Tor Software Project</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:820 /tmp/u3kTkswOVo.xml:826
+#: /home/runa/dev/website/press/en/inthemedia.wml:784 /tmp/Q2ndl8ZYsF.xml:790
 msgid "2004 Dec 23"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:821
+#: /home/runa/dev/website/press/en/inthemedia.wml:785
 msgid "golem.de"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:822
+#: /home/runa/dev/website/press/en/inthemedia.wml:786
 msgid ""
 "<a href=\"http://www.golem.de/0412/35340.html\"> EFF unterstützt "
 "Anonymisierer Tor</a> (German)"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:827
+#: /home/runa/dev/website/press/en/inthemedia.wml:791
 msgid "SuicideGirls"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:828
+#: /home/runa/dev/website/press/en/inthemedia.wml:792
 msgid ""
 "<a href=\"http://suicidegirls.com/news/technology/6150/\"> New Routing "
 "Software Allows Anonymous Internet Use</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:832
+#: /home/runa/dev/website/press/en/inthemedia.wml:796
 msgid "2004 Dec 18"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:833
+#: /home/runa/dev/website/press/en/inthemedia.wml:797
 msgid "P2Pnet"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:834
+#: /home/runa/dev/website/press/en/inthemedia.wml:798
 msgid "<a href=\"http://p2pnet.net/story/3357\"> EFF to sponsor Tor</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:838
+#: /home/runa/dev/website/press/en/inthemedia.wml:802
 msgid "2004 Dec 22"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:840
+#: /home/runa/dev/website/press/en/inthemedia.wml:804
 msgid ""
 "<a "
 "href=\"http://yro.slashdot.org/article.pl?sid=04/12/22/2031229&amp;tid=95&amp;tid=158&amp;tid=153&amp;tid=17\">"
@@ -2074,106 +2070,106 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:844
+#: /home/runa/dev/website/press/en/inthemedia.wml:808
 msgid "2004 Nov 16"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:845
+#: /home/runa/dev/website/press/en/inthemedia.wml:809
 msgid "AlterNet"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:846
+#: /home/runa/dev/website/press/en/inthemedia.wml:810
 msgid ""
 "<a href=\"http://www.alternet.org/columnists/story/20523/\"> Heavy "
 "Traffic</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:850
+#: /home/runa/dev/website/press/en/inthemedia.wml:814
 msgid "2004 Aug 30"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:851
+#: /home/runa/dev/website/press/en/inthemedia.wml:815
 msgid "Newsweek"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:852
+#: /home/runa/dev/website/press/en/inthemedia.wml:816
 msgid "Technology: Instant Security (no link)"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:856
+#: /home/runa/dev/website/press/en/inthemedia.wml:820
 msgid "2004 Aug 16"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:857
+#: /home/runa/dev/website/press/en/inthemedia.wml:821
 msgid "Eweek"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:858
+#: /home/runa/dev/website/press/en/inthemedia.wml:822
 msgid ""
 "<a href=\"http://www.eweek.com/c/a/Security/Dont-Fear-Internet-Anonymity-"
 "Tools/\"> Don't Fear Internet Anonymity Tools</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:862 /tmp/u3kTkswOVo.xml:868
+#: /home/runa/dev/website/press/en/inthemedia.wml:826 /tmp/Q2ndl8ZYsF.xml:832
 msgid "2004 Aug 6"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:863
+#: /home/runa/dev/website/press/en/inthemedia.wml:827
 msgid "HCC magazine"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:864
+#: /home/runa/dev/website/press/en/inthemedia.wml:828
 msgid ""
 "<a href=\"http://www.hcc.nl/eCache/DEF/21/083.html\"> Anoniem surfen met "
 "hulp van marine VS</a> (Dutch)"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:869
+#: /home/runa/dev/website/press/en/inthemedia.wml:833
 msgid "Golem"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:870
+#: /home/runa/dev/website/press/en/inthemedia.wml:834
 msgid ""
 "<a href=\"http://www.golem.de/0408/32835.html\"> Tor: Anonymisierer nutzt "
 "Onion-Routing</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:874
+#: /home/runa/dev/website/press/en/inthemedia.wml:838
 msgid "2004 Aug 5"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:875
+#: /home/runa/dev/website/press/en/inthemedia.wml:839
 msgid "Network World Security"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:876
+#: /home/runa/dev/website/press/en/inthemedia.wml:840
 msgid ""
 "<a href=\"http://www.networkworld.com/details/7088.html\"> Onion routing</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:880
+#: /home/runa/dev/website/press/en/inthemedia.wml:844
 msgid "2004 May 8"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:882
+#: /home/runa/dev/website/press/en/inthemedia.wml:846
 msgid ""
 "<a href=\"http://www.wired.com/politics/security/news/2004/08/64464\"> Onion"
 " Routing Averts Prying Eyes</a>. Also in <a "
@@ -2181,29 +2177,29 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:886
+#: /home/runa/dev/website/press/en/inthemedia.wml:850
 msgid "2004 Mar 8"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:887
+#: /home/runa/dev/website/press/en/inthemedia.wml:851
 msgid "CNET Japan blog"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:888
+#: /home/runa/dev/website/press/en/inthemedia.wml:852
 msgid ""
 "<a href=\"http://japan.cnet.com/blog/umeda/2004/03/08/entry_post_126/\"> "
 "Yearning of hackers and insecurity</a> (Japanese)"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:892
+#: /home/runa/dev/website/press/en/inthemedia.wml:856
 msgid "1999 Apr 13"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:894
+#: /home/runa/dev/website/press/en/inthemedia.wml:858
 msgid ""
 "<a href=\"http://www.wired.com/science/discoveries/news/1999/04/19091\"> "
 "Anonymous Web Surfing? Uh-Uh</a>"

Modified: translation/trunk/projects/website/po/es/press/4-optional.2010-03-25-tor-store-press-release.po
===================================================================
--- translation/trunk/projects/website/po/es/press/4-optional.2010-03-25-tor-store-press-release.po	2011-04-12 16:15:00 UTC (rev 24594)
+++ translation/trunk/projects/website/po/es/press/4-optional.2010-03-25-tor-store-press-release.po	2011-04-12 16:19:31 UTC (rev 24595)
@@ -8,7 +8,7 @@
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
 "POT-Creation-Date: 2010-12-26 14:32+0000\n"
-"PO-Revision-Date: 2011-03-27 17:35+0000\n"
+"PO-Revision-Date: 2011-04-12 16:13+0000\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: Spanish (Castilian) <None>\n"
 "MIME-Version: 1.0\n"

Modified: translation/trunk/projects/website/po/es/projects/1-high.torbrowser.po
===================================================================
--- translation/trunk/projects/website/po/es/projects/1-high.torbrowser.po	2011-04-12 16:15:00 UTC (rev 24594)
+++ translation/trunk/projects/website/po/es/projects/1-high.torbrowser.po	2011-04-12 16:19:31 UTC (rev 24595)
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-03-25 16:51+0000\n"
-"PO-Revision-Date: 2011-03-26 00:33+0000\n"
+"POT-Creation-Date: 2011-03-28 12:49+0200\n"
+"PO-Revision-Date: 2011-03-29 00:27+0000\n"
 "Last-Translator: runasand <runa.sandvik at gmail.com>\n"
 "Language-Team: Spanish (Castilian) <None>\n"
 "MIME-Version: 1.0\n"
@@ -18,7 +18,7 @@
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:9
+#: /home/runa/dev/website/projects/en/torbrowser.wml:9
 msgid ""
 "<a href=\"<page index>\">Home &raquo; </a> <a href=\"<page "
 "projects/projects>\">Projects &raquo; </a> <a href=\"<page "
@@ -26,17 +26,17 @@
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:17
+#: /home/runa/dev/website/projects/en/torbrowser.wml:17
 msgid "Tor Browser Bundle"
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:18
+#: /home/runa/dev/website/projects/en/torbrowser.wml:18
 msgid "<hr/>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:20
+#: /home/runa/dev/website/projects/en/torbrowser.wml:20
 msgid ""
 "The <strong>Tor</strong> software protects you by bouncing your "
 "communications around a distributed network of relays run by volunteers all "
@@ -47,7 +47,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:27
+#: /home/runa/dev/website/projects/en/torbrowser.wml:27
 msgid ""
 "The <strong>Tor Browser Bundle</strong> lets you use Tor on Windows, Mac OS "
 "X, or Linux without needing to install any software.  It can run off a USB "
@@ -59,7 +59,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:39
+#: /home/runa/dev/website/projects/en/torbrowser.wml:39
 msgid ""
 "Freedom House has produced a video on how to find and use the Tor Browser "
 "Bundle.  If you don't see a video below, view it at <a "
@@ -68,19 +68,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:49
+#: /home/runa/dev/website/projects/en/torbrowser.wml:49
 msgid "<a id=\"Download\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:50
+#: /home/runa/dev/website/projects/en/torbrowser.wml:50
 msgid ""
 "<a class=\"anchor\" href=\"#Download\">Download Tor Browser Bundle and Tor "
 "IM Browser Bundle</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:52
+#: /home/runa/dev/website/projects/en/torbrowser.wml:52
 msgid ""
 "To start using the Tor Browser Bundle or Tor IM Browser Bundle, download the"
 " file for your preferred language. This file can be saved wherever is "
@@ -88,7 +88,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:56
+#: /home/runa/dev/website/projects/en/torbrowser.wml:56
 msgid ""
 "If you have an unreliable Internet connection, it may be easier for you to "
 "download the bundle edition which is <a href=\"<page projects/torbrowser-"
@@ -96,14 +96,14 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:58
+#: /home/runa/dev/website/projects/en/torbrowser.wml:58
 msgid ""
 "Tor Browser Bundle for Windows with Firefox (version <version-"
 "torbrowserbundle>, 16 MB)"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:62
+#: /home/runa/dev/website/projects/en/torbrowser.wml:62
 msgid ""
 "<a href=\"../dist/torbrowser/tor-browser-<version-torbrowserbundle>_en-"
 "US.exe\">English (en-US)</a> (<a href=\"../dist/torbrowser/tor-browser"
@@ -112,7 +112,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:64
+#: /home/runa/dev/website/projects/en/torbrowser.wml:64
 msgid ""
 "<a href=\"../dist/torbrowser/tor-browser-<version-"
 "torbrowserbundle>_ar.exe\">&#x0627;&#x0644;&#x0639;&#x0631;&#x0628;&#x064a;&#x0629;"
@@ -121,7 +121,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:66
+#: /home/runa/dev/website/projects/en/torbrowser.wml:66
 msgid ""
 "<a href=\"../dist/torbrowser/tor-browser-<version-"
 "torbrowserbundle>_de.exe\">Deutsch (de)</a> (<a href=\"../dist/torbrowser"
@@ -130,7 +130,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:68
+#: /home/runa/dev/website/projects/en/torbrowser.wml:68
 msgid ""
 "<a href=\"../dist/torbrowser/tor-browser-<version-torbrowserbundle>_es-"
 "ES.exe\">&#x0045;&#x0073;&#x0070;&#x0061;&#x00f1;&#x006f;&#x006c; (es-"
@@ -139,7 +139,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:70
+#: /home/runa/dev/website/projects/en/torbrowser.wml:70
 msgid ""
 "<a href=\"../dist/torbrowser/tor-browser-<version-"
 "torbrowserbundle>_fa.exe\">&#x0641;&#x0627;&#x0631;&#x0633;&#x06cc; (fa)</a>"
@@ -148,7 +148,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:72
+#: /home/runa/dev/website/projects/en/torbrowser.wml:72
 msgid ""
 "<a href=\"../dist/torbrowser/tor-browser-<version-"
 "torbrowserbundle>_fr.exe\">&#x0046;&#x0072;&#x0061;&#x006e;&#x00e7;&#x0061;&#x0069;&#x0073;"
@@ -157,7 +157,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:74
+#: /home/runa/dev/website/projects/en/torbrowser.wml:74
 msgid ""
 "<a href=\"../dist/torbrowser/tor-browser-<version-"
 "torbrowserbundle>_it.exe\">Italiano (it)</a> (<a href=\"../dist/torbrowser"
@@ -166,7 +166,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:76
+#: /home/runa/dev/website/projects/en/torbrowser.wml:76
 msgid ""
 "<a href=\"../dist/torbrowser/tor-browser-<version-"
 "torbrowserbundle>_nl.exe\">Nederlands (nl)</a> (<a href=\"../dist/torbrowser"
@@ -175,7 +175,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:78
+#: /home/runa/dev/website/projects/en/torbrowser.wml:78
 msgid ""
 "<a href=\"../dist/torbrowser/tor-browser-<version-"
 "torbrowserbundle>_pl.exe\">Polish (pl)</a> (<a href=\"../dist/torbrowser"
@@ -184,7 +184,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:80
+#: /home/runa/dev/website/projects/en/torbrowser.wml:80
 msgid ""
 "<a href=\"../dist/torbrowser/tor-browser-<version-torbrowserbundle>_pt-"
 "PT.exe\">&#x0050;&#x006f;&#x0072;&#x0074;&#x0075;&#x0067;&#x0075;&#x00ea;&#x0073;"
@@ -193,7 +193,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:82
+#: /home/runa/dev/website/projects/en/torbrowser.wml:82
 msgid ""
 "<a href=\"../dist/torbrowser/tor-browser-<version-"
 "torbrowserbundle>_ru.exe\">&#x0420;&#x0443;&#x0441;&#x0441;&#x043a;&#x0438;&#x0439;"
@@ -202,7 +202,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:84
+#: /home/runa/dev/website/projects/en/torbrowser.wml:84
 msgid ""
 "<a href=\"../dist/torbrowser/tor-browser-<version-"
 "torbrowserbundle>_vi.exe\">Vietnamese (vi)</a> (<a href=\"../dist/torbrowser"
@@ -211,7 +211,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:86
+#: /home/runa/dev/website/projects/en/torbrowser.wml:86
 msgid ""
 "<a href=\"../dist/torbrowser/tor-browser-<version-torbrowserbundle>_zh-"
 "CN.exe\">&#x7b80;&#x4f53;&#x5b57; (zh-CN)</a> (<a href=\"../dist/torbrowser"
@@ -220,14 +220,14 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:90
+#: /home/runa/dev/website/projects/en/torbrowser.wml:90
 msgid ""
 "Tor IM Browser Bundle for Windows with Firefox and Pidgin (version <version-"
 "torimbrowserbundle>, 25 MB)"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:94
+#: /home/runa/dev/website/projects/en/torbrowser.wml:94
 msgid ""
 "<a href=\"../dist/torbrowser/tor-im-browser-<version-torimbrowserbundle>_en-"
 "US.exe\">English (en-US)</a> (<a href=\"../dist/torbrowser/tor-im-browser"
@@ -236,7 +236,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:96
+#: /home/runa/dev/website/projects/en/torbrowser.wml:96
 msgid ""
 "<a href=\"../dist/torbrowser/tor-im-browser-<version-"
 "torimbrowserbundle>_ar.exe\">&#x0627;&#x0644;&#x0639;&#x0631;&#x0628;&#x064a;&#x0629;"
@@ -245,7 +245,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:98
+#: /home/runa/dev/website/projects/en/torbrowser.wml:98
 msgid ""
 "<a href=\"../dist/torbrowser/tor-im-browser-<version-"
 "torimbrowserbundle>_de.exe\">Deutsch (de)</a> (<a href=\"../dist/torbrowser"
@@ -254,7 +254,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:100
+#: /home/runa/dev/website/projects/en/torbrowser.wml:100
 msgid ""
 "<a href=\"../dist/torbrowser/tor-im-browser-<version-torimbrowserbundle>_es-"
 "ES.exe\">&#x0045;&#x0073;&#x0070;&#x0061;&#x00f1;&#x006f;&#x006c; (es-"
@@ -263,7 +263,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:102
+#: /home/runa/dev/website/projects/en/torbrowser.wml:102
 msgid ""
 "<a href=\"../dist/torbrowser/tor-im-browser-<version-"
 "torimbrowserbundle>_fa.exe\">&#x0641;&#x0627;&#x0631;&#x0633;&#x06cc; "
@@ -272,7 +272,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:104
+#: /home/runa/dev/website/projects/en/torbrowser.wml:104
 msgid ""
 "<a href=\"../dist/torbrowser/tor-im-browser-<version-"
 "torimbrowserbundle>_fr.exe\">&#x0046;&#x0072;&#x0061;&#x006e;&#x00e7;&#x0061;&#x0069;&#x0073;"
@@ -281,7 +281,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:106
+#: /home/runa/dev/website/projects/en/torbrowser.wml:106
 msgid ""
 "<a href=\"../dist/torbrowser/tor-im-browser-<version-"
 "torimbrowserbundle>_it.exe\">Italiano (it)</a> (<a href=\"../dist/torbrowser"
@@ -290,7 +290,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:108
+#: /home/runa/dev/website/projects/en/torbrowser.wml:108
 msgid ""
 "<a href=\"../dist/torbrowser/tor-im-browser-<version-"
 "torimbrowserbundle>_nl.exe\">Nederlands (nl)</a> (<a "
@@ -299,7 +299,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:110
+#: /home/runa/dev/website/projects/en/torbrowser.wml:110
 msgid ""
 "<a href=\"../dist/torbrowser/tor-im-browser-<version-"
 "torimbrowserbundle>_pl.exe\">Polish (pl)</a> (<a href=\"../dist/torbrowser"
@@ -308,7 +308,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:112
+#: /home/runa/dev/website/projects/en/torbrowser.wml:112
 msgid ""
 "<a href=\"../dist/torbrowser/tor-im-browser-<version-torimbrowserbundle>_pt-"
 "PT.exe\">&#x0050;&#x006f;&#x0072;&#x0074;&#x0075;&#x0067;&#x0075;&#x00ea;&#x0073;"
@@ -317,7 +317,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:114
+#: /home/runa/dev/website/projects/en/torbrowser.wml:114
 msgid ""
 "<a href=\"../dist/torbrowser/tor-im-browser-<version-"
 "torimbrowserbundle>_ru.exe\">&#x0420;&#x0443;&#x0441;&#x0441;&#x043a;&#x0438;&#x0439;"
@@ -326,7 +326,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:116
+#: /home/runa/dev/website/projects/en/torbrowser.wml:116
 msgid ""
 "<a href=\"../dist/torbrowser/tor-im-browser-<version-"
 "torimbrowserbundle>_vi.exe\">Vietnamese (vi)</a> (<a "
@@ -335,7 +335,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:118
+#: /home/runa/dev/website/projects/en/torbrowser.wml:118
 msgid ""
 "<a href=\"../dist/torbrowser/tor-im-browser-<version-torimbrowserbundle>_zh-"
 "CN.exe\">&#x7b80;&#x4f53;&#x5b57; (zh-CN)</a> (<a href=\"../dist/torbrowser"
@@ -344,14 +344,14 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:122
+#: /home/runa/dev/website/projects/en/torbrowser.wml:122
 msgid ""
-"BETA: Tor Browser Bundle for Intel Mac OS X with Firefox (version <version-"
-"torbrowserbundleosx>, 28 MB)"
+"BETA: Tor Browser Bundle for Intel Mac OS X 10.5 and higher with Firefox "
+"(version <version-torbrowserbundleosx>, 28 MB)"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:126
+#: /home/runa/dev/website/projects/en/torbrowser.wml:126
 msgid ""
 "<a href=\"../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx"
 ">-dev-osx-i386-en-US.zip\">English (en-US)</a> (<a "
@@ -360,7 +360,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:129
+#: /home/runa/dev/website/projects/en/torbrowser.wml:129
 msgid ""
 "<a href=\"../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx"
 ">-dev-"
@@ -371,7 +371,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:133
+#: /home/runa/dev/website/projects/en/torbrowser.wml:133
 msgid ""
 "<a href=\"../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx"
 ">-dev-osx-i386-de.zip\">Deutsch (de)</a> (<a "
@@ -380,7 +380,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:136
+#: /home/runa/dev/website/projects/en/torbrowser.wml:136
 msgid ""
 "<a href=\"../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx"
 ">-dev-osx-i386-es-"
@@ -391,7 +391,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:140
+#: /home/runa/dev/website/projects/en/torbrowser.wml:140
 msgid ""
 "<a href=\"../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx"
 ">-dev-osx-i386-fa.zip\">&#x0641;&#x0627;&#x0631;&#x0633;&#x06cc; (fa) </a> "
@@ -400,7 +400,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:143
+#: /home/runa/dev/website/projects/en/torbrowser.wml:143
 msgid ""
 "<a href=\"../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx"
 ">-dev-"
@@ -411,7 +411,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:146
+#: /home/runa/dev/website/projects/en/torbrowser.wml:146
 msgid ""
 "<a href=\"../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx"
 ">-dev-osx-i386-it.zip\">Italiano (it)</a> (<a "
@@ -420,7 +420,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:149
+#: /home/runa/dev/website/projects/en/torbrowser.wml:149
 msgid ""
 "<a href=\"../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx"
 ">-dev-osx-i386-nl.zip\">Nederlands (nl)</a> (<a "
@@ -429,7 +429,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:152
+#: /home/runa/dev/website/projects/en/torbrowser.wml:152
 msgid ""
 "<a href=\"../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx"
 ">-dev-osx-i386-pl.zip\">Polish (pl)</a> (<a "
@@ -438,7 +438,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:155
+#: /home/runa/dev/website/projects/en/torbrowser.wml:155
 msgid ""
 "<a href=\"../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx"
 ">-dev-osx-i386-pt-"
@@ -449,7 +449,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:158
+#: /home/runa/dev/website/projects/en/torbrowser.wml:158
 msgid ""
 "<a href=\"../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx"
 ">-dev-"
@@ -460,7 +460,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:162
+#: /home/runa/dev/website/projects/en/torbrowser.wml:162
 msgid ""
 "<a href=\"../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx"
 ">-dev-osx-i386-zh-CN.zip\">&#x7b80;&#x4f53;&#x5b57; (zh-CN)</a> (<a "
@@ -469,7 +469,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:169
+#: /home/runa/dev/website/projects/en/torbrowser.wml:169
 msgid ""
 "BETA: Tor Browser Bundle for Linux with Firefox (version <version-"
 "torbrowserbundlelinux32> (32-bit), <version-torbrowserbundlelinux64> "
@@ -477,7 +477,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:172
+#: /home/runa/dev/website/projects/en/torbrowser.wml:172
 msgid ""
 "English (en-US): <a href=\"../dist/torbrowser/linux/tor-browser-gnu-"
 "linux-i686-<version-torbrowserbundlelinux32>-dev-en-US.tar.gz\">32-bit</a> "
@@ -491,7 +491,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:175
+#: /home/runa/dev/website/projects/en/torbrowser.wml:175
 msgid ""
 "&#x0627;&#x0644;&#x0639;&#x0631;&#x0628;&#x064a;&#x0629; (ar): <a "
 "href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-"
@@ -506,7 +506,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:177
+#: /home/runa/dev/website/projects/en/torbrowser.wml:177
 msgid ""
 "Deutsch (de): <a href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-i686"
 "-<version-torbrowserbundlelinux32>-dev-de.tar.gz\">32-bit</a> (<a "
@@ -520,7 +520,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:179
+#: /home/runa/dev/website/projects/en/torbrowser.wml:179
 msgid ""
 "&#x0045;&#x0073;&#x0070;&#x0061;&#x00f1;&#x006f;&#x006c; (es-ES): <a "
 "href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-"
@@ -535,7 +535,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:181
+#: /home/runa/dev/website/projects/en/torbrowser.wml:181
 msgid ""
 "&#x0641;&#x0627;&#x0631;&#x0633;&#x06cc; (fa): <a "
 "href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-"
@@ -550,7 +550,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:183
+#: /home/runa/dev/website/projects/en/torbrowser.wml:183
 msgid ""
 "&#x0046;&#x0072;&#x0061;&#x006e;&#x00e7;&#x0061;&#x0069;&#x0073; (fr): <a "
 "href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-"
@@ -565,7 +565,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:185
+#: /home/runa/dev/website/projects/en/torbrowser.wml:185
 msgid ""
 "Italiano (it): <a href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-i686"
 "-<version-torbrowserbundlelinux32>-dev-it.tar.gz\">32-bit</a> (<a "
@@ -579,7 +579,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:187
+#: /home/runa/dev/website/projects/en/torbrowser.wml:187
 msgid ""
 "Nederlands (nl): <a href=\"../dist/torbrowser/linux/tor-browser-gnu-"
 "linux-i686-<version-torbrowserbundlelinux32>-dev-nl.tar.gz\">32-bit</a> (<a "
@@ -593,7 +593,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:189
+#: /home/runa/dev/website/projects/en/torbrowser.wml:189
 msgid ""
 "Polish (pl): <a href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-i686"
 "-<version-torbrowserbundlelinux32>-dev-pl.tar.gz\">32-bit</a> (<a "
@@ -607,7 +607,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:191
+#: /home/runa/dev/website/projects/en/torbrowser.wml:191
 msgid ""
 "&#x0050;&#x006f;&#x0072;&#x0074;&#x0075;&#x0067;&#x0075;&#x00ea;&#x0073; "
 "(pt-PT): <a href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-i686"
@@ -622,7 +622,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:193
+#: /home/runa/dev/website/projects/en/torbrowser.wml:193
 msgid ""
 "&#x0420;&#x0443;&#x0441;&#x0441;&#x043a;&#x0438;&#x0439; (ru): <a "
 "href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-"
@@ -637,7 +637,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:195
+#: /home/runa/dev/website/projects/en/torbrowser.wml:195
 msgid ""
 "&#x7b80;&#x4f53;&#x5b57; (zh-CN): <a href=\"../dist/torbrowser/linux/tor-"
 "browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-zh-"
@@ -651,7 +651,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:201
+#: /home/runa/dev/website/projects/en/torbrowser.wml:201
 msgid ""
 "See our instructions on <a href=\"<page docs/verifying-signatures>\">how to "
 "verify package signatures</a>, which allows you to make sure you've "
@@ -663,17 +663,17 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:211
+#: /home/runa/dev/website/projects/en/torbrowser.wml:211
 msgid "<a id=\"MacOSX\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:212
+#: /home/runa/dev/website/projects/en/torbrowser.wml:212
 msgid "<a class=\"anchor\" href=\"#MacOSX\">Mac OS X instructions</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:213
+#: /home/runa/dev/website/projects/en/torbrowser.wml:213
 msgid ""
 "Download the file above, save it somewhere, then click on it. Mac OS X will "
 "automatically unarchive it and you will have a TorBrowser application in "
@@ -682,18 +682,25 @@
 "will launch Firefox."
 msgstr ""
 
+#. type: Content of: <div><div><p>
+#: /home/runa/dev/website/projects/en/torbrowser.wml:219
+msgid ""
+"<img src=\"$(IMGROOT)/screenshot-osx-torbrowser-icon.png\" alt=\"Screenshot "
+"Mac OS X bundle\" />"
+msgstr ""
+
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:219
+#: /home/runa/dev/website/projects/en/torbrowser.wml:221
 msgid "<a id=\"Linux\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:220
+#: /home/runa/dev/website/projects/en/torbrowser.wml:222
 msgid "<a class=\"anchor\" href=\"#Linux\">Linux instructions</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:221
+#: /home/runa/dev/website/projects/en/torbrowser.wml:223
 msgid ""
 "Download the architecture-appropriate file above, save it somewhere, then "
 "run:<br> tar -xvzf tor-browser-gnu-linux-i686-<version-"
@@ -706,17 +713,17 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:230
+#: /home/runa/dev/website/projects/en/torbrowser.wml:232
 msgid "<a id=\"Extraction\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:231
+#: /home/runa/dev/website/projects/en/torbrowser.wml:233
 msgid "<a class=\"anchor\" href=\"#Extraction\">Extraction</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:233
+#: /home/runa/dev/website/projects/en/torbrowser.wml:235
 msgid ""
 "Download the file above, and save it somewhere, then double click on it.  "
 "Click on the button labelled <strong>\"...\"</strong> (1) and select where "
@@ -728,57 +735,57 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:241
+#: /home/runa/dev/website/projects/en/torbrowser.wml:243
 msgid ""
 "Click <strong>Extract</strong> (3) to begin extraction. This may take a few "
 "minutes to complete."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:244
+#: /home/runa/dev/website/projects/en/torbrowser.wml:246
 msgid ""
 "<img src=\"$(IMGROOT)/tbb-screenshot1.png\" alt=\"Screenshot of extraction "
 "process\" />"
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:247
+#: /home/runa/dev/website/projects/en/torbrowser.wml:249
 msgid "<a id=\"Usage\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:248
+#: /home/runa/dev/website/projects/en/torbrowser.wml:250
 msgid "<a class=\"anchor\" href=\"#Usage\">Usage</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:250
+#: /home/runa/dev/website/projects/en/torbrowser.wml:252
 msgid ""
 "Once extraction is complete, open the folder <strong>Tor Browser</strong> "
 "from the location you saved the bundle."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:252
+#: /home/runa/dev/website/projects/en/torbrowser.wml:254
 msgid ""
 "Double click on the <strong>Start Tor Browser</strong> (4) application (it "
 "may be called <strong>Start Tor Browser.exe</strong> on some systems.)"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:255
+#: /home/runa/dev/website/projects/en/torbrowser.wml:257
 msgid "The Vidalia window will shortly appear."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:257
+#: /home/runa/dev/website/projects/en/torbrowser.wml:259
 msgid ""
 "<img src=\"$(IMGROOT)/tbb-screenshot2.png\" alt=\"Screenshot of bundle "
 "startup\" />"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:260
+#: /home/runa/dev/website/projects/en/torbrowser.wml:262
 msgid ""
 "Once Tor is ready, Firefox will automatically be opened. Only web pages "
 "visited through the included Firefox browser will be sent via Tor. Other web"
@@ -790,14 +797,14 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:267
+#: /home/runa/dev/website/projects/en/torbrowser.wml:269
 msgid ""
 "If you installed the Tor IM Browser Bundle, the Pidgin instant messaging "
 "client will also be automatically opened."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:269
+#: /home/runa/dev/website/projects/en/torbrowser.wml:271
 msgid ""
 "Once you are finished browsing, close any open Firefox windows by clicking "
 "on the <img src=\"$(IMGROOT)/tbb-close-button.png\" alt=\"Close button "
@@ -806,12 +813,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:275
+#: /home/runa/dev/website/projects/en/torbrowser.wml:277
 msgid "<img src=\"$(IMGROOT)/tbb-screenshot3a.png\" alt=\"Screenshot of Firefox\" />"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:278
+#: /home/runa/dev/website/projects/en/torbrowser.wml:280
 msgid ""
 "With the Tor Browser Bundle, Vidalia and Tor will automatically close. With "
 "the Tor IM Browser Bundle you need to also close Pidgin by right-clicking on"
@@ -819,19 +826,19 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:280
+#: /home/runa/dev/website/projects/en/torbrowser.wml:282
 msgid "<img src=\"$(IMGROOT)/tbb-screenshot3b.png\" alt=\"Screenshot of Pidgin\" />"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:283
+#: /home/runa/dev/website/projects/en/torbrowser.wml:285
 msgid ""
 "To use the Tor Browser Bundle or Tor IM Browser Bundle again, repeat the "
 "steps in <a href=\"#Usage\">\"Usage\"</a>."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:285
+#: /home/runa/dev/website/projects/en/torbrowser.wml:287
 msgid ""
 "Remember that Tor anonymizes the origin of your traffic, and it encrypts "
 "everything inside the Tor network, but <a "
@@ -843,17 +850,17 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:293
+#: /home/runa/dev/website/projects/en/torbrowser.wml:295
 msgid "<a id=\"Feedback\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:294
+#: /home/runa/dev/website/projects/en/torbrowser.wml:296
 msgid "<a class=\"anchor\" href=\"#Feedback\">Comments and suggestions</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:296
+#: /home/runa/dev/website/projects/en/torbrowser.wml:298
 msgid ""
 "The Tor Browser Bundle is under development and not yet complete.  To "
 "discuss improvements and submit comments, please use the <a "
@@ -861,24 +868,24 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:300
+#: /home/runa/dev/website/projects/en/torbrowser.wml:302
 msgid "<a id=\"More\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:301
+#: /home/runa/dev/website/projects/en/torbrowser.wml:303
 msgid "<a class=\"anchor\" href=\"#More\">More information</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:303
+#: /home/runa/dev/website/projects/en/torbrowser.wml:305
 msgid ""
 "<strong>What is Tor and why do I need it?</strong> To learn more about Tor, "
 "visit the <a href=\"<page index>\">Tor Project website</a>."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:307
+#: /home/runa/dev/website/projects/en/torbrowser.wml:309
 msgid ""
 "<strong>What is in the Tor Browser Bundle?</strong> It contains Tor, "
 "Vidalia, Polipo, Firefox, and Torbutton (<a href=\"<page projects"
@@ -886,7 +893,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:311
+#: /home/runa/dev/website/projects/en/torbrowser.wml:313
 msgid ""
 "<strong>What is in the Tor IM Browser Bundle?</strong> It contains Tor, "
 "Vidalia, Polipo, Firefox, Torbutton, Pidgin and OTR (<a href=\"<page "
@@ -894,7 +901,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:315
+#: /home/runa/dev/website/projects/en/torbrowser.wml:317
 msgid ""
 "<strong>How can I make my own bundle?</strong> To download the source code "
 "and learn how to build the bundle yourself, read the <a href=\"<page "
@@ -902,7 +909,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:319
+#: /home/runa/dev/website/projects/en/torbrowser.wml:321
 msgid ""
 "Tor Browser Bundle is partially based on <a "
 "href=\"http://portableapps.com/apps/internet/firefox_portable\">Mozilla "

Modified: translation/trunk/projects/website/po/fa/1-high.index.po
===================================================================
--- translation/trunk/projects/website/po/fa/1-high.index.po	2011-04-12 16:15:00 UTC (rev 24594)
+++ translation/trunk/projects/website/po/fa/1-high.index.po	2011-04-12 16:19:31 UTC (rev 24595)
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-03-17 18:05+0000\n"
-"PO-Revision-Date: 2011-03-22 16:15+0000\n"
+"POT-Creation-Date: 2011-03-28 12:48+0200\n"
+"PO-Revision-Date: 2011-03-29 00:25+0000\n"
 "Last-Translator: amirpouran <amirpooran8931084 at yahoo.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
@@ -18,32 +18,32 @@
 "Plural-Forms: nplurals=1; plural=0\n"
 
 #. type: Content of: <div><div><div><div><ul><li>
-#: /home/runa/tor/website/en/index.wml:12
+#: /home/runa/dev/website/en/index.wml:12
 msgid "Tor prevents anyone from learning your location or browsing habits."
 msgstr ""
 "تر مانع از این می شود که کسی بتواند مکان شما و یا وبگردی شما را کشف کند"
 
 #. type: Content of: <div><div><div><div><ul><li>
-#: /home/runa/tor/website/en/index.wml:13
+#: /home/runa/dev/website/en/index.wml:13
 msgid ""
 "Tor is for web browsers, instant messaging clients, remote logins, and more."
 msgstr ""
 "تر مناسب برای مرورگرهای وب ،کلاینتهای پیامهای فوری،لاگین از راه دور و...است"
 
 #. type: Content of: <div><div><div><div><ul><li>
-#: /home/runa/tor/website/en/index.wml:14
+#: /home/runa/dev/website/en/index.wml:14
 msgid "Tor is free and open source for Windows, Mac, Linux/Unix, and Android"
 msgstr ""
 "تر یک نرم افزار رایگان و کد باز(اپن سورس)برای ویندوز ،مکینتاش،لینوکس،یونیکس "
 "و اندروی است "
 
 #. type: Content of: <div><div><div><div><h1>
-#: /home/runa/tor/website/en/index.wml:16
+#: /home/runa/dev/website/en/index.wml:16
 msgid "Anonymity Online"
 msgstr "گمنام ماندن کاربران آنلاین حاضر"
 
 #. type: Content of: <div><div><div><div><p>
-#: /home/runa/tor/website/en/index.wml:17
+#: /home/runa/dev/website/en/index.wml:17
 msgid ""
 "Protect your privacy. Defend yourself against network surveillance and "
 "traffic analysis."
@@ -52,7 +52,7 @@
 "ترافیک."
 
 #. type: Content of: <div><div><div><div><div>
-#: /home/runa/tor/website/en/index.wml:20
+#: /home/runa/dev/website/en/index.wml:20
 msgid ""
 "<a href=\"<page download/download>\"> <span class=\"download-tor\">Download "
 "Tor</span></a>"
@@ -61,12 +61,12 @@
 "تر</a></span>"
 
 #. type: Content of: <div><div><div><div><div><h2>
-#: /home/runa/tor/website/en/index.wml:26
+#: /home/runa/dev/website/en/index.wml:26
 msgid "What is Tor?"
 msgstr "تر چیست؟"
 
 #. type: Content of: <div><div><div><div><div><p>
-#: /home/runa/tor/website/en/index.wml:26
+#: /home/runa/dev/website/en/index.wml:26
 msgid ""
 "Tor is free software and an open network that helps you defend against a "
 "form of network surveillance that threatens personal freedom and privacy, "
@@ -79,12 +79,12 @@
 " دولت امنیت <a href=\"<page about/overview>\"></a> <br> <span class=\"continue\"><a href=\"<page about/overview>\">اطلاعات بیشتر در مورد تر »</a></span>"
 
 #. type: Content of: <div><div><div><div><div><h2>
-#: /home/runa/tor/website/en/index.wml:36
+#: /home/runa/dev/website/en/index.wml:36
 msgid "Why Anonymity Matters"
 msgstr "چرا گمنام ماند مهم است؟"
 
 #. type: Content of: <div><div><div><div><div><p>
-#: /home/runa/tor/website/en/index.wml:37
+#: /home/runa/dev/website/en/index.wml:37
 msgid ""
 "Tor protects you by bouncing your communications around a distributed "
 "network of relays run by volunteers all around the world: it prevents "
@@ -99,22 +99,22 @@
 " پروتکل تیسیپی. <br> <a href=\"<page getinvolved/volunteer>\"><span class=\"continue\"> »همراه شدن با تر</span></a>"
 
 #. type: Content of: <div><div><div><div><h2>
-#: /home/runa/tor/website/en/index.wml:50
+#: /home/runa/dev/website/en/index.wml:50
 msgid "Our Projects"
 msgstr "پروژه های ما"
 
 #. type: Content of: <div><div><div><div><table><tr><td>
-#: /home/runa/tor/website/en/index.wml:55
+#: /home/runa/dev/website/en/index.wml:55
 msgid "<img src=\"$(IMGROOT)/icon-TorButton.jpg\" alt=\"Torbutton Icon\">"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><table><tr><td><h3>
-#: /home/runa/tor/website/en/index.wml:56
+#: /home/runa/dev/website/en/index.wml:56
 msgid "<a href=\"<page torbutton/index>\">Torbutton</a>"
 msgstr "<a href=\"<page torbutton/index>\">دکمه تر</a>"
 
 #. type: Content of: <div><div><div><div><table><tr><td><p>
-#: /home/runa/tor/website/en/index.wml:57
+#: /home/runa/dev/website/en/index.wml:57
 msgid ""
 "Torbutton is a 1-click way for Firefox users to enable or disable Tor in "
 "Firefox."
@@ -123,32 +123,32 @@
 "تر را در موزیلا فعال یا غیر فعال کنند"
 
 #. type: Content of: <div><div><div><div><table><tr><td>
-#: /home/runa/tor/website/en/index.wml:61
+#: /home/runa/dev/website/en/index.wml:61
 msgid "<img src=\"$(IMGROOT)/icon-TorCheck.jpg\" alt=\"Tor Check Icon\">"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><table><tr><td><h3>
-#: /home/runa/tor/website/en/index.wml:62
+#: /home/runa/dev/website/en/index.wml:62
 msgid "<a href=\"https://check.torproject.org/\">Check</a>"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><table><tr><td><p>
-#: /home/runa/tor/website/en/index.wml:63
+#: /home/runa/dev/website/en/index.wml:63
 msgid "Check determines if you are successfully browsing with Tor."
 msgstr "بررسی کنید که آیا درست از تر استفاده می کنید؟"
 
 #. type: Content of: <div><div><div><div><table><tr><td>
-#: /home/runa/tor/website/en/index.wml:69
+#: /home/runa/dev/website/en/index.wml:69
 msgid "<img src=\"$(IMGROOT)/icon-Vidalia.jpg\" alt=\"Vidalia Icon\">"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><table><tr><td><h3>
-#: /home/runa/tor/website/en/index.wml:70
+#: /home/runa/dev/website/en/index.wml:70
 msgid "<a href=\"<page projects/vidalia>\">Vidalia</a>"
 msgstr "<a href=\"<page projects/vidalia>\">ویدالیا</a>"
 
 #. type: Content of: <div><div><div><div><table><tr><td><p>
-#: /home/runa/tor/website/en/index.wml:71
+#: /home/runa/dev/website/en/index.wml:71
 msgid ""
 "Vidalia is a graphical way to control and view Tor's connections and "
 "settings."
@@ -157,35 +157,35 @@
 "است"
 
 #. type: Content of: <div><div><div><div><table><tr><td>
-#: /home/runa/tor/website/en/index.wml:75
+#: /home/runa/dev/website/en/index.wml:75
 msgid "<img src=\"$(IMGROOT)/icon-TorBrowser.jpg\" alt=\"TorBrowser Icon\">"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><table><tr><td><h3>
-#: /home/runa/tor/website/en/index.wml:76
+#: /home/runa/dev/website/en/index.wml:76
 msgid "<a href=\"<page projects/torbrowser>\">Tor Browser</a>"
 msgstr "<a href=\"<page projects/torbrowser>\">مرورگر تر</a>"
 
 #. type: Content of: <div><div><div><div><table><tr><td><p>
-#: /home/runa/tor/website/en/index.wml:78
+#: /home/runa/dev/website/en/index.wml:78
 msgid ""
 "Tor Browser contains everything you need to safely browse the Internet."
 msgstr "مرورگر تر شامل همه آن چیزی است که شما برای یک اتصال امن نیاز دارید"
 
 #. type: Content of: <div><div><div><div><h2>
-#: /home/runa/tor/website/en/index.wml:90
+#: /home/runa/dev/website/en/index.wml:90
 msgid "Who Uses Tor?"
 msgstr "چه کسانی از تر استفاده می کنند؟ "
 
 #. type: Content of: <div><div><div><div><div><h3>
-#: /home/runa/tor/website/en/index.wml:93
+#: /home/runa/dev/website/en/index.wml:93
 msgid ""
 "<a href=\"<page about/torusers>#normalusers\"><img "
 "src=\"$(IMGROOT)/family.jpg\" alt=\"Normal People\">Family &amp; Friends</a>"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><div><p>
-#: /home/runa/tor/website/en/index.wml:95
+#: /home/runa/dev/website/en/index.wml:95
 msgid ""
 "People like you and your family use Tor to protect themselves, their "
 "children, and their dignity while using the Internet."
@@ -194,14 +194,14 @@
 "هنگاام گشت وگذار در اینترنت حفظ کنند از تر استفاه کنند "
 
 #. type: Content of: <div><div><div><div><div><h3>
-#: /home/runa/tor/website/en/index.wml:99
+#: /home/runa/dev/website/en/index.wml:99
 msgid ""
 "<a href=\"<page about/torusers>#executives\"><img "
 "src=\"$(IMGROOT)/consumers.jpg\" alt=\"Businesses\">Businesses</a>"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><div><p>
-#: /home/runa/tor/website/en/index.wml:101
+#: /home/runa/dev/website/en/index.wml:101
 msgid ""
 "Businesses use Tor to research competition, keep business strategies "
 "confidential, and facilitate internal accountability."
@@ -210,7 +210,7 @@
 " روابط داخلی خود استفاده می کنند"
 
 #. type: Content of: <div><div><div><div><div><h3>
-#: /home/runa/tor/website/en/index.wml:105
+#: /home/runa/dev/website/en/index.wml:105
 msgid ""
 "<a href=\"<page about/torusers>#activists\"><img "
 "src=\"$(IMGROOT)/activists.jpg\" alt=\"Activists &amp; "
@@ -218,7 +218,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><div><div><div><p>
-#: /home/runa/tor/website/en/index.wml:107
+#: /home/runa/dev/website/en/index.wml:107
 msgid ""
 "Activists use Tor to anonymously report abuses from danger zones.  "
 "Whistleblowers use Tor to safely report on corruption."
@@ -227,21 +227,21 @@
 "Whistleblowers استفاده تر به فساد با خیال راحت در گزارش."
 
 #. type: Content of: <div><div><div><div><div><h3>
-#: /home/runa/tor/website/en/index.wml:111
+#: /home/runa/dev/website/en/index.wml:111
 msgid ""
 "<a href=\"<page about/torusers>#journalist\"><img "
 "src=\"$(IMGROOT)/media.jpg\" alt=\"Journalists and the Media\">Media</a>"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><div><p>
-#: /home/runa/tor/website/en/index.wml:113
+#: /home/runa/dev/website/en/index.wml:113
 msgid ""
 "Journalists and the media use Tor to protect their research and sources "
 "online."
 msgstr ""
 
 #. type: Content of: <div><div><div><div><div><h3>
-#: /home/runa/tor/website/en/index.wml:117
+#: /home/runa/dev/website/en/index.wml:117
 msgid ""
 "<a href=\"<page about/torusers>#military\"><img "
 "src=\"$(IMGROOT)/military.jpg\" alt=\"Military and Law "
@@ -249,24 +249,39 @@
 msgstr ""
 
 #. type: Content of: <div><div><div><div><div><p>
-#: /home/runa/tor/website/en/index.wml:119
+#: /home/runa/dev/website/en/index.wml:119
 msgid ""
 "Militaries and law enforcement use Tor to protect their communications, "
 "investigations, and intelligence gathering online."
 msgstr ""
 
 #. type: Content of: <div><div><div><div><h2>
-#: /home/runa/tor/website/en/index.wml:123
+#: /home/runa/dev/website/en/index.wml:123
 msgid "Announcements"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><table><tr><td><div>
-#: /home/runa/tor/website/en/index.wml:128
+#: /home/runa/dev/website/en/index.wml:128
+msgid "<span class=\"month\">Mar</span><br><span class=\"day\">23</span>"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><table><tr><td><p>
+#: /home/runa/dev/website/en/index.wml:129
+msgid ""
+"The Tor Project wins the \"Project of Social Benefit\" award from the Free "
+"Software Foundation and GNU Project. We are honored to win this award and to"
+" be listed amongst the former winners. <a "
+"href=\"https://blog.torproject.org/blog/tor-project-receives-fsf-"
+"award\">Read more</a> about this award."
+msgstr ""
+
+#. type: Content of: <div><div><div><div><table><tr><td><div>
+#: /home/runa/dev/website/en/index.wml:135
 msgid "<span class=\"month\">Feb</span><br><span class=\"day\">23</span>"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><table><tr><td><p>
-#: /home/runa/tor/website/en/index.wml:129
+#: /home/runa/dev/website/en/index.wml:136
 msgid ""
 "The latest stable Tor version, 0.2.1.30, is <a "
 "href=\"https://lists.torproject.org/pipermail/tor-"
@@ -276,18 +291,3 @@
 "reachable from Iran again.  We don't expect this tweak will win the arms "
 "race long-term, but it buys us time until we roll out a better solution."
 msgstr ""
-
-#. type: Content of: <div><div><div><div><table><tr><td><div>
-#: /home/runa/tor/website/en/index.wml:138
-msgid "<span class=\"month\">Jan</span><br><span class=\"day\">30</span>"
-msgstr ""
-
-#. type: Content of: <div><div><div><div><table><tr><td><p>
-#: /home/runa/tor/website/en/index.wml:139
-msgid ""
-"Tor helping with Egypt.  Here's what we've learned <a "
-"href=\"https://blog.torproject.org/blog/recent-events-egypt\">about recent "
-"events in Egypt</a>. And we're keeping our <a href=\"<page "
-"press/inthemedia>\">In the media</a> page up to date with stories about how "
-"we're helping around the world."
-msgstr ""

Added: translation/trunk/projects/website/po/fa/about/2-medium.overview.po
===================================================================
--- translation/trunk/projects/website/po/fa/about/2-medium.overview.po	                        (rev 0)
+++ translation/trunk/projects/website/po/fa/about/2-medium.overview.po	2011-04-12 16:19:31 UTC (rev 24595)
@@ -0,0 +1,514 @@
+# 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.
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
+"POT-Creation-Date: 2011-03-01 16:37+0000\n"
+"PO-Revision-Date: 2011-04-09 02:07+0000\n"
+"Last-Translator: pakdelreza <pakdelreza at gmail.com>\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"
+"Language: fa\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/about/en/overview.wml:8
+msgid ""
+"<a href=\"<page index>\">Home &raquo; </a> <a href=\"<page "
+"about/overview>\">About &raquo; </a>"
+msgstr ""
+"<a href=\"<page index>\">خانه &raquo; </a> <a href=\"<page "
+"about/overview>\">درباره &raquo; </a>"
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/about/en/overview.wml:12
+msgid "<a name=\"overview\"></a>"
+msgstr "<a name=\"overview\"></a>"
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/about/en/overview.wml:13
+msgid "<a class=\"anchor\" href=\"#overview\">Tor: Overview</a>"
+msgstr "<a class=\"anchor\" href=\"#overview\">آشنایی با تور </a>"
+
+#. type: Content of: <div><div><div><h3>
+#: /home/runa/tor/website/about/en/overview.wml:16
+msgid "Topics"
+msgstr "موضوع ها"
+
+#. type: Content of: <div><div><div><ul><li>
+#: /home/runa/tor/website/about/en/overview.wml:18
+msgid "<a href=\"<page about/overview>#overview\">Overview</a>"
+msgstr "<a href=\"<page about/overview>#overview\">آشنایی با تور</a>"
+
+#. type: Content of: <div><div><div><ul><li>
+#: /home/runa/tor/website/about/en/overview.wml:19
+msgid "<a href=\"<page about/overview>#whyweneedtor\">Why we need Tor</a>"
+msgstr "<a href=\"<page about/overview>#whyweneedtor\">چرا به تور نياز داريم؟</a>"
+
+#. type: Content of: <div><div><div><ul><li>
+#: /home/runa/tor/website/about/en/overview.wml:20
+msgid "<a href=\"<page about/overview>#thesolution\">The Solution</a>"
+msgstr "<a href=\"<page about/overview>#thesolution\">راه حل</a>"
+
+#. type: Content of: <div><div><div><ul><li>
+#: /home/runa/tor/website/about/en/overview.wml:21
+msgid "<a href=\"<page about/overview>#hiddenservices\">Hidden services</a>"
+msgstr "<a href=\"<page about/overview>#hiddenservices\">خدمات پنهان</a>"
+
+#. type: Content of: <div><div><div><ul><li>
+#: /home/runa/tor/website/about/en/overview.wml:22
+msgid "<a href=\"<page about/overview>#stayinganonymous\">Staying anonymous</a>"
+msgstr "<a href=\"<page about/overview>#stayinganonymous\">ناشناس باقی ماندن</a>"
+
+#. type: Content of: <div><div><div><ul><li>
+#: /home/runa/tor/website/about/en/overview.wml:23
+msgid "<a href=\"<page about/overview>#thefutureoftor\">The future of Tor</a>"
+msgstr "<a href=\"<page about/overview>#thefutureoftor\">آینده تور</a>"
+
+#.  END SIDEBAR
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/about/en/overview.wml:28
+msgid "<hr>"
+msgstr "<hr style=\";text-align:right;direction:rtl\">"
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/about/en/overview.wml:31
+msgid ""
+"Tor is a network of virtual tunnels that allows people and groups to improve"
+" their privacy and security on the Internet.  It also enables software "
+"developers to create new communication tools with built-in privacy features."
+"  Tor provides the foundation for a range of applications that allow "
+"organizations and individuals to share information over public networks "
+"without compromising their privacy."
+msgstr ""
+"تور شبکه‌ای است از تونل‌های مجازی که به افراد و گروه‌ها اجازه می‌دهد تا "
+"امنيت و حفاظت از حريم خصوصی خود را در اينترنت تقويت کنند. همچنين تور "
+"تهيه‌کنندگان نرم‌افزار را قادر می‌سازد تا ابزارهای ارتباط جديدی بسازند که "
+"دارای قابليت‌های حفاظت از حريم خصوصی باشند. تور بستری فراهم می‌کند برای "
+"اينکه طيفی از نرم‌افزارهای مختلف به افراد و سازمان‌ها امکان تبادل اطلاعات "
+"روی شبکه‌های عمومی بدهند، بدون اينکه حريم خصوصی‌شان در معرض خطر قرار گيرد."
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/about/en/overview.wml:41
+msgid ""
+"Individuals use Tor to keep websites from tracking them and their family "
+"members, or to connect to news sites, instant messaging services, or the "
+"like when these are blocked by their local Internet providers.  Tor's <a "
+"href=\"<page docs/hidden-services>\">hidden services</a> let users publish "
+"web sites and other services without needing to reveal the location of the "
+"site. Individuals also use Tor for socially sensitive communication: chat "
+"rooms and web forums for rape and abuse survivors, or people with illnesses."
+msgstr ""
+"افراد به دلايل مختلفی از تور استفاده می‌کنند مانند اينکه از رديابی خود و "
+"خانواده‌شان توسط سايت‌ها جلوگيری کنند، به سايت‌های خبری دسترسی پيدا کنند، و "
+"از خدمات پيام‌رسانی اينترنتی و ديگر خدماتی که توسط خدمت‌دهندگان اينرنتی آنها"
+" مسدود شده‌اند استفاده کنند. <a href=\"<page docs/hidden-services>\">خدمات "
+"پنهان</a> تور به کاربران اجازه می‌دهد تا وبسايت يا ديگر خدمات اينترنتی خود "
+"را بدون نياز به فاش کردن مکان خود منتشر کنند. افراد برای ارتباطات حساس "
+"اجتماعی نيز از تور استفاده می‌کنند، مانند اتاق‌های چت و تالارهای گفتگو برای "
+"قربانينان تجاوز و سوء استفاده، و يا افراد دارای بيماری‌های خاص.."
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/about/en/overview.wml:52
+msgid ""
+"Journalists use Tor to communicate more safely with whistleblowers and "
+"dissidents. Non-governmental organizations (NGOs) use Tor to allow their "
+"workers to connect to their home website while they're in a foreign country,"
+" without notifying everybody nearby that they're working with that "
+"organization."
+msgstr ""
+"خبرنگاران از تور برای ارتباط امن تر با معترضين و درزدهندگان اطلاعات محرمانه "
+"استفاده می‌کنند. سازمان‌های غيردولتی (NGO ها) از تور برای ارتباط با کارکنان "
+"خود در کشورهای خارجی استفاده می‌کنند، هنگامی که آن کارکنان نمی‌خواهند ارتباط"
+" خود با آن سازمان را در کشور محل اقامت خود فاش کنند."
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/about/en/overview.wml:60
+msgid ""
+"Groups such as Indymedia recommend Tor for safeguarding their members' "
+"online privacy and security. Activist groups like the Electronic Frontier "
+"Foundation (EFF) recommend Tor as a mechanism for maintaining civil "
+"liberties online. Corporations use Tor as a safe way to conduct competitive "
+"analysis, and to protect sensitive procurement patterns from eavesdroppers. "
+"They also use it to replace traditional VPNs, which reveal the exact amount "
+"and timing of communication. Which locations have employees working late? "
+"Which locations have employees consulting job-hunting websites? Which "
+"research divisions are communicating with the company's patent lawyers?"
+msgstr ""
+"گروه‌هایی مانند Indymedia تور را برای تأمين امنيت و حفظ حريم خصوصی اينترنتی "
+"اعضای خود پيشنهاد می‌کنند. گروه‌های فعالان اجتماعی مانند Electronic Frontier"
+" Foundation (EFF) تور را به عنوان روشی برای حفاظت از آزادی‌های مدنی در "
+"اينترنت پيشنهاد می‌کنند. شرکت‌های تجاری از تور به عنوان روشی امن برای انجام "
+"تحليل رقابتی و نيز حفاظت از اطلاعات حساس مربوط به روش‌های کاری خود استفاده "
+"می‌کنند. همچنين از تور به عنوان جايگزينی برای VPN های سنتی استفاده می‌شود، "
+"چرا که آنها زمان و حجم دقيق ارتباطات را پنهان نمی‌کنند و اطلاعاتی را فاش "
+"می‎‌نمايند مانند اينکه در چه مکان‌هایی کارکنان تا ديروقت کار می‌کنند، در چه "
+"مکان‌هایی کارکنان به سايت‌های کاريابی مراجعه می‌کنند، و کدام بخش‌های "
+"تحقيقاتی شرکت با وکلای متخصص ثبت اختراع تماس دارند."
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/about/en/overview.wml:73
+msgid ""
+"A branch of the U.S. Navy uses Tor for open source intelligence gathering, "
+"and one of its teams used Tor while deployed in the Middle East recently. "
+"Law enforcement uses Tor for visiting or surveilling web sites without "
+"leaving government IP addresses in their web logs, and for security during "
+"sting operations."
+msgstr ""
+"شاخه‌ای از نيروی دريايی ايالات متحده از تور برای جمع‌آوری اطلاعات منبع باز "
+"استفاده می‌کند، و يکی از تيم‌هایش اخيراً در مأموريتی که در خاورميانه داشت از"
+" تور استفاده کرده است. نيروهای پليس و مسئولين تضمين اجرای قانون نيز از تور "
+"برای بازديد و نظارت بر سايت‌ها استفاده می‌کنند بدون اينکه از IP دولتی خارج "
+"شوند، و نيز برای تضمين امنيتشان در حين عمليات نفوذی."
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/about/en/overview.wml:81
+msgid ""
+"The variety of people who use Tor is actually <a "
+"href=\"http://freehaven.net/doc/fc03/econymics.pdf\">part of what makes it "
+"so secure</a>.  Tor hides you among <a href=\"<page about/torusers>\">the "
+"other users on the network</a>, so the more populous and diverse the user "
+"base for Tor is, the more your anonymity will be protected."
+msgstr ""
+"تنوع کسانی که از تور استفاده می‌کنند در واقع  <a "
+"href=\"http://freehaven.net/doc/fc03/econymics.pdf\">يکی از قوت‌هایی است که "
+"باعث ميزان بالای امنيت آن می‌شود</a> . تور شما را در ميان <a href=\"<page "
+"about/torusers>\">ساير کاربران شبکه</a>  پنهان می‌کند، بنابراين هر چقدر "
+"جمعيت کاربران تور بيشتر و متنوع‌تر باشد، از هويت شما بهتر حفاظت می‌شود."
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/about/en/overview.wml:89
+msgid "<a name=\"whyweneedtor\"></a>"
+msgstr "<a name=\"whyweneedtor\"></a>"
+
+#. type: Content of: <div><div><h3>
+#: /home/runa/tor/website/about/en/overview.wml:90
+msgid "<a class=\"anchor\" href=\"#whyweneedtor\">Why we need Tor</a>"
+msgstr "<a class=\"anchor\" href=\"#whyweneedtor\">چرا به تور نياز داريم؟</a>"
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/about/en/overview.wml:93
+msgid ""
+"Using Tor protects you against a common form of Internet surveillance known "
+"as \"traffic analysis.\" Traffic analysis can be used to infer who is "
+"talking to whom over a public network.  Knowing the source and destination "
+"of your Internet traffic allows others to track your behavior and interests."
+"  This can impact your checkbook if, for example, an e-commerce site uses "
+"price discrimination based on your country or institution of origin.  It can"
+" even threaten your job and physical safety by revealing who and where you "
+"are. For example, if you're travelling abroad and you connect to your "
+"employer's computers to check or send mail, you can inadvertently reveal "
+"your national origin and professional affiliation to anyone observing the "
+"network, even if the connection is encrypted."
+msgstr ""
+"استفاده از تور برای حفاظت از شما در مقابل يک نوع رايج از شنود اينترنتی است "
+"که با عنوان «تحليل ترافيک» شناخته می‌شود. تحليل ترافيک می‌تواند برای شناسایی"
+" اينکه چه کسی با چه کسی در يک شبکه عمومی ارتباط دارد، به کار گرفته شود. "
+"دانستن اينکه مبدأ و مقصد ترافيک اينترنتی شما چيست به ديگران اجازه می‌دهد که "
+"رفتار و علايق شما را دنبال کنند. اين موضوع می‌تواند برای شما ضرر مالی داشته "
+"باشد، مثلاً به اين طريق که يک سايت تجارت الکترونيکی می‌تواند بر اساس محل "
+"اقامت شما يا محل استخدامتان قيمت‌های بالاتری را به شما نمايش دهد. علاوه بر "
+"اين، فاش کردن هويت و مکان شما می‌تواند برای امنيت شغلی و فيزيکی شما هم "
+"خطرساز باشد. برای مثال، اگر از يک کشور خارجی به رايانه های سازمانی که در آن "
+"استخدام هستيد وصل شويد تا يک ايميل بفرستيد يا بخوانيد، ممکن است به طور "
+"ناخواسته اطلاعات مربوط به کشور مبدأ و سازمان مطبوع خود را به کسانی که شبکه "
+"را شنود می‌کنند فاش کنيد، حتّی اگر اتصال شما رمزنگاری شده باشد."
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/about/en/overview.wml:108
+msgid ""
+"How does traffic analysis work? Internet data packets have two parts: a data"
+" payload and a header used for routing.  The data payload is whatever is "
+"being sent, whether that's an email message, a web page, or an audio file.  "
+"Even if you encrypt the data payload of your communications, traffic "
+"analysis still reveals a great deal about what you're doing and, possibly, "
+"what you're saying.  That's because it focuses on the header, which "
+"discloses source, destination, size, timing, and so on."
+msgstr ""
+"تحليل ترافيک چگونه کار می‌کند؟ بسته‌های داده‌های اينترنتی دو بخش دارند: يک "
+"ظرفيت ترابری (Payload) و يک سربرگ (Header) که برای مسيريابی استفاده می‌شود. "
+"ظرفيت ترابری شامل محتوای اطلاعاتی است که فرستاده می‌شود، خواه يک ايميل باشد،"
+" يک وبسايت، يا يک فايل صوتی. حتّی اگر اين ظرفيت ترابری در ارتباطات شما "
+"رمزنگاری شده باشد، تحليل ترافيک باز هم اطلاعات زيادی درباره فعاليت شما، و "
+"شايد حتّی محتوای مکالمات شما فاش می‌کند. دليلش اين است که تحليل ترافيک روی "
+"سربرگ بسته‌ها تمرکز می‌کند که شامل مبدأ، مقصد، حجم، زمان‌بندی و ديگر "
+"مشخصه‌های اطلاعات رد و بدل شده می‌باشد."
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/about/en/overview.wml:118
+msgid ""
+"A basic problem for the privacy minded is that the recipient of your "
+"communications can see that you sent it by looking at headers.  So can "
+"authorized intermediaries like Internet service providers, and sometimes "
+"unauthorized intermediaries as well.  A very simple form of traffic analysis"
+" might involve sitting somewhere between sender and recipient on the "
+"network, looking at headers."
+msgstr ""
+"يک مسئله اصلی برای کسانی که نگران حريم خصوصی‌شان هستند اين است که دريافت "
+"کننده ارتباطات شما می‌تواند با نگاه کردن به سربرگ‌ها ببيند که شما آنها را "
+"فرستاده‌ايد. اين کار را واسطه های مجاز مانند خدمات‌دهندگان اينترنتی (ISP ها)"
+" و نيز واسطه‌های غيرمجاز هم می‌توانند انجام دهند. يک نوع ساده از تحليل "
+"ترافيک می‌تواند به اين شکل باشد که شخصی ميان فرستنده و گيرنده در شبکه "
+"می‌نشيند و به سربرگ‌ها نگاه می‌کند."
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/about/en/overview.wml:127
+msgid ""
+"But there are also more powerful kinds of traffic analysis.  Some attackers "
+"spy on multiple parts of the Internet and use sophisticated statistical "
+"techniques to track the communications patterns of many different "
+"organizations and individuals.  Encryption does not help against these "
+"attackers, since it only hides the content of Internet traffic, not the "
+"headers."
+msgstr ""
+"امّا انواع قدرتمندتری از تحليل ترافيک نيز وجود دارد. برخی از حمله کنندگان در"
+" بخش‌های مختلفی از اينترنت به طور همزمان جاسوسی می‌کنند و از روش‌های پيشرفته"
+" آماری برای رديابی الگوهای ارتباطی تعداد زيادی از سازمان‌ها و افراد مختلف "
+"استفاده می‌کنند. رمزنگاری عليه اين گونه حملات کمکی نمی‌کند، چرا که تنها "
+"محتوای اطلاعات رد و بدل شده را پنهان می‌کند و نه سربرگ‌های آن را."
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/about/en/overview.wml:135
+msgid "<a name=\"thesolution\"></a>"
+msgstr "<a name=\"thesolution\"></a>"
+
+#. type: Content of: <div><div><h3>
+#: /home/runa/tor/website/about/en/overview.wml:136
+msgid ""
+"<a class=\"anchor\" href=\"#thesolution\">The solution: a distributed, "
+"anonymous network</a>"
+msgstr ""
+"<a class=\"anchor\" href=\"#thesolution\">راه حل: يک شبکه توزيع شده و "
+"ناشناس</a>"
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/about/en/overview.wml:137
+msgid "<img src=\"$(IMGROOT)/htw1.png\" alt=\"How Tor works\">"
+msgstr "<img src=\"$(IMGROOT)/htw1.png\" alt=\"How Tor works\">"
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/about/en/overview.wml:140
+msgid ""
+"Tor helps to reduce the risks of both simple and sophisticated traffic "
+"analysis by distributing your transactions over several places on the "
+"Internet, so no single point can link you to your destination.  The idea is "
+"similar to using a twisty, hard-to-follow route in order to throw off "
+"somebody who is tailing you &mdash; and then periodically erasing your "
+"footprints.  Instead of taking a direct route from source to destination, "
+"data packets on the Tor network take a random pathway through several relays"
+" that cover your tracks so no observer at any single point can tell where "
+"the data came from or where it's going."
+msgstr ""
+"تور به کاهش خطر تحليل ترافيک (چه ساده و چه پيشرفته) کمک می‌کند به اين ترتيب "
+"که مبادلات شما ميان چندين مکان مختلف در اينترنت توزيع می‌شود، به طوری که هيچ"
+" نقطه ای در اين ميان نتواند ارتباط ميان شما و مقصدتان را تشخيص دهد. اين ايده"
+" شبيه به اين است که از يک مسير پر پيچ و خم و گيج کننده حرکت کنيد و هر از "
+"گاهی ردپای خود را پاک کنيد تا کسی که دنبال شما افتاده است راه را گم کند. "
+"بسته‌های داده در شبکه تور به جای اينکه مستقيم از مبدأ به مقصد بروند، يک مسير"
+" نامعين تصادفی از ميان چندين بازپخش کننده (relay) را طی می‌کنند که ردپای شما"
+" را پنهان کرده به طوری که هيچ مشاهده کننده‌ای از يک نقطه شبکه نتواند تشخيص "
+"دهد که داده‌ها از کجا آمده و به کجا می‌روند."
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/about/en/overview.wml:152
+msgid ""
+"To create a private network pathway with Tor, the user's software or client "
+"incrementally builds a circuit of encrypted connections through relays on "
+"the network.  The circuit is extended one hop at a time, and each relay "
+"along the way knows only which relay gave it data and which relay it is "
+"giving data to.  No individual relay ever knows the complete path that a "
+"data packet has taken.  The client negotiates a separate set of encryption "
+"keys for each hop along the circuit to ensure that each hop can't trace "
+"these connections as they pass through."
+msgstr ""
+"برای ايجاد يک مسير حرکت اختصاصی با تور، نرم‌افزار مورد استفاده کاربر، قدم به"
+" قدم مداری می‌سازد از اتصالات رمزنگاری شده ميان بازپخش کننده‌های موجود در "
+"شبکه. اين مدار در هر قدم تنها يک اتصال را اضافه می‌کند، به طوری که هر بازپخش"
+" کننده در ميان راه فقط می‌داند که بازپخش کننده قبل از خود و بعد از خود "
+"کدام‌ها هستند. به اين ترتيب هيچ بازپخش کننده‌ای نمی‌داند که مسير کامل "
+"داده‌های دريافتی‌اش از مبدأ اوليه تا مقصد نهایی چيست. نرم‌افزار مورد استفاده"
+" کاربر در هر قدم کليد رمزنگاری جداگانه‌ای را برای هر اتصال در مدار تعيين "
+"می‌کند تا اطمينان حاصل شود که در هيچ قدمی مسير قبلی اتصالات قابل رديابی "
+"نيست."
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/about/en/overview.wml:162
+msgid "<img alt=\"Tor circuit step two\" src=\"$(IMGROOT)/htw2.png\">"
+msgstr "<img alt=\"Tor circuit step two\" src=\"$(IMGROOT)/htw2.png\">"
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/about/en/overview.wml:165
+msgid ""
+"Once a circuit has been established, many kinds of data can be exchanged and"
+" several different sorts of software applications can be deployed over the "
+"Tor network.  Because each relay sees no more than one hop in the circuit, "
+"neither an eavesdropper nor a compromised relay can use traffic analysis to "
+"link the connection's source and destination.  Tor only works for TCP "
+"streams and can be used by any application with SOCKS support."
+msgstr ""
+"پس از برقراری مدار، انواع مختلفی از داده می‌تواند مبادله شود و چند نوع "
+"نرم‌افزار کاربردی می‌توانند در شبکه تور به کار گرفته شوند. از آنجا که هر "
+"بازپخش کننده تنها يک قدم از مسير مدار را می‌بيند، نه يک شنود کننده و نه يک "
+"بازپخش کننده نفوذی، هيچ يک نمی‌توانند با استفاده از تحليل ترافيک مبدأ و مقصد"
+" مبادله را به هم وصل کنند. تور فقط برای جريان‌های TCP کار می‌کند و می‌تواند "
+"توسط هر نرم‌افزاری که از SOCKS پشتيبانی می‌کند به کار گرفته شود."
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/about/en/overview.wml:175
+msgid ""
+"For efficiency, the Tor software uses the same circuit for connections that "
+"happen within the same ten minutes or so.  Later requests are given a new "
+"circuit, to keep people from linking your earlier actions to the new ones."
+msgstr ""
+"برای کارایی بيشتر، در صورتی که فاصله ميان دو مورد تبادل اطلاعات کمتر از حدود"
+" ده دقيقه باشد، نرم‌افزار تور از همان مدار قبلی استفاده می‌کند. در غير اين "
+"صورت مدار جديدی تهيه خواهد شد تا کسی نتواند ارتباط ميان فعاليت‌های قبلی شما "
+"با فعاليت جديدتان را تشخيص دهد."
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/about/en/overview.wml:181
+msgid "<img alt=\"Tor circuit step three\" src=\"$(IMGROOT)/htw3.png\">"
+msgstr "<img alt=\"Tor circuit step three\" src=\"$(IMGROOT)/htw3.png\">"
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/about/en/overview.wml:184
+msgid "<a name=\"hiddenservices\"></a>"
+msgstr "<a name=\"hiddenservices\"></a>"
+
+#. type: Content of: <div><div><h3>
+#: /home/runa/tor/website/about/en/overview.wml:185
+msgid "<a class=\"anchor\" href=\"#hiddenservices\">Hidden services</a>"
+msgstr "<a class=\"anchor\" href=\"#hiddenservices\">خدمات پنهان</a>"
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/about/en/overview.wml:188
+msgid ""
+"Tor also makes it possible for users to hide their locations while offering "
+"various kinds of services, such as web publishing or an instant messaging "
+"server.  Using Tor \"rendezvous points,\" other Tor users can connect to "
+"these hidden services, each without knowing the other's network identity.  "
+"This hidden service functionality could allow Tor users to set up a website "
+"where people publish material without worrying about censorship.  Nobody "
+"would be able to determine who was offering the site, and nobody who offered"
+" the site would know who was posting to it.  Learn more about <a "
+"href=\"<page docs/tor-hidden-service>\">configuring hidden services</a> and "
+"how the <a href=\"<page docs/hidden-services>\">hidden service protocol</a> "
+"works."
+msgstr ""
+"تور امکان پنهان‌سازی مکان را همراه با  ارائه انواع خدمات فراهم می‌کند، از "
+"جمله انتشار سايت‌ و يا پيام‌رسانی اينترنتی. با استفاده از يک سری «نقطه "
+"ملاقات» ساير کاربران تور می‌توانند به اين خدمات پنهان وصل شوند، بدون اينکه "
+"هيچ کدام از هويت ديگری در شبکه آگاه باشند. اين کارکرد خدمات پنهان می‌تواند "
+"به کاربران تور امکان دهد تا سايت‌هایی راه‌اندازی کنند که افراد بتوانند در "
+"آنها مطالب خود را منتشر کنند، بدون اينکه نگران سانسور باشند. در چنين شرايطی "
+"هيچ کس نمی‌تواند تشخيص دهد که چه کسی سايت را راه‌اندازی کرده است، و هيچ کسی "
+"که چنين سايتی راه‌اندای کند نمی‌تواند تشخيص دهد که چه کسانی در آن مطلب قرار "
+"می‌دهند. می‌توانيد درباره <a href=\"<page docs/tor-hidden-service>\">تنظيم "
+"خدمات پنهان</a>  و اينکه <a href=\"<page docs/hidden-services>\">پروتکل "
+"خدمات پنهان</a>  چگونه کار می‌کند اطلاعات بيشتری کسب کنيد."
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/about/en/overview.wml:201
+msgid "<a name=\"stayinganonymous\"></a>"
+msgstr "<a name=\"stayinganonymous\"></a>"
+
+#. type: Content of: <div><div><h3>
+#: /home/runa/tor/website/about/en/overview.wml:202
+msgid "<a class=\"anchor\" href=\"#stayinganonymous\">Staying anonymous</a>"
+msgstr "<a class=\"anchor\" href=\"#stayinganonymous\">ناشناس باقی ماندن</a>"
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/about/en/overview.wml:205
+msgid ""
+"Tor can't solve all anonymity problems.  It focuses only on protecting the "
+"transport of data.  You need to use protocol-specific support software if "
+"you don't want the sites you visit to see your identifying information. For "
+"example, you can use web proxies such as Privoxy while web browsing to block"
+" cookies and withhold information about your browser type."
+msgstr ""
+"تور نمی‌تواند تمام مشکلات مربوط به بی‌نامی را حل کند و فقط روی حفاظت از "
+"انتقال اطلاعات تمرکز می‌کند. اگر نمی‌خواهيد سايت‌های مورد بازديدتان بتوانند "
+"اطلاعات شناسایی شما را ببينند، بايد از نرم‌افزارهای پشتيبان مخصوص پروتکل‌های"
+" مختلف استفاده کنيد. برای مثال، می‌توانيد هنگام مرورگری از پراکسی (proxy) "
+"های اينترنتی مانند Privoxy برای جلوگيری از کلوچک (Cookie) ها و درز اطلاعات "
+"مربوط به نوع مرورگر خود استفاده کنيد."
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/about/en/overview.wml:214
+msgid ""
+"Also, to protect your anonymity, be smart.  Don't provide your name or other"
+" revealing information in web forms.  Be aware that, like all anonymizing "
+"networks that are fast enough for web browsing, Tor does not provide "
+"protection against end-to-end timing attacks: If your attacker can watch the"
+" traffic coming out of your computer, and also the traffic arriving at your "
+"chosen destination, he can use statistical analysis to discover that they "
+"are part of the same circuit."
+msgstr ""
+"علاوه بر اين برای حفاظت از ناشناسی خود هوشمندانه عمل کنيد. نام و ساير "
+"اطلاعات شناسایی خودتان را در فرم‌های اينترنتی ننويسيد. مراقب باشيد که مانند "
+"ساير شبکه‌های بی‌نام کننده‌ای که برای مرورگری اينترنت سرعت کافی دارند، تور "
+"شما را در مقابل حملات زمانبندی شده پايانه به پايانه (end-to-end) محافظت "
+"نمی‌کند. به اين معنی که اگر حمله کننده بتواند ترافيک خروجی از رايانه شما را "
+"مشاهده کند، و ترافيک ورودی به مقصد انتخابی‌تان را نيز تحت نظارت داشته باشد، "
+"می‌تواند با تحليل آماری تشخيص دهد که هر دو عضو يک مدار هستند."
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/about/en/overview.wml:223
+msgid "<a name=\"thefutureoftor\"></a>"
+msgstr "<a name=\"thefutureoftor\"></a>"
+
+#. type: Content of: <div><div><h3>
+#: /home/runa/tor/website/about/en/overview.wml:224
+msgid "<a class=\"anchor\" href=\"#thefutureoftor\">The future of Tor</a>"
+msgstr "<a class=\"anchor\" href=\"#thefutureoftor\">آینده تور</a>"
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/about/en/overview.wml:227
+msgid ""
+"Providing a usable anonymizing network on the Internet today is an ongoing "
+"challenge. We want software that meets users' needs. We also want to keep "
+"the network up and running in a way that handles as many users as possible. "
+"Security and usability don't have to be at odds: As Tor's usability "
+"increases, it will attract more users, which will increase the possible "
+"sources and destinations of each communication, thus increasing security for"
+" everyone.  We're making progress, but we need your help.  Please consider "
+"<a href=\"<page docs/tor-doc-relay>\">running a relay</a> or <a href=\"<page"
+" getinvolved/volunteer>\">volunteering</a> as a <a href=\"<page "
+"docs/documentation>#Developers\">developer</a>."
+msgstr ""
+"امروزه ارائه يک شبکه ناشناس‌گر قابل استفاده در اينترنت چالش ادامه‌داری است. "
+"ما نرم‌افزاری می‌خواهيم که نيازهای کاربران را براورده کند. همچنين می‌خواهيم "
+"شبکه را صحيح و سالم در حالت فعال نگه داريم، به طوری که تعداد کاربران را "
+"بتوان تا حد ممکن بالا برد. نيازی نيست امنيت و استفاده‌پذيری با هم در تضاد "
+"باشند: هر چقدر استفاده‌پذيری تور بالا برود، تعداد بيشتری از کاربران را جذب "
+"خواهد کرد، و در نتيجه تعداد مبدأ و مقصد ممکن برای هر مبادله اطلاعات بالاتر "
+"می‌رود، که امنيت همه کاربران را بالاتر می‌برد. ما در حال پيشرفت هستيم، ولی "
+"به کمک شما نياز داريم. لطفاً در نظر بگيريد که می‌توانيد <a href=\"<page docs"
+"/tor-doc-relay>\">يک بازپخش کننده به اجرا بگذاريد</a>  و يا به عنوان يک <a "
+"href=\"<page docs/documentation>#Developers\">برنامه‌نويس</a>  برای کمک  <a "
+"href=\"<page getinvolved/volunteer>\">داوطلب</a>  شويد. "
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/about/en/overview.wml:241
+msgid ""
+"Ongoing trends in law, policy, and technology threaten anonymity as never "
+"before, undermining our ability to speak and read freely online. These "
+"trends also undermine national security and critical infrastructure by "
+"making communication among individuals, organizations, corporations, and "
+"governments more vulnerable to analysis. Each new user and relay provides "
+"additional diversity, enhancing Tor's ability to put control over your "
+"security and privacy back into your hands."
+msgstr ""
+"روندهای امروزی در حقوق، سياست‌گذاری، و فناوری باعث شده‌اند تا ناشناس ماندن و"
+" محافظت از هويت اينترنتی بيش از هر زمان ديگری تحت تهديد قرار گرفته و توانایی"
+" خواندن و حرف زدن آزاد در معرض خطر باشد. اين روندها امنيت ملی و زيرساخت‌های "
+"حياتی را نيز تهديد می‌کنند چرا که ارتباطات ميان افراد، سازمان‌ها، شرکت‌ها و "
+"دولت‌ها بيشتر در مقابل تحليل ترافيک آسيب‌پذير می‌شوند. هر کاربر و "
+"بازپخش‌کننده جديد، تنوع بيشتری با خود می‌آورد و تور را بيشتر قادر می‌سازد تا"
+" کنترل امنيت و حريم خصوصی شما را به خودتان برگرداند."

Added: translation/trunk/projects/website/po/fa/about/2-medium.torusers.po
===================================================================
--- translation/trunk/projects/website/po/fa/about/2-medium.torusers.po	                        (rev 0)
+++ translation/trunk/projects/website/po/fa/about/2-medium.torusers.po	2011-04-12 16:19:31 UTC (rev 24595)
@@ -0,0 +1,616 @@
+# 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.
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
+"POT-Creation-Date: 2010-12-05 19:13+0000\n"
+"PO-Revision-Date: 2011-04-12 16:10+0000\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"
+"Language: fa\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/about/en/torusers.wml:9
+msgid ""
+"<a href=\"<page index>\">Home &raquo; </a> <a href=\"<page "
+"about/overview>\">About &raquo; </a> <a href=\"<page about/torusers>\">Who "
+"Uses Tor</a>"
+msgstr ""
+
+#. type: Content of: <div><div><h1>
+#: /home/runa/tor/website/about/en/torusers.wml:15
+msgid "Inception"
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/about/en/torusers.wml:16 /tmp/AfVA5b24NV.xml:31
+#: /tmp/AfVA5b24NV.xml:63 /tmp/AfVA5b24NV.xml:91 /tmp/AfVA5b24NV.xml:116
+#: /tmp/AfVA5b24NV.xml:143 /tmp/AfVA5b24NV.xml:210 /tmp/AfVA5b24NV.xml:242
+#: /tmp/AfVA5b24NV.xml:279 /tmp/AfVA5b24NV.xml:291
+msgid "<hr>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/about/en/torusers.wml:18
+msgid ""
+"Tor was originally designed, implemented, and deployed as a third-generation"
+" <a href=\"http://www.onion-router.net/\">onion routing project of the Naval"
+" Research Laboratory</a>.  It was originally developed with the U.S. Navy in"
+" mind, for the primary purpose of protecting government communications.  "
+"Today, it is used every day for a wide variety of purposes by the military, "
+"journalists, law enforcement officers, activists, and many others. Here are "
+"some of the specific uses we've seen or recommend."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/about/en/torusers.wml:28
+msgid ""
+"<a name=\"normalusers\"></a> <img src=\"$(IMGROOT)/family.jpg\" alt=\"Normal"
+" People\">"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/about/en/torusers.wml:30
+msgid "<a class=\"anchor\" href=\"#normalusers\">Normal people use Tor</a>"
+msgstr ""
+
+#. type: Content of: <div><div><ul><li>
+#: /home/runa/tor/website/about/en/torusers.wml:33
+msgid ""
+"<strong>They protect their privacy from unscrupulous marketers and identity "
+"thieves.</strong> Internet Service Providers (ISPs) <a "
+"href=\"http://seekingalpha.com/article/29449-compete-ceo-isps-sell-"
+"clickstreams-for-5-a-month\"> sell your Internet browsing records</a> to "
+"marketers or anyone else willing to pay for it. ISPs typically say that they"
+" anonymize the data by not providing personally identifiable information, "
+"but <a "
+"href=\"http://www.wired.com/politics/security/news/2006/08/71579?currentPage=all\">this"
+" has proven incorrect</a>.  A full record of every site you visit, the text "
+"of every search you perform, and potentially userid and even password "
+"information can still be part of this data.  In addition to your ISP, the "
+"websites (<a href=\"http://www.google.com/privacy_faq.html\">and search "
+"engines</a>) you visit have their own logs, containing the same or more "
+"information."
+msgstr ""
+
+#. type: Content of: <div><div><ul><li>
+#: /home/runa/tor/website/about/en/torusers.wml:42
+msgid ""
+"<strong> They protect their communications from irresponsible "
+"corporations.</strong> All over the Internet, Tor is being recommended to "
+"people newly concerned about their privacy in the face of increasing "
+"breaches and betrayals of private data. From <a "
+"href=\"http://www.securityfocus.com/news/11048\">lost backup tapes</a>, to "
+"<a "
+"href=\"http://www.nytimes.com/2006/08/09/technology/09aol.html?ex=1312776000&amp;en=f6f61949c6da4d38&amp;ei=5090\">giving"
+" away the data to researchers</a>, your data is often not well protected by "
+"those you are supposed to trust to keep it safe."
+msgstr ""
+
+#. type: Content of: <div><div><ul><li>
+#: /home/runa/tor/website/about/en/torusers.wml:48
+msgid ""
+"<strong>They protect their children online.</strong> You've told your kids "
+"they shouldn't share personally identifying information online, but they may"
+" be sharing their location simply by not concealing their IP address. "
+"Increasingly, IP addresses can be <a "
+"href=\"http://whatismyipaddress.com/\">literally mapped to a city or even "
+"street location</a>, and can <a href=\"http://whatsmyip.org/more/\">reveal "
+"other information</a> about how you are connecting to the Internet.  In the "
+"United States, the government is pushing to make this mapping increasingly "
+"precise."
+msgstr ""
+
+#. type: Content of: <div><div><ul><li>
+#: /home/runa/tor/website/about/en/torusers.wml:53
+msgid ""
+"<strong>They research sensitive topics.</strong> There's a wealth of "
+"information available online. But perhaps in your country, access to "
+"information on AIDS, birth control, <a "
+"href=\"http://www.cbsnews.com/stories/2002/12/03/tech/main531567.shtml\">Tibetan"
+" culture</a>, or world religions is behind a national firewall."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/about/en/torusers.wml:60
+msgid ""
+"<a name=\"military\"></a> <img src=\"$(IMGROOT)/military.jpg\" "
+"alt=\"Military and Law Enforcement\">"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/about/en/torusers.wml:62
+msgid "<a class=\"anchor\" href=\"#military\">Militaries use Tor</a>"
+msgstr ""
+
+#. type: Content of: <div><div><ul><li>
+#: /home/runa/tor/website/about/en/torusers.wml:67
+msgid ""
+"<strong>Field agents:</strong> It is not difficult for insurgents to monitor"
+" Internet traffic and discover all the hotels and other locations from which"
+" people are connecting to known military servers.  Military field agents "
+"deployed away from home use Tor to mask the sites they are visiting, "
+"protecting military interests and operations, as well as protecting "
+"themselves from physical harm."
+msgstr ""
+
+#. type: Content of: <div><div><ul><li>
+#: /home/runa/tor/website/about/en/torusers.wml:76
+msgid ""
+"<strong>Hidden services:</strong> When the Internet was designed by DARPA, "
+"its primary purpose was to be able to facilitate distributed, robust "
+"communications in case of local strikes.  However, some functions must be "
+"centralized, such as command and control sites.  It's the nature of the "
+"Internet protocols to reveal the geographic location of any server that is "
+"reachable online.  Tor's hidden services capacity allows military command "
+"and control to be physically secure from discovery and takedown."
+msgstr ""
+
+#. type: Content of: <div><div><ul><li>
+#: /home/runa/tor/website/about/en/torusers.wml:82
+msgid ""
+"<strong>Intelligence gathering:</strong> Military personnel need to use "
+"electronic resources run and monitored by insurgents. They do not want the "
+"webserver logs on an insurgent website to record a military address, thereby"
+" revealing the surveillance."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/about/en/torusers.wml:88
+msgid ""
+"<a name=\"journalist\"></a> <img src=\"$(IMGROOT)/media.jpg\" "
+"alt=\"Journalists and the Media\">"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/about/en/torusers.wml:90
+msgid ""
+"<a class=\"anchor\" href=\"#journalist\">Journalists and their audience use "
+"Tor</a>"
+msgstr ""
+
+#. type: Content of: <div><div><ul><li>
+#: /home/runa/tor/website/about/en/torusers.wml:93
+msgid ""
+"<strong><a href=\"http://www.rsf.org/\">Reporters without "
+"Borders</a></strong> tracks Internet prisoners of conscience and jailed or "
+"harmed journalists all over the world. They advise journalists, sources, "
+"bloggers, and dissidents to use Tor to ensure their privacy and safety."
+msgstr ""
+
+#. type: Content of: <div><div><ul><li>
+#: /home/runa/tor/website/about/en/torusers.wml:97
+msgid ""
+"<strong>The US <a href=\"http://www.ibb.gov/\">International Broadcasting "
+"Bureau</a></strong> (Voice of America/Radio Free Europe/Radio Free Asia) "
+"supports Tor development to help Internet users in countries without safe "
+"access to free media.  Tor preserves the ability of persons behind national "
+"firewalls or under the surveillance of repressive regimes to obtain a global"
+" perspective on controversial topics including democracy, economics and "
+"religion."
+msgstr ""
+
+#. type: Content of: <div><div><ul><li>
+#: /home/runa/tor/website/about/en/torusers.wml:103
+msgid ""
+"<strong>Citizen journalists in China</strong> use Tor to write about local "
+"events to encourage social change and political reform."
+msgstr ""
+
+#. type: Content of: <div><div><ul><li>
+#: /home/runa/tor/website/about/en/torusers.wml:106
+msgid ""
+"<strong>Citizens and journalists in <a "
+"href=\"http://www.rsf.org/rubrique.php3?id_rubrique=554\">Internet black "
+"holes</a></strong> use Tor to research state propaganda and opposing "
+"viewpoints, to file stories with non-State controlled media, and to avoid "
+"risking the personal consequences of intellectual curiosity."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/about/en/torusers.wml:114
+msgid "<a name=\"lawenforcement\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/about/en/torusers.wml:115
+msgid ""
+"<a class=\"anchor\" href=\"#lawenforcement\">Law enforcement officers use "
+"Tor</a>"
+msgstr ""
+
+#. type: Content of: <div><div><ul><li>
+#: /home/runa/tor/website/about/en/torusers.wml:118
+msgid ""
+"<strong>Online surveillance:</strong> Tor allows officials to surf "
+"questionable web sites and services without leaving tell-tale tracks.  If "
+"the system administrator of an illegal gambling site, for example, were to "
+"see multiple connections from government or law enforcement IP addresses in "
+"usage logs, investigations may be hampered."
+msgstr ""
+
+#. type: Content of: <div><div><ul><li>
+#: /home/runa/tor/website/about/en/torusers.wml:125
+msgid ""
+"<strong>Sting operations:</strong> Similarly, anonymity allows law officers "
+"to engage in online &ldquo;undercover &rdquo; operations.  Regardless of how"
+" good an undercover officer's &ldquo;street cred&rdquo; may be, if the "
+"communications include IP ranges from police addresses, the cover is blown."
+msgstr ""
+
+#. type: Content of: <div><div><ul><li>
+#: /home/runa/tor/website/about/en/torusers.wml:131
+msgid ""
+"<strong>Truly anonymous tip lines:</strong> While online anonymous tip lines"
+" are popular, without anonymity software, they are far less useful.  "
+"Sophisticated sources understand that although a name or email address is "
+"not attached to information, server logs can identify them very quickly.  As"
+" a result, tip line web sites that do not encourage anonymity are limiting "
+"the sources of their tips."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/about/en/torusers.wml:140
+msgid ""
+"<a name=\"activists\"></a> <img src=\"$(IMGROOT)/activists.jpg\" "
+"alt=\"Activists &amp; Whistleblowers\">"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/about/en/torusers.wml:142
+msgid ""
+"<a class=\"anchor\" href=\"#activists\">Activists &amp; Whistleblowers use "
+"Tor</a>"
+msgstr ""
+
+#. type: Content of: <div><div><ul><li>
+#: /home/runa/tor/website/about/en/torusers.wml:145
+msgid ""
+"<strong>Human rights activists use Tor to anonymously report abuses from "
+"danger zones.</strong> Internationally, labor rights workers use Tor and "
+"other forms of online and offline anonymity to organize workers in "
+"accordance with the Universal Declaration of Human Rights. Even though they "
+"are within the law, it does not mean they are safe. Tor provides the ability"
+" to avoid persecution while still raising a voice."
+msgstr ""
+
+#. type: Content of: <div><div><ul><li>
+#: /home/runa/tor/website/about/en/torusers.wml:152
+msgid ""
+"When groups such as the <strong>Friends Service Committee and environmental "
+"groups are increasingly <a href=\"http://www.afsc.org/news/2005/government-"
+"spying.htm\">falling under surveillance</a> in the United States</strong> "
+"under laws meant to protect against terrorism, many peaceful agents of "
+"change rely on Tor for basic privacy during legitimate activities."
+msgstr ""
+
+#. type: Content of: <div><div><ul><li>
+#: /home/runa/tor/website/about/en/torusers.wml:157
+msgid ""
+"<strong><a href=\"http://hrw.org/doc/?t=internet\">Human Rights "
+"Watch</a></strong> recommends Tor in their report, &ldquo; <a "
+"href=\"http://www.hrw.org/reports/2006/china0806/\">Race to the Bottom: "
+"Corporate Complicity in Chinese Internet Censorship</a>.&rdquo; The study "
+"co-author interviewed Roger Dingledine, Tor project leader, on Tor use.  "
+"They cover Tor in the section on how to breach the <a "
+"href=\"http://www.hrw.org/reports/2006/china0806/3.htm#_Toc142395820\">&ldquo;Great"
+" Firewall of China,&rdquo;</a> and recommend that human rights workers "
+"throughout the globe use Tor for &ldquo;secure browsing and "
+"communications.&rdquo;"
+msgstr ""
+
+#. type: Content of: <div><div><ul><li>
+#: /home/runa/tor/website/about/en/torusers.wml:167
+msgid ""
+"Tor has consulted with and volunteered help to <strong>Amnesty "
+"International's recent <a href=\"http://irrepressible.info/\">corporate "
+"responsibility campaign</a></strong>.  See also their <a "
+"href=\"http://irrepressible.info/static/pdf/FOE-in-"
+"china-2006-lores.pdf\">full report</a> on China Internet issues."
+msgstr ""
+
+#. type: Content of: <div><div><ul><li>
+#: /home/runa/tor/website/about/en/torusers.wml:172
+msgid ""
+"<a href=\"http://www.globalvoicesonline.org\">Global Voices</a> recommends "
+"Tor, especially for <strong>anonymous blogging</strong>, throughout their <a"
+" href=\"http://advocacy.globalvoicesonline.org/projects/guide/\"> web "
+"site.</a>"
+msgstr ""
+
+#. type: Content of: <div><div><ul><li>
+#: /home/runa/tor/website/about/en/torusers.wml:177
+msgid ""
+"In the US, the Supreme Court recently stripped legal protections from "
+"government whistleblowers.  But whistleblowers working for governmental "
+"transparency or corporate accountability can use Tor to seek justice without"
+" personal repercussions."
+msgstr ""
+
+#. type: Content of: <div><div><ul><li>
+#: /home/runa/tor/website/about/en/torusers.wml:182
+msgid ""
+"A contact of ours who works with a public health nonprofit in Africa reports"
+" that his nonprofit <strong>must budget 10% to cover various sorts of "
+"corruption</strong>, mostly bribes and such.  When that percentage rises "
+"steeply, not only can they not afford the money, but they can not afford to "
+"complain &mdash; this is the point at which open objection can become "
+"dangerous.  So his nonprofit has been working to <strong>use Tor to safely "
+"whistleblow on government corruption</strong> in order to continue their "
+"work."
+msgstr ""
+
+#. type: Content of: <div><div><ul><li>
+#: /home/runa/tor/website/about/en/torusers.wml:189
+msgid ""
+"At a recent conference, a Tor staffer ran into a woman who came from a "
+"&ldquo;company town&rdquo; in the eastern United States. She was attempting "
+"to blog anonymously to rally local residents to <strong>urge reform in the "
+"company</strong> that dominated the town's economic and government affairs. "
+"She is fully cognizant that the kind of organizing she was doing "
+"<strong>could lead to harm or &ldquo;fatal accidents.&rdquo;</strong>"
+msgstr ""
+
+#. type: Content of: <div><div><ul><li>
+#: /home/runa/tor/website/about/en/torusers.wml:196
+msgid ""
+"In east Asia, some labor organizers use anonymity to <strong>reveal "
+"information regarding sweatshops</strong> that produce goods for western "
+"countries and to organize local labor."
+msgstr ""
+
+#. type: Content of: <div><div><ul><li>
+#: /home/runa/tor/website/about/en/torusers.wml:201
+msgid ""
+"Tor can help activists avoid government or corporate censorship that hinders"
+" organization.  In one such case, a <a "
+"href=\"http://www.cbc.ca/canada/story/2005/07/24/telus-"
+"sites050724.html\">Canadian ISP blocked access to a union website used by "
+"their own employees</a> to help organize a strike."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/about/en/torusers.wml:208
+msgid "<a name=\"spotlight\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/about/en/torusers.wml:209
+msgid ""
+"<a class=\"anchor\" href=\"#spotlight\">High &amp; low profile people use "
+"Tor</a>"
+msgstr ""
+
+#. type: Content of: <div><div><ul><li>
+#: /home/runa/tor/website/about/en/torusers.wml:212
+msgid ""
+"Does being in the public spotlight shut you off from having a private life, "
+"forever, online? A rural lawyer in a New England state keeps an anonymous "
+"blog because, with the diverse clientele at his prestigious law firm, "
+"<strong>his political beliefs are bound to offend someone</strong>.  Yet, he"
+" doesn't want to remain silent on issues he cares about.  Tor helps him feel"
+" secure that he can express his opinion without consequences to his public "
+"role."
+msgstr ""
+
+#. type: Content of: <div><div><ul><li>
+#: /home/runa/tor/website/about/en/torusers.wml:220
+msgid ""
+"People living in poverty often don't participate fully in civil society -- "
+"not out of ignorance or apathy, but out of fear.  If something you write "
+"were to get back to your boss, would you lose your job? If your social "
+"worker read about your opinion of the system, would she treat you "
+"differently? Anonymity gives a voice to the voiceless.  To support this, "
+"<strong>Tor currently has an open Americorps/VISTA position</strong> "
+"pending.  This government grant will cover a full time stipend for a "
+"volunteer to create curricula to <strong>show low-income populations how to "
+"use anonymity online for safer civic engagement</strong>.  Although it's "
+"often said that the poor do not use online access for civic engagement, "
+"failing to act in their self-interests, it is our hypothesis (based on "
+"personal conversations and anecdotal information) that it is precisely the "
+"&ldquo;permanent record &rdquo; left online that keeps many of the poor from"
+" speaking out on the Internet.  We hope to show people how to engage more "
+"safely online, and then at the end of the year, evaluate how online and "
+"offline civic engagement has changed, and how the population sees this "
+"continuing into the future."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/about/en/torusers.wml:239
+msgid ""
+"<a name=\"executives\"></a> <img src=\"$(IMGROOT)/consumers.jpg\" "
+"alt=\"Businesses\">"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/about/en/torusers.wml:241
+msgid "<a class=\"anchor\" href=\"#executives\">Business executives use Tor</a>"
+msgstr ""
+
+#. type: Content of: <div><div><ul><li>
+#: /home/runa/tor/website/about/en/torusers.wml:244
+msgid ""
+"<strong>Security breach information clearinghouses:</strong> Say a financial"
+" institution participates in a security clearinghouse of information on "
+"Internet attacks.  Such a repository requires members to report breaches to "
+"a central group, who correlates attacks to detect coordinated patterns and "
+"send out alerts.  But if a specific bank in St. Louis is breached, they "
+"don't want an attacker watching the incoming traffic to such a repository to"
+" be able to track where information is coming from.  Even though every "
+"packet were encrypted, the IP address would betray the location of a "
+"compromised system.  Tor allows such repositories of sensitive information "
+"to resist compromises."
+msgstr ""
+
+#. type: Content of: <div><div><ul><li>
+#: /home/runa/tor/website/about/en/torusers.wml:254
+msgid ""
+"<strong>Seeing your competition as your market does:</strong> If you try to "
+"check out a competitor's pricing, you may find no information or misleading "
+"information on their web site.  This is because their web server may be "
+"keyed to detect connections from competitors, and block or spread "
+"disinformation to your staff.  Tor allows a business to view their sector as"
+" the general public would view it."
+msgstr ""
+
+#. type: Content of: <div><div><ul><li>
+#: /home/runa/tor/website/about/en/torusers.wml:261
+msgid ""
+"<strong>Keeping strategies confidential:</strong> An investment bank, for "
+"example, might not want industry snoopers to be able to track what web sites"
+" their analysts are watching.  The strategic importance of traffic patterns,"
+" and the vulnerability of the surveillance of such data, is starting to be "
+"more widely recognized in several areas of the business world."
+msgstr ""
+
+#. type: Content of: <div><div><ul><li>
+#: /home/runa/tor/website/about/en/torusers.wml:268
+msgid ""
+"<strong>Accountability:</strong> In an age when irresponsible and unreported"
+" corporate activity has undermined multi-billion dollar businesses, an "
+"executive exercising true stewardship wants the whole staff to feel free to "
+"disclose internal malfeasance.  Tor facilitates internal accountability "
+"before it turns into whistleblowing."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/about/en/torusers.wml:277
+msgid "<a name=\"bloggers\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/about/en/torusers.wml:278
+msgid "<a class=\"anchor\" href=\"#bloggers\">Bloggers use Tor</a>"
+msgstr ""
+
+#. type: Content of: <div><div><ul><li>
+#: /home/runa/tor/website/about/en/torusers.wml:281
+msgid ""
+"Frequently we hear about bloggers who are <a "
+"href=\"http://online.wsj.com/public/article/SB112541909221726743-Kl4kLxv0wSbjqrkXg_DieY3c8lg_20050930.html\">sued</a>"
+" or <a href=\"http://www.usatoday.com/money/workplace/2005-06-14-worker-"
+"blogs-usat_x.htm\">fired</a> for saying perfectly legal things online, in "
+"their blog."
+msgstr ""
+
+#. type: Content of: <div><div><ul><li>
+#: /home/runa/tor/website/about/en/torusers.wml:285
+msgid ""
+"We recommend the <a href=\"http://www.eff.org/issues/bloggers/legal\">EFF "
+"Legal Guide for Bloggers</a>."
+msgstr ""
+
+#. type: Content of: <div><div><ul><li>
+#: /home/runa/tor/website/about/en/torusers.wml:286
+msgid ""
+"Global Voices maintains a <a "
+"href=\"http://advocacy.globalvoicesonline.org/projects/guide/\">guide to "
+"anonymous blogging with Wordpress and Tor</a>."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/about/en/torusers.wml:289
+msgid "<a name=\"itprofessionals\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/about/en/torusers.wml:290
+msgid "<a class=\"anchor\" href=\"#itprofessionals\">IT Professionals use Tor</a>"
+msgstr ""
+
+#. type: Content of: <div><div><ul><li>
+#: /home/runa/tor/website/about/en/torusers.wml:293
+msgid ""
+"To verify IP based firewall rules: A firewall may have some policies that "
+"only allow certain IP addresses or ranges. Tor can be used to verify those "
+"configurations by using an IP number outside of the company's alloted IP "
+"block."
+msgstr ""
+
+#. type: Content of: <div><div><ul><li>
+#: /home/runa/tor/website/about/en/torusers.wml:294
+msgid ""
+"To bypass their own security systems for sensitive professional activities: "
+"For instance, a company may have a strict policy regarding the material "
+"employees can view on the internet. A log review reveals a possible "
+"violation. Tor can be used to verify the information without an exception "
+"being put into corporate security systems."
+msgstr ""
+
+#. type: Content of: <div><div><ul><li>
+#: /home/runa/tor/website/about/en/torusers.wml:295
+msgid ""
+"To connect back to deployed services: A network engineer can use Tor to "
+"remotely connect back to services, without the need for an external machine "
+"and user account, as part of operational testing."
+msgstr ""
+
+#. type: Content of: <div><div><ul><li>
+#: /home/runa/tor/website/about/en/torusers.wml:296
+msgid ""
+"To access internet resources: Acceptable use policy for IT Staff and normal "
+"employees is usually different. Tor can allow unfettered access to the "
+"internet while leaving standard security policies in place."
+msgstr ""
+
+#. type: Content of: <div><div><ul><li>
+#: /home/runa/tor/website/about/en/torusers.wml:297
+msgid ""
+"To work around ISP network outages: Sometimes when an ISP is having routing "
+"or DNS problems, Tor can make internet resources available, when the actual "
+"ISP is malfunctioning. This can be invaluable is crisis situations."
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/about/en/torusers.wml:301
+msgid ""
+"Please do send us your success stories. They are very important because Tor "
+"provides anonymity. While it is thrilling to speculate about <a href=\"<page"
+" docs/faq-abuse>\">undesired effects of Tor</a>, when it succeeds, nobody "
+"notices.  This is great for users, but not so good for us, since publishing "
+"success stories about how people or organizations are staying anonymous "
+"could be counterproductive.  For example, we talked to an FBI officer who "
+"explained that he uses Tor every day for his work &mdash; but he quickly "
+"followed up with a request not to provide details or mention his name."
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/about/en/torusers.wml:310
+msgid ""
+"Like any technology, from pencils to cellphones, anonymity can be used for "
+"both good and bad.  You have probably seen some of the vigorous debate (<a "
+"href=\"http://www.wired.com/politics/security/commentary/securitymatters/2006/01/70000\">pro</a>,"
+" <a href=\"http://www.edge.org/q2006/q06_4.html#kelly\">con</a>, and <a "
+"href=\"http://web.mit.edu/gtmarx/www/anon.html\">academic</a>) over "
+"anonymity. The Tor project is based on the belief that anonymity is not just"
+" a good idea some of the time &mdash; it is a requirement for a free and "
+"functioning society.  The <a "
+"href=\"http://www.eff.org/issues/anonymity\">EFF maintains a good "
+"overview</a> of how anonymity was crucial to the founding of the United "
+"States.  Anonymity is recognized by US courts as a fundamental and important"
+" right. In fact, governments mandate anonymity in many cases themselves: <a "
+"href=\"https://www.crimeline.co.za/default.asp\">police tip lines</a>, <a "
+"href=\"http://www.texasbar.com/Content/ContentGroups/Public_Information1/Legal_Resources_Consumer_Information/Family_Law1/Adoption_Options.htm#sect2\">adoption"
+" services</a>, <a "
+"href=\"http://writ.news.findlaw.com/aronson/20020827.html\">police officer "
+"identities</a>, and so forth. It would be impossible to rehash the entire "
+"anonymity debate here &mdash; it is too large an issue with too many "
+"nuances, and there are plenty of other places where this information can be "
+"found. We do have a <a href=\"<page docs/faq-abuse>\">Tor abuse</a> page "
+"describing some of the possible abuse cases for Tor, but suffice it to say "
+"that if you want to abuse the system, you'll either find it mostly closed "
+"for your purposes (e.g. the majority of Tor relays do not support SMTP in "
+"order to prevent anonymous email spamming), or if you're one of the <a "
+"href=\"http://www.schneier.com/blog/archives/2005/12/computer_crime_1.html\">Four"
+" Horsemen of the Information Apocalypse</a>, you have better options than "
+"Tor. While not dismissing the potential abuses of Tor, this page shows a few"
+" of the many important ways anonymity is used online today."
+msgstr ""

Added: translation/trunk/projects/website/po/fa/docs/1-high.tor-doc-windows.po
===================================================================
--- translation/trunk/projects/website/po/fa/docs/1-high.tor-doc-windows.po	                        (rev 0)
+++ translation/trunk/projects/website/po/fa/docs/1-high.tor-doc-windows.po	2011-04-12 16:19:31 UTC (rev 24595)
@@ -0,0 +1,398 @@
+# 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.
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
+"POT-Creation-Date: 2011-02-12 12:20+0000\n"
+"PO-Revision-Date: 2011-04-10 19:40+0000\n"
+"Last-Translator: pakdelreza <pakdelreza at gmail.com>\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"
+"Language: fa\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:8
+msgid ""
+"<a href=\"<page index>\">Home &raquo; </a> <a href=\"<page "
+"docs/documentation>\">Documentation &raquo; </a> <a href=\"<page docs/tor-"
+"doc-windows>\">Windows Client</a>"
+msgstr ""
+"<a href=\"<page index>\">خانه »</a> <a href=\"<page "
+"docs/documentation>\">مستندات »</a> <a href=\"<page docs/tor-doc-"
+"windows>\">کلاينت تحت ویندوز</a>"
+
+#. type: Content of: <div><div><h1>
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:13
+msgid "Running the <a href=\"<page index>\">Tor</a> client on Microsoft Windows"
+msgstr "اجرای کلاينت <a href=\"<page index>\">تور</a>  در محيط مايکروسافت ويندوز"
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:14
+#: /tmp/aFRjTXc1En.xml:36 /tmp/aFRjTXc1En.xml:72 /tmp/aFRjTXc1En.xml:111
+#: /tmp/aFRjTXc1En.xml:154
+msgid "<br>"
+msgstr "<br>"
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:17
+msgid ""
+"<b>Note that these are the installation instructions for running a Tor "
+"client on Microsoft Windows (XP, Vista, 7, and Server Editions).  If you "
+"want to relay traffic for others to help the network grow (please do), read "
+"the <a href=\"<page docs/tor-doc-relay>\">Configuring a relay</a> guide.</b>"
+msgstr ""
+"<b>توجه داشته باشيد که اين مطالب راهنمای نصب کلاينت تور در محيط مايکروسافت "
+"ويندوز (XP، Vista، 7، و يا Server) می باشند. در صورتی که می‌خواهيد "
+"بازپخش‌کننده ترافيک ديگران باشيد تا به رشد شبکه کمک کنيد (شما را تشويق "
+"می‌کنيم به اين کار)، راهنمای <a href=\"<page docs/tor-doc-relay>\">تنظيم "
+"بازپخش‌کننده</a>   را مطالعه کنيد.</b>"
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:24
+msgid ""
+"Freedom House has produced a video on how to install Tor.  You can view it "
+"at <a href=\"http://media.torproject.org/video/2009-install-and-use-"
+"tor.ogv\">How to install Tor on Windows</a>.  Know of a better video, or one"
+" translated into your language? Let us know!"
+msgstr ""
+"خانه آزادی (Freedom House) ويديويی توليد کرده که نحوه نصب تور را نمايش "
+"می‌دهد. آن را می‌توانيد تحت عنوان <a "
+"href=\"http://media.torproject.org/video/2009-install-and-use-"
+"tor.ogv\">چگونگی نصب تور در ويندوز</a>  ببينيد. اگر ويديوی بهتری سراغ داريد "
+"يا ترجمه‌ای به زبان خودتان سراغ داريد ما را خبردار کنيد!"
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:33
+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:35
+msgid ""
+"<a class=\"anchor\" href=\"#installing\">Step One: Download and Install "
+"Tor</a>"
+msgstr "<a class=\"anchor\" href=\"#installing\">گام اوّل : دانلود و نصب تور</a>"
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:39
+msgid ""
+"The Vidalia Bundle for Windows contains <a href=\"<page index>\">Tor</a>, <a"
+" href=\"<page projects/vidalia>\">Vidalia</a> (a GUI for Tor), <a "
+"href=\"<page torbutton/index>\">Torbutton</a> (a plugin for Mozilla "
+"Firefox), and <a "
+"href=\"http://www.pps.jussieu.fr/~jch/software/polipo/\">Polipo</a> (a web "
+"proxy) packaged into one bundle, with the four applications pre-configured "
+"to work together.  Download either the <a href=\"../<package-win32-bundle-"
+"stable>\">stable</a> or the <a href=\"../<package-win32-bundle-"
+"alpha>\">experimental</a> version of the Vidalia Bundle, or look for more "
+"options on the <a href=\"<page download/download>\">download page</a>."
+msgstr ""
+"بسته ويداليا برای ويندوز حاوی <a href=\"<page index>\">تور</a>  ،  <a "
+"href=\"<page projects/vidalia>\">ويداليا </a> (يک ميانای کاربری گرافيکی برای"
+" تور)، <a href=\"<page torbutton/index>\">Torbutton</a>   (يک افزونه برای "
+"موزيلا فايرفاکس) و <a "
+"href=\"http://www.pps.jussieu.fr/~jch/software/polipo/\">Polipo</a>  (يک "
+"پراکسی وب) است که در يک بسته قرار داده شده و از پيش تنظيم شده‌اند تا با "
+"يکديگر کار کنند. می‌توانيد هر يک از نسخه‌های  <a href=\"../<package-win32"
+"-bundle-stable>\">پايدار</a>  و يا <a href=\"../<package-win32-bundle-"
+"alpha>\">آزمايشی</a>  بسته ويداليا را دانلود کنيد و يا گزينه‌های ديگر را در "
+"<a href=\"<page download/download>\">صفحه دانلود</a>   بررسی کنيد."
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:51
+msgid ""
+"<img alt=\"tor installer splash page\" src=\"$(IMGROOT)/screenshot-win32"
+"-installer-splash.png\">"
+msgstr ""
+"<img alt=\"tor installer splash page\" src=\"$(IMGROOT)/screenshot-win32"
+"-installer-splash.png\">"
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:53
+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."
+msgstr ""
+"چنانچه پيش از اين تور، Vidalia، و يا Polipo را نصب کرده‌ايد می‌توانيد هر "
+"کدام از اين مؤلفه‌ها را که نياز به نصب نداريد در پنجره ای که عکس آن در زير "
+"آمده است، از حالت انتخاب شده خارج کنيد."
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:58
+msgid ""
+"<img alt=\"select components to install\" src=\"$(IMGROOT)/screenshot-win32"
+"-installer-components.png\">"
+msgstr ""
+"<img alt=\"select components to install\" src=\"$(IMGROOT)/screenshot-win32"
+"-installer-components.png\">"
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:60
+msgid ""
+"After you have completed the installer, the components you selected will "
+"automatically be started for you."
+msgstr ""
+"پس از نصب موفقيت آميز، مؤلفه هایی که انتخاب کرديد به طور خودکار اجرا "
+"می‌شوند."
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:64
+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 "
+"settings. Tor is now installed."
+msgstr ""
+"تور به طور معمول به صورت يک کلاينت تنظيم شده است. از يک فايل تنظيم در داخل "
+"خود استفاده می‌کند، و اکثر کاربران نيازی به تغيير تنظيمات نخواهند داشت. تور "
+"هم‌اکنون نصب شده است."
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:69
+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-windows.wml:71
+msgid ""
+"<a class=\"anchor\" href=\"#using\">Step Two: Configure your applications to"
+" use Tor</a>"
+msgstr ""
+"<a class=\"anchor\" href=\"#using\">گام دوّم : تنظیم برنامه های خود برای "
+"استفاده از تور</a>"
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:74
+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 ""
+"پس از نصب تور و Polipo، بايد برنامه‌های خود را برای استفاده از آنها تنظيم "
+"کنيد. اولين کار اين است که مرورگری وب را راه‌اندازی کنيد."
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:77
+msgid ""
+"You should use Tor with Firefox and Torbutton, for best safety. The bundle "
+"installs the <a href=\"<page torbutton/index>\">Torbutton plugin</a> for "
+"you. Restart your Firefox, and you're all set:"
+msgstr ""
+"برای بيشترين امنيت، بهتر است از تور با فايرفاکس و Torbutton استفاده کنيد. "
+"بسته مذکور خودش افزونه Torbutton را برايتان نصب می‌کند. پس از آن فايرفاکس را"
+" يک دور ببنديد و دوباره باز کنيد تا آماده کار با تور باشد."
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:83
+msgid ""
+"<img alt=\"Torbutton plugin for Firefox\" src=\"$(IMGROOT)/screenshot-"
+"torbutton.png\"/> <br>"
+msgstr ""
+"<img alt=\"Torbutton plugin for Firefox\" src=\"$(IMGROOT)/screenshot-"
+"torbutton.png\"/> <br>"
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:88
+msgid ""
+"If you plan to run Firefox on a different computer than Tor, see the <a "
+"href=\"<wikifaq>#SocksListenAddress\">FAQ entry for running Tor on a "
+"different computer</a>."
+msgstr ""
+"اگر قصد داريد فايرفاکس را روی رايانه‌ای متفاوت با تور اجرا کنيد، به <a "
+"href=\"<wikifaq>#SocksListenAddress\">سؤال متداول مربوط به اجرای تور روی "
+"رايانه متفاوت</a>  مراجعه کنيد."
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:93
+msgid ""
+"To Torify other applications that support HTTP proxies, just point them at "
+"Polipo (that is, localhost port 8118). To use SOCKS directly (for instant "
+"messaging, Jabber, IRC, etc), you can point your application directly at Tor"
+" (localhost port 9050), but see <a href=\"<wikifaq>#SOCKSAndDNS\">this FAQ "
+"entry</a> for why this may be dangerous. For applications that support "
+"neither SOCKS nor HTTP, take a look at SocksCap or <a "
+"href=\"http://www.freecap.ru/eng/\">FreeCap</a>.  (FreeCap is free software;"
+" SocksCap is proprietary.)"
+msgstr ""
+"برای تنظيم ديگر نرم افزارها جهت کار با تور، اگر از پراکسی‌های HTTP پشتيبانی "
+"می‌کنند کافی است آنها را به سمت Polipo هدايت کنيد (که همان درگاهی يا "
+"localhost port 8118 است). برای اينکه که مستقيماً ازSOCKS استفاده کنيد (مثلاً"
+" برای پيام‌رسانی، Jabber، IRC و غيره)، می‌توانيد نرم‌افزار مورد نظر را "
+"مستقيماً به تور (موجود در localhost port 9050) هدايت کنيد، امّا <a "
+"href=\"<wikifaq>#SOCKSAndDNS\">اين سؤال متداول</a>  را هم در نظر بگيريد که "
+"توضيج می‌دهد که چرا اين کار ممکن است خطرناک باشد. برای برنامه‌هایی که نه "
+"SOCKS و نه HTTP را پشتيبانی می‌کنند، نگاهی بياندازيد به SocksCap و يا <a "
+"href=\"http://www.freecap.ru/eng/\">FreeCap</a>. (FreeCap رايگان است؛ "
+"SocksCap تجاری است.) "
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:103
+msgid ""
+"For information on how to Torify other applications, check out the <a "
+"href=\"<wiki>/TheOnionRouter/TorifyHOWTO\">Torify HOWTO</a>."
+msgstr ""
+"برای اطلاعات بيشتر در مورد اينکه چگونه نرم‌افزارهای مختلف را با تور سازگار "
+"کنيم، مراجعه کنيد به مستند مربوط به <a "
+"href=\"<wiki>/TheOnionRouter/TorifyHOWTO\">چگونگی سازگارسازی با تور</a>  ."
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:108
+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-windows.wml:110
+msgid "<a class=\"anchor\" href=\"#verify\">Step Three: Make sure it's working</a>"
+msgstr ""
+"<a class=\"anchor\" href=\"#verify\">گام سوّم : اطمینان حاصل کنید که کار می "
+"کند</a>"
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:114
+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 "
+"running. You can start or stop Tor by right-clicking on Vidalia's icon in "
+"your system tray and selecting \"Start\" or \"Stop\" from the menu as shown "
+"below:"
+msgstr ""
+"مطمئن شويد که ويداليا (Vidalia) در حال اجرا است.هنگامی که تور در حال اجرا "
+"باشد، ويداليا از يک علامت پياز کوچک سبز رنگ استفاده می‌کند و هنگامی که تور "
+"خاموش باشد از يک علامت پياز تاريک همرا با نشان X قرمز استفاده می‌کند. "
+"همانطور که در شکل زير نشان داده شده است، برای خاموش و روشن کردن تور "
+"می‌توانيد روی علامت ويداليا راست کليک کنيد و گزينه‌های شروع (Start) و يا "
+"توقف (Stop) را از منو انتخاب کنيد."
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:121
+msgid ""
+"<img alt=\"Vidalia Tray Icon\" src=\"$(IMGROOT)/screenshot-"
+"win32-vidalia.png\"/>"
+msgstr ""
+"<img alt=\"Vidalia Tray Icon\" src=\"$(IMGROOT)/screenshot-"
+"win32-vidalia.png\"/>"
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:124
+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/\">the Tor detector</a> and see whether "
+"it thinks you're using Tor or not.  (If that site is down, see <a "
+"href=\"<wikifaq>#IsMyConnectionPrivate\">this FAQ entry</a> for more "
+"suggestions on how to test your Tor.)"
+msgstr ""
+"سپس بهتر است که شروع کنيد به استفاده از مرورگر خود به همراه تور تا مطمئن "
+"شويد که آدرس IP  شما ناشناس گشته است.  روی سايت <a "
+"href=\"https://check.torproject.org/\">تورياب (Tor detector) </a> کليک کنيد "
+"تا ببينيد استفاده از تور را تشخيص می‌دهد يا خير. اگر اين سايت کار نمی‌کرد، "
+"برای روش‌های ديگر آزمودن تور <a href=\"<wikifaq>#IsMyConnectionPrivate\">اين"
+" سؤال متداول</a>   را ببينيد."
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:132
+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"
+" to local port 8118 and port 9050. If your firewall blocks outgoing "
+"connections, punch a hole so it can connect to at least TCP ports 80 and "
+"443, and then see <a href=\"<wikifaq>#FirewalledClient\">this FAQ entry</a>."
+msgstr ""
+"اگر يک ديوار آتش (‌Firewall) شخصی داريد که امکان ارتباط رايانه شما را با "
+"خودش محدود می‌نمايد، حتماً اجازه ارتباط نرم‌افزارهای خود را با درگاهی محلی "
+"(local port) شماره 8118 و درگاهی شماره 9050 بدهيد. اگر ديوار آتش شما "
+"ارتباطات خروجی را مسدود می‌کند، حفره‌ای در آن ايجاد کنيد تا لااقل بتواند به "
+"درگاهی‌های TCP شماره‌های 80 و 443 وصل شود. سپس <a "
+"href=\"<wikifaq>#FirewalledClient\">اين سؤال متداول</a>   را ببينيد."
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:141
+msgid ""
+"If it's still not working, look at <a href=\"<page "
+"docs/faq>#DoesntWork\">this FAQ entry</a> for hints."
+msgstr ""
+"اگر همچنان موفق نشده‌ايد که تور را راه‌اندازی کنيد، برای راهنمایی بيشتر به "
+"<a href=\"<page docs/faq>#DoesntWork\">اين سؤال متداول</a>   مراجعه کنيد."
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:146
+msgid ""
+"Once it's working, learn more about <a href=\"<page "
+"download/download>#Warning\">what Tor does and does not offer</a>."
+msgstr ""
+"پس از اينکه موفق شديد تور را به کار بياندازيد، درباره اينکه تور دقيقاً <a "
+"href=\"<page download/download>#Warning\">چه کارهایی انجام می‌دهد و چه "
+"کارهایی انجام نمی‌دهد</a>   بيشتر مطالعه کنيد. "
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:150
+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-windows.wml:153
+msgid "<a class=\"anchor\" href=\"#relay\">Step Four: Configure it as a relay</a>"
+msgstr ""
+"<a class=\"anchor\" href=\"#relay\">گام چهارم : تنظيم تور به عنوان يک "
+"بازپخش‌کننده</a>"
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:156
+msgid ""
+"The Tor network relies on volunteers to donate bandwidth. The more people "
+"who run relays, the faster the Tor network will be. If you have at least 20 "
+"kilobytes/s each way, please help out Tor by configuring your Tor to be a "
+"relay too. We have many features that make Tor relays easy and convenient, "
+"including rate limiting for bandwidth, exit policies so you can limit your "
+"exposure to abuse complaints, and support for dynamic IP addresses."
+msgstr ""
+"شبکه تور تکيه دارد به داوطلبانی که پهنای باند اهدا می‌کنند. هر چقدر تعداد "
+"افرادی که بازپخش‌کننده راه‌اندازی کرده‌اند بيشتر باشد، سرعت شبکه تور بيشتر "
+"می‌شود. اگر حداقل به اندازه 20 کيلوبايت در ثانيه در هر دو جهت پهنای باند "
+"داريد، لطفاً با تنظيم تور خود به عنوان يک بازپخش‌کننده، به تور کمک کنيد. ما "
+"امکانات بسياری فراهم کرده‌ايم تا به کار گيری بازپخش‌کننده‌های تور را آسان و "
+"بی دردسر نماييم. از جمله اين امکانات عبارتند از امکان محدودسازی ميزان پهنای "
+"باند استفاده شده، امکان تعيين قوانين خروجی برای کاهش خطر شکايت‌های مربوط به "
+"سوء استفاده، و نيز پشتيبانی از آدرس‌های IP پويا. "
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:164
+msgid ""
+"Having relays in many different places on the Internet is what makes Tor "
+"users secure. <a href=\"<wikifaq>#RelayAnonymity\">You may also get stronger"
+" anonymity yourself</a>, since remote sites can't know whether connections "
+"originated at your computer or were relayed from others."
+msgstr ""
+"داشتن بازپخش‌کننده در بسياری از جاهای متفاوت اينترنت، عاملی است که باعث "
+"امنيت کاربران تور می‌شود. <a href=\"<wikifaq>#RelayAnonymity\">امنيت خودتان "
+"هم می‌تواند بالاتر برود</a> امنيت خودتان هم می‌تواند بالاتر برود، چرا که "
+"سايت‌های بيرونی نمی‌توانند تشخيص دهند که اتصالات از رايانه شما نشأت گرفته و "
+"يا بازپخش رايانه‌های ديگر هستند."
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:171
+msgid ""
+"Read more at our <a href=\"<page docs/tor-doc-relay>\">Configuring a "
+"relay</a> guide."
+msgstr ""
+"برای اطلاعات بيشتر به راهنمای <a href=\"<page docs/tor-doc-relay>\">تنظيم "
+"بازپخش‌کننده</a>   مراجعه کنيد."
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:174
+msgid "<hr>"
+msgstr "<hr>"
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/tor-doc-windows.wml:176
+msgid ""
+"If you have suggestions for improving this document, please <a href=\"<page "
+"about/contact>\">send them to us</a>. Thanks!"
+msgstr ""
+"چنانچه پيشنهاداتی برای بهبود اين مستند داريد، لطفاً  <a href=\"<page "
+"about/contact>\">آنها را با ما در ميان بگذاريد</a> . متشکريم!"

Added: translation/trunk/projects/website/po/fa/docs/2-medium.tor-doc-osx.po
===================================================================
--- translation/trunk/projects/website/po/fa/docs/2-medium.tor-doc-osx.po	                        (rev 0)
+++ translation/trunk/projects/website/po/fa/docs/2-medium.tor-doc-osx.po	2011-04-12 16:19:31 UTC (rev 24595)
@@ -0,0 +1,472 @@
+# 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.
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
+"POT-Creation-Date: 2011-03-28 12:48+0200\n"
+"PO-Revision-Date: 2011-04-10 22:11+0000\n"
+"Last-Translator: pakdelreza <pakdelreza at gmail.com>\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"
+"Language: fa\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#. type: Content of: <div><div>
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:8
+msgid ""
+"<a href=\"<page index>\">Home &raquo; </a> <a href=\"<page "
+"docs/documentation>\">Documentation &raquo; </a> <a href=\"<page docs/tor-"
+"doc-osx>\">Mac OS X Client</a>"
+msgstr ""
+"<a href=\"<page index>\">خانه »</a> <a href=\"<page "
+"docs/documentation>\">مستندات »</a> <a href=\"<page docs/tor-doc-"
+"windows>\">کلاينت تحت Mac OS X</a>"
+
+#. type: Content of: <div><div><h1>
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:13
+msgid "Running the <a href=\"<page index>\">Tor</a> client on Mac OS X"
+msgstr "اجرای کلاينت <a href=\"<page index>\">تور</a>  در محيط Mac OS X"
+
+#. type: Content of: <div><div>
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:14 /tmp/dnqIbbGTnT.xml:26
+#: /tmp/dnqIbbGTnT.xml:71 /tmp/dnqIbbGTnT.xml:104 /tmp/dnqIbbGTnT.xml:136
+#: /tmp/dnqIbbGTnT.xml:158
+msgid "<br>"
+msgstr "<br>"
+
+#. type: Content of: <div><div><p>
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:17
+msgid ""
+"<b>Note that these are the installation instructions for running a Tor "
+"client on Mac OS X. If you want to relay traffic for others to help the "
+"network grow (please do), read the <a href=\"<page docs/tor-doc-"
+"relay>\">Configuring a relay</a> guide.</b>"
+msgstr ""
+"<b>توجه داشته باشيد که اين مطالب راهنمای نصب کلاينت تور در محيط Mac OS X می "
+"باشند. در صورتی که می‌خواهيد بازپخش‌کننده ترافيک ديگران باشيد تا به رشد شبکه"
+" کمک کنيد (شما را تشويق می‌کنيم به اين کار)، راهنمای <a href=\"<page docs"
+"/tor-doc-relay>\">تنظيم بازپخش‌کننده</a>   را مطالعه کنيد.</b>"
+
+#. type: Content of: <div><div>
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:23
+msgid "<hr> <a id=\"installing\"></a>"
+msgstr "<hr> <a id=\"installing\"></a>"
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:25
+msgid ""
+"<a class=\"anchor\" href=\"#installing\">Step One: Download and Install "
+"Tor</a>"
+msgstr "<a class=\"anchor\" href=\"#installing\">گام اوّل : دانلود و نصب تور</a>"
+
+#. type: Content of: <div><div><p>
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:29
+msgid ""
+"The install for Macintosh OS X bundles <a href=\"<page index>\">Tor</a>, <a "
+"href=\"<page projects/vidalia>\">Vidalia</a> (a graphical interface for "
+"Tor), <a href=\"<page torbutton/index>\">Torbutton</a>, and <a "
+"href=\"http://www.pps.jussieu.fr/~jch/software/polipo/\">Polipo</a> (a web "
+"proxy)  into one package, with the four applications pre-configured to work "
+"together.  Download either the <a href=\"<page "
+"download/download>#mac\">stable</a> or the <a href=\"<page "
+"download/download>#mac\">experimental</a> version of the OS X bundle, or "
+"look for more options on the <a href=\"<page download/download>\">download "
+"page</a>."
+msgstr ""
+"بسته نرم‌افزاری برای Macintosh OS X حاوی <a href=\"<page index>\">تور</a>  ،"
+"  <a href=\"<page projects/vidalia>\">ويداليا </a> (يک ميانای کاربری گرافيکی"
+" برای تور)، <a href=\"<page torbutton/index>\">Torbutton</a>   (يک افزونه "
+"برای موزيلا فايرفاکس) و <a "
+"href=\"http://www.pps.jussieu.fr/~jch/software/polipo/\">Polipo</a>  (يک "
+"پراکسی وب) است که در يک بسته قرار داده شده و از پيش تنظيم شده‌اند تا با "
+"يکديگر کار کنند. می‌توانيد هر يک از نسخه‌های  <a href=\"<page "
+"download/download>#mac\">پايدار</a>  و يا <a href=\"<page "
+"download/download>#mac\">آزمايشی</a>  بسته ويداليا را دانلود کنيد و يا "
+"گزينه‌های ديگر را در <a href=\"<page download/download>\">صفحه دانلود</a>   "
+"بررسی کنيد."
+
+#. type: Content of: <div><div><p>
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:42
+msgid ""
+"Once you've downloaded the dmg, double-click and let it mount.  Browse to "
+"the now open Vidalia Bundle in Finder.  It's easy to install the bundle; "
+"simply drag and drop the Vidalia onion icon to the Applications folder.  "
+"Optionally, double click the \"install torbutton\" script and let it install"
+" torbutton into Firefox.  You can also get Torbutton from Mozilla Add-ons by"
+" searching for \"torbutton\"."
+msgstr ""
+"پس از اينکه فايل dmg را دانلود کرديد، روی آن دو بار کليک کنيد و اجازه دهيد "
+"تا به اصطلاح سوار يا mount شود. در مرورگر Finder برويد به بسته ويداليا "
+"(Vidalia Bundle) که بايد هم‌اکنون باز شده باشد. نصب بسته آسان است؛ کافی است "
+"شمايل (icon) ويداليا را به سمت پوشه برنامه‌ها (Applications) بکشانيد. اگر "
+"مايل باشيد می‌توانيد روی خط install torbutton دوبار کليک کنيد و اجازه دهيد "
+"تا torbutton را در فايرفاکس نصب کند. روش ديگر اين است که torbutton را از "
+"طريق فهرست افزونه‌های موزيلا پيدا کنيد. کافی است واژه torbutton را جستجو "
+"کنید. "
+
+#. type: Content of: <div><div><p>
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:49
+msgid ""
+"When you are finished installing, you can start Vidalia by selecting its "
+"icon from your Applications folder. A dark onion with a red X in your dock "
+"means Tor is not currently running. You can start Tor by selecting Start "
+"from the \"Tor\" menu at the top of your screen."
+msgstr ""
+"هنگامی که نصب به پايان رسيد، می‌توانيد ويداليا را با انتخاب شمايل آن در پوشه"
+" برنامه‌ها اجرا کنيد. اگر يک نشان پياز تاريک با يک X قرمز رنگ در نوار "
+"برنامه‌ها (dock) می‌بينيد، تور هم‌اکنون در حال کار نيست. می‌توانيد با انتخاب"
+" گزينه Start از منوی Tor در بالای صفحه، تور را راه‌اندازی کنيد.  "
+
+#. type: Content of: <div><div><p>
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:55
+msgid "When Tor is running, Vidalia's dock icon will look like the following:"
+msgstr ""
+"هنگامی که تور در حال کار باشد، شمايل ويداليا در نوار برنامه‌ها به شکل زير "
+"خواهد بود:"
+
+#. type: Content of: <div><div><p>
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:58
+msgid ""
+"<img alt=\"vidalia running tor\" src=\"$(IMGROOT)/screenshot-osx-"
+"vidalia.png\" />"
+msgstr ""
+"<img alt=\"vidalia running tor\" src=\"$(IMGROOT)/screenshot-osx-"
+"vidalia.png\" />"
+
+#. type: Content of: <div><div><p>
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:61
+msgid ""
+"Polipo is installed as part of the Tor bundle package installer. Once it is "
+"installed, it will start automatically when your computer is restarted.  You"
+" do not need to configure Polipo to use Tor &mdash; a custom Polipo "
+"configuration for Tor has been installed as part of the installer package."
+msgstr ""
+"Polipo به عنوان بخشی از بسته نرم‌افزاری تور به طور خودکار نصب خواهد شد. پس "
+"از اينکه نصب شد، دفعه بعد که رايانه خود را روشن يا بازشروع (restart) کنيد به"
+" طور خودکار اجرا خواهد شد. لازم نيست برای تنظيم Polipo جهت سازگاری با تور "
+"کاری کنيد. يک تنظيم مخصوص برای اين منظور به عنوان بخشی از بسته نرم‌افزاری "
+"نصب شده است."
+
+#. type: Content of: <div><div>
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:68
+msgid "<hr> <a id=\"using\"></a>"
+msgstr "<hr> <a id=\"using\"></a>"
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:70
+msgid ""
+"<a class=\"anchor\" href=\"#using\">Step Two: Configure your applications to"
+" use Tor</a>"
+msgstr ""
+"<a class=\"anchor\" href=\"#using\">گام دوّم : تنظیم برنامه های خود برای "
+"استفاده از تور</a>"
+
+#. type: Content of: <div><div><p>
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:73
+msgid ""
+"After installing, 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/dev/website/docs/en/tor-doc-osx.wml:76
+msgid ""
+"You should use Tor with Firefox and Torbutton, for best safety.  Torbutton "
+"was installed for you.  Click on the red \"Tor Disabled\" toggle button to "
+"turn Tor on, and you're all set:"
+msgstr ""
+"برای بيشترين امنيت، بهتر است از تور با فايرفاکس و Torbutton استفاده کنيد. "
+"Torbutton بايد به طور خودکار نصب شده باشد. روی دکمه قرمز Tor Disabled کليک "
+"کنيد تا تور را فعال کنيد. حال آماده استفاده از تور هستيد."
+
+#. type: Content of: <div><div><p>
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:80
+msgid ""
+"<img alt=\"Torbutton plugin for Firefox\" src=\"$(IMGROOT)/screenshot-"
+"torbutton.png\" />"
+msgstr ""
+"<img alt=\"Torbutton plugin for Firefox\" src=\"$(IMGROOT)/screenshot-"
+"torbutton.png\" />"
+
+#. type: Content of: <div><div><p>
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:83
+msgid ""
+"If you plan to run Firefox on a different computer than Tor, see the <a "
+"href=\"<wikifaq>#SocksListenAddress\">FAQ entry for running Tor on a "
+"different computer</a>."
+msgstr ""
+"اگر قصد داريد فايرفاکس را روی رايانه‌ای متفاوت با تور اجرا کنيد، به <a "
+"href=\"<wikifaq>#SocksListenAddress\">سؤال متداول مربوط به اجرای تور روی "
+"رايانه متفاوت</a>  مراجعه کنيد."
+
+#. type: Content of: <div><div><p>
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:87
+msgid ""
+"To Torify other applications that support HTTP proxies, just point them at "
+"Polipo (that is, localhost port 8118). To use SOCKS directly (for instant "
+"messaging, Jabber, IRC, etc), you can point your application directly at Tor"
+" (localhost port 9050), but see <a href=\"<wikifaq>#SOCKSAndDNS\">this FAQ "
+"entry</a> for why this may be dangerous. For applications that support "
+"neither SOCKS nor HTTP, take a look at <a "
+"href=\"http://www.taiyo.co.jp/~gotoh/ssh/connect.html\">connect</a> or <a "
+"href=\"http://www.dest-unreach.org/socat/\">socat</a>."
+msgstr ""
+"برای تنظيم ديگر نرم افزارها جهت کار با تور، اگر از پراکسی‌های HTTP پشتيبانی "
+"می‌کنند کافی است آنها را به سمت Polipo هدايت کنيد (که همان درگاهی يا "
+"localhost port 8118 است). برای اينکه که مستقيماً ازSOCKS استفاده کنيد (مثلاً"
+" برای پيام‌رسانی، Jabber، IRC و غيره)، می‌توانيد نرم‌افزار مورد نظر را "
+"مستقيماً به تور (موجود در localhost port 9050) هدايت کنيد، امّا <a "
+"href=\"<wikifaq>#SOCKSAndDNS\">اين سؤال متداول</a>  را هم در نظر بگيريد که "
+"توضيج می‌دهد که چرا اين کار ممکن است خطرناک باشد. برای برنامه‌هایی که نه "
+"SOCKS و نه HTTP را پشتيبانی می‌کنند، نگاهی بياندازيد به a "
+"href=\"http://www.taiyo.co.jp/~gotoh/ssh/connect.html\">connect</a>  و يا <a"
+" href=\"http://www.dest-unreach.org/socat/\">socat</a> ."
+
+#. type: Content of: <div><div><p>
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:97
+msgid ""
+"For information on how to Torify other applications, check out the <a "
+"href=\"<wiki>/TheOnionRouter/TorifyHOWTO\">Torify HOWTO</a>."
+msgstr ""
+"برای اطلاعات بيشتر در مورد اينکه چگونه نرم‌افزارهای مختلف را با تور سازگار "
+"کنيم، مراجعه کنيد به مستند مربوط به <a "
+"href=\"<wiki>/TheOnionRouter/TorifyHOWTO\">چگونگی سازگارسازی با تور</a>  ."
+
+#. type: Content of: <div><div>
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:101
+msgid "<hr> <a id=\"verify\"></a>"
+msgstr "<hr> <a id=\"verify\"></a>"
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:103
+msgid "<a class=\"anchor\" href=\"#verify\">Step Three: Make sure it's working</a>"
+msgstr ""
+"<a class=\"anchor\" href=\"#verify\">گام سوّم : اطمینان حاصل کنید که کار می "
+"کند</a>"
+
+#. type: Content of: <div><div><p>
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:107
+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/\">the Tor detector</a> and see whether "
+"it thinks you're using Tor or not.  (If that site is down, see <a "
+"href=\"<wikifaq>#IsMyConnectionPrivate\">this FAQ entry</a> for more "
+"suggestions on how to test your Tor.)"
+msgstr ""
+"سپس بهتر است که شروع کنيد به استفاده از مرورگر خود به همراه تور تا مطمئن "
+"شويد که آدرس IP  شما ناشناس گشته است.  روی سايت <a "
+"href=\"https://check.torproject.org/\">تورياب (Tor detector) </a> کليک کنيد "
+"تا ببينيد استفاده از تور را تشخيص می‌دهد يا خير. اگر اين سايت کار نمی‌کرد، "
+"برای روش‌های ديگر آزمودن تور <a href=\"<wikifaq>#IsMyConnectionPrivate\">اين"
+" سؤال متداول</a>   را ببينيد."
+
+#. type: Content of: <div><div><p>
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:115
+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"
+" to local port 8118 and port 9050. If your firewall blocks outgoing "
+"connections, punch a hole so it can connect to at least TCP ports 80 and "
+"443, and then see <a href=\"<wikifaq>#FirewalledClient\">this FAQ entry</a>."
+msgstr ""
+"اگر يک ديوار آتش (‌Firewall) شخصی داريد که امکان ارتباط رايانه شما را با "
+"خودش محدود می‌نمايد، حتماً اجازه ارتباط نرم‌افزارهای خود را با درگاهی محلی "
+"(local port) شماره 8118 و درگاهی شماره 9050 بدهيد. اگر ديوار آتش شما "
+"ارتباطات خروجی را مسدود می‌کند، حفره‌ای در آن ايجاد کنيد تا لااقل بتواند به "
+"درگاهی‌های TCP شماره‌های 80 و 443 وصل شود. سپس <a "
+"href=\"<wikifaq>#FirewalledClient\">اين سؤال متداول</a>   را ببينيد."
+
+#. type: Content of: <div><div><p>
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:124
+msgid ""
+"If it's still not working, look at <a href=\"<page "
+"docs/faq>#DoesntWork\">this FAQ entry</a> for hints."
+msgstr ""
+"اگر همچنان موفق نشده‌ايد که تور را راه‌اندازی کنيد، برای راهنمایی بيشتر به "
+"<a href=\"<page docs/faq>#DoesntWork\">اين سؤال متداول</a>   مراجعه کنيد."
+
+#. type: Content of: <div><div><p>
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:128
+msgid ""
+"Once it's working, learn more about <a href=\"<page "
+"download/download>#Warning\">what Tor does and does not offer</a>."
+msgstr ""
+"پس از اينکه موفق شديد تور را به کار بياندازيد، درباره اينکه تور دقيقاً <a "
+"href=\"<page download/download>#Warning\">چه کارهایی انجام می‌دهد و چه "
+"کارهایی انجام نمی‌دهد</a>   بيشتر مطالعه کنيد. "
+
+#. type: Content of: <div><div>
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:132
+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/dev/website/docs/en/tor-doc-osx.wml:135
+msgid "<a class=\"anchor\" href=\"#relay\">Step Four: Configure it as a relay</a>"
+msgstr ""
+"<a class=\"anchor\" href=\"#relay\">گام چهارم : تنظيم تور به عنوان يک "
+"بازپخش‌کننده</a>"
+
+#. type: Content of: <div><div><p>
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:138
+msgid ""
+"The Tor network relies on volunteers to donate bandwidth. The more people "
+"who run relays, the faster the Tor network will be. If you have at least 20 "
+"kilobytes/s each way, please help out Tor by configuring your Tor to be a "
+"relay too. We have many features that make Tor relays easy and convenient, "
+"including rate limiting for bandwidth, exit policies so you can limit your "
+"exposure to abuse complaints, and support for dynamic IP addresses."
+msgstr ""
+"شبکه تور تکيه دارد به داوطلبانی که پهنای باند اهدا می‌کنند. هر چقدر تعداد "
+"افرادی که بازپخش‌کننده راه‌اندازی کرده‌اند بيشتر باشد، سرعت شبکه تور بيشتر "
+"می‌شود. اگر حداقل به اندازه 20 کيلوبايت در ثانيه در هر دو جهت پهنای باند "
+"داريد، لطفاً با تنظيم تور خود به عنوان يک بازپخش‌کننده، به تور کمک کنيد. ما "
+"امکانات بسياری فراهم کرده‌ايم تا به کار گيری بازپخش‌کننده‌های تور را آسان و "
+"بی دردسر نماييم. از جمله اين امکانات عبارتند از امکان محدودسازی ميزان پهنای "
+"باند استفاده شده، امکان تعيين قوانين خروجی برای کاهش خطر شکايت‌های مربوط به "
+"سوء استفاده، و نيز پشتيبانی از آدرس‌های IP پويا. "
+
+#. type: Content of: <div><div><p>
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:146
+msgid ""
+"Having relays in many different places on the Internet is what makes Tor "
+"users secure. <a href=\"<wikifaq>#RelayAnonymity\">You may also get stronger"
+" anonymity yourself</a>, since remote sites can't know whether connections "
+"originated at your computer or were relayed from others."
+msgstr ""
+"داشتن بازپخش‌کننده در بسياری از جاهای متفاوت اينترنت، عاملی است که باعث "
+"امنيت کاربران تور می‌شود. <a href=\"<wikifaq>#RelayAnonymity\">امنيت خودتان "
+"هم می‌تواند بالاتر برود</a> امنيت خودتان هم می‌تواند بالاتر برود، چرا که "
+"سايت‌های بيرونی نمی‌توانند تشخيص دهند که اتصالات از رايانه شما نشأت گرفته و "
+"يا بازپخش رايانه‌های ديگر هستند."
+
+#. type: Content of: <div><div><p>
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:152
+msgid ""
+"Read more at our <a href=\"<page docs/tor-doc-relay>\">Configuring a "
+"relay</a> guide."
+msgstr ""
+"برای اطلاعات بيشتر به راهنمای <a href=\"<page docs/tor-doc-relay>\">تنظيم "
+"بازپخش‌کننده</a>   مراجعه کنيد."
+
+#. type: Content of: <div><div>
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:155
+msgid "<hr> <a id=\"uninstall\"></a>"
+msgstr "<hr> <a id=\"uninstall\"></a>"
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:157
+msgid "<a class=\"anchor\" href=\"#uninstall\">How To Uninstall Tor and Polipo</a>"
+msgstr ""
+"<a class=\"anchor\" href=\"#uninstall\">چگونه تور و Polipo را حذف "
+"(uninstall) کنيم</a>"
+
+#. type: Content of: <div><div><p>
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:160
+msgid ""
+"There are two ways to uninstall the bundle from your computer, using Finder "
+"or a command line or Terminal-based uninstaller.  If you want to remove Tor "
+"on OSX, here's how:"
+msgstr ""
+"دو روش برای حذف (uninstall) کردن بسته وجود دارد. يکی با استفاده از Finder و "
+"ديگری با استفاده از خط فرمان (command line) يا يک حذف کننده کمبتنی بر "
+"ترمينال (Terminal-based uninstaller). برای حذف تور از OSX به ترتيب زير عمل "
+"کنيد:"
+
+#. type: Content of: <div><div><p>
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:164
+msgid ""
+"Change your application proxy settings back to their original values.  If "
+"you just want to stop using Tor, you can end at this point."
+msgstr ""
+"تنظيمات پراکسی نرم‌افزارتان را به مقادير اوليه خود بازگردانيد. اگر فقط قصد "
+"داريد به استفاده خود از تور پايان دهيد، می‌توانيد در همين مرحله توقف کنيد."
+
+#. type: Content of: <div><div><p>
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:168
+msgid ""
+"If you want to completely remove Tor, and your account has Admin Privileges,"
+" then proceed as follows:"
+msgstr ""
+"اگر می‌خواهيد تور را به طور کلی پاک کنيد، و حساب شما دسترسی Admin دارد، به "
+"ترتيب زير عمل کنيد:"
+
+#. type: Content of: <div><div><ol><li>
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:172
+msgid "Open Finder and click on Applications."
+msgstr "Finder را باز کنيد و روی Applications کليک کنيد."
+
+#. type: Content of: <div><div><ol><li>
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:173
+msgid "Drag /Applications/Vidalia to the Trash."
+msgstr "پوشه /Applications/Vidalia را بکشيد و در سطل زباله بياندازيد."
+
+#. type: Content of: <div><div><ol><li>
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:174
+msgid "Remove /Library/Torbutton from your system."
+msgstr "پوشه /Library/Torbutton را از سيستم خود حذف کنيد."
+
+#. type: Content of: <div><div><ol><li>
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:175
+msgid ""
+"In your User or home directory, go to Library, remove the Vidalia directory"
+msgstr ""
+"در پوشه خانه خود يا همان پوشه user، به Library برويد و از آنجا پوشه Vidalia "
+"را حذف کنيد."
+
+#. type: Content of: <div><div><p>
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:179
+msgid "Tor, Vidalia, and Polipo are now completely removed from your system."
+msgstr "حال تور، ويداليا، و Polipo به طور کامل از سيستم شما حذف شده‌اند."
+
+#. type: Content of: <div><div><p>
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:181
+msgid ""
+"If you're familiar with the command line or Terminal, you can manually type "
+"the following:"
+msgstr ""
+"اگر با نحوه استفاده از ترمينال يا خط فرمان آشنایی داريد، می‌توانيد دستورات "
+"زير را اجرا کنيد:"
+
+#. type: Content of: <div><div><ul><li>
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:184
+msgid "rm -r /Applications/Vidalia.app"
+msgstr "rm -r /Applications/Vidalia.app"
+
+#. type: Content of: <div><div><ul><li>
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:185
+msgid "rm -r /Library/Torbutton"
+msgstr "rm -r /Library/Torbutton"
+
+#. type: Content of: <div><div><ul><li>
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:186
+msgid "rm -r ~/Library/Vidalia"
+msgstr "rm -r ~/Library/Vidalia"
+
+#. type: Content of: <div><div><ul><li>
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:187
+msgid "rm -r ~/.tor"
+msgstr "rm -r ~/.tor"
+
+#. type: Content of: <div><div>
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:190
+msgid "<hr>"
+msgstr "<hr>"
+
+#. type: Content of: <div><div><p>
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:192
+msgid ""
+"If you have suggestions for improving this document, please <a href=\"<page "
+"about/contact>\">send them to us</a>. Thanks!"
+msgstr ""
+"چنانچه پيشنهاداتی برای بهبود اين مستند داريد، لطفاً  <a href=\"<page "
+"about/contact>\">آنها را با ما در ميان بگذاريد</a> . متشکريم!"

Added: translation/trunk/projects/website/po/fa/docs/2-medium.verifying-signatures.po
===================================================================
--- translation/trunk/projects/website/po/fa/docs/2-medium.verifying-signatures.po	                        (rev 0)
+++ translation/trunk/projects/website/po/fa/docs/2-medium.verifying-signatures.po	2011-04-12 16:19:31 UTC (rev 24595)
@@ -0,0 +1,440 @@
+# 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.
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
+"POT-Creation-Date: 2011-03-01 16:37+0000\n"
+"PO-Revision-Date: 2011-04-12 16:15+0000\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"
+"Language: fa\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:8
+msgid ""
+"<a href=\"<page index>\">Home &raquo; </a> <a href=\"<page docs/verifying-"
+"signatures>\">Verifying Signatures</a>"
+msgstr ""
+
+#. type: Content of: <div><div><h1>
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:12
+msgid "How to verify signatures for packages"
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:13
+#: /tmp/ETpEqGX4UH.xml:38 /tmp/ETpEqGX4UH.xml:54 /tmp/ETpEqGX4UH.xml:81
+#: /tmp/ETpEqGX4UH.xml:155
+msgid "<hr>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:15
+msgid ""
+"Each file on <a href=\"<page download/download>\">our download page</a> is "
+"accompanied by a file with the same name as the package and the extension "
+"\".asc\". These .asc files are GPG signatures. They allow you to verify the "
+"file you've downloaded is exactly the one that we intended you to get. For "
+"example, tor-browser-<version-torbrowserbundle>_en-US.exe is accompanied by "
+"tor-browser-<version-torbrowserbundle>_en-US.exe.asc."
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:22
+msgid ""
+"Of course, you'll need to have our GPG keys in your keyring: if you don't "
+"know the GPG key, you can't be sure that it was really us who signed it. The"
+" signing keys we use are:"
+msgstr ""
+
+#. type: Content of: <div><div><ul><li>
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:26
+msgid "Roger's (0x28988BF5) typically signs the source code file."
+msgstr ""
+
+#. type: Content of: <div><div><ul><li>
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:27
+msgid "Nick's (0x165733EA, or its subkey 0x8D29319A)."
+msgstr ""
+
+#. type: Content of: <div><div><ul><li>
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:28
+msgid ""
+"Andrew's (0x31B0974B) typically signed older packages for windows and mac."
+msgstr ""
+
+#. type: Content of: <div><div><ul><li>
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:29
+msgid "Peter's (0x94C09C7F, or its subkey 0xAFA44BDD)."
+msgstr ""
+
+#. type: Content of: <div><div><ul><li>
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:30
+msgid "Matt's (0x5FA14861)."
+msgstr ""
+
+#. type: Content of: <div><div><ul><li>
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:31
+msgid "Jacob's (0xE012B42D)."
+msgstr ""
+
+#. type: Content of: <div><div><ul><li>
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:32
+msgid ""
+"Erinn's (0x63FEE659) and (0xF1F5C9B5) typically signs all windows, mac, and "
+"most linux packages."
+msgstr ""
+
+#. type: Content of: <div><div><ul><li>
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:33
+msgid "Mike's (0xDDC6C0AD) signs the Torbutton xpi."
+msgstr ""
+
+#. type: Content of: <div><div><ul><li>
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:34
+msgid "Karsten's (0xF7C11265) signs the metrics archives and tools."
+msgstr ""
+
+#. type: Content of: <div><div><h3>
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:37
+msgid "Step Zero: Install GnuPG"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:39
+msgid "You need to have GnuPG installed before you can verify signatures."
+msgstr ""
+
+#. type: Content of: <div><div><ul><li>
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:43
+msgid ""
+"Linux: see <a "
+"href=\"http://www.gnupg.org/download/\">http://www.gnupg.org/download/</a> "
+"or install <i>gnupg</i> from the package management system."
+msgstr ""
+
+#. type: Content of: <div><div><ul><li>
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:46
+msgid ""
+"Windows: see <a "
+"href=\"http://www.gnupg.org/download/\">http://www.gnupg.org/download/</a>. "
+"Look for the \"version compiled for MS-Windows\" under \"Binaries\"."
+msgstr ""
+
+#. type: Content of: <div><div><ul><li>
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:49
+msgid ""
+"Mac: see <a "
+"href=\"http://macgpg.sourceforge.net/\">http://macgpg.sourceforge.net/</a>."
+msgstr ""
+
+#. type: Content of: <div><div><h3>
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:53
+msgid "Step One: Import the keys"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:55
+msgid ""
+"The next step is to import the key. This can be done directly from GnuPG. "
+"Make sure you import the correct key. For example, if you downloaded a "
+"Windows package, you will need to import Erinn's key."
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:59
+#: /tmp/ETpEqGX4UH.xml:84 /tmp/ETpEqGX4UH.xml:163
+msgid "<b>Windows:</b>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:60
+msgid ""
+"GnuPG for Windows is a command line tool, and you will need to use "
+"<i>cmd.exe</i>. Unless you edit your PATH environment variable, you will "
+"need to tell Windows the full path to the GnuPG program. If you installed "
+"GnuPG with the default values, the path should be something like this: "
+"<i>C:\\Program Files\\Gnu\\GnuPg\\gpg.exe</i>."
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:66
+msgid "To import the key 0x28988BF5, start <i>cmd.exe</i> and type:"
+msgstr ""
+
+#. type: Content of: <div><div><pre>
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:68
+#, no-wrap
+msgid ""
+"C:\\Program Files\\Gnu\\GnuPg\\gpg.exe --keyserver hkp://keys.gnupg.net "
+"--recv-keys 0x28988BF5"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:70
+#: /tmp/ETpEqGX4UH.xml:87
+msgid "<b>Mac and Linux</b>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:71
+msgid ""
+"Whether you have a Mac or you run Linux, you will need to use the terminal "
+"to run GnuPG. Mac users can find the terminal under \"Applications\". If you"
+" run Linux and use Gnome, the terminal should be under \"Applications menu\""
+" and \"Accessories\". KDE users can find the terminal under \"Menu\" and "
+"\"System\"."
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:76
+msgid "To import the key 0x28988BF5, start the terminal and type:"
+msgstr ""
+
+#. type: Content of: <div><div><pre>
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:78
+#, no-wrap
+msgid "gpg --keyserver hkp://keys.gnupg.net --recv-keys 0x28988BF5"
+msgstr ""
+
+#. type: Content of: <div><div><h3>
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:80
+msgid "Step Two: Verify the fingerprints"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:82
+msgid ""
+"After importing the key, you will want to verify that the fingerprint is "
+"correct."
+msgstr ""
+
+#. type: Content of: <div><div><pre>
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:85
+#, no-wrap
+msgid "C:\\Program Files\\Gnu\\GnuPg\\gpg.exe --fingerprint (insert keyid here)"
+msgstr ""
+
+#. type: Content of: <div><div><pre>
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:88
+#, no-wrap
+msgid "gpg --fingerprint (insert keyid here)"
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:90
+msgid "The fingerprints for the keys should be:"
+msgstr ""
+
+#. type: Content of: <div><div><pre>
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:93
+#, no-wrap
+msgid ""
+"    pub   1024D/28988BF5 2000-02-27\n"
+"          Key fingerprint = B117 2656 DFF9 83C3 042B  C699 EB5A 896A 2898 8BF5\n"
+"    uid                  Roger Dingledine &lt;arma at mit.edu&gt;\n"
+"\n"
+"    pub   3072R/165733EA 2004-07-03\n"
+"          Key fingerprint = B35B F85B F194 89D0 4E28  C33C 2119 4EBB 1657 33EA\n"
+"    uid                  Nick Mathewson &lt;nickm at alum.mit.edu&gt;\n"
+"    uid                  Nick Mathewson &lt;nickm at wangafu.net&gt;\n"
+"    uid                  Nick Mathewson &lt;nickm at freehaven.net&gt;\n"
+"\n"
+"    pub  1024D/31B0974B 2003-07-17\n"
+"         Key fingerprint = 0295 9AA7 190A B9E9 027E  0736 3B9D 093F 31B0 974B\n"
+"    uid                  Andrew Lewman (phobos) &lt;phobos at rootme.org&gt;\n"
+"    uid                  Andrew Lewman &lt;andrew at lewman.com&gt;\n"
+"    uid                  Andrew Lewman &lt;andrew at torproject.org&gt;\n"
+"    sub   4096g/B77F95F7 2003-07-17\n"
+"\n"
+"    pub   1024D/94C09C7F 1999-11-10\n"
+"          Key fingerprint = 5B00 C96D 5D54 AEE1 206B  AF84 DE7A AF6E 94C0 9C7F\n"
+"    uid                  Peter Palfrader\n"
+"    uid                  Peter Palfrader &lt;peter at palfrader.org&gt;\n"
+"    uid                  Peter Palfrader &lt;weasel at debian.org&gt;\n"
+"\n"
+"    pub   1024D/5FA14861 2005-08-17\n"
+"          Key fingerprint = 9467 294A 9985 3C9C 65CB  141D AF7E 0E43 5FA1 4861\n"
+"    uid                  Matt Edman &lt;edmanm at rpi.edu&gt;\n"
+"    uid                  Matt Edman &lt;Matt_Edman at baylor.edu&gt;\n"
+"    uid                  Matt Edman &lt;edmanm2 at cs.rpi.edu&gt;\n"
+"    sub   4096g/EA654E59 2005-08-17\n"
+"\n"
+"    pub   4096R/E012B42D 2010-05-07\n"
+"          Key fingerprint = D8C9 AF51 CAA9 CAEA D3D8  9C9E A34F A745 E012 B42D\n"
+"    uid                  Jacob Appelbaum &lt;jacob at appelbaum.net&gt;\n"
+"    uid                  Jacob Appelbaum &lt;jacob at torproject.org&gt;\n"
+"    sub   4096R/7CA91A52 2010-05-07 [expires: 2011-05-07]\n"
+"\n"
+"    pub   2048R/63FEE659 2003-10-16\n"
+"          Key fingerprint = 8738 A680 B84B 3031 A630  F2DB 416F 0610 63FE E659\n"
+"    uid                  Erinn Clark &lt;erinn at torproject.org&gt;\n"
+"    uid                  Erinn Clark &lt;erinn at debian.org&gt;\n"
+"    uid                  Erinn Clark &lt;erinn at double-helix.org&gt;\n"
+"    sub   2048R/EB399FD7 2003-10-16\n"
+"\n"
+"    pub   1024D/F1F5C9B5 2010-02-03\n"
+"          Key fingerprint = C2E3 4CFC 13C6 2BD9 2C75  79B5 6B8A AEB1 F1F5 C9B5\n"
+"    uid                  Erinn Clark &lt;erinn at torproject.org&gt;\n"
+"    sub   1024g/7828F26A 2010-02-03\n"
+"\n"
+"    pub   1024D/DDC6C0AD 2006-07-26\n"
+"          Key fingerprint = BECD 90ED D1EE 8736 7980  ECF8 1B0C A30C DDC6 C0AD\n"
+"    uid                  Mike Perry &lt;mikeperry at fscked.org&gt;\n"
+"    uid                  Mike Perry &lt;mikepery at fscked.org&gt;\n"
+"    sub   4096g/AF0A91D7 2006-07-26\n"
+"\n"
+"    pub   1024D/F7C11265 2007-03-09 [expires: 2012-03-01]\n"
+"          Key fingerprint = FC8A EEF1 792E EE71 D721  7D47 D0CF 963D F7C1 1265\n"
+"    uid                  Karsten Loesing &lt;karsten.loesing at gmx.net&gt;\n"
+"    sub   2048g/75D85E4B 2007-03-09 [expires: 2012-03-01]\n"
+"\n"
+"    "
+msgstr ""
+
+#. type: Content of: <div><div><h3>
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:154
+msgid "Step Three: Verify the downloaded package"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:156
+msgid ""
+"To verify the signature of the package you downloaded, you will need to "
+"download the \".asc\" file as well."
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:159
+msgid ""
+"In the following examples, the user Alice downloads packages for Windows, "
+"Mac OS X and Linux and also verifies the signature of each package. All "
+"files are saved on the desktop."
+msgstr ""
+
+#. type: Content of: <div><div><pre>
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:164
+#, no-wrap
+msgid ""
+"C:\\Program Files\\Gnu\\GnuPg\\gpg.exe --verify C:\\Users\\Alice\\Desktop"
+"\\<file-win32-bundle-stable>.asc C:\\Users\\Alice\\Desktop\\<file-win32"
+"-bundle-stable>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:166
+msgid "<b>Mac:</b>"
+msgstr ""
+
+#. type: Content of: <div><div><pre>
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:167
+#, no-wrap
+msgid ""
+"gpg --verify /Users/Alice/<file-osx-x86-bundle-stable>.asc /Users/Alice"
+"/<file-osx-x86-bundle-stable>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:169
+msgid "<b>Linux</b>"
+msgstr ""
+
+#. type: Content of: <div><div><pre>
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:170
+#, no-wrap
+msgid ""
+"gpg --verify /home/Alice/Desktop/<file-source-stable>.asc "
+"/home/Alice/Desktop/<file-source-stable>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:173
+msgid ""
+"After verifying, GnuPG will come back saying something like \"Good "
+"signature\" or \"BAD signature\". The output should look something like "
+"this:"
+msgstr ""
+
+#. type: Content of: <div><div><pre>
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:178
+#, no-wrap
+msgid ""
+"    gpg: Signature made Tue 16 Mar 2010 05:55:17 AM CET using DSA key ID 28988BF5\n"
+"    gpg: Good signature from \"Roger Dingledine &lt;arma at mit.edu&gt;\"\n"
+"    gpg: WARNING: This key is not certified with a trusted signature!\n"
+"    gpg:          There is no indication that the signature belongs to the owner.\n"
+"    Primary key fingerprint: B117 2656 DFF9 83C3 042B  C699 EB5A 896A 2898 8BF5\n"
+"    "
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:186
+msgid ""
+"Notice that there is a warning because you haven't assigned a trust index to"
+" this person. This means that GnuPG verified that the key made that "
+"signature, but it's up to you to decide if that key really belongs to the "
+"developer. The best method is to meet the developer in person and exchange "
+"key fingerprints."
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:193
+msgid ""
+"For your reference, this is an example of a <em>BAD</em> verification. It "
+"means that the signature and file contents do not match. In this case, you "
+"should not trust the file contents:"
+msgstr ""
+
+#. type: Content of: <div><div><pre>
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:198
+#, no-wrap
+msgid ""
+"    gpg: Signature made Tue 20 Apr 2010 12:22:32 PM CEST using DSA key ID 28988BF5\n"
+"    gpg: BAD signature from \"Roger Dingledine &lt;arma at mit.edu&gt;\"\n"
+"    "
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:202
+msgid "<b>RPM-based distributions :</b>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:203
+msgid ""
+"In order to manually verify the signatures on the RPM packages, you must use"
+" the <code>rpm</code> tool like so: <br />"
+msgstr ""
+
+#. type: Content of: <div><div><p><pre>
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:206
+#, no-wrap
+msgid "rpm -K filename.rpm"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:209
+msgid "<b>Debian:</b>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:210
+msgid ""
+"If you are running Tor on Debian you should read the instructions on <a "
+"href=\"<page docs/debian>#packages\">importing these keys to apt</a>."
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/verifying-signatures.wml:213
+msgid ""
+"If you wish to learn more about GPG, see <a "
+"href=\"http://www.gnupg.org/documentation/\">http://www.gnupg.org/documentation/</a>."
+msgstr ""

Added: translation/trunk/projects/website/po/fa/docs/3-low.tor-doc-unix.po
===================================================================
--- translation/trunk/projects/website/po/fa/docs/3-low.tor-doc-unix.po	                        (rev 0)
+++ translation/trunk/projects/website/po/fa/docs/3-low.tor-doc-unix.po	2011-04-12 16:19:31 UTC (rev 24595)
@@ -0,0 +1,410 @@
+# 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.
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
+"POT-Creation-Date: 2011-02-12 12:20+0000\n"
+"PO-Revision-Date: 2011-04-10 20:47+0000\n"
+"Last-Translator: pakdelreza <pakdelreza at gmail.com>\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"
+"Language: fa\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:8
+msgid ""
+"<a href=\"<page index>\">Home &raquo; </a> <a href=\"<page "
+"docs/documentation>\">Documentation &raquo; </a> <a href=\"<page docs/tor-"
+"doc-unix>\">Linux/BSD/Unix Client</a>"
+msgstr ""
+"<a href=\"<page index>\">خانه »</a> <a href=\"<page "
+"docs/documentation>\">مستندات »</a> <a href=\"<page docs/tor-doc-"
+"unix>\">کلاينت تحت لينوکس، يونيکس، يا BSD</a>"
+
+#. type: Content of: <div><div><h1>
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:13
+msgid "Running the <a href=\"<page index>\">Tor</a> client on Linux/BSD/Unix"
+msgstr ""
+"اجرای کلاينت <a href=\"<page index>\">تور</a> در محيط لينوکس، يونيکس، يا BSD"
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:14 /tmp/IT3itHQw4v.xml:26
+#: /tmp/IT3itHQw4v.xml:58 /tmp/IT3itHQw4v.xml:92 /tmp/IT3itHQw4v.xml:135
+#: /tmp/IT3itHQw4v.xml:173
+msgid "<br>"
+msgstr "<br>"
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:17
+msgid ""
+"<b>Note that these are the installation instructions for running a Tor "
+"client. If you want to relay traffic for others to help the network grow "
+"(please do), read the <a href=\"<page docs/tor-doc-relay>\">Configuring a "
+"relay</a> guide.</b>"
+msgstr ""
+"<b>توجه داشته باشيد که اين مطالب راهنمای نصب کلاينت تور می باشند. در صورتی "
+"که می‌خواهيد بازپخش‌کننده ترافيک ديگران باشيد تا به رشد شبکه کمک کنيد (شما "
+"را تشويق می‌کنيم به اين کار)، راهنمای <a href=\"<page docs/tor-doc-"
+"relay>\">تنظيم بازپخش‌کننده</a> را مطالعه کنيد.</b>"
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:23
+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-unix.wml:25
+msgid ""
+"<a class=\"anchor\" href=\"#installing\">Step One: Download and Install "
+"Tor</a>"
+msgstr "<a class=\"anchor\" href=\"#installing\">گام اوّل : دانلود و نصب تور</a>"
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:29
+msgid ""
+"The latest release of Tor can be found on the <a href=\"<page "
+"download/download>\">download</a> page. We have packages for Debian, Red "
+"Hat, Gentoo, *BSD, etc there too. If you're using Ubuntu, don't use the "
+"default packages: use <a href=\"<page docs/debian>#ubuntu\">our deb "
+"repository</a> instead.  Similarly, CentOS / Fedora / OpenSUSE users should "
+"use <a href=\"<page docs/rpms>\">our rpm repository</a> instead."
+msgstr ""
+"آخرين نسخه تور را همواره می‌توانيد در صفحه دانلود پيدا کنيد. بسته‌هایی برای "
+"Debian, Red Hat, Gentoo, *BSD و غيره نيز در آنجا موجود است. اگر از Ubuntu "
+"استفاده می‌کنید، از بسته‌های مذکور استفاده نکنيد و به جای آن از  <a "
+"href=\"<page docs/debian>#ubuntu\">مخزن deb ما</a>  استفاده نماييد. به همين "
+"ترتيب چنانچه کاربر CentOS / Fedora / OpenSUSE هستيد، از  <a href=\"<page "
+"docs/rpms>\">مخزن rpm ما </a>  استفاده کنيد."
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:38
+msgid ""
+"If you're building from source, first install <a "
+"href=\"http://www.monkey.org/~provos/libevent/\">libevent</a>, and make sure"
+" you have openssl and zlib (including the -devel packages if applicable). "
+"Then run:<br> <tt>tar xzf tor-<version-stable>.tar.gz; cd tor-<version-"
+"stable></tt><br> <tt>./configure &amp;&amp; make</tt><br> Now you can run "
+"tor as <tt>src/or/tor</tt>, or you can run <tt>make install</tt> (as root if"
+" necessary) to install it into /usr/local/, and then you can start it just "
+"by running <tt>tor</tt>."
+msgstr ""
+"اگر از کد منبع می‌خواهيد تور را بسازيد، ابتدا <a "
+"href=\"http://www.monkey.org/~provos/libevent/\">libevent</a>  را نصب کنيد، "
+"و نيز اطمينان حاصل کنيد که openssl و zlib را نيز داريد (به همراه بسته‌های "
+"-devel در صورت نياز). سپس دستور مقابل را اجرا کنيد: <br> <tt>tar xzf tor"
+"-<version-stable>.tar.gz; cd tor-<version-stable></tt><br> <tt>./configure "
+"&amp;&amp; make</tt><br> حال می‌توانيد با اجرای دستور <tt>src/or/tor</tt> "
+"تور را راه‌اندازی کنيد، و يا اينکه می‌توانيد دستور <tt>make install</tt> را "
+"اجرا کنيد (اگر لازم بود به عنوان root) تا تور در /usr/local/ نصب شود، و سپس "
+"می‌توانيد با اجرای <tt>tor</tt> آن را راه‌اندازی کنيد.    "
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:49
+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 "
+"settings. Tor is now installed."
+msgstr ""
+"تور به طور معمول به صورت يک کلاينت تنظيم شده است. از يک فايل تنظيم در داخل "
+"خود استفاده می‌کند، و اکثر کاربران نيازی به تغيير تنظيمات نخواهند داشت. تور "
+"هم‌اکنون نصب شده است"
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:54
+msgid "<hr> <a id=\"privoxy\"></a> <a id=\"polipo\"></a>"
+msgstr "<hr> <a id=\"privoxy\"></a> <a id=\"polipo\"></a>"
+
+#. type: Content of: <div><div><h2>
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:57
+msgid ""
+"<a class=\"anchor\" href=\"#polipo\">Step Two: Install Polipo for Web "
+"Browsing</a>"
+msgstr "<a class=\"anchor\" href=\"#polipo\">گام دوّم : نصب Polipo برای مرور وب</a>"
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:60
+msgid ""
+"After installing Tor, you need to configure your applications to use it."
+msgstr "پس از نصب تور، بايد برنامه‌های خود را برای استفاده از آن تنظيم کنيد."
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:64
+msgid ""
+"The first step is to set up web browsing. Start by installing <a "
+"href=\"http://www.pps.jussieu.fr/~jch/software/polipo/\">Polipo</a> from "
+"your favorite repository. Polipo is a caching web proxy that does http "
+"pipelining well, so it's well-suited for Tor's latencies. Make sure to get "
+"at least Polipo 1.0.4, since earlier versions lack the SOCKS support "
+"required to use Polipo with Tor. You should uninstall privoxy at this point "
+"(e.g. apt-get remove privoxy or yum remove privoxy), so they don't conflict."
+msgstr ""
+"اولين کار اين است که مرورگری وب را راه‌اندازی کنيد. با نصب <a "
+"href=\"http://www.pps.jussieu.fr/~jch/software/polipo/\">Polipo</a> از مخزن "
+"مورد علاقه‌تان شروع کنيد. Polipo يک پراکسی وب ذخيره‌ساز است که کار به اصطلاح"
+" خط لوله سازی (pipelining) برای http را خوب انجام می‌دهد، بنابراين برای "
+"وقفه‌های زمانی تور مناسب است. مطمئن شويد که حداقل نسخه 1.0.4 يا بالاتر "
+"Polipo را بگيريد چرا که نسخه‌های پايين‌تر از پشتيبانی SOCKS که برای کار با "
+"تور مورد نياز است برخوردار نيستند. در اين مرحله بهتر است privoxy را حذف "
+"(uninstall) کنيد تا با هم تداخلی نداشته باشند. برای اين کار می‌توانيد از "
+"دستور apt-get remove privoxy و يا yum remove privoxy استفاده کنيد.    "
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:74
+msgid ""
+"Once you've installed Polipo (either from package or from source), <b>you "
+"will need to configure Polipo to use Tor</b>. Grab our <a href=\"<tbbrepo"
+">/build-scripts/config/polipo.conf\">Polipo configuration for Tor</a> and "
+"put it in place of your current polipo config file (e.g. /etc/polipo/config "
+"or ~/.polipo).  You'll need to restart Polipo for the changes to take "
+"effect. For example:<br> <tt>/etc/init.d/polipo restart</tt>"
+msgstr ""
+"پس از اينکه Polipo را نصب کرديد  (چه از طريق بسته و چه از طريق منبع کد)، "
+"<b>لازم خواهد بود تا آن را برای استفاده از تور تنظيم کنيد</b> . فايل تنظيم "
+"Polipo برای تور را از <a href=\"<tbbrepo>/build-"
+"scripts/config/polipo.conf\">اينجا</a>   دانلود کنيد و آن را جايگزين فايل "
+"config کنونی کنيد. برای اين کار می‌توانيد از دستوری شبيه به "
+"/etc/polipo/config و يا ~/.polipo استفاده کنيد. برای اينکه تغييرات اثر کند "
+"بايستی يک بار Polipo را ببنديد و مجدداً باز کنيد. برای اين کار می‌توانيد از "
+"دستوری مانند <br> <tt>/etc/init.d/polipo restart</tt> استفاده کنید."
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:84
+msgid ""
+"If you prefer, you can instead use Privoxy with <a "
+"href=\"<wiki>TheOnionRouter/PrivoxyConfig\">this sample Privoxy "
+"configuration</a>. But since the config files both use port 8118, you "
+"shouldn't run both Polipo and Privoxy at the same time."
+msgstr ""
+"اگر ترجيح می‌دهيد می‌توانید به جای Polipo از Privoxy استفاده کنيد و آن را با"
+" اين نمونه تنظيم به کار بگيريد. امّا از آنجا که هر دو فايل تنظيم از درگاهی "
+"(port) شماره 8118 استفاده می‌کنند، نبايد Polipo و Privoxy را همزمان اجرا "
+"کنيد."
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:89
+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:91
+msgid ""
+"<a class=\"anchor\" href=\"#using\">Step Three: Configure your applications "
+"to use Tor</a>"
+msgstr ""
+"<a class=\"anchor\" href=\"#using\">گام سوّم : تنظیم برنامه های خود برای "
+"استفاده از تور</a>"
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:94
+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 ""
+"پس از نصب تور و Polipo، بايد برنامه‌های خود را برای استفاده از آنها تنظيم "
+"کنيد. اولين کار اين است که مرورگری وب را راه‌اندازی کنيد"
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:97
+msgid ""
+"You should use Tor with Firefox and Torbutton, for best safety.  Simply "
+"install the <a href=\"<page torbutton/index>\">Torbutton plugin</a>, restart"
+" your Firefox, and you're all set:"
+msgstr ""
+"برای بيشترين امنيت، بهتر است از تور با فايرفاکس و Torbutton استفاده کنيد. "
+"کافی است  <a href=\"<page torbutton/index>\">افزونه Torbutton</a>   را نصب "
+"کنيد. پس از آن فايرفاکس را يک دور ببنديد و دوباره باز کنيد تا آماده کار با "
+"تور باشد."
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:103
+msgid ""
+"<img alt=\"Torbutton plugin for Firefox\" src=\"$(IMGROOT)/screenshot-"
+"torbutton.png\" > <br>"
+msgstr ""
+"<img alt=\"Torbutton plugin for Firefox\" src=\"$(IMGROOT)/screenshot-"
+"torbutton.png\" > <br>"
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:110
+msgid ""
+"If you plan to run Firefox on a different computer than Tor, see the <a "
+"href=\"<wikifaq>#SocksListenAddress\"> FAQ entry for running Tor on a "
+"different computer</a>."
+msgstr ""
+"اگر قصد داريد فايرفاکس را روی رايانه‌ای متفاوت با تور اجرا کنيد، به <a "
+"href=\"<wikifaq>#SocksListenAddress\">سؤال متداول مربوط به اجرای تور روی "
+"رايانه متفاوت</a> مراجعه کنيد."
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:116
+msgid ""
+"To Torify other applications that support HTTP proxies, just point them at "
+"Polipo (that is, localhost port 8118). To use SOCKS directly (for instant "
+"messaging, Jabber, IRC, etc), you can point your application directly at Tor"
+" (localhost port 9050), but see <a href=\"<wikifaq>#SOCKSAndDNS\">this FAQ "
+"entry</a> for why this may be dangerous. For applications that support "
+"neither SOCKS nor HTTP, take a look at <a "
+"href=\"https://code.google.com/p/torsocks/\">torsocks</a> or <a "
+"href=\"<wiki>TheOnionRouter/TorifyHOWTO#socat\">socat</a>."
+msgstr ""
+"برای تنظيم ديگر نرم افزارها جهت کار با تور، اگر از پراکسی‌های HTTP پشتيبانی "
+"می‌کنند کافی است آنها را به سمت Polipo هدايت کنيد (که همان درگاهی يا "
+"localhost port 8118 است). برای اينکه که مستقيماً ازSOCKS استفاده کنيد (مثلاً"
+" برای پيام‌رسانی، Jabber، IRC و غيره)، می‌توانيد نرم‌افزار مورد نظر را "
+"مستقيماً به تور (موجود در localhost port 9050) هدايت کنيد، امّا <a "
+"href=\"<wikifaq>#SOCKSAndDNS\">اين سؤال متداول</a>  را هم در نظر بگيريد که "
+"توضيج می‌دهد که چرا اين کار ممکن است خطرناک باشد. برای برنامه‌هایی که نه "
+"SOCKS و نه HTTP را پشتيبانی می‌کنند، نگاهی بياندازيد به <a "
+"href=\"https://code.google.com/p/torsocks/\">torsocks</a> و يا <a "
+"href=\"<wiki>TheOnionRouter/TorifyHOWTO#socat\">socat</a>."
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:127
+msgid ""
+"For information on how to Torify other applications, check out the <a "
+"href=\"<wiki>TheOnionRouter/TorifyHOWTO\">Torify HOWTO</a>."
+msgstr ""
+"برای اطلاعات بيشتر در مورد اينکه چگونه نرم‌افزارهای مختلف را با تور سازگار "
+"کنيم، مراجعه کنيد به مستند مربوط به <a "
+"href=\"<wiki>/TheOnionRouter/TorifyHOWTO\">چگونگی سازگارسازی با تور</a> ."
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:132
+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:134
+msgid "<a class=\"anchor\" href=\"#verify\">Step Four: Make sure it's working</a>"
+msgstr ""
+"<a class=\"anchor\" href=\"#verify\">گام چهارم : اطمینان حاصل کنید که کار می"
+" کند</a>"
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:138
+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/\">the Tor detector</a> and see whether "
+"it thinks you're using Tor or not.  #<a href=\"http://ipchicken.com/\">this "
+"site</a> #to see what IP address it thinks you're using.  (If that site is "
+"down, see <a href=\"<wikifaq>#IsMyConnectionPrivate\">this FAQ entry</a> for"
+" more suggestions on how to test your Tor.)"
+msgstr ""
+"سپس بهتر است که شروع کنيد به استفاده از مرورگر خود به همراه تور تا مطمئن "
+"شويد که آدرس IP شما ناشناس گشته است. روی سايت <a "
+"href=\"https://check.torproject.org/\">تورياب (Tor detector) </a> کليک کنيد "
+"تا ببينيد استفاده از تور را تشخيص می‌دهد يا خير. همچنين می‌توانيد در <a "
+"href=\"http://ipchicken.com/\">اين سايت</a>   ببينيد که چه آدرس IP به شما "
+"منصوب شده است. اگر اين سايت کار نمی‌کرد، برای روش‌های ديگر آزمودن تور <a "
+"href=\"<wikifaq>#IsMyConnectionPrivate\">اين سؤال متداول</a> را ببينيد."
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:150
+msgid ""
+"If you have a personal firewall that limits your computer's ability to "
+"connect to itself (this includes something like SELinux on Fedora Core 4), "
+"be sure to allow connections from your local applications to Polipo (local "
+"port 8118) and Tor (local port 9050). If your firewall blocks outgoing "
+"connections, punch a hole so it can connect to at least TCP ports 80 and "
+"443, and then see <a href=\"<wikifaq>#FirewalledClient\">this FAQ entry</a>."
+"  If your SELinux config is not allowing tor or privoxy to run correctly, "
+"create a file named booleans.local in the directory /etc/selinux/targeted.  "
+"Edit this file in your favorite text editor and insert \"allow_ypbind=1\".  "
+"Restart your machine for this change to take effect."
+msgstr ""
+"اگر يک ديوار آتش (‌Firewall) شخصی داريد که امکان ارتباط رايانه شما را با "
+"خودش محدود می‌نمايد (مثلاً چيزی شبيه SELinux روی Fedora Core 4)، حتماً اجازه"
+" ارتباط نرم‌افزارهای خود را با درگاهی محلی (local port) شماره  8118 برای "
+"Polipo و درگاهی شماره 9050 برای تور بدهيد. اگر ديوار آتش شما ارتباطات خروجی "
+"را مسدود می‌کند، حفره‌ای در آن ايجاد کنيد تا لااقل بتواند به درگاهی‌های TCP "
+"شماره‌های 80 و 443 وصل شود. سپس <a href=\"<wikifaq>#FirewalledClient\">اين "
+"سؤال متداول</a> را ببينيد. اگر SELinux config اجازه نمی‌دهد تور يا privoxy "
+"به طور صحيح اجرا شوند، فايلی با نام booleans.local در پوشه "
+"/etc/selinux/targeted ايجاد کنيد. اين فايل را در يک ويرايشگر متنی ويرايش "
+"کنيد و عبارت allow_ypbind=1 را در آن قرار دهيد. رايانه خود را يک دور بازشروع"
+" (restart) کنيد تا تغييرات انجام شده اثر کنند."
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:165
+msgid ""
+"If it's still not working, look at <a href=\"<page "
+"docs/faq>#DoesntWork\">this FAQ entry</a> for hints."
+msgstr ""
+"اگر همچنان موفق نشده‌ايد که تور را راه‌اندازی کنيد، برای راهنمایی بيشتر به "
+"<a href=\"<page docs/faq>#DoesntWork\">اين سؤال متداول</a>   مراجعه کنيد."
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:169
+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:172
+msgid "<a class=\"anchor\" href=\"#relay\">Step Five: Configure it as a relay</a>"
+msgstr ""
+"<a class=\"anchor\" href=\"#relay\">گام پنجم : تنظيم تور به عنوان يک "
+"بازپخش‌کننده</a>"
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:175
+msgid ""
+"The Tor network relies on volunteers to donate bandwidth. The more people "
+"who run relays, the faster the Tor network will be. If you have at least 20 "
+"kilobytes/s each way, please help out Tor by configuring your Tor to be a "
+"relay too. We have many features that make Tor relays easy and convenient, "
+"including rate limiting for bandwidth, exit policies so you can limit your "
+"exposure to abuse complaints, and support for dynamic IP addresses."
+msgstr ""
+"شبکه تور تکيه دارد به داوطلبانی که پهنای باند اهدا می‌کنند. هر چقدر تعداد "
+"افرادی که بازپخش‌کننده راه‌اندازی کرده‌اند بيشتر باشد، سرعت شبکه تور بيشتر "
+"می‌شود. اگر حداقل به اندازه 20 کيلوبايت در ثانيه در هر دو جهت پهنای باند "
+"داريد، لطفاً با تنظيم تور خود به عنوان يک بازپخش‌کننده، به تور کمک کنيد. ما "
+"امکانات بسياری فراهم کرده‌ايم تا به کار گيری بازپخش‌کننده‌های تور را آسان و "
+"بی دردسر نماييم. از جمله اين امکانات عبارتند از امکان محدودسازی ميزان پهنای "
+"باند استفاده شده، امکان تعيين قوانين خروجی برای کاهش خطر شکايت‌های مربوط به "
+"سوء استفاده، و نيز پشتيبانی از آدرس‌های IP پويا. "
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:183
+msgid ""
+"Having relays in many different places on the Internet is what makes Tor "
+"users secure. <a href=\"<wikifaq>#RelayAnonymity\">You may also get stronger"
+" anonymity yourself</a>, since remote sites can't know whether connections "
+"originated at your computer or were relayed from others."
+msgstr ""
+"داشتن بازپخش‌کننده در بسياری از جاهای متفاوت اينترنت، عاملی است که باعث "
+"امنيت کاربران تور می‌شود. <a href=\"<wikifaq>#RelayAnonymity\">امنيت خودتان "
+"هم می‌تواند بالاتر برود</a> امنيت خودتان هم می‌تواند بالاتر برود، چرا که "
+"سايت‌های بيرونی نمی‌توانند تشخيص دهند که اتصالات از رايانه شما نشأت گرفته و "
+"يا بازپخش رايانه‌های ديگر هستند."
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:190
+msgid ""
+"Read more at our <a href=\"<page docs/tor-doc-relay>\">Configuring a "
+"relay</a> guide."
+msgstr ""
+"برای اطلاعات بيشتر به راهنمای <a href=\"<page docs/tor-doc-relay>\">تنظيم "
+"بازپخش‌کننده</a>   مراجعه کنيد."
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:193
+msgid "<hr>"
+msgstr "<hr>"
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:195
+msgid ""
+"If you have suggestions for improving this document, please <a href=\"<page "
+"about/contact>\">send them to us</a>. Thanks!"
+msgstr ""
+"چنانچه پيشنهاداتی برای بهبود اين مستند داريد، لطفاً  <a href=\"<page "
+"about/contact>\">آنها را با ما در ميان بگذاريد</a> . متشکريم!"

Added: translation/trunk/projects/website/po/fa/docs/3-low.tor-doc-web.po
===================================================================
--- translation/trunk/projects/website/po/fa/docs/3-low.tor-doc-web.po	                        (rev 0)
+++ translation/trunk/projects/website/po/fa/docs/3-low.tor-doc-web.po	2011-04-12 16:19:31 UTC (rev 24595)
@@ -0,0 +1,107 @@
+# 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.
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
+"POT-Creation-Date: 2011-02-12 12:20+0000\n"
+"PO-Revision-Date: 2011-04-12 16:10+0000\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"
+"Language: fa\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/tor-doc-web.wml:8
+msgid ""
+"<a href=\"<page index>\">Home &raquo; </a> <a href=\"<page "
+"docs/documentation>\">Documentation &raquo; </a> <a href=\"<page docs/tor-"
+"doc-web>\">Configure Your Browser</a>"
+msgstr ""
+
+#. type: Content of: <div><div><h1>
+#: /home/runa/tor/website/docs/en/tor-doc-web.wml:13
+msgid "Configuring your browser to use <a href=\"<page index>\">Tor</a>"
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/tor-doc-web.wml:14
+msgid "<br>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/tor-doc-web.wml:16
+msgid ""
+"If you're using Firefox (we recommend it), you don't need this page.  Simply"
+" install the <a href=\"<page torbutton/index>\">Torbutton plugin</a>, "
+"restart your Firefox, and you're all set:"
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/tor-doc-web.wml:22
+msgid ""
+"<img alt=\"Torbutton plugin for Firefox\" src=\"$(IMGROOT)/screenshot-"
+"torbutton.png\" /> <br>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/tor-doc-web.wml:27
+msgid ""
+"Otherwise, you need to manually configure your browser's proxy settings."
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/tor-doc-web.wml:29
+msgid ""
+"In Mozilla and Firefox on Windows, this is in Tools - Options - General - "
+"Connection Settings."
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/tor-doc-web.wml:31
+msgid ""
+"In Firefox on OS X, it's Firefox - Preferences - General - Connection "
+"Settings."
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/tor-doc-web.wml:33
+msgid ""
+"In Firefox on Linux, this is in Edit - Preferences - Advanced - Proxies."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/tor-doc-web.wml:36
+msgid ""
+"<img alt=\"Proxy settings in Firefox\" src=\"$(IMGROOT)/screenshot-win32"
+"-firefox-proxies.jpg\">"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/tor-doc-web.wml:40
+msgid ""
+"You should fill in \"localhost\" and \"8118\" to point the top four "
+"protocols to Polipo, as shown here. (Even though Polipo doesn't support FTP "
+"and Gopher, <a href=\"<wikifaq>#FtpProxy\">you should set them up "
+"anyway</a>.) You should also fill out the socks proxy entry to point "
+"directly to Tor (\"localhost\", \"9050\", and socks5)  to cover protocols "
+"besides the first four. Then click \"OK\"."
+msgstr ""
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/docs/en/tor-doc-web.wml:47
+msgid "<hr>"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: /home/runa/tor/website/docs/en/tor-doc-web.wml:49
+msgid ""
+"If you have suggestions for improving this document, please <a href=\"<page "
+"about/contact>\">send them to us</a>. Thanks!"
+msgstr ""

Added: translation/trunk/projects/website/po/fa/download/3-low.download.po
===================================================================
--- translation/trunk/projects/website/po/fa/download/3-low.download.po	                        (rev 0)
+++ translation/trunk/projects/website/po/fa/download/3-low.download.po	2011-04-12 16:19:31 UTC (rev 24595)
@@ -0,0 +1,540 @@
+# 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.
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
+"POT-Creation-Date: 2011-03-17 18:04+0000\n"
+"PO-Revision-Date: 2011-04-12 16:09+0000\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"
+"Language: fa\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#. type: Content of: <div><div>
+#: /home/runa/tor/website/download/en/download.wml:7
+msgid ""
+"<a href=\"<page index>\">Home &raquo; </a><a href=\"<page "
+"download/download>\">Download</a>"
+msgstr ""
+
+#. type: Content of: <div><div><h1>
+#: /home/runa/tor/website/download/en/download.wml:9
+msgid "Download Tor"
+msgstr ""
+
+#. type: Content of: <div><div><div><h2>
+#: /home/runa/tor/website/download/en/download.wml:12
+msgid "Want Tor to really work?"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+#: /home/runa/tor/website/download/en/download.wml:13
+msgid ""
+"...then please don't just install it and go on.  You need to change some of "
+"your habits, and reconfigure your software! Tor by itself is <em>NOT</em> "
+"all you need to maintain your anonymity. Read the <a href=\"#warning\">full "
+"list of warnings</a>."
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td><div>
+#: /home/runa/tor/website/download/en/download.wml:20
+msgid "<a name=\"Windows\">Microsoft Windows</a>"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/download/en/download.wml:23
+msgid "The Tor Software for Windows comes bundled in three different ways:"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td><ul><li>
+#: /home/runa/tor/website/download/en/download.wml:25 /tmp/LYAFL6nMUK.xml:82
+#: /tmp/LYAFL6nMUK.xml:120
+msgid ""
+"The <strong>Tor Browser Bundle</strong> contains everything you need to "
+"safely browse the Internet. This package requires no installation. Just "
+"extract it and run. <a href=\"<page projects/torbrowser>\">Learn more "
+"&raquo;</a>"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td><ul><li>
+#: /home/runa/tor/website/download/en/download.wml:26 /tmp/LYAFL6nMUK.xml:83
+msgid ""
+"The <strong>Vidalia Bundle</strong> contains Tor, <a href=\"<page "
+"projects/vidalia>\">Vidalia</a>, and Polipo for installation on your system."
+"  You need to configure your applications to use Tor."
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td><ul><li>
+#: /home/runa/tor/website/download/en/download.wml:27
+msgid ""
+"The <strong>Expert Package</strong> contains just Tor and nothing else.  "
+"You'll need to configure Tor and all of your applications manually."
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td><p>
+#: /home/runa/tor/website/download/en/download.wml:29 /tmp/LYAFL6nMUK.xml:85
+msgid ""
+"There are two versions of each package, a stable and alpha release.  Stable "
+"packages are released when we believe the features and code will not change "
+"for many months.  Alpha or unstable packages are released so you can help us"
+" test new features and bugfixes. Even though they have a higher version "
+"number than the stable versions listed above, there is a much higher chance "
+"of serious reliability and security bugs in these downloads.  Please be "
+"prepared to <a href=\"https://bugs.torproject.org/\">report bugs</a>."
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td><p>
+#: /home/runa/tor/website/download/en/download.wml:30
+msgid ""
+"The current stable version of Tor for Windows is <version-win32-stable>.  "
+"The current alpha/unstable version of tor for Windows is <version-"
+"win32-alpha>."
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/download/en/download.wml:34
+msgid ""
+"<span class=\"windows\"> Tor Browser Bundle (English) version <version-"
+"torbrowserbundle>, works with Windows 7, Vista, and XP. <a "
+"href=\"../dist/torbrowser/tor-browser-<version-torbrowserbundle>_en-"
+"US.exe\">Download</a>&nbsp;(<a href=\"../dist/torbrowser/tor-browser"
+"-<version-torbrowserbundle>_en-US.exe.asc\">sig</a>)  </span>"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/download/en/download.wml:41
+msgid ""
+"<span class=\"windows\"> Tor Browser Instant Messaging Bundle (English) "
+"version <version-torimbrowserbundle>, works with Windows 7, Vista, and XP. "
+"<a href=\"../dist/torbrowser/tor-im-browser-<version-torimbrowserbundle>_en-"
+"US.exe\">Download</a>&nbsp;(<a href=\"../dist/torbrowser/tor-im-browser"
+"-<version-torimbrowserbundle>_en-US.exe.asc\">sig</a>)  </span>"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/download/en/download.wml:48
+msgid ""
+"<span class=\"windows\"> Download <a href=\"<page "
+"projects/torbrowser>\">other language versions and the source code</a> of "
+"the Tor Browser Bundle.  </span>"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/download/en/download.wml:53
+msgid ""
+"<span class=\"windows\"> Stable Vidalia Bundle works with Windows 7, Vista, "
+"XP, <a href=\"<package-win32-bundle-stable>\">Download Stable</a>&nbsp;(<a "
+"href=\"<package-win32-bundle-stable>.asc\">sig</a>)  </span>"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/download/en/download.wml:57
+msgid ""
+"<span class=\"windows\">Unstable Vidalia Bundles works with Windows 7, "
+"Vista, XP, <a href=\"<package-win32-bundle-alpha>\">Download "
+"Unstable</a>&nbsp;(<a href=\"<package-win32-bundle-"
+"alpha>.asc\">sig</a>)</span>"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/download/en/download.wml:60
+msgid ""
+"<span class=\"windows\">Stable Expert Bundle works with Windows 98SE, ME, "
+"Windows 7, Vista, XP, 2000, 2003 Server, <a href=\"../dist/win32/tor"
+"-<version-win32-stable>-win32.exe\">Download Stable</a>&nbsp;(<a "
+"href=\"../dist/win32/tor-<version-"
+"win32-stable>-win32.exe.asc\">sig</a>)</span>"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/download/en/download.wml:63
+msgid ""
+"<span class=\"windows\">Unstable Expert Bundle works with Windows 98SE, ME, "
+"Windows 7, Vista, XP, 2000, 2003 Server, <a href=\"../dist/win32/tor"
+"-<version-win32-alpha>-win32.exe\">Download Unstable</a>&nbsp;(<a "
+"href=\"../dist/win32/tor-<version-win32-alpha>-win32.exe.asc\">sig</a>)  "
+"</span>"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/download/en/download.wml:69
+msgid ""
+"<a href=\"<page docs/tor-doc-windows>\">Documentation for Microsoft Windows "
+"clients</a>"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td><div>
+#: /home/runa/tor/website/download/en/download.wml:77
+msgid "<a name=\"mac\">Apple OS X</a>"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/download/en/download.wml:80
+msgid "The Tor Software for OS X comes bundled in two different ways:"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td><p>
+#: /home/runa/tor/website/download/en/download.wml:86
+msgid ""
+"The current stable version of Tor for OS X is <version-osx-x86-stable>.  The"
+" current alpha/unstable version of Tor for OS X is <version-osx-x86-alpha>."
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/download/en/download.wml:90
+msgid ""
+"<span class=\"mac\">Tor Browser Bundle for OS X Intel (beta version), <a "
+"href=\"../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-"
+"osx-i386-en-US.zip\">Download</a>&nbsp; (<a "
+"href=\"../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-"
+"osx-i386-en-US.zip.asc\">sig</a>)  </span>"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/download/en/download.wml:97
+msgid ""
+"<span class=\"mac\">Stable Vidalia Bundle for OS X Intel, <a href"
+"=\"<package-osx-x86-bundle-stable>\">Download Stable</a>&nbsp;(<a href"
+"=\"<package-osx-x86-bundle-stable>.asc\">sig</a>)</span>"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/download/en/download.wml:100
+msgid ""
+"<span class=\"mac\">Unstable Vidalia Bundle for OS X Intel, <a href"
+"=\"<package-osx-x86-bundle-alpha>\">Download Unstable</a>&nbsp;(<a href"
+"=\"<package-osx-x86-bundle-alpha>.asc\">sig</a>)</span>"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/download/en/download.wml:103
+msgid ""
+"<span class=\"mac\">Stable Vidalia Bundle for OS X PowerPC, <a href"
+"=\"<package-osx-ppc-bundle-stable>\">Download Stable</a>&nbsp;(<a href"
+"=\"<package-osx-ppc-bundle-stable>.asc\">sig</a>)</span>"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/download/en/download.wml:106
+msgid ""
+"<span class=\"mac\">Unstable Vidalia Bundle for OS X PowerPC, <a href"
+"=\"<package-osx-ppc-bundle-alpha>\">Download Unstable</a>&nbsp;(<a href"
+"=\"<package-osx-ppc-bundle-alpha>.asc\">sig</a>)</span>"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/download/en/download.wml:109
+msgid ""
+"<a href=\"<page docs/tor-doc-osx>\">Documentation for Apple OS X "
+"clients</a>."
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td><div>
+#: /home/runa/tor/website/download/en/download.wml:116
+msgid "<a name=\"linux\">Linux/Unix</a>"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/download/en/download.wml:118
+msgid "The Tor Software comes bundled in two different ways:"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td><ul><li>
+#: /home/runa/tor/website/download/en/download.wml:121
+msgid ""
+"Read how to use <a href=\"<page download/download-unix>\">our repositories "
+"for the Tor software.</a>."
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/download/en/download.wml:126
+msgid ""
+"<span class=\"linux\">Tor Browser Bundle for GNU/Linux (beta version) on "
+"i686, <a href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-i686"
+"-<version-torbrowserbundlelinux32>-dev-en-US.tar.gz\">Download</a>&nbsp; (<a"
+" href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-"
+"torbrowserbundlelinux32>-dev-en-US.tar.gz.asc\">sig</a>)</span>"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/download/en/download.wml:131
+msgid ""
+"<span class=\"linux\">Tor Browser Bundle for GNU/Linux (beta version) on "
+"x86_64, <a href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64"
+"-<version-torbrowserbundlelinux64>-dev-en-US.tar.gz\">Download</a>&nbsp; (<a"
+" href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-"
+"torbrowserbundlelinux64>-dev-en-US.tar.gz.asc\">sig</a>)</span>"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/download/en/download.wml:136
+msgid ""
+"<span class=\"linux\">Use <a href=\"<page download/download-unix>\">our "
+"repositories</a> for all other Tor-related software.</span>"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td><div>
+#: /home/runa/tor/website/download/en/download.wml:141
+msgid "<a name=\"smartphones\">Tor for Smartphones</a>"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/download/en/download.wml:144
+msgid "Android-based phones, tablets, computers"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/download/en/download.wml:145
+msgid ""
+"<a href=\"../dist/android/<version-androidbundle-tor>-orbot-<version-"
+"androidbundle-orbot>.apk\">Android Bundle</a>"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/download/en/download.wml:146
+msgid "<a href=\"<page docs/android>\">Android Instructions</a>"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/download/en/download.wml:149
+msgid "iPhone, iPod Touch, iPad"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/download/en/download.wml:150
+msgid ""
+"<span class=\"mac\"><a href=\"http://sid77.slackware.it/iphone/\">Test "
+"packages by Marco</a></span>"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/download/en/download.wml:153
+msgid "Nokia Maemo/N900"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/download/en/download.wml:155
+msgid ""
+"<span class=\"nokia\"><a href=\"<page docs/N900>\">Experimental "
+"instructions</a></span>"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td><div>
+#: /home/runa/tor/website/download/en/download.wml:163
+msgid "<a name=\"source\">Source&nbsp;Code</a>"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/download/en/download.wml:166
+msgid ""
+"The current stable version of Tor is <version-stable>.  Its <a "
+"href=\"https://gitweb.torproject.org/tor.git/blob/release-0.2.1:/ChangeLog\">release"
+" notes</a> are available."
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/download/en/download.wml:169
+msgid ""
+"The current unstable/alpha version of Tor is <version-alpha>.  Its <a "
+"href=\"https://gitweb.torproject.org/tor.git/blob/refs/heads/release-0.2.2:/ChangeLog\">Changelog"
+" </a> is available."
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/download/en/download.wml:175
+msgid "Source Tarballs"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/download/en/download.wml:176
+msgid "./configure &amp;&amp; make &amp;&amp; src/or/tor"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/download/en/download.wml:177
+msgid ""
+"<a href=\"../dist/tor-<version-stable>.tar.gz\">Download Stable</a> (<a "
+"href=\"../dist/tor-<version-stable>.tar.gz.asc\">sig</a>)"
+msgstr ""
+
+#. type: Content of: <div><div><table><tr><td>
+#: /home/runa/tor/website/download/en/download.wml:178
+msgid ""
+"<a href=\"../dist/tor-<version-alpha>.tar.gz\">Download Unstable</a> (<a "
+"href=\"../dist/tor-<version-alpha>.tar.gz.asc\">sig</a>)"
+msgstr ""
+
+#. type: Content of: <div><div><div>
+#: /home/runa/tor/website/download/en/download.wml:182 /tmp/LYAFL6nMUK.xml:255
+msgid "<br>"
+msgstr ""
+
+#. type: Content of: <div><div><div>
+#: /home/runa/tor/website/download/en/download.wml:185
+msgid "<a name=\"warning\"></a> <a name=\"Warning\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><h2>
+#: /home/runa/tor/website/download/en/download.wml:187
+msgid "<a class=\"anchor\" href=\"#warning\">Want Tor to really work?</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+#: /home/runa/tor/website/download/en/download.wml:188
+msgid ""
+"...then please don't just install it and go on.  You need to change some of "
+"your habits, and reconfigure your software! Tor by itself is <em>NOT</em> "
+"all you need to maintain your anonymity. There are several major pitfalls to"
+" watch out for:"
+msgstr ""
+
+#. type: Content of: <div><div><div><ol><li>
+#: /home/runa/tor/website/download/en/download.wml:193
+msgid ""
+"Tor only protects Internet applications that are configured to send their "
+"traffic through Tor &mdash; it doesn't magically anonymize all your traffic "
+"just because you install it.  We recommend you use <a "
+"href=\"http://www.mozilla.com/en-US/firefox/all-older.html\">Firefox</a> "
+"with the <a href=\"<page torbutton/index>\">Torbutton</a> extension."
+msgstr ""
+
+#. type: Content of: <div><div><div><ol><li>
+#: /home/runa/tor/website/download/en/download.wml:201
+msgid ""
+"Torbutton blocks browser plugins such as Java, Flash, ActiveX, RealPlayer, "
+"Quicktime, Adobe's PDF plugin, and others: they can be manipulated into "
+"revealing your IP address. For example, that means Youtube is disabled. If "
+"you really need your Youtube, you can <a href=\"<page torbutton/torbutton-"
+"faq>#noflash\">reconfigure Torbutton</a> to allow it; but be aware that "
+"you're opening yourself up to potential attack. Also, extensions like Google"
+" toolbar look up more information about the websites you type in: they may "
+"bypass Tor and/or broadcast sensitive information. Some people prefer using "
+"two browsers (one for Tor, one for non-Tor browsing)."
+msgstr ""
+
+#. type: Content of: <div><div><div><ol><li>
+#: /home/runa/tor/website/download/en/download.wml:214
+msgid ""
+"Beware of cookies: if you ever browse without Tor and a site gives you a "
+"cookie, that cookie could identify you even when you start using Tor again. "
+"Torbutton tries to handle your cookies safely. <a "
+"href=\"https://addons.mozilla.org/firefox/82/\">CookieCuller</a> can help "
+"protect any cookies you do not want to lose."
+msgstr ""
+
+#. type: Content of: <div><div><div><ol><li>
+#: /home/runa/tor/website/download/en/download.wml:222
+msgid ""
+"Tor anonymizes the origin of your traffic, and it encrypts everything "
+"between you and the Tor network and everything inside the Tor network, but "
+"<a href=\"<wikifaq>#SoImtotallyanonymousifIuseTor\">it can't encrypt your "
+"traffic between the Tor network and its final destination.</a> If you are "
+"communicating sensitive information, you should use as much care as you "
+"would on the normal scary Internet &mdash; use HTTPS or other end-to-end "
+"encryption and authentication.  <a href=\"https://www.eff.org/https-"
+"everywhere\">HTTPS Everywhere</a> is a Firefox extension produced as a "
+"collaboration between The Tor Project and the Electronic Frontier "
+"Foundation. It encrypts your communications with a number of major websites."
+msgstr ""
+
+#. type: Content of: <div><div><div><ol><li>
+#: /home/runa/tor/website/download/en/download.wml:236
+msgid ""
+"While Tor blocks attackers on your local network from discovering or "
+"influencing your destination, it opens new risks: malicious or misconfigured"
+" Tor exit nodes can send you the wrong page, or even send you embedded Java "
+"applets disguised as domains you trust. Be careful opening documents or "
+"applications you download through Tor, unless you've verified their "
+"integrity."
+msgstr ""
+
+#. type: Content of: <div><div><div><ol><li>
+#: /home/runa/tor/website/download/en/download.wml:245
+msgid ""
+"Tor tries to prevent attackers from learning what destinations you connect "
+"to. It doesn't prevent somebody watching your traffic from learning that "
+"you're using Tor. You can mitigate (but not fully resolve) the risk by using"
+" a <a href=\"<page docs/bridges>\">Tor bridge relay</a> rather than "
+"connecting directly to the public Tor network, but ultimately the best "
+"protection here is a social approach: the more Tor users there are near you "
+"and the more <a href=\"<page about/torusers>\">diverse</a> their interests, "
+"the less dangerous it will be that you are one of them."
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+#: /home/runa/tor/website/download/en/download.wml:257
+msgid ""
+"Be smart and learn more. Understand what Tor does and does not offer.  This "
+"list of pitfalls isn't complete, and we need your help <a href=\"<page "
+"getinvolved/volunteer>#Documentation\">identifying and documenting all the "
+"issues</a>."
+msgstr ""
+
+#. type: Content of: <div><div><div><div><h2>
+#: /home/runa/tor/website/download/en/download.wml:269
+msgid "Jump to:"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><ul><li>
+#: /home/runa/tor/website/download/en/download.wml:271
+msgid "<a href=\"#Windows\">Microsoft Windows</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><ul><li>
+#: /home/runa/tor/website/download/en/download.wml:272
+msgid "<a href=\"#mac\">Apple OS X</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><ul><li>
+#: /home/runa/tor/website/download/en/download.wml:273
+msgid "<a href=\"#linux\">Linux/Unix</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><ul><li>
+#: /home/runa/tor/website/download/en/download.wml:274
+msgid "<a href=\"#smartphones\">Smartphones</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><ul><li>
+#: /home/runa/tor/website/download/en/download.wml:275
+msgid "<a href=\"#source\">Source Code</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><ul><li>
+#: /home/runa/tor/website/download/en/download.wml:276
+msgid "<a href=\"<page donate/donate>\">Please consider a donation</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><h2>
+#: /home/runa/tor/website/download/en/download.wml:284
+msgid "What is the (sig) link?"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><p>
+#: /home/runa/tor/website/download/en/download.wml:285
+msgid ""
+"These are GPG signatures to allow you to verify that your downloaded file is"
+" really from The Tor Project and not an imposter."
+msgstr ""
+
+#. type: Content of: <div><div><div><div>
+#: /home/runa/tor/website/download/en/download.wml:288
+msgid "<a href=\"<page docs/verifying-signatures>\">Learn more &raquo;</a>"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><h2>
+#: /home/runa/tor/website/download/en/download.wml:294
+msgid "Having Trouble?"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><ul><li>
+#: /home/runa/tor/website/download/en/download.wml:296
+msgid "<a href=\"<page docs/documentation>\">Read the fine manuals</a>"
+msgstr ""

Modified: translation/trunk/projects/website/po/fa/press/3-low.inthemedia.po
===================================================================
--- translation/trunk/projects/website/po/fa/press/3-low.inthemedia.po	2011-04-12 16:15:00 UTC (rev 24594)
+++ translation/trunk/projects/website/po/fa/press/3-low.inthemedia.po	2011-04-12 16:19:31 UTC (rev 24595)
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-03-25 16:51+0000\n"
-"PO-Revision-Date: 2011-03-26 00:32+0000\n"
+"POT-Creation-Date: 2011-03-28 12:48+0200\n"
+"PO-Revision-Date: 2011-03-29 00:27+0000\n"
 "Last-Translator: Ghazall <emroozz at gmail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
@@ -18,7 +18,7 @@
 "Plural-Forms: nplurals=1; plural=0\n"
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/press/en/inthemedia.wml:8
+#: /home/runa/dev/website/press/en/inthemedia.wml:8
 msgid ""
 "<a href=\"<page index>\">Home &raquo; </a> <a href=\"<page "
 "press/press>\">Press &raquo; </a> <a href=\"<page press/inthemedia>\">Tor in"
@@ -29,12 +29,12 @@
 "در رسانه ها</a>\n"
 
 #. type: Content of: <div><div><h1>
-#: /home/runa/tor/website/press/en/inthemedia.wml:15
+#: /home/runa/dev/website/press/en/inthemedia.wml:15
 msgid "Media Appearances"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/press/en/inthemedia.wml:17
+#: /home/runa/dev/website/press/en/inthemedia.wml:17
 msgid ""
 "Major news organizations including the New York Times, Forbes, Al Jazeera, "
 "Washington Post, Le Monde, NPR, BBC, and more have sought out or quoted Tor "
@@ -43,7 +43,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/press/en/inthemedia.wml:21
+#: /home/runa/dev/website/press/en/inthemedia.wml:21
 msgid ""
 "Since Tor is widely used throughout the world, it is mentioned regularly in "
 "the press.  This list is not comprehensive, but illustrates some of the "
@@ -51,39 +51,39 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/press/en/inthemedia.wml:24
+#: /home/runa/dev/website/press/en/inthemedia.wml:24
 msgid ""
 "A sample of such media appearances and mentions is below in order of newest "
 "to oldest:"
 msgstr ""
 
 #. type: Content of: <div><div><table><thead><tr><th>
-#: /home/runa/tor/website/press/en/inthemedia.wml:30
+#: /home/runa/dev/website/press/en/inthemedia.wml:30
 msgid "Date"
 msgstr ""
 
 #. type: Content of: <div><div><table><thead><tr><th>
-#: /home/runa/tor/website/press/en/inthemedia.wml:31
+#: /home/runa/dev/website/press/en/inthemedia.wml:31
 msgid "Publication"
 msgstr ""
 
 #. type: Content of: <div><div><table><thead><tr><th>
-#: /home/runa/tor/website/press/en/inthemedia.wml:32
+#: /home/runa/dev/website/press/en/inthemedia.wml:32
 msgid "Topic"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:36
+#: /home/runa/dev/website/press/en/inthemedia.wml:36
 msgid "2011 March 18"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:37
+#: /home/runa/dev/website/press/en/inthemedia.wml:37
 msgid "Telegraph"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:38
+#: /home/runa/dev/website/press/en/inthemedia.wml:38
 msgid ""
 "<a href=\"http://www.telegraph.co.uk/news/worldnews/middleeast/iran/8388484"
 "/Iran-cracks-down-on-web-dissident-technology.html\">Iran cracks down on web"
@@ -91,17 +91,17 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:43
+#: /home/runa/dev/website/press/en/inthemedia.wml:43
 msgid "2011 March 17"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:44 /tmp/u3kTkswOVo.xml:241
+#: /home/runa/dev/website/press/en/inthemedia.wml:44 /tmp/Q2ndl8ZYsF.xml:228
 msgid "BusinessWeek"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:45
+#: /home/runa/dev/website/press/en/inthemedia.wml:45
 msgid ""
 "<a "
 "href=\"http://www.businessweek.com/magazine/content/11_13/b4221043353206.htm\">Social"
@@ -109,17 +109,17 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:50
+#: /home/runa/dev/website/press/en/inthemedia.wml:50
 msgid "2011 March 10"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:51
+#: /home/runa/dev/website/press/en/inthemedia.wml:51
 msgid "NyTeknik"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:52
+#: /home/runa/dev/website/press/en/inthemedia.wml:52
 msgid ""
 "<a "
 "href=\"http://www.nyteknik.se/nyheter/it_telekom/internet/article3123594.ece\">Svenska"
@@ -127,17 +127,17 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:57
+#: /home/runa/dev/website/press/en/inthemedia.wml:57
 msgid "2011 March 09"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:58
+#: /home/runa/dev/website/press/en/inthemedia.wml:58
 msgid "Washington Post"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:59
+#: /home/runa/dev/website/press/en/inthemedia.wml:59
 msgid ""
 "<a href=\"http://www.washingtonpost.com/wp-"
 "dyn/content/article/2011/03/09/AR2011030905157_pf.html\">U.S.  funding tech "
@@ -145,17 +145,17 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:65
+#: /home/runa/dev/website/press/en/inthemedia.wml:65
 msgid "2011 February 17"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:66
+#: /home/runa/dev/website/press/en/inthemedia.wml:66
 msgid "Walpole Times"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:67
+#: /home/runa/dev/website/press/en/inthemedia.wml:67
 msgid ""
 "<a href=\"http://www.wickedlocal.com/walpole/news/x95296113/Tor-Project-a"
 "-Walpole-based-company-helps-Egyptians-avoid-Internet-censorship-during-"
@@ -164,18 +164,18 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:72 /tmp/u3kTkswOVo.xml:88
-#: /tmp/u3kTkswOVo.xml:96 /tmp/u3kTkswOVo.xml:104
+#: /home/runa/dev/website/press/en/inthemedia.wml:72 /tmp/Q2ndl8ZYsF.xml:86
+#: /tmp/Q2ndl8ZYsF.xml:93 /tmp/Q2ndl8ZYsF.xml:100
 msgid "2011 January 31"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:73
+#: /home/runa/dev/website/press/en/inthemedia.wml:73
 msgid "NPR: WBUR"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:74
+#: /home/runa/dev/website/press/en/inthemedia.wml:74
 msgid ""
 "<a href=\"http://hereandnow.wbur.org/2011/01/31/egypt-internet-"
 "government\">Here &amp; Now: U.S. Activists Help Egyptian Protesters Elude "
@@ -183,74 +183,73 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:80
+#: /home/runa/dev/website/press/en/inthemedia.wml:80
 msgid "2011 February 01"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:81
+#: /home/runa/dev/website/press/en/inthemedia.wml:81
 msgid "Discovery News"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:82
+#: /home/runa/dev/website/press/en/inthemedia.wml:82
 msgid ""
 "<a href=\"http://news.discovery.com/tech/egypt-internet-online-"
-"protesters-110201.  html\">Egypt's Internet Block Incomplete But "
-"Damaging</a>"
+"protesters-110201.html\">Egypt's Internet Block Incomplete But Damaging</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:89
+#: /home/runa/dev/website/press/en/inthemedia.wml:87
 msgid "IDG Poland"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:90
+#: /home/runa/dev/website/press/en/inthemedia.wml:88
 msgid ""
 "<a "
-"href=\"http://www.idg.pl/news/366773/Egipt.blokuje.Internet.aktywisci.szukaja."
-"  alternatyw.html\">Egipt blokuje Internet, aktywiści szukają alternatyw</a>"
+"href=\"http://www.idg.pl/news/366773/Egipt.blokuje.Internet.aktywisci.szukaja.alternatyw.html\">Egipt"
+" blokuje Internet, aktywiści szukają alternatyw</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:97 /tmp/u3kTkswOVo.xml:713
+#: /home/runa/dev/website/press/en/inthemedia.wml:94 /tmp/Q2ndl8ZYsF.xml:677
 msgid "New Scientist"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:98
+#: /home/runa/dev/website/press/en/inthemedia.wml:95
 msgid ""
 "<a href=\"http://www.newscientist.com/blogs/onepercent/2011/01/egypt-"
-"remains- officially-offli.html\">How Egypt is getting online</a>"
+"remains-officially-offli.html\">How Egypt is getting online</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:105
+#: /home/runa/dev/website/press/en/inthemedia.wml:101
 msgid "El Pais"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:106
+#: /home/runa/dev/website/press/en/inthemedia.wml:102
 msgid ""
 "<a "
-"href=\"http://www.elpais.com/articulo/internacional/Sortear/censura/golpe/fax/"
-" elpepuint/20110130elpepuint_14/Tes\">Sortear la censura a golpe de fax</a>"
+"href=\"http://www.elpais.com/articulo/internacional/Sortear/censura/golpe/fax/elpepuint/20110130elpepuint_14/Tes\">Sortear"
+" la censura a golpe de fax</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:112 /tmp/u3kTkswOVo.xml:119
-#: /tmp/u3kTkswOVo.xml:126
+#: /home/runa/dev/website/press/en/inthemedia.wml:107 /tmp/Q2ndl8ZYsF.xml:114
+#: /tmp/Q2ndl8ZYsF.xml:121
 msgid "2011 January 30"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:113
+#: /home/runa/dev/website/press/en/inthemedia.wml:108
 msgid "Fox 25 News - Boston"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:114
+#: /home/runa/dev/website/press/en/inthemedia.wml:109
 msgid ""
 "<a href=\"http://www.myfoxboston.com/dpp/news/local/local-company-helps-"
 "give-egyptians-internet-access-20110130\">Local company helps give Egyptians"
@@ -258,12 +257,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:120
+#: /home/runa/dev/website/press/en/inthemedia.wml:115
 msgid "New England Cable News"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:121
+#: /home/runa/dev/website/press/en/inthemedia.wml:116
 msgid ""
 "<a href=\"http://www.necn.com/01/30/11/Mass-company-helps-activists-avoid-"
 "onlin/landing.html?blockID=400628&feedID=4213\">Mass.  company helps "
@@ -271,167 +270,166 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:127 /tmp/u3kTkswOVo.xml:269
+#: /home/runa/dev/website/press/en/inthemedia.wml:122 /tmp/Q2ndl8ZYsF.xml:253
 msgid "Boston Globe"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:128
+#: /home/runa/dev/website/press/en/inthemedia.wml:123
 msgid ""
 "<a "
-"href=\"http://www.boston.com/news/local/massachusetts/articles/2011/01/30/ "
-"mass_groups_software_helps_avoid_censorship/\">Foreign activists stay "
-"covered online</a>"
+"href=\"http://www.boston.com/news/local/massachusetts/articles/2011/01/30/mass_groups_software_helps_avoid_censorship/\">Foreign"
+" activists stay covered online</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:134 /tmp/u3kTkswOVo.xml:142
+#: /home/runa/dev/website/press/en/inthemedia.wml:128 /tmp/Q2ndl8ZYsF.xml:135
 msgid "2011 January 29"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:135
+#: /home/runa/dev/website/press/en/inthemedia.wml:129
 msgid "SvD.se"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:136
+#: /home/runa/dev/website/press/en/inthemedia.wml:130
 msgid ""
-"<a href=\"http://www.svd.se/nyheter/utrikes/tor-oppnar-dorrar-for- "
+"<a href=\"http://www.svd.se/nyheter/utrikes/tor-oppnar-dorrar-for-"
 "natdissidenter_5902693.svd\">Tor öppnar dörrar för nätdissidenter</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:143 /tmp/u3kTkswOVo.xml:351
+#: /home/runa/dev/website/press/en/inthemedia.wml:136 /tmp/Q2ndl8ZYsF.xml:329
 msgid "ComputerWorld"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:144
+#: /home/runa/dev/website/press/en/inthemedia.wml:137
 msgid ""
-"<a href=\"http://www.computerworld.com/s/article/9207058/ "
-"Without_Internet_Egyptians_find_new_ways_to_get_online?taxonomyId=16\">Without"
+"<a "
+"href=\"http://www.computerworld.com/s/article/9207058/Without_Internet_Egyptians_find_new_ways_to_get_online?taxonomyId=16\">Without"
 " Internet, Egyptians find new ways to get online.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:150
+#: /home/runa/dev/website/press/en/inthemedia.wml:142
 msgid "2011 January 28"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:151
+#: /home/runa/dev/website/press/en/inthemedia.wml:143
 msgid "Globe and Mail"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:152
+#: /home/runa/dev/website/press/en/inthemedia.wml:144
 msgid ""
 "<a href=\"https://www.theglobeandmail.com/news/technology/in-a-span-of-"
-"minutes-a- country-goes-offline/article1887207/\">In a span of minutes, a "
+"minutes-a-country-goes-offline/article1887207/\">In a span of minutes, a "
 "country goes offline</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:158
+#: /home/runa/dev/website/press/en/inthemedia.wml:149
 msgid "2010 December 22"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:159 /tmp/u3kTkswOVo.xml:235
-#: /tmp/u3kTkswOVo.xml:256 /tmp/u3kTkswOVo.xml:339 /tmp/u3kTkswOVo.xml:380
-#: /tmp/u3kTkswOVo.xml:664
+#: /home/runa/dev/website/press/en/inthemedia.wml:150 /tmp/Q2ndl8ZYsF.xml:222
+#: /tmp/Q2ndl8ZYsF.xml:241 /tmp/Q2ndl8ZYsF.xml:317 /tmp/Q2ndl8ZYsF.xml:355
+#: /tmp/Q2ndl8ZYsF.xml:628
 msgid "Technology Review"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:160
+#: /home/runa/dev/website/press/en/inthemedia.wml:151
 msgid ""
 "<a href=\"http://www.technologyreview.com/web/26981/\">Home Internet with "
 "Anonymity Built In</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:164
+#: /home/runa/dev/website/press/en/inthemedia.wml:155
 msgid "2010 December 17"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:165
+#: /home/runa/dev/website/press/en/inthemedia.wml:156
 msgid "New York Times Magazine"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:166
+#: /home/runa/dev/website/press/en/inthemedia.wml:157
 msgid ""
 "<a href=\"https://www.nytimes.com/2010/12/19/magazine/19FOB-"
 "Medium-t.html\">Granting Anonymity</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:171
+#: /home/runa/dev/website/press/en/inthemedia.wml:162
 msgid "2010 November 03"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:172
+#: /home/runa/dev/website/press/en/inthemedia.wml:163
 msgid "metro sverige"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:173
+#: /home/runa/dev/website/press/en/inthemedia.wml:164
 msgid ""
 "<a href=\"http://www.metro.se/2010/11/03/73897/sida-hjalper-utsatta-bli-"
-"anonyma-pa-n /\">Sida hjälper utsatta bli anonyma på nätet</a>"
+"anonyma-pa-n/\">Sida hjälper utsatta bli anonyma på nätet</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:178
+#: /home/runa/dev/website/press/en/inthemedia.wml:168
 msgid "2010 Sept 17"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:179
+#: /home/runa/dev/website/press/en/inthemedia.wml:169
 msgid "NPR: On the media"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:180
+#: /home/runa/dev/website/press/en/inthemedia.wml:170
 msgid ""
 "<a href=\"http://www.onthemedia.org/transcripts/2010/09/17/05\">On the "
 "Media: Interview with Jacob Appelbaum</a>."
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:184
+#: /home/runa/dev/website/press/en/inthemedia.wml:174
 msgid "2010 August 01"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:185
+#: /home/runa/dev/website/press/en/inthemedia.wml:175
 msgid "PC Format - Poland"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:186
+#: /home/runa/dev/website/press/en/inthemedia.wml:176
 msgid ""
 "<a href=\"http://www.pcformat.pl/index.php/artykul/aid/1236/t/google-"
-"facebook-nas- szpieguj-jak-chroni-prywatno-w-sieci\">Google and Facebook are"
-" spying on us</a>"
+"facebook-nas-szpieguj-jak-chroni-prywatno-w-sieci\">Google and Facebook are "
+"spying on us</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:192
+#: /home/runa/dev/website/press/en/inthemedia.wml:181
 msgid "2010 July 14"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:193
+#: /home/runa/dev/website/press/en/inthemedia.wml:182
 msgid "China Rights Forum"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:194
+#: /home/runa/dev/website/press/en/inthemedia.wml:183
 msgid ""
 "<a "
 "href=\"http://www.hrichina.org/public/contents/category?cid=175033\">China "
@@ -439,52 +437,52 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:200
+#: /home/runa/dev/website/press/en/inthemedia.wml:189
 msgid "2010 May 25"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:201
+#: /home/runa/dev/website/press/en/inthemedia.wml:190
 msgid "The Australian"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:202
+#: /home/runa/dev/website/press/en/inthemedia.wml:191
 msgid ""
 "<a href=\"http://www.theaustralian.com.au/australian-it/call-to-join-tor-"
-"network-to- fight-censorship/story-e6frgakx-1225870756466\"> Call to join "
-"Tor network to fight censorship</a>"
+"network-to-fight-censorship/story-e6frgakx-1225870756466\"> Call to join Tor"
+" network to fight censorship</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:208
+#: /home/runa/dev/website/press/en/inthemedia.wml:196
 msgid "2010 Mar 17"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:209
+#: /home/runa/dev/website/press/en/inthemedia.wml:197
 msgid "PC World Poland"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:210
+#: /home/runa/dev/website/press/en/inthemedia.wml:198
 msgid ""
 "<a href=\"http://www.idg.pl/news/356993/Anonimowosc.w.Sieci.html\">Anonymity"
 " in the Web</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:214
+#: /home/runa/dev/website/press/en/inthemedia.wml:202
 msgid "2010 Mar 11"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:215
+#: /home/runa/dev/website/press/en/inthemedia.wml:203
 msgid "ABC Australia"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:216
+#: /home/runa/dev/website/press/en/inthemedia.wml:204
 msgid ""
 "<a "
 "href=\"http://www.abc.net.au/rn/futuretense/stories/2010/2837736.htm\">Future"
@@ -492,91 +490,90 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:219
+#: /home/runa/dev/website/press/en/inthemedia.wml:207
 msgid "2010 Mar 09"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:220
+#: /home/runa/dev/website/press/en/inthemedia.wml:208
 msgid "PC Pro UK"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:221
+#: /home/runa/dev/website/press/en/inthemedia.wml:209
 msgid ""
 "<a href=\"http://www.pcpro.co.uk/features/356254/the-dark-side-of-the-"
 "web\">The dark side of the web</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:226
+#: /home/runa/dev/website/press/en/inthemedia.wml:214
 msgid "2009 Dec 29"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:227
+#: /home/runa/dev/website/press/en/inthemedia.wml:215
 msgid "Times Online"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:228
+#: /home/runa/dev/website/press/en/inthemedia.wml:216
 msgid ""
 "<a "
-"href=\"http://www.timesonline.co.uk/tol/news/world/middle_east/article6969958."
-"  ece\">When Iran’s regime falls this will be remembered as the YouTube "
-"revolution </a>"
+"href=\"http://www.timesonline.co.uk/tol/news/world/middle_east/article6969958.ece\">When"
+" Iran’s regime falls this will be remembered as the YouTube revolution </a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:234
+#: /home/runa/dev/website/press/en/inthemedia.wml:221
 msgid "2009 Oct 15"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:236
+#: /home/runa/dev/website/press/en/inthemedia.wml:223
 msgid ""
 "<a href=\"http://www.technologyreview.com/web/23736/?a=f\">China Cracks Down"
 " on Tor Anonymity Network</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:240
+#: /home/runa/dev/website/press/en/inthemedia.wml:227
 msgid "2009 Sep 30"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:242
+#: /home/runa/dev/website/press/en/inthemedia.wml:229
 msgid ""
 "<a "
-"href=\"http://www.businessweek.com/globalbiz/content/sep2009/gb20090930_620354."
-"  htm\">China's Online Censors Work Overtime</a>"
+"href=\"http://www.businessweek.com/globalbiz/content/sep2009/gb20090930_620354.htm\">China's"
+" Online Censors Work Overtime</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:247
+#: /home/runa/dev/website/press/en/inthemedia.wml:233
 msgid "2009 Aug 19"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:248
+#: /home/runa/dev/website/press/en/inthemedia.wml:234
 msgid "Reuters"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:249
+#: /home/runa/dev/website/press/en/inthemedia.wml:235
 msgid ""
-"<a href=\"http://www.reuters.com/article/internetNews/idUSTRE57I4IE20090819?"
-" pageNumber=1&amp;virtualBrandChannel=0&amp;sp=true\">Web tools help protect"
-" human rights activists</a>"
+"<a "
+"href=\"http://www.reuters.com/article/internetNews/idUSTRE57I4IE20090819?pageNumber=1&amp;virtualBrandChannel=0&amp;sp=true\">Web"
+" tools help protect human rights activists</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:255
+#: /home/runa/dev/website/press/en/inthemedia.wml:240
 msgid "2009 Aug 10"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:257
+#: /home/runa/dev/website/press/en/inthemedia.wml:242
 msgid ""
 "<a "
 "href=\"http://www.technologyreview.com/blog/editors/23958/?nlid=2255\">How "
@@ -584,162 +581,161 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:261 /tmp/u3kTkswOVo.xml:268
+#: /home/runa/dev/website/press/en/inthemedia.wml:246 /tmp/Q2ndl8ZYsF.xml:252
 msgid "2009 Jul 26"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:262 /tmp/u3kTkswOVo.xml:296
+#: /home/runa/dev/website/press/en/inthemedia.wml:247 /tmp/Q2ndl8ZYsF.xml:278
 msgid "Washington Times"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:263
+#: /home/runa/dev/website/press/en/inthemedia.wml:248
 msgid ""
 "<a href=\"http://www.washingtontimes.com/news/2009/jul/26/senate-help-iran-"
-"dodge- internet-censorship/\">Senate OKs funds to thwart Iran Web "
-"censors</a>"
+"dodge-internet-censorship/\">Senate OKs funds to thwart Iran Web censors</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:270
+#: /home/runa/dev/website/press/en/inthemedia.wml:254
 msgid ""
-"<a href=\"http://www.boston.com/news/nation/washington/articles/2009/07/26/ "
-"us_to_increase_funding_for_hackivists_aiding_iranians/\">US set to hike aid "
-"aimed at Iranians</a>"
+"<a "
+"href=\"http://www.boston.com/news/nation/washington/articles/2009/07/26/us_to_increase_funding_for_hackivists_aiding_iranians/\">US"
+" set to hike aid aimed at Iranians</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:276
+#: /home/runa/dev/website/press/en/inthemedia.wml:259
 msgid "2009 Jul 24"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:277
+#: /home/runa/dev/website/press/en/inthemedia.wml:260
 msgid "Associated Press"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:278
+#: /home/runa/dev/website/press/en/inthemedia.wml:261
 msgid ""
-"<a href=\"http://www.google.com/hostednews/ap/article/ALeqM5hTf- "
+"<a href=\"http://www.google.com/hostednews/ap/article/ALeqM5hTf-"
 "p6Iy3sWHK8BRR58npGosLC3AD99L01QO0\">Iran activists work to elude crackdown "
 "on Internet</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:284
+#: /home/runa/dev/website/press/en/inthemedia.wml:266
 msgid "2009 Jul 08"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:285
+#: /home/runa/dev/website/press/en/inthemedia.wml:267
 msgid "Tehran Bureau"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:286
+#: /home/runa/dev/website/press/en/inthemedia.wml:268
 msgid ""
 "<a href=\"http://tehranbureau.com/geeks-globe-rally-iranians-online/\">Geeks"
 " Around the Globe Rally to Help Iranians Online</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:290
+#: /home/runa/dev/website/press/en/inthemedia.wml:272
 msgid "2009 Jul 02"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:291
+#: /home/runa/dev/website/press/en/inthemedia.wml:273
 msgid "NED/CIMA"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:292
+#: /home/runa/dev/website/press/en/inthemedia.wml:274
 msgid ""
 "<a href=\"http://cima.ned.org/events/new-media-in-iran.html\">The Role of "
 "New Media in the Iranian Elections</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:295
+#: /home/runa/dev/website/press/en/inthemedia.wml:277
 msgid "2009 Jun 26"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:297
+#: /home/runa/dev/website/press/en/inthemedia.wml:279
 msgid ""
 "<a href=\"http://www.washingtontimes.com/news/2009/jun/26/protesters-use-"
-"navy- technology-to-avoid-censorship/?feat=home_headlines\">Iranian "
+"navy-technology-to-avoid-censorship/?feat=home_headlines\">Iranian "
 "protesters avoid censorship with Navy technology</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:303
+#: /home/runa/dev/website/press/en/inthemedia.wml:284
 msgid "2009 Jun 29"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:304
+#: /home/runa/dev/website/press/en/inthemedia.wml:285
 msgid "EFF"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:305
+#: /home/runa/dev/website/press/en/inthemedia.wml:286
 msgid ""
 "<a href=\"http://www.eff.org/deeplinks/2009/06/help-protesters-iran-run-tor-"
-"relays- bridges\">Help Protesters in Iran: Run a Tor Bridge or a Tor "
+"relays-bridges\">Help Protesters in Iran: Run a Tor Bridge or a Tor "
 "Relay</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:310
+#: /home/runa/dev/website/press/en/inthemedia.wml:290
 msgid "2009 Jun 24"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:311
+#: /home/runa/dev/website/press/en/inthemedia.wml:291
 msgid "Daily Finance"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:312
+#: /home/runa/dev/website/press/en/inthemedia.wml:292
 msgid ""
-"<a href=\"http://www.dailyfinance.com/2009/06/24/nokia-and-siemens-in-iran- "
+"<a href=\"http://www.dailyfinance.com/2009/06/24/nokia-and-siemens-in-iran-"
 "controversy/\">Nokia and Siemens in Iran controversy</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:317 /tmp/u3kTkswOVo.xml:332
-#: /tmp/u3kTkswOVo.xml:338
+#: /home/runa/dev/website/press/en/inthemedia.wml:296 /tmp/Q2ndl8ZYsF.xml:310
+#: /tmp/Q2ndl8ZYsF.xml:316
 msgid "2009 Jun 18"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:318 /tmp/u3kTkswOVo.xml:414
-#: /tmp/u3kTkswOVo.xml:658
+#: /home/runa/dev/website/press/en/inthemedia.wml:297 /tmp/Q2ndl8ZYsF.xml:386
+#: /tmp/Q2ndl8ZYsF.xml:622
 msgid "Wall Street Journal"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:319
+#: /home/runa/dev/website/press/en/inthemedia.wml:298
 msgid ""
 "<a href=\"http://blogs.wsj.com/digits/2009/06/18/iranians-using-tor-to-"
-"anonymize-web -use/\">Iranians Using Tor to Anonymize Web Use</a>"
+"anonymize-web-use/\">Iranians Using Tor to Anonymize Web Use</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:324
+#: /home/runa/dev/website/press/en/inthemedia.wml:302
 msgid "2009 Jun 19"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:325
+#: /home/runa/dev/website/press/en/inthemedia.wml:303
 msgid "O'Reilly Radar"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:326
+#: /home/runa/dev/website/press/en/inthemedia.wml:304
 msgid ""
 "<a href=\"http://radar.oreilly.com/2009/06/tor-and-the-legality-of-"
 "runnin.html\"> Dramatic Increase in Number of Tor Clients from Iran: "
@@ -747,98 +743,97 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:333
+#: /home/runa/dev/website/press/en/inthemedia.wml:311
 msgid "Deutsche Welle"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:334
+#: /home/runa/dev/website/press/en/inthemedia.wml:312
 msgid ""
 "<a href=\"http://www.dw-world.de/dw/article/0,,4400882,00.html\">Internet "
 "proxies let Iranians and others connect to blocked Web sites</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:340
+#: /home/runa/dev/website/press/en/inthemedia.wml:318
 msgid ""
 "<a href=\"http://www.technologyreview.com/web/22893/\">The Web vs. the "
 "Republic of Iran</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:344 /tmp/u3kTkswOVo.xml:350
+#: /home/runa/dev/website/press/en/inthemedia.wml:322 /tmp/Q2ndl8ZYsF.xml:328
 msgid "2009 Jun 17"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:345
+#: /home/runa/dev/website/press/en/inthemedia.wml:323
 msgid "CNet News"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:346
+#: /home/runa/dev/website/press/en/inthemedia.wml:324
 msgid ""
 "<a href=\"http://news.cnet.com/8301-13578_3-10267287-38.html\">Iranians find"
 " ways to bypass Net censors</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:352
+#: /home/runa/dev/website/press/en/inthemedia.wml:330
 msgid ""
 "<a "
-"href=\"http://www.computerworld.com/action/article.do?command=viewArticleBasic&"
-" amp;articleId=9134471&amp;intsrc=news_ts_head\">Iran's leaders fight "
-"Internet; Internet wins (so far)</a>"
+"href=\"http://www.computerworld.com/action/article.do?command=viewArticleBasic&amp;articleId=9134471&amp;intsrc=news_ts_head\">Iran's"
+" leaders fight Internet; Internet wins (so far)</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:358
+#: /home/runa/dev/website/press/en/inthemedia.wml:335
 msgid "2009 May 29"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:359 /tmp/u3kTkswOVo.xml:387
+#: /home/runa/dev/website/press/en/inthemedia.wml:336 /tmp/Q2ndl8ZYsF.xml:362
 msgid "Le Monde"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:360
+#: /home/runa/dev/website/press/en/inthemedia.wml:337
 msgid ""
 "<a href=\"http://www.lemonde.fr/actualite-medias/article/2009/05/29/les-"
-"censeurs-du- net_1199993_3236.html\">Les censeurs du Net</a>"
+"censeurs-du-net_1199993_3236.html\">Les censeurs du Net</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:365
+#: /home/runa/dev/website/press/en/inthemedia.wml:341
 msgid "2009 May 15"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:366
+#: /home/runa/dev/website/press/en/inthemedia.wml:342
 msgid "Mass High Tech"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:367
+#: /home/runa/dev/website/press/en/inthemedia.wml:343
 msgid ""
 "<a href=\"http://www.masshightech.com/stories/2009/05/11/newscolumn2-Tor-"
-"tackles-Net -privacy-game-makers-flock-to-Hub.html\">Tor tackles Net "
+"tackles-Net-privacy-game-makers-flock-to-Hub.html\">Tor tackles Net "
 "privacy</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:372
+#: /home/runa/dev/website/press/en/inthemedia.wml:347
 msgid "2009 May 01"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:373 /tmp/u3kTkswOVo.xml:669
-#: /tmp/u3kTkswOVo.xml:679
+#: /home/runa/dev/website/press/en/inthemedia.wml:348 /tmp/Q2ndl8ZYsF.xml:633
+#: /tmp/Q2ndl8ZYsF.xml:643
 msgid "New York Times"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:374
+#: /home/runa/dev/website/press/en/inthemedia.wml:349
 msgid ""
 "<a "
 "href=\"http://www.nytimes.com/2009/05/01/technology/01filter.html\">Iranians"
@@ -846,12 +841,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:379
+#: /home/runa/dev/website/press/en/inthemedia.wml:354
 msgid "2009 Apr 23"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:381
+#: /home/runa/dev/website/press/en/inthemedia.wml:356
 msgid ""
 "<a href=\"http://www.technologyreview.com/computing/22427/?a=f\">Dissent "
 "Made Safer: How anonymity technology could save free speech on the "
@@ -859,87 +854,87 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:386
+#: /home/runa/dev/website/press/en/inthemedia.wml:361
 msgid "2009 Apr 22"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:388
+#: /home/runa/dev/website/press/en/inthemedia.wml:363
 msgid ""
 "<a href=\"http://bugbrother.blog.lemonde.fr/2009/04/22/comment-contourner-"
-"la- cybersurveillance/\">How to circumvent cybersurveillance</a>"
+"la-cybersurveillance/\">How to circumvent cybersurveillance</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:393 /tmp/u3kTkswOVo.xml:400
+#: /home/runa/dev/website/press/en/inthemedia.wml:367 /tmp/Q2ndl8ZYsF.xml:373
 msgid "2009 Apr 06"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:394
+#: /home/runa/dev/website/press/en/inthemedia.wml:368
 msgid "Reader's Digest"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:395
+#: /home/runa/dev/website/press/en/inthemedia.wml:369
 msgid ""
 "<a href=\"http://www.rd.com/advice-and-know-how/how-to-hide-"
-"anything/article122219.  html\">How to Hide Anything</a>"
+"anything/article122219.html\">How to Hide Anything</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:401
+#: /home/runa/dev/website/press/en/inthemedia.wml:374
 msgid "Al Jazeera"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:402
+#: /home/runa/dev/website/press/en/inthemedia.wml:375
 msgid ""
 "<a href=\"http://www.youtube.com/watch?v=vuatxUN2cUQ\">Global Village Voices"
 " showcases Tor</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:406
+#: /home/runa/dev/website/press/en/inthemedia.wml:379
 msgid "2009 Mar 18"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:407
+#: /home/runa/dev/website/press/en/inthemedia.wml:380
 msgid "Marie Claire"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:408
+#: /home/runa/dev/website/press/en/inthemedia.wml:381
 msgid ""
 "<a href=\"http://www.marieclaire.com/career-money/career-coach/manage-online"
-"--web- image\">How to Manage Your Web Footprint</a>"
+"--web-image\">How to Manage Your Web Footprint</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:413
+#: /home/runa/dev/website/press/en/inthemedia.wml:385
 msgid "2009 Mar 13"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:415
+#: /home/runa/dev/website/press/en/inthemedia.wml:387
 msgid ""
 "<a href=\"http://online.wsj.com/article/SB123567809587886053.html\">The "
 "Kindness of Strangers</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:420
+#: /home/runa/dev/website/press/en/inthemedia.wml:392
 msgid "2009 Mar 12"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:421
+#: /home/runa/dev/website/press/en/inthemedia.wml:393
 msgid "BBC World Service"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:422
+#: /home/runa/dev/website/press/en/inthemedia.wml:394
 msgid ""
 "<a href=\"http://bbcworldservicetrust.wordpress.com/2009/03/12/12-march-"
 "world-day-against-cyber-censorship/\">Steven J Murdoch interviewed about Tor"
@@ -947,102 +942,102 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:425
+#: /home/runa/dev/website/press/en/inthemedia.wml:397
 msgid "2009 Mar 03"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:426
+#: /home/runa/dev/website/press/en/inthemedia.wml:398
 msgid "Orf Austria"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:427
+#: /home/runa/dev/website/press/en/inthemedia.wml:399
 msgid ""
 "<a href=\"http://futurezone.orf.at/stories/1503028/\">WIRTSCHAFTSKAMMER "
 "column</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:431
+#: /home/runa/dev/website/press/en/inthemedia.wml:403
 msgid "2009 Feb 18"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:432 /tmp/u3kTkswOVo.xml:589
+#: /home/runa/dev/website/press/en/inthemedia.wml:404 /tmp/Q2ndl8ZYsF.xml:553
 msgid "Bangkok Post"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:433
+#: /home/runa/dev/website/press/en/inthemedia.wml:405
 msgid ""
 "<a href=\"http://www.bangkokpost.com/tech/technews/11872/the-old-fake-404"
-"-not-found- routine\">The old fake \"404 not found\" routine</a>"
+"-not-found-routine\">The old fake \"404 not found\" routine</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:438
+#: /home/runa/dev/website/press/en/inthemedia.wml:409
 msgid "2009 Feb 13"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:439
+#: /home/runa/dev/website/press/en/inthemedia.wml:410
 msgid "Hearsay Culture"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:440
+#: /home/runa/dev/website/press/en/inthemedia.wml:411
 msgid ""
 "<a href=\"http://www.hearsayculture.com/?p=307\">Hearsay Culture Radio "
 "Interview/Podcast</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:443
+#: /home/runa/dev/website/press/en/inthemedia.wml:414
 msgid "2008 Dec 29"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:444
+#: /home/runa/dev/website/press/en/inthemedia.wml:415
 msgid "nu.nl"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:445
+#: /home/runa/dev/website/press/en/inthemedia.wml:416
 msgid ""
 "<a href=\"http://www.nu.nl/internet/1891289/anoniem-browsen-voor-gsm-in-de-"
 "maak.html\">Anoniem browsen voor gsm in de maak</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:449
+#: /home/runa/dev/website/press/en/inthemedia.wml:420
 msgid "2008 Dec 14"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:450
+#: /home/runa/dev/website/press/en/inthemedia.wml:421
 msgid "PC Magazine: Middle &amp; Near East"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:451
+#: /home/runa/dev/website/press/en/inthemedia.wml:422
 msgid ""
 "<a href=\"http://www.pcmag-mideast.com/FeatureDetail.aspx?ID=1039\">How To "
 "Reclaim Your Online Privacy</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:456
+#: /home/runa/dev/website/press/en/inthemedia.wml:427
 msgid "2008 Aug 21"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:457
+#: /home/runa/dev/website/press/en/inthemedia.wml:428
 msgid "CNN"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:458
+#: /home/runa/dev/website/press/en/inthemedia.wml:429
 msgid ""
 "<a "
 "href=\"http://www.cnn.com/2008/TECH/08/21/internet.filtering/index.html\">Experts:"
@@ -1050,51 +1045,51 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:463
+#: /home/runa/dev/website/press/en/inthemedia.wml:434
 msgid "2008 Aug 22"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:464
+#: /home/runa/dev/website/press/en/inthemedia.wml:435
 msgid "The Sydney Morning Herald"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:465
+#: /home/runa/dev/website/press/en/inthemedia.wml:436
 msgid ""
 "<a href=\"http://www.smh.com.au/news/web/the-china-"
-"syndrome/2008/08/20/1218911800889 .html\">The China Syndrome</a>"
+"syndrome/2008/08/20/1218911800889.html\">The China Syndrome</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:471
+#: /home/runa/dev/website/press/en/inthemedia.wml:441
 msgid "2008 Aug 20"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:472
+#: /home/runa/dev/website/press/en/inthemedia.wml:442
 msgid "Scientific American"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:473
+#: /home/runa/dev/website/press/en/inthemedia.wml:443
 msgid ""
 "<a href=\"http://www.sciam.com/article.cfm?id=cryptography-how-to-keep-your-"
-"secrets- safe\">Cryptography: How to Keep Your Secrets Safe</a>"
+"secrets-safe\">Cryptography: How to Keep Your Secrets Safe</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:479
+#: /home/runa/dev/website/press/en/inthemedia.wml:448
 msgid "2008 Aug 05"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:480
+#: /home/runa/dev/website/press/en/inthemedia.wml:449
 msgid "Guardian UK"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:481
+#: /home/runa/dev/website/press/en/inthemedia.wml:450
 msgid ""
 "<a "
 "href=\"http://www.guardian.co.uk/commentisfree/2008/aug/05/china.censorship\">"
@@ -1102,62 +1097,62 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:487
+#: /home/runa/dev/website/press/en/inthemedia.wml:456
 msgid "2008 Aug 10"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:488
+#: /home/runa/dev/website/press/en/inthemedia.wml:457
 msgid "Tech Radar UK"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:489
+#: /home/runa/dev/website/press/en/inthemedia.wml:458
 msgid ""
 "<a href=\"http://www.techradar.com/news/internet/web/freedom-stick-"
-"highlights- chinese-net-censorship-449233\">Freedom Stick highlights Chinese"
-" 'net censorship: USB drive promises anonymous surfing for the paranoid</a>"
+"highlights-chinese-net-censorship-449233\">Freedom Stick highlights Chinese "
+"'net censorship: USB drive promises anonymous surfing for the paranoid</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:497 /tmp/u3kTkswOVo.xml:505
-#: /tmp/u3kTkswOVo.xml:514 /tmp/u3kTkswOVo.xml:522
+#: /home/runa/dev/website/press/en/inthemedia.wml:465 /tmp/Q2ndl8ZYsF.xml:473
+#: /tmp/Q2ndl8ZYsF.xml:481 /tmp/Q2ndl8ZYsF.xml:489
 msgid "2008 Aug 07"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:498
+#: /home/runa/dev/website/press/en/inthemedia.wml:466
 msgid "Spiegel"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:499
+#: /home/runa/dev/website/press/en/inthemedia.wml:467
 msgid ""
 "<a href=\"http://www.spiegel.de/netzwelt/tech/0,1518,570421,00.html\">Tricks"
 " gegen Zensur und Überwachung</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:506 /tmp/u3kTkswOVo.xml:560
-#: /tmp/u3kTkswOVo.xml:628 /tmp/u3kTkswOVo.xml:742
+#: /home/runa/dev/website/press/en/inthemedia.wml:474 /tmp/Q2ndl8ZYsF.xml:524
+#: /tmp/Q2ndl8ZYsF.xml:592 /tmp/Q2ndl8ZYsF.xml:706
 msgid "PC World"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:507
+#: /home/runa/dev/website/press/en/inthemedia.wml:475
 msgid ""
 "<a "
-"href=\"http://www.pcworld.com/article/149399-3/15_great_free_privacy_downloads."
-"  html\">15 Great, Free Privacy Downloads</a>.  Tor is Number 1."
+"href=\"http://www.pcworld.com/article/149399-3/15_great_free_privacy_downloads.html\">15"
+" Great, Free Privacy Downloads</a>.  Tor is Number 1."
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:515
+#: /home/runa/dev/website/press/en/inthemedia.wml:482
 msgid "The Guardian UK"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:516
+#: /home/runa/dev/website/press/en/inthemedia.wml:483
 msgid ""
 "<a "
 "href=\"http://www.guardian.co.uk/technology/2008/aug/07/censorship.hacking\">Chaos"
@@ -1165,12 +1160,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:523
+#: /home/runa/dev/website/press/en/inthemedia.wml:490
 msgid "The Register UK"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:524
+#: /home/runa/dev/website/press/en/inthemedia.wml:491
 msgid ""
 "<a "
 "href=\"http://www.theregister.co.uk/2008/08/07/torbrowser_olympics/\">German"
@@ -1178,66 +1173,67 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:530
+#: /home/runa/dev/website/press/en/inthemedia.wml:497
 msgid "2008 May 24"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:531
+#: /home/runa/dev/website/press/en/inthemedia.wml:498
 msgid "Groupo Estado"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:532
+#: /home/runa/dev/website/press/en/inthemedia.wml:499
 msgid ""
-"<a href=\"http://blog.estadao.com.br/blog/cruz/?title= "
-"cfp08_navegacao_anonima_na_rede&amp;more=1&amp;c=1&amp;tb=1&amp;pb=1&amp;cat="
-" 525\">Interview at Computers, Freedom, and Privacy 2008 Conference</a>"
+"<a "
+"href=\"http://blog.estadao.com.br/blog/cruz/?title=cfp08_navegacao_anonima_na_rede&amp;more=1&amp;c=1&amp;tb=1&amp;pb=1&amp;cat=525\">Interview"
+" at Computers, Freedom, and Privacy 2008 Conference</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:540
+#: /home/runa/dev/website/press/en/inthemedia.wml:505
 msgid "2008 Mar 12"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:541
+#: /home/runa/dev/website/press/en/inthemedia.wml:506
 msgid "SearchSecurity.com"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:542
+#: /home/runa/dev/website/press/en/inthemedia.wml:507
 msgid ""
-"<a href=\"http://searchsecurity.techtarget.com/news/article/0,289142, "
-"sid14_gci1305120,00.html\"> Tor network 'bridges' help evade blockers</a>.  "
-"Covers new Tor features designed to overcome filtering and blocking that "
-"prevent access to the Tor network."
+"<a "
+"href=\"http://searchsecurity.techtarget.com/news/article/0,289142,sid14_gci1305120,00.html\">"
+" Tor network 'bridges' help evade blockers</a>.  Covers new Tor features "
+"designed to overcome filtering and blocking that prevent access to the Tor "
+"network."
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:552
+#: /home/runa/dev/website/press/en/inthemedia.wml:516
 msgid "2008 Feb 14"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:553
+#: /home/runa/dev/website/press/en/inthemedia.wml:517
 msgid "Wired: Compiler Blog"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:554
+#: /home/runa/dev/website/press/en/inthemedia.wml:518
 msgid ""
 "<a href=\"http://blog.wired.com/monkeybites/2008/02/how-to-set-up-a.html\"> "
 "How To: Set Up Anonymous Browsing in 30 Seconds or Less</a>."
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:559
+#: /home/runa/dev/website/press/en/inthemedia.wml:523
 msgid "2008 Feb 01"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:561
+#: /home/runa/dev/website/press/en/inthemedia.wml:525
 msgid ""
 "<a href=\"http://www.pcworld.com/article/id,142094-pg,1/article.html\"> "
 "Hackers Can Expose Masked Surfers, Study Says</a> A report on <a "
@@ -1249,17 +1245,17 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:568
+#: /home/runa/dev/website/press/en/inthemedia.wml:532
 msgid "2007 Sep 21"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:569
+#: /home/runa/dev/website/press/en/inthemedia.wml:533
 msgid "Wired HowTo Blog"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:570
+#: /home/runa/dev/website/press/en/inthemedia.wml:534
 msgid ""
 "<a "
 "href=\"http://howto.wired.com/wiredhowtos/index.cgi?page_name=be_a_whistle_blower;action=display;category=Work\">Be"
@@ -1268,17 +1264,17 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:573
+#: /home/runa/dev/website/press/en/inthemedia.wml:537
 msgid "2007 Sep 16"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:574
+#: /home/runa/dev/website/press/en/inthemedia.wml:538
 msgid "Cnet"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:575
+#: /home/runa/dev/website/press/en/inthemedia.wml:539
 msgid ""
 "<a href=\"http://news.cnet.com/8301-13739_3-9779225-46.html\">Tor anonymity "
 "server admin arrested</a>.  A Tor exit node operator from Germany was "
@@ -1293,18 +1289,18 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:578
+#: /home/runa/dev/website/press/en/inthemedia.wml:542
 msgid "2007 Sep 10"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:579 /tmp/u3kTkswOVo.xml:696
-#: /tmp/u3kTkswOVo.xml:772 /tmp/u3kTkswOVo.xml:881 /tmp/u3kTkswOVo.xml:893
+#: /home/runa/dev/website/press/en/inthemedia.wml:543 /tmp/Q2ndl8ZYsF.xml:660
+#: /tmp/Q2ndl8ZYsF.xml:736 /tmp/Q2ndl8ZYsF.xml:845 /tmp/Q2ndl8ZYsF.xml:857
 msgid "Wired"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:580
+#: /home/runa/dev/website/press/en/inthemedia.wml:544
 msgid ""
 "<a "
 "href=\"http://www.wired.com/politics/security/news/2007/09/embassy_hacks\"> "
@@ -1341,17 +1337,17 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:583
+#: /home/runa/dev/website/press/en/inthemedia.wml:547
 msgid "2007 Jul 27"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:584
+#: /home/runa/dev/website/press/en/inthemedia.wml:548
 msgid "Wired Blog"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:585
+#: /home/runa/dev/website/press/en/inthemedia.wml:549
 msgid ""
 "<a href=\"http://blog.wired.com/27bstroke6/2007/07/cyber-jihadists.html\"> "
 "Cyber Jihadists Embrace Tor</a><br/> A pointer to a <a "
@@ -1362,12 +1358,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:588
+#: /home/runa/dev/website/press/en/inthemedia.wml:552
 msgid "2007 Jun 22"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:590
+#: /home/runa/dev/website/press/en/inthemedia.wml:554
 msgid ""
 "<a href=\"http://www.asiamedia.ucla.edu/article-"
 "southeastasia.asp?parentid=72388\"> The problems with censorship</a>.  "
@@ -1376,17 +1372,17 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:593
+#: /home/runa/dev/website/press/en/inthemedia.wml:557
 msgid "2007 Mar 15"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:594
+#: /home/runa/dev/website/press/en/inthemedia.wml:558
 msgid "World Changing"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:595
+#: /home/runa/dev/website/press/en/inthemedia.wml:559
 msgid ""
 "<a href=\"http://www.worldchanging.com/archives/006309.html\"> Blogging "
 "Where Speech Isn’t Free</a><br/> Coverage of former Tor Executive Director "
@@ -1396,17 +1392,17 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:598
+#: /home/runa/dev/website/press/en/inthemedia.wml:562
 msgid "2007 Mar 8"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:599
+#: /home/runa/dev/website/press/en/inthemedia.wml:563
 msgid "Security Focus"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:600
+#: /home/runa/dev/website/press/en/inthemedia.wml:564
 msgid ""
 "<a href=\"http://www.securityfocus.com/news/11447/1\"> Tor hack proposed to "
 "catch criminals</a>.  Coverage of a toolset called \"Torment\" for "
@@ -1415,17 +1411,17 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:603
+#: /home/runa/dev/website/press/en/inthemedia.wml:567
 msgid "2007 Feb 1"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:604
+#: /home/runa/dev/website/press/en/inthemedia.wml:568
 msgid "Dr Dobb's"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:605
+#: /home/runa/dev/website/press/en/inthemedia.wml:569
 msgid ""
 "<a href=\"http://www.ddj.com/security/197002414\"> Tor Project Protects "
 "Anonymous Sources</a>.  An introduction to Tor, including technical and "
@@ -1433,17 +1429,17 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:608
+#: /home/runa/dev/website/press/en/inthemedia.wml:572
 msgid "2006 Oct 19"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:609
+#: /home/runa/dev/website/press/en/inthemedia.wml:573
 msgid "Wired Threat Level"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:610
+#: /home/runa/dev/website/press/en/inthemedia.wml:574
 msgid ""
 "<a href=\"http://blog.wired.com/27bstroke6/2006/10/the_onion_route.html\"> "
 "The Onion Router (TOR) is Leaky (Leeky)</a>.  Explains why you need "
@@ -1453,17 +1449,17 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:613
+#: /home/runa/dev/website/press/en/inthemedia.wml:577
 msgid "2006 Aug 18"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:614 /tmp/u3kTkswOVo.xml:702
+#: /home/runa/dev/website/press/en/inthemedia.wml:578 /tmp/Q2ndl8ZYsF.xml:666
 msgid "NPR"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:615
+#: /home/runa/dev/website/press/en/inthemedia.wml:579
 msgid ""
 "<a href=\"http://www.npr.org/templates/story/story.php?storyId=5168456\"> "
 "Tips for Protecting Privacy Online</a>.  Kevin Bankston of the EFF "
@@ -1472,17 +1468,17 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:618
+#: /home/runa/dev/website/press/en/inthemedia.wml:582
 msgid "2006 Jul 5"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:619
+#: /home/runa/dev/website/press/en/inthemedia.wml:583
 msgid "MSNBC"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:620
+#: /home/runa/dev/website/press/en/inthemedia.wml:584
 msgid ""
 "<a href=\"http://www.msnbc.msn.com/id/13718446/page/2/\"> Defending "
 "liberties in high-tech world</a>.  Mentions EFF funding for Tor as one of "
@@ -1490,17 +1486,17 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:622
+#: /home/runa/dev/website/press/en/inthemedia.wml:586
 msgid "2006 Apr 11"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:623
+#: /home/runa/dev/website/press/en/inthemedia.wml:587
 msgid "PBS Frontline"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:624
+#: /home/runa/dev/website/press/en/inthemedia.wml:588
 msgid ""
 "<a "
 "href=\"http://pbs.gen.in/wgbh/pages/frontline/tankman/internet/tech.html\">Chipping"
@@ -1508,12 +1504,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:627
+#: /home/runa/dev/website/press/en/inthemedia.wml:591
 msgid "2006 Feb 28"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:629
+#: /home/runa/dev/website/press/en/inthemedia.wml:593
 msgid ""
 "<a "
 "href=\"http://www.pcworld.com/article/id,124891-page,1/article.html\">Outsmarting"
@@ -1521,17 +1517,17 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:632
+#: /home/runa/dev/website/press/en/inthemedia.wml:596
 msgid "2006 Feb 27"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:633
+#: /home/runa/dev/website/press/en/inthemedia.wml:597
 msgid "Forbes"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:634
+#: /home/runa/dev/website/press/en/inthemedia.wml:598
 msgid ""
 "<a href=\"http://members.forbes.com/global/2006/0227/018A_2.html\"> Cracks "
 "In the Wall</a>.  Discussion of Tor being used for evading censorship by "
@@ -1539,35 +1535,35 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:637
+#: /home/runa/dev/website/press/en/inthemedia.wml:601
 msgid "2006 Feb 20"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:638
+#: /home/runa/dev/website/press/en/inthemedia.wml:602
 msgid "The Boston Globe"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:639
+#: /home/runa/dev/website/press/en/inthemedia.wml:603
 msgid ""
 "<a href=\"http://members.forbes.com/global/2006/0227/018A_2.html\"> Beating "
 "censorship on the Internet</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:642 /tmp/u3kTkswOVo.xml:647
-#: /tmp/u3kTkswOVo.xml:652 /tmp/u3kTkswOVo.xml:689
+#: /home/runa/dev/website/press/en/inthemedia.wml:606 /tmp/Q2ndl8ZYsF.xml:611
+#: /tmp/Q2ndl8ZYsF.xml:616 /tmp/Q2ndl8ZYsF.xml:653
 msgid "2006 Feb 15"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:643
+#: /home/runa/dev/website/press/en/inthemedia.wml:607
 msgid "CBS Evening News"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:644
+#: /home/runa/dev/website/press/en/inthemedia.wml:608
 msgid ""
 "<a "
 "href=\"http://www.cbsnews.com/stories/2006/02/15/eveningnews/main1321785.shtml?source=search_story\">"
@@ -1576,22 +1572,22 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:648
+#: /home/runa/dev/website/press/en/inthemedia.wml:612
 msgid "CNBC - Closing Bell"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:649
+#: /home/runa/dev/website/press/en/inthemedia.wml:613
 msgid "TV Appearance by Roger Dingledine at 4:25pm. (no link)"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:653
+#: /home/runa/dev/website/press/en/inthemedia.wml:617
 msgid "Network Secure"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:654
+#: /home/runa/dev/website/press/en/inthemedia.wml:618
 msgid ""
 "<a href=\"http://www.network-"
 "secure.de/index.php?option=com_content&amp;task=view&amp;id=3909\">Tor: "
@@ -1599,12 +1595,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:657
+#: /home/runa/dev/website/press/en/inthemedia.wml:621
 msgid "2006 Feb 13"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:659
+#: /home/runa/dev/website/press/en/inthemedia.wml:623
 msgid ""
 "<a href=\"http://online.wsj.com/article/SB113979965346572150.html\"> Chinese"
 " Censors Of Internet Face 'Hacktivists' in U.S.</a>Full article text can "
@@ -1613,53 +1609,53 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:663
+#: /home/runa/dev/website/press/en/inthemedia.wml:627
 msgid "2006 Jan 31"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:665
+#: /home/runa/dev/website/press/en/inthemedia.wml:629
 msgid ""
 "<a href=\"http://www.technologyreview.com/Infotech/16216/page2/\">Evading "
 "the Google Eye</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:668
+#: /home/runa/dev/website/press/en/inthemedia.wml:632
 msgid "2006 Jan 29"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:670
+#: /home/runa/dev/website/press/en/inthemedia.wml:634
 msgid ""
 "<a href=\"http://www.nytimes.com/2006/01/29/weekinreview/29basic.html\"> How"
 " to Outwit the World's Internet Censors</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:673
+#: /home/runa/dev/website/press/en/inthemedia.wml:637
 msgid "2006 Jan 27"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:674
+#: /home/runa/dev/website/press/en/inthemedia.wml:638
 msgid "Fox News/eWeek"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:675
+#: /home/runa/dev/website/press/en/inthemedia.wml:639
 msgid ""
 "<a href=\"http://www.foxnews.com/story/0,2933,183005,00.html\"> Web "
 "Anonymizers Suddenly Get Very Popular</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:678
+#: /home/runa/dev/website/press/en/inthemedia.wml:642
 msgid "2006 Jan 25"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:680
+#: /home/runa/dev/website/press/en/inthemedia.wml:644
 msgid ""
 "<a "
 "href=\"http://www.nytimes.com/2006/01/25/technology/techspecial2/25privacy.html?_r=1&amp;oref=slogin\">"
@@ -1667,17 +1663,17 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:683
+#: /home/runa/dev/website/press/en/inthemedia.wml:647
 msgid "2006 Jan 23"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:684
+#: /home/runa/dev/website/press/en/inthemedia.wml:648
 msgid "NPR Talk of the Nation"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:685
+#: /home/runa/dev/website/press/en/inthemedia.wml:649
 msgid ""
 "<a href=\"http://www.npr.org/templates/story/story.php?storyId=5168456\"> "
 "Search Engines and Privacy Rights on the Web</a><br/> <a "
@@ -1686,24 +1682,24 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:690
+#: /home/runa/dev/website/press/en/inthemedia.wml:654
 msgid "Punto Informatico"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:691
+#: /home/runa/dev/website/press/en/inthemedia.wml:655
 msgid ""
 "<a href=\"http://punto-informatico.it/p.aspx?i=1430903\"> TOR c'è</a> "
 "(Italian)"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:695 /tmp/u3kTkswOVo.xml:701
+#: /home/runa/dev/website/press/en/inthemedia.wml:659 /tmp/Q2ndl8ZYsF.xml:665
 msgid "2006 Jan 20"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:697
+#: /home/runa/dev/website/press/en/inthemedia.wml:661
 msgid ""
 "<a "
 "href=\"http://www.wired.com/science/discoveries/news/2006/01/70051?currentPage=2\">"
@@ -1711,53 +1707,53 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:703
+#: /home/runa/dev/website/press/en/inthemedia.wml:667
 msgid ""
 "<a href=\"http://www.npr.org/templates/story/story.php?storyId=5165854\"> "
 "Google Records Subpoena Raises Privacy Fears</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:707
+#: /home/runa/dev/website/press/en/inthemedia.wml:671
 msgid "2005 Sep 30"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:708
+#: /home/runa/dev/website/press/en/inthemedia.wml:672
 msgid "Viva o Linux"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:709
+#: /home/runa/dev/website/press/en/inthemedia.wml:673
 msgid ""
 "<a href=\"http://www.vivaolinux.com.br/artigos/verArtigo.php?codigo=2759\"> "
 "TOR: A Internet sem rastreabilidade</a> (Portuguese)"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:712
+#: /home/runa/dev/website/press/en/inthemedia.wml:676
 msgid "2005 Aug 6"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:714
+#: /home/runa/dev/website/press/en/inthemedia.wml:678
 msgid ""
 "<a href=\"http://www.eurekalert.org/pub_releases/2005-08/ns-"
 "wwa080305.php\">Why we all need pornography</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:717
+#: /home/runa/dev/website/press/en/inthemedia.wml:681
 msgid "2005 Jul 12"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:718
+#: /home/runa/dev/website/press/en/inthemedia.wml:682
 msgid "IEEE Computer Society's Technical Committee on Security and Privacy"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:719
+#: /home/runa/dev/website/press/en/inthemedia.wml:683
 msgid ""
 "<a href=\"http://www.ieee-"
 "security.org/Cipher/Newsbriefs/2005/071805.html#TOR\"> Onion routing "
@@ -1765,34 +1761,34 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:723
+#: /home/runa/dev/website/press/en/inthemedia.wml:687
 msgid "2005 Jun 22"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:724
+#: /home/runa/dev/website/press/en/inthemedia.wml:688
 msgid "The Unofficial Apple Blog"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:725
+#: /home/runa/dev/website/press/en/inthemedia.wml:689
 msgid ""
 "<a href=\"http://www.tuaw.com/2005/06/22/privacy-watch-tor/\"> Privacy "
 "Watch: Tor</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:729
+#: /home/runa/dev/website/press/en/inthemedia.wml:693
 msgid "2005 Jun 10"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:730
+#: /home/runa/dev/website/press/en/inthemedia.wml:694
 msgid "The New Zealand Herald"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:731
+#: /home/runa/dev/website/press/en/inthemedia.wml:695
 msgid ""
 "<a "
 "href=\"http://www.nzherald.co.nz/section/story.cfm?c_id=5&amp;objectid=10329896\">"
@@ -1800,104 +1796,104 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:735
+#: /home/runa/dev/website/press/en/inthemedia.wml:699
 msgid "2005 Jun 8"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:736
+#: /home/runa/dev/website/press/en/inthemedia.wml:700
 msgid "American Public Radio"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:737
+#: /home/runa/dev/website/press/en/inthemedia.wml:701
 msgid ""
 "<a href=\"http://www.publicradio.org/columns/futuretense/2005/06/08.shtml\">"
 " An Internet privacy tool called \"Tor\"</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:741 /tmp/u3kTkswOVo.xml:747
+#: /home/runa/dev/website/press/en/inthemedia.wml:705 /tmp/Q2ndl8ZYsF.xml:711
 msgid "2005 Jun 1"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:743
+#: /home/runa/dev/website/press/en/inthemedia.wml:707
 msgid ""
 "<a href=\"http://www.pcworld.com/article/id,120763-page,4/article.html\"> "
 "The 100 Best Products of 2005</a><br/> Tor is ranked #40 on the list."
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:748
+#: /home/runa/dev/website/press/en/inthemedia.wml:712
 msgid "Linux Weekly News"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:749
+#: /home/runa/dev/website/press/en/inthemedia.wml:713
 msgid ""
 "<a href=\"http://lwn.net/Articles/138242/\"> A Look at The Onion Router "
 "(Tor)</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:753
+#: /home/runa/dev/website/press/en/inthemedia.wml:717
 msgid "2005 May 22"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:754 /tmp/u3kTkswOVo.xml:839
+#: /home/runa/dev/website/press/en/inthemedia.wml:718 /tmp/Q2ndl8ZYsF.xml:803
 msgid "Slashdot"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:755
+#: /home/runa/dev/website/press/en/inthemedia.wml:719
 msgid ""
 "<a href=\"http://yro.slashdot.org/article.pl?sid=05/05/22/0113244\"> Tor "
 "Anonymity Network Reaches 100 Verified Nodes</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:759
+#: /home/runa/dev/website/press/en/inthemedia.wml:723
 msgid "2005 May 20"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:760
+#: /home/runa/dev/website/press/en/inthemedia.wml:724
 msgid "Security.uz"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:761
+#: /home/runa/dev/website/press/en/inthemedia.wml:725
 msgid ""
 "<a href=\"http://security.uz/news/default.asp?id=10541\"> Tor - мощный "
 "анонимайзер для всех ОС</a> (Russian)"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:765
+#: /home/runa/dev/website/press/en/inthemedia.wml:729
 msgid "2005 May 19"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:766
+#: /home/runa/dev/website/press/en/inthemedia.wml:730
 msgid "WebPlanet"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:767
+#: /home/runa/dev/website/press/en/inthemedia.wml:731
 msgid ""
 "<a href=\"http://webplanet.ru/news/security/2005/5/19/tor.html\"> Tor: "
 "распределенная система анонимного серфинга</a> (Russian)"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:771 /tmp/u3kTkswOVo.xml:778
+#: /home/runa/dev/website/press/en/inthemedia.wml:735 /tmp/Q2ndl8ZYsF.xml:742
 msgid "2005 May 17"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:773
+#: /home/runa/dev/website/press/en/inthemedia.wml:737
 msgid ""
 "<a "
 "href=\"http://www.wired.com/politics/security/news/2005/05/67542?currentPage=all\">"
@@ -1906,170 +1902,170 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:779
+#: /home/runa/dev/website/press/en/inthemedia.wml:743
 msgid "XBiz"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:780
+#: /home/runa/dev/website/press/en/inthemedia.wml:744
 msgid ""
 "<a href=\"http://xbiz.com/news/8761\"> Navy Project Allows Anonymous "
 "Browsing</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:784
+#: /home/runa/dev/website/press/en/inthemedia.wml:748
 msgid "2005 Apr 13"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:785
+#: /home/runa/dev/website/press/en/inthemedia.wml:749
 msgid "Heise online"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:786
+#: /home/runa/dev/website/press/en/inthemedia.wml:750
 msgid ""
 "<a href=\"http://www.heise.de/newsticker/meldung/58506\"> CFP: Vom "
 "kafkaesken Schwinden der Anonymität</a> (German)"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:790
+#: /home/runa/dev/website/press/en/inthemedia.wml:754
 msgid "2005 Apr 5"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:791
+#: /home/runa/dev/website/press/en/inthemedia.wml:755
 msgid "Libero"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:792
+#: /home/runa/dev/website/press/en/inthemedia.wml:756
 msgid ""
 "<a href=\"http://magazine.libero.it/internetlife/scienzaeweb/ne208.phtml\"> "
 "Anonimato on line, ecco Tor</a> (Italian)"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:796
+#: /home/runa/dev/website/press/en/inthemedia.wml:760
 msgid "2005 Jan 4"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:797
+#: /home/runa/dev/website/press/en/inthemedia.wml:761
 msgid "Internetnews"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:798
+#: /home/runa/dev/website/press/en/inthemedia.wml:762
 msgid ""
 "<a href=\"http://www.internetnews.com/dev-news/article.php/3454521\"> EFF "
 "Throws Support to 'Anonymous' Internet Project</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:802
+#: /home/runa/dev/website/press/en/inthemedia.wml:766
 msgid "2005 Mar 31"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:803
+#: /home/runa/dev/website/press/en/inthemedia.wml:767
 msgid "Linux.com"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:804
+#: /home/runa/dev/website/press/en/inthemedia.wml:768
 msgid ""
 "<a href=\"http://www.linux.com/articles/43713?tid=19&amp;tid=78\"> Securing "
 "your online privacy with Tor</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:808
+#: /home/runa/dev/website/press/en/inthemedia.wml:772
 msgid "2004 Dec 27"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:809
+#: /home/runa/dev/website/press/en/inthemedia.wml:773
 msgid "BoingBoing"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:810
+#: /home/runa/dev/website/press/en/inthemedia.wml:774
 msgid ""
 "<a href=\"http://www.boingboing.net/2004/12/27/eff-helping-produce-.html\"> "
 "EFF helping produce anonymizing software</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:814
+#: /home/runa/dev/website/press/en/inthemedia.wml:778
 msgid "2004 Dec 25"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:815
+#: /home/runa/dev/website/press/en/inthemedia.wml:779
 msgid "Kansas City infozine"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:816
+#: /home/runa/dev/website/press/en/inthemedia.wml:780
 msgid ""
 "<a href=\"http://www.infozine.com/news/stories/op/storiesView/sid/4933/\"> "
 "EFF Joins Forces with Tor Software Project</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:820 /tmp/u3kTkswOVo.xml:826
+#: /home/runa/dev/website/press/en/inthemedia.wml:784 /tmp/Q2ndl8ZYsF.xml:790
 msgid "2004 Dec 23"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:821
+#: /home/runa/dev/website/press/en/inthemedia.wml:785
 msgid "golem.de"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:822
+#: /home/runa/dev/website/press/en/inthemedia.wml:786
 msgid ""
 "<a href=\"http://www.golem.de/0412/35340.html\"> EFF unterstützt "
 "Anonymisierer Tor</a> (German)"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:827
+#: /home/runa/dev/website/press/en/inthemedia.wml:791
 msgid "SuicideGirls"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:828
+#: /home/runa/dev/website/press/en/inthemedia.wml:792
 msgid ""
 "<a href=\"http://suicidegirls.com/news/technology/6150/\"> New Routing "
 "Software Allows Anonymous Internet Use</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:832
+#: /home/runa/dev/website/press/en/inthemedia.wml:796
 msgid "2004 Dec 18"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:833
+#: /home/runa/dev/website/press/en/inthemedia.wml:797
 msgid "P2Pnet"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:834
+#: /home/runa/dev/website/press/en/inthemedia.wml:798
 msgid "<a href=\"http://p2pnet.net/story/3357\"> EFF to sponsor Tor</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:838
+#: /home/runa/dev/website/press/en/inthemedia.wml:802
 msgid "2004 Dec 22"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:840
+#: /home/runa/dev/website/press/en/inthemedia.wml:804
 msgid ""
 "<a "
 "href=\"http://yro.slashdot.org/article.pl?sid=04/12/22/2031229&amp;tid=95&amp;tid=158&amp;tid=153&amp;tid=17\">"
@@ -2077,106 +2073,106 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:844
+#: /home/runa/dev/website/press/en/inthemedia.wml:808
 msgid "2004 Nov 16"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:845
+#: /home/runa/dev/website/press/en/inthemedia.wml:809
 msgid "AlterNet"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:846
+#: /home/runa/dev/website/press/en/inthemedia.wml:810
 msgid ""
 "<a href=\"http://www.alternet.org/columnists/story/20523/\"> Heavy "
 "Traffic</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:850
+#: /home/runa/dev/website/press/en/inthemedia.wml:814
 msgid "2004 Aug 30"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:851
+#: /home/runa/dev/website/press/en/inthemedia.wml:815
 msgid "Newsweek"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:852
+#: /home/runa/dev/website/press/en/inthemedia.wml:816
 msgid "Technology: Instant Security (no link)"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:856
+#: /home/runa/dev/website/press/en/inthemedia.wml:820
 msgid "2004 Aug 16"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:857
+#: /home/runa/dev/website/press/en/inthemedia.wml:821
 msgid "Eweek"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:858
+#: /home/runa/dev/website/press/en/inthemedia.wml:822
 msgid ""
 "<a href=\"http://www.eweek.com/c/a/Security/Dont-Fear-Internet-Anonymity-"
 "Tools/\"> Don't Fear Internet Anonymity Tools</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:862 /tmp/u3kTkswOVo.xml:868
+#: /home/runa/dev/website/press/en/inthemedia.wml:826 /tmp/Q2ndl8ZYsF.xml:832
 msgid "2004 Aug 6"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:863
+#: /home/runa/dev/website/press/en/inthemedia.wml:827
 msgid "HCC magazine"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:864
+#: /home/runa/dev/website/press/en/inthemedia.wml:828
 msgid ""
 "<a href=\"http://www.hcc.nl/eCache/DEF/21/083.html\"> Anoniem surfen met "
 "hulp van marine VS</a> (Dutch)"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:869
+#: /home/runa/dev/website/press/en/inthemedia.wml:833
 msgid "Golem"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:870
+#: /home/runa/dev/website/press/en/inthemedia.wml:834
 msgid ""
 "<a href=\"http://www.golem.de/0408/32835.html\"> Tor: Anonymisierer nutzt "
 "Onion-Routing</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:874
+#: /home/runa/dev/website/press/en/inthemedia.wml:838
 msgid "2004 Aug 5"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:875
+#: /home/runa/dev/website/press/en/inthemedia.wml:839
 msgid "Network World Security"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:876
+#: /home/runa/dev/website/press/en/inthemedia.wml:840
 msgid ""
 "<a href=\"http://www.networkworld.com/details/7088.html\"> Onion routing</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:880
+#: /home/runa/dev/website/press/en/inthemedia.wml:844
 msgid "2004 May 8"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:882
+#: /home/runa/dev/website/press/en/inthemedia.wml:846
 msgid ""
 "<a href=\"http://www.wired.com/politics/security/news/2004/08/64464\"> Onion"
 " Routing Averts Prying Eyes</a>. Also in <a "
@@ -2184,29 +2180,29 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:886
+#: /home/runa/dev/website/press/en/inthemedia.wml:850
 msgid "2004 Mar 8"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:887
+#: /home/runa/dev/website/press/en/inthemedia.wml:851
 msgid "CNET Japan blog"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:888
+#: /home/runa/dev/website/press/en/inthemedia.wml:852
 msgid ""
 "<a href=\"http://japan.cnet.com/blog/umeda/2004/03/08/entry_post_126/\"> "
 "Yearning of hackers and insecurity</a> (Japanese)"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:892
+#: /home/runa/dev/website/press/en/inthemedia.wml:856
 msgid "1999 Apr 13"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:894
+#: /home/runa/dev/website/press/en/inthemedia.wml:858
 msgid ""
 "<a href=\"http://www.wired.com/science/discoveries/news/1999/04/19091\"> "
 "Anonymous Web Surfing? Uh-Uh</a>"

Modified: translation/trunk/projects/website/po/fa/projects/1-high.torbrowser.po
===================================================================
--- translation/trunk/projects/website/po/fa/projects/1-high.torbrowser.po	2011-04-12 16:15:00 UTC (rev 24594)
+++ translation/trunk/projects/website/po/fa/projects/1-high.torbrowser.po	2011-04-12 16:19:31 UTC (rev 24595)
@@ -7,9 +7,9 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-03-25 16:51+0000\n"
-"PO-Revision-Date: 2011-03-26 00:33+0000\n"
-"Last-Translator: Ghazall <emroozz at gmail.com>\n"
+"POT-Creation-Date: 2011-03-28 12:49+0200\n"
+"PO-Revision-Date: 2011-04-09 04:21+0000\n"
+"Last-Translator: pakdelreza <pakdelreza at gmail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,28 +18,28 @@
 "Plural-Forms: nplurals=1; plural=0\n"
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:9
+#: /home/runa/dev/website/projects/en/torbrowser.wml:9
 msgid ""
 "<a href=\"<page index>\">Home &raquo; </a> <a href=\"<page "
 "projects/projects>\">Projects &raquo; </a> <a href=\"<page "
 "projects/torbrowser>\">TorBrowser</a>"
 msgstr ""
-"<a href=\"<page index>\">خانه و راکو; </a> <a href=\"<page "
-"projects/projects>\">پروژه ها و راکو; </a> <a href=\"<page "
+"<a href=\"<page index>\">خانه »</a> <a href=\"<page "
+"projects/projects>\">پروژه ها »</a> <a href=\"<page "
 "projects/torbrowser>\">مرورگر تور</a>"
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:17
+#: /home/runa/dev/website/projects/en/torbrowser.wml:17
 msgid "Tor Browser Bundle"
-msgstr ""
+msgstr "بسته مرورگر تور"
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:18
+#: /home/runa/dev/website/projects/en/torbrowser.wml:18
 msgid "<hr/>"
-msgstr ""
+msgstr "<hr/ style=\";text-align:right;direction:rtl\">"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:20
+#: /home/runa/dev/website/projects/en/torbrowser.wml:20
 msgid ""
 "The <strong>Tor</strong> software protects you by bouncing your "
 "communications around a distributed network of relays run by volunteers all "
@@ -48,9 +48,16 @@
 "learning your physical location, and it lets you access sites which are "
 "blocked."
 msgstr ""
+"نرم‌افزار <strong>تور</strong>   برای محافظت از ارتباطات اينترنتی شما است و "
+"روش کار آن به  اين شکل است که ارتباطات شما را در شبکه ای از رايانه های "
+"بازپخش کننده که توسط داوطلبان مختلف در سراسر جهان اداره می شوند، انعکاس "
+"می‌دهد. به اين ترتيب از اينکه کسی بتواند ببيند که شما از چه سايت‌هایی بازديد"
+" کرده‌ايد جلوگيری می‌شود، از اينکه سايت‌هایی که به آنها می رويد بتوانند مکان"
+" فيزيکی شما را تشخيص دهند جلوگيری می‌‌شود، و به شما امکان دسترسی به سايت‌های"
+" مسدود شده داده می‌شود."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:27
+#: /home/runa/dev/website/projects/en/torbrowser.wml:27
 msgid ""
 "The <strong>Tor Browser Bundle</strong> lets you use Tor on Windows, Mac OS "
 "X, or Linux without needing to install any software.  It can run off a USB "
@@ -60,310 +67,446 @@
 "browser, install Tor permanently, or if you don't use Windows, see the other"
 " ways to <a href=\"<page download/download>\">download Tor</a>."
 msgstr ""
+"<strong>بسته مرورگر تور</strong>  به شما امکان می دهد که بدون نياز به نصب هر"
+" گونه نرم‌افزار، از تور بر روی سيستم عامل ويندوز، Mac OS X و يا لينوکس "
+"استفاده کنيد. اين بسته می‌تواند از روی يک فلش درايو USB اجرا شود، همراه با "
+"يک مرورگر اينترنتی از پيش تنظيم شده می‌آيد، و خودکفا است. <strong>بسته "
+"پيام‌رسان و مرورگر تور</strong>  امکان چت و پيام‌رسانی سريع از طريق تور را "
+"نيز اضافه می‌کند. چنانچه ترجيح می‌دهيد با مرورگر موجود خود از تور استفاده "
+"کنيد، تور را به طور دائمی نصب کنيد، يا اگر از ويندوز استفاده نمی‌کنيد، به "
+"روش‌های ديگر <a href=\"<page download/download>\">دانلود تور</a>   مراجعه "
+"کنيد."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:39
+#: /home/runa/dev/website/projects/en/torbrowser.wml:39
 msgid ""
 "Freedom House has produced a video on how to find and use the Tor Browser "
 "Bundle.  If you don't see a video below, view it at <a "
 "href=\"http://www.youtube.com/thetorproject\">Youtube </a>.  Know of a "
 "better video or one translated into your language? Let us know!"
 msgstr ""
+"خانه آزادی (Freedom House) ويديويی توليد کرده که نحوه پيدا کردن و استفاده از"
+" بسته مرورگر تور را نمايش می‌دهد. اگر اين ويديو را در زير مشاهده نمی‌کنيد، "
+"آن را در <a href=\"http://www.youtube.com/thetorproject\">يوتوب </a>  "
+"ببينيد. اگر ويديوی بهتری سراغ داريد يا ترجمه‌ای به زبان خودتان سراغ داريد ما"
+" را خبردار کنيد!"
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:49
+#: /home/runa/dev/website/projects/en/torbrowser.wml:49
 msgid "<a id=\"Download\"></a>"
-msgstr ""
+msgstr "<a id=\"Download\"></a>"
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:50
+#: /home/runa/dev/website/projects/en/torbrowser.wml:50
 msgid ""
 "<a class=\"anchor\" href=\"#Download\">Download Tor Browser Bundle and Tor "
 "IM Browser Bundle</a>"
 msgstr ""
+"<a class=\"anchor\" href=\"#Download\">دانلود بسته مرورگر تور و بسته "
+"پيام‌رسان و مرورگر تور</a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:52
+#: /home/runa/dev/website/projects/en/torbrowser.wml:52
 msgid ""
 "To start using the Tor Browser Bundle or Tor IM Browser Bundle, download the"
 " file for your preferred language. This file can be saved wherever is "
 "convenient, e.g. the Desktop or a USB flash drive."
 msgstr ""
+"برای شروع به استفاده از بسته مرورگر تور يا بسته پيام‌رسان و مرورگر تور، فايل"
+" مربوط زبان مورد پسند خود را از فهرست زير دانلود کنيد. اين فايل می‌تواند در "
+"هر مکانی که خواستيد ذخيره شود، مانند دسکتاپ (Desktop) و يا يک فلش درايو USB."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:56
+#: /home/runa/dev/website/projects/en/torbrowser.wml:56
 msgid ""
 "If you have an unreliable Internet connection, it may be easier for you to "
 "download the bundle edition which is <a href=\"<page projects/torbrowser-"
 "split>\">split up</a> into smaller parts."
 msgstr ""
+"چنانچه اتصال اينترنت شما غير قابل اطمينان است، ممکن است برايتان آسان‌تر باشد"
+" که نسخه‌ای از بسته را دانلود کنيد که به قطعات کوچکتر <a href=\"<page "
+"projects/torbrowser-split>\">تقسيم شده </a> است."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:58
+#: /home/runa/dev/website/projects/en/torbrowser.wml:58
 msgid ""
 "Tor Browser Bundle for Windows with Firefox (version <version-"
 "torbrowserbundle>, 16 MB)"
 msgstr ""
+"بسته مرورگر تور برای ويندوز با فايرفاکس (نسخه  <version-torbrowserbundle>، "
+"16 مگابايت)"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:62
+#: /home/runa/dev/website/projects/en/torbrowser.wml:62
 msgid ""
 "<a href=\"../dist/torbrowser/tor-browser-<version-torbrowserbundle>_en-"
 "US.exe\">English (en-US)</a> (<a href=\"../dist/torbrowser/tor-browser"
 "-<version-torbrowserbundle>_en-US.exe.asc\" style=\"font-size: "
 "90%;\">signature</a>)"
 msgstr ""
+"<a href=\"../dist/torbrowser/tor-browser-<version-torbrowserbundle>_en-"
+"US.exe\">English (en-US)</a> (<a href=\"../dist/torbrowser/tor-browser"
+"-<version-torbrowserbundle>_en-US.exe.asc\" style=\"font-size: "
+"90%;\">signature</a>)"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:64
+#: /home/runa/dev/website/projects/en/torbrowser.wml:64
 msgid ""
 "<a href=\"../dist/torbrowser/tor-browser-<version-"
 "torbrowserbundle>_ar.exe\">&#x0627;&#x0644;&#x0639;&#x0631;&#x0628;&#x064a;&#x0629;"
 " (ar)</a> (<a href=\"../dist/torbrowser/tor-browser-<version-"
 "torbrowserbundle>_ar.exe.asc\" style=\"font-size: 90%;\">signature</a>)"
 msgstr ""
+"<a href=\"../dist/torbrowser/tor-browser-<version-"
+"torbrowserbundle>_ar.exe\">&#x0627;&#x0644;&#x0639;&#x0631;&#x0628;&#x064a;&#x0629;"
+" (ar)</a> (<a href=\"../dist/torbrowser/tor-browser-<version-"
+"torbrowserbundle>_ar.exe.asc\" style=\"font-size: 90%;\">signature</a>)"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:66
+#: /home/runa/dev/website/projects/en/torbrowser.wml:66
 msgid ""
 "<a href=\"../dist/torbrowser/tor-browser-<version-"
 "torbrowserbundle>_de.exe\">Deutsch (de)</a> (<a href=\"../dist/torbrowser"
 "/tor-browser-<version-torbrowserbundle>_de.exe.asc\" style=\"font-size: "
 "90%;\">signature</a>)"
 msgstr ""
+"<a href=\"../dist/torbrowser/tor-browser-<version-"
+"torbrowserbundle>_de.exe\">Deutsch (de)</a> (<a href=\"../dist/torbrowser"
+"/tor-browser-<version-torbrowserbundle>_de.exe.asc\" style=\"font-size: "
+"90%;\">signature</a>)"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:68
+#: /home/runa/dev/website/projects/en/torbrowser.wml:68
 msgid ""
 "<a href=\"../dist/torbrowser/tor-browser-<version-torbrowserbundle>_es-"
 "ES.exe\">&#x0045;&#x0073;&#x0070;&#x0061;&#x00f1;&#x006f;&#x006c; (es-"
 "ES)</a> (<a href=\"../dist/torbrowser/tor-browser-<version-torbrowserbundle"
 ">_es-ES.exe.asc\" style=\"font-size: 90%;\">signature</a>)"
 msgstr ""
+"<a href=\"../dist/torbrowser/tor-browser-<version-torbrowserbundle>_es-"
+"ES.exe\">&#x0045;&#x0073;&#x0070;&#x0061;&#x00f1;&#x006f;&#x006c; (es-"
+"ES)</a> (<a href=\"../dist/torbrowser/tor-browser-<version-torbrowserbundle"
+">_es-ES.exe.asc\" style=\"font-size: 90%;\">signature</a>)"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:70
+#: /home/runa/dev/website/projects/en/torbrowser.wml:70
 msgid ""
 "<a href=\"../dist/torbrowser/tor-browser-<version-"
 "torbrowserbundle>_fa.exe\">&#x0641;&#x0627;&#x0631;&#x0633;&#x06cc; (fa)</a>"
 " (<a href=\"../dist/torbrowser/tor-browser-<version-"
 "torbrowserbundle>_fa.exe.asc\" style=\"font-size: 90%;\">signature</a>)"
 msgstr ""
+"<a href=\"../dist/torbrowser/tor-browser-<version-"
+"torbrowserbundle>_fa.exe\">&#x0641;&#x0627;&#x0631;&#x0633;&#x06cc; (fa)</a>"
+" (<a href=\"../dist/torbrowser/tor-browser-<version-"
+"torbrowserbundle>_fa.exe.asc\" style=\"font-size: 90%;\">signature</a>)"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:72
+#: /home/runa/dev/website/projects/en/torbrowser.wml:72
 msgid ""
 "<a href=\"../dist/torbrowser/tor-browser-<version-"
 "torbrowserbundle>_fr.exe\">&#x0046;&#x0072;&#x0061;&#x006e;&#x00e7;&#x0061;&#x0069;&#x0073;"
 " (fr)</a> (<a href=\"../dist/torbrowser/tor-browser-<version-"
 "torbrowserbundle>_fr.exe.asc\" style=\"font-size: 90%;\">signature</a>)"
 msgstr ""
+"<a href=\"../dist/torbrowser/tor-browser-<version-"
+"torbrowserbundle>_fr.exe\">&#x0046;&#x0072;&#x0061;&#x006e;&#x00e7;&#x0061;&#x0069;&#x0073;"
+" (fr)</a> (<a href=\"../dist/torbrowser/tor-browser-<version-"
+"torbrowserbundle>_fr.exe.asc\" style=\"font-size: 90%;\">signature</a>)"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:74
+#: /home/runa/dev/website/projects/en/torbrowser.wml:74
 msgid ""
 "<a href=\"../dist/torbrowser/tor-browser-<version-"
 "torbrowserbundle>_it.exe\">Italiano (it)</a> (<a href=\"../dist/torbrowser"
 "/tor-browser-<version-torbrowserbundle>_it.exe.asc\" style=\"font-size: "
 "90%;\">signature</a>)"
 msgstr ""
+"<a href=\"../dist/torbrowser/tor-browser-<version-"
+"torbrowserbundle>_it.exe\">Italiano (it)</a> (<a href=\"../dist/torbrowser"
+"/tor-browser-<version-torbrowserbundle>_it.exe.asc\" style=\"font-size: "
+"90%;\">signature</a>)"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:76
+#: /home/runa/dev/website/projects/en/torbrowser.wml:76
 msgid ""
 "<a href=\"../dist/torbrowser/tor-browser-<version-"
 "torbrowserbundle>_nl.exe\">Nederlands (nl)</a> (<a href=\"../dist/torbrowser"
 "/tor-browser-<version-torbrowserbundle>_nl.exe.asc\" style=\"font-size: "
 "90%;\">signature</a>)"
 msgstr ""
+"<a href=\"../dist/torbrowser/tor-browser-<version-"
+"torbrowserbundle>_nl.exe\">Nederlands (nl)</a> (<a href=\"../dist/torbrowser"
+"/tor-browser-<version-torbrowserbundle>_nl.exe.asc\" style=\"font-size: "
+"90%;\">signature</a>)"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:78
+#: /home/runa/dev/website/projects/en/torbrowser.wml:78
 msgid ""
 "<a href=\"../dist/torbrowser/tor-browser-<version-"
 "torbrowserbundle>_pl.exe\">Polish (pl)</a> (<a href=\"../dist/torbrowser"
 "/tor-browser-<version-torbrowserbundle>_pl.exe.asc\" style=\"font-size: "
 "90%;\">signature</a>)"
 msgstr ""
+"<a href=\"../dist/torbrowser/tor-browser-<version-"
+"torbrowserbundle>_pl.exe\">Polish (pl)</a> (<a href=\"../dist/torbrowser"
+"/tor-browser-<version-torbrowserbundle>_pl.exe.asc\" style=\"font-size: "
+"90%;\">signature</a>)"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:80
+#: /home/runa/dev/website/projects/en/torbrowser.wml:80
 msgid ""
 "<a href=\"../dist/torbrowser/tor-browser-<version-torbrowserbundle>_pt-"
 "PT.exe\">&#x0050;&#x006f;&#x0072;&#x0074;&#x0075;&#x0067;&#x0075;&#x00ea;&#x0073;"
 " (pt-PT)</a> (<a href=\"../dist/torbrowser/tor-browser-<version-"
 "torbrowserbundle>_pt-PT.exe.asc\" style=\"font-size: 90%;\">signature</a>)"
 msgstr ""
+"<a href=\"../dist/torbrowser/tor-browser-<version-torbrowserbundle>_pt-"
+"PT.exe\">&#x0050;&#x006f;&#x0072;&#x0074;&#x0075;&#x0067;&#x0075;&#x00ea;&#x0073;"
+" (pt-PT)</a> (<a href=\"../dist/torbrowser/tor-browser-<version-"
+"torbrowserbundle>_pt-PT.exe.asc\" style=\"font-size: 90%;\">signature</a>)"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:82
+#: /home/runa/dev/website/projects/en/torbrowser.wml:82
 msgid ""
 "<a href=\"../dist/torbrowser/tor-browser-<version-"
 "torbrowserbundle>_ru.exe\">&#x0420;&#x0443;&#x0441;&#x0441;&#x043a;&#x0438;&#x0439;"
 " (ru)</a> (<a href=\"../dist/torbrowser/tor-browser-<version-"
 "torbrowserbundle>_ru.exe.asc\" style=\"font-size: 90%;\">signature</a>)"
 msgstr ""
+"<a href=\"../dist/torbrowser/tor-browser-<version-"
+"torbrowserbundle>_ru.exe\">&#x0420;&#x0443;&#x0441;&#x0441;&#x043a;&#x0438;&#x0439;"
+" (ru)</a> (<a href=\"../dist/torbrowser/tor-browser-<version-"
+"torbrowserbundle>_ru.exe.asc\" style=\"font-size: 90%;\">signature</a>)"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:84
+#: /home/runa/dev/website/projects/en/torbrowser.wml:84
 msgid ""
 "<a href=\"../dist/torbrowser/tor-browser-<version-"
 "torbrowserbundle>_vi.exe\">Vietnamese (vi)</a> (<a href=\"../dist/torbrowser"
 "/tor-browser-<version-torbrowserbundle>_vi.exe.asc\" style=\"font-size: "
 "90%;\">signature</a>)"
 msgstr ""
+"<a href=\"../dist/torbrowser/tor-browser-<version-"
+"torbrowserbundle>_vi.exe\">Vietnamese (vi)</a> (<a href=\"../dist/torbrowser"
+"/tor-browser-<version-torbrowserbundle>_vi.exe.asc\" style=\"font-size: "
+"90%;\">signature</a>)"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:86
+#: /home/runa/dev/website/projects/en/torbrowser.wml:86
 msgid ""
 "<a href=\"../dist/torbrowser/tor-browser-<version-torbrowserbundle>_zh-"
 "CN.exe\">&#x7b80;&#x4f53;&#x5b57; (zh-CN)</a> (<a href=\"../dist/torbrowser"
 "/tor-browser-<version-torbrowserbundle>_zh-CN.exe.asc\" style=\"font-size: "
 "90%;\">signature</a>)"
 msgstr ""
+"<a href=\"../dist/torbrowser/tor-browser-<version-torbrowserbundle>_zh-"
+"CN.exe\">&#x7b80;&#x4f53;&#x5b57; (zh-CN)</a> (<a href=\"../dist/torbrowser"
+"/tor-browser-<version-torbrowserbundle>_zh-CN.exe.asc\" style=\"font-size: "
+"90%;\">signature</a>)"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:90
+#: /home/runa/dev/website/projects/en/torbrowser.wml:90
 msgid ""
 "Tor IM Browser Bundle for Windows with Firefox and Pidgin (version <version-"
 "torimbrowserbundle>, 25 MB)"
 msgstr ""
+"بسته پيام‌رسان و مرورگر تور برای ويندوز با فايرفاکس و پيدگين (نسخه  "
+"<version-torimbrowserbundle>، 25 مگابايت)"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:94
+#: /home/runa/dev/website/projects/en/torbrowser.wml:94
 msgid ""
 "<a href=\"../dist/torbrowser/tor-im-browser-<version-torimbrowserbundle>_en-"
 "US.exe\">English (en-US)</a> (<a href=\"../dist/torbrowser/tor-im-browser"
 "-<version-torimbrowserbundle>_en-US.exe.asc\" style=\"font-size: "
 "90%;\">signature</a>)"
 msgstr ""
+"<a href=\"../dist/torbrowser/tor-im-browser-<version-torimbrowserbundle>_en-"
+"US.exe\">English (en-US)</a> (<a href=\"../dist/torbrowser/tor-im-browser"
+"-<version-torimbrowserbundle>_en-US.exe.asc\" style=\"font-size: "
+"90%;\">signature</a>)"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:96
+#: /home/runa/dev/website/projects/en/torbrowser.wml:96
 msgid ""
 "<a href=\"../dist/torbrowser/tor-im-browser-<version-"
 "torimbrowserbundle>_ar.exe\">&#x0627;&#x0644;&#x0639;&#x0631;&#x0628;&#x064a;&#x0629;"
 " (ar)</a> (<a href=\"../dist/torbrowser/tor-im-browser-<version-"
 "torimbrowserbundle>_ar.exe.asc\" style=\"font-size: 90%;\">signature</a>)"
 msgstr ""
+"<a href=\"../dist/torbrowser/tor-im-browser-<version-"
+"torimbrowserbundle>_ar.exe\">&#x0627;&#x0644;&#x0639;&#x0631;&#x0628;&#x064a;&#x0629;"
+" (ar)</a> (<a href=\"../dist/torbrowser/tor-im-browser-<version-"
+"torimbrowserbundle>_ar.exe.asc\" style=\"font-size: 90%;\">signature</a>)"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:98
+#: /home/runa/dev/website/projects/en/torbrowser.wml:98
 msgid ""
 "<a href=\"../dist/torbrowser/tor-im-browser-<version-"
 "torimbrowserbundle>_de.exe\">Deutsch (de)</a> (<a href=\"../dist/torbrowser"
 "/tor-im-browser-<version-torimbrowserbundle>_de.exe.asc\" style=\"font-size:"
 " 90%;\">signature</a>)"
 msgstr ""
+"<a href=\"../dist/torbrowser/tor-im-browser-<version-"
+"torimbrowserbundle>_de.exe\">Deutsch (de)</a> (<a href=\"../dist/torbrowser"
+"/tor-im-browser-<version-torimbrowserbundle>_de.exe.asc\" style=\"font-size:"
+" 90%;\">signature</a>)"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:100
+#: /home/runa/dev/website/projects/en/torbrowser.wml:100
 msgid ""
 "<a href=\"../dist/torbrowser/tor-im-browser-<version-torimbrowserbundle>_es-"
 "ES.exe\">&#x0045;&#x0073;&#x0070;&#x0061;&#x00f1;&#x006f;&#x006c; (es-"
 "ES)</a> (<a href=\"../dist/torbrowser/tor-im-browser-<version-"
 "torimbrowserbundle>_es-ES.exe.asc\" style=\"font-size: 90%;\">signature</a>)"
 msgstr ""
+"<a href=\"../dist/torbrowser/tor-im-browser-<version-torimbrowserbundle>_es-"
+"ES.exe\">&#x0045;&#x0073;&#x0070;&#x0061;&#x00f1;&#x006f;&#x006c; (es-"
+"ES)</a> (<a href=\"../dist/torbrowser/tor-im-browser-<version-"
+"torimbrowserbundle>_es-ES.exe.asc\" style=\"font-size: 90%;\">signature</a>)"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:102
+#: /home/runa/dev/website/projects/en/torbrowser.wml:102
 msgid ""
 "<a href=\"../dist/torbrowser/tor-im-browser-<version-"
 "torimbrowserbundle>_fa.exe\">&#x0641;&#x0627;&#x0631;&#x0633;&#x06cc; "
 "(fa)</a> (<a href=\"../dist/torbrowser/tor-im-browser-<version-"
 "torimbrowserbundle>_fa.exe.asc\" style=\"font-size: 90%;\">signature</a>)"
 msgstr ""
+"<a href=\"../dist/torbrowser/tor-im-browser-<version-"
+"torimbrowserbundle>_fa.exe\">&#x0641;&#x0627;&#x0631;&#x0633;&#x06cc; "
+"(fa)</a> (<a href=\"../dist/torbrowser/tor-im-browser-<version-"
+"torimbrowserbundle>_fa.exe.asc\" style=\"font-size: 90%;\">signature</a>)"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:104
+#: /home/runa/dev/website/projects/en/torbrowser.wml:104
 msgid ""
 "<a href=\"../dist/torbrowser/tor-im-browser-<version-"
 "torimbrowserbundle>_fr.exe\">&#x0046;&#x0072;&#x0061;&#x006e;&#x00e7;&#x0061;&#x0069;&#x0073;"
 " (fr)</a> (<a href=\"../dist/torbrowser/tor-im-browser-<version-"
 "torimbrowserbundle>_fr.exe.asc\" style=\"font-size: 90%;\">signature</a>)"
 msgstr ""
+"<a href=\"../dist/torbrowser/tor-im-browser-<version-"
+"torimbrowserbundle>_fr.exe\">&#x0046;&#x0072;&#x0061;&#x006e;&#x00e7;&#x0061;&#x0069;&#x0073;"
+" (fr)</a> (<a href=\"../dist/torbrowser/tor-im-browser-<version-"
+"torimbrowserbundle>_fr.exe.asc\" style=\"font-size: 90%;\">signature</a>)"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:106
+#: /home/runa/dev/website/projects/en/torbrowser.wml:106
 msgid ""
 "<a href=\"../dist/torbrowser/tor-im-browser-<version-"
 "torimbrowserbundle>_it.exe\">Italiano (it)</a> (<a href=\"../dist/torbrowser"
 "/tor-im-browser-<version-torimbrowserbundle>_it.exe.asc\" style=\"font-size:"
 " 90%;\">signature</a>)"
 msgstr ""
+"<a href=\"../dist/torbrowser/tor-im-browser-<version-"
+"torimbrowserbundle>_it.exe\">Italiano (it)</a> (<a href=\"../dist/torbrowser"
+"/tor-im-browser-<version-torimbrowserbundle>_it.exe.asc\" style=\"font-size:"
+" 90%;\">signature</a>)"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:108
+#: /home/runa/dev/website/projects/en/torbrowser.wml:108
 msgid ""
 "<a href=\"../dist/torbrowser/tor-im-browser-<version-"
 "torimbrowserbundle>_nl.exe\">Nederlands (nl)</a> (<a "
 "href=\"../dist/torbrowser/tor-im-browser-<version-"
 "torimbrowserbundle>_nl.exe.asc\" style=\"font-size: 90%;\">signature</a>)"
 msgstr ""
+"<a href=\"../dist/torbrowser/tor-im-browser-<version-"
+"torimbrowserbundle>_nl.exe\">Nederlands (nl)</a> (<a "
+"href=\"../dist/torbrowser/tor-im-browser-<version-"
+"torimbrowserbundle>_nl.exe.asc\" style=\"font-size: 90%;\">signature</a>)"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:110
+#: /home/runa/dev/website/projects/en/torbrowser.wml:110
 msgid ""
 "<a href=\"../dist/torbrowser/tor-im-browser-<version-"
 "torimbrowserbundle>_pl.exe\">Polish (pl)</a> (<a href=\"../dist/torbrowser"
 "/tor-im-browser-<version-torimbrowserbundle>_pl.exe.asc\" style=\"font-size:"
 " 90%;\">signature</a>)"
 msgstr ""
+"<a href=\"../dist/torbrowser/tor-im-browser-<version-"
+"torimbrowserbundle>_pl.exe\">Polish (pl)</a> (<a href=\"../dist/torbrowser"
+"/tor-im-browser-<version-torimbrowserbundle>_pl.exe.asc\" style=\"font-size:"
+" 90%;\">signature</a>)"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:112
+#: /home/runa/dev/website/projects/en/torbrowser.wml:112
 msgid ""
 "<a href=\"../dist/torbrowser/tor-im-browser-<version-torimbrowserbundle>_pt-"
 "PT.exe\">&#x0050;&#x006f;&#x0072;&#x0074;&#x0075;&#x0067;&#x0075;&#x00ea;&#x0073;"
 " (pt-PT)</a> (<a href=\"../dist/torbrowser/tor-im-browser-<version-"
 "torimbrowserbundle>_pt-PT.exe.asc\" style=\"font-size: 90%;\">signature</a>)"
 msgstr ""
+"<a href=\"../dist/torbrowser/tor-im-browser-<version-torimbrowserbundle>_pt-"
+"PT.exe\">&#x0050;&#x006f;&#x0072;&#x0074;&#x0075;&#x0067;&#x0075;&#x00ea;&#x0073;"
+" (pt-PT)</a> (<a href=\"../dist/torbrowser/tor-im-browser-<version-"
+"torimbrowserbundle>_pt-PT.exe.asc\" style=\"font-size: 90%;\">signature</a>)"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:114
+#: /home/runa/dev/website/projects/en/torbrowser.wml:114
 msgid ""
 "<a href=\"../dist/torbrowser/tor-im-browser-<version-"
 "torimbrowserbundle>_ru.exe\">&#x0420;&#x0443;&#x0441;&#x0441;&#x043a;&#x0438;&#x0439;"
 " (ru)</a> (<a href=\"../dist/torbrowser/tor-im-browser-<version-"
 "torimbrowserbundle>_ru.exe.asc\" style=\"font-size: 90%;\">signature</a>)"
 msgstr ""
+"<a href=\"../dist/torbrowser/tor-im-browser-<version-"
+"torimbrowserbundle>_ru.exe\">&#x0420;&#x0443;&#x0441;&#x0441;&#x043a;&#x0438;&#x0439;"
+" (ru)</a> (<a href=\"../dist/torbrowser/tor-im-browser-<version-"
+"torimbrowserbundle>_ru.exe.asc\" style=\"font-size: 90%;\">signature</a>)"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:116
+#: /home/runa/dev/website/projects/en/torbrowser.wml:116
 msgid ""
 "<a href=\"../dist/torbrowser/tor-im-browser-<version-"
 "torimbrowserbundle>_vi.exe\">Vietnamese (vi)</a> (<a "
 "href=\"../dist/torbrowser/tor-im-browser-<version-"
 "torimbrowserbundle>_vi.exe.asc\" style=\"font-size: 90%;\">signature</a>)"
 msgstr ""
+"<a href=\"../dist/torbrowser/tor-im-browser-<version-"
+"torimbrowserbundle>_vi.exe\">Vietnamese (vi)</a> (<a "
+"href=\"../dist/torbrowser/tor-im-browser-<version-"
+"torimbrowserbundle>_vi.exe.asc\" style=\"font-size: 90%;\">signature</a>)"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:118
+#: /home/runa/dev/website/projects/en/torbrowser.wml:118
 msgid ""
 "<a href=\"../dist/torbrowser/tor-im-browser-<version-torimbrowserbundle>_zh-"
 "CN.exe\">&#x7b80;&#x4f53;&#x5b57; (zh-CN)</a> (<a href=\"../dist/torbrowser"
 "/tor-im-browser-<version-torimbrowserbundle>_zh-CN.exe.asc\" style=\"font-"
 "size: 90%;\">signature</a>)"
 msgstr ""
+"<a href=\"../dist/torbrowser/tor-im-browser-<version-torimbrowserbundle>_zh-"
+"CN.exe\">&#x7b80;&#x4f53;&#x5b57; (zh-CN)</a> (<a href=\"../dist/torbrowser"
+"/tor-im-browser-<version-torimbrowserbundle>_zh-CN.exe.asc\" style=\"font-"
+"size: 90%;\">signature</a>)"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:122
+#: /home/runa/dev/website/projects/en/torbrowser.wml:122
 msgid ""
-"BETA: Tor Browser Bundle for Intel Mac OS X with Firefox (version <version-"
-"torbrowserbundleosx>, 28 MB)"
+"BETA: Tor Browser Bundle for Intel Mac OS X 10.5 and higher with Firefox "
+"(version <version-torbrowserbundleosx>, 28 MB)"
 msgstr ""
+"نسخه آزمايشی: بسته مرورگر تور برای Intel Mac OS X 10.5 يا بالاتر با فايرفاکس"
+" (نسخه  <version-torbrowserbundleosx>، 28 مگابايت)"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:126
+#: /home/runa/dev/website/projects/en/torbrowser.wml:126
 msgid ""
 "<a href=\"../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx"
 ">-dev-osx-i386-en-US.zip\">English (en-US)</a> (<a "
 "href=\"../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-"
 "osx-i386-en-US.zip.asc\" style=\"font-size: 90%;\">signature</a>)"
 msgstr ""
+"<a href=\"../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx"
+">-dev-osx-i386-en-US.zip\">English (en-US)</a> (<a "
+"href=\"../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-"
+"osx-i386-en-US.zip.asc\" style=\"font-size: 90%;\">signature</a>)"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:129
+#: /home/runa/dev/website/projects/en/torbrowser.wml:129
 msgid ""
 "<a href=\"../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx"
 ">-dev-"
@@ -372,18 +515,28 @@
 "torbrowserbundleosx>-dev-osx-i386-ar.zip.asc\" style=\"font-size: "
 "90%;\">signature</a>)"
 msgstr ""
+"<a href=\"../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx"
+">-dev-"
+"osx-i386-ar.zip\">&#x0627;&#x0644;&#x0639;&#x0631;&#x0628;&#x064a;&#x0629; "
+"(ar)</a> (<a href=\"../dist/torbrowser/osx/TorBrowser-<version-"
+"torbrowserbundleosx>-dev-osx-i386-ar.zip.asc\" style=\"font-size: "
+"90%;\">signature</a>)"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:133
+#: /home/runa/dev/website/projects/en/torbrowser.wml:133
 msgid ""
 "<a href=\"../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx"
 ">-dev-osx-i386-de.zip\">Deutsch (de)</a> (<a "
 "href=\"../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-"
 "osx-i386-de.zip.asc\" style=\"font-size: 90%;\">signature</a>)"
 msgstr ""
+"<a href=\"../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx"
+">-dev-osx-i386-de.zip\">Deutsch (de)</a> (<a "
+"href=\"../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-"
+"osx-i386-de.zip.asc\" style=\"font-size: 90%;\">signature</a>)"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:136
+#: /home/runa/dev/website/projects/en/torbrowser.wml:136
 msgid ""
 "<a href=\"../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx"
 ">-dev-osx-i386-es-"
@@ -392,18 +545,28 @@
 "torbrowserbundleosx>-dev-osx-i386-es-ES.zip.asc\" style=\"font-size: "
 "90%;\">signature</a>)"
 msgstr ""
+"<a href=\"../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx"
+">-dev-osx-i386-es-"
+"ES.zip\">&#x0045;&#x0073;&#x0070;&#x0061;&#x00f1;&#x006f;&#x006c; (es-"
+"ES)</a> (<a href=\"../dist/torbrowser/osx/TorBrowser-<version-"
+"torbrowserbundleosx>-dev-osx-i386-es-ES.zip.asc\" style=\"font-size: "
+"90%;\">signature</a>)"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:140
+#: /home/runa/dev/website/projects/en/torbrowser.wml:140
 msgid ""
 "<a href=\"../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx"
 ">-dev-osx-i386-fa.zip\">&#x0641;&#x0627;&#x0631;&#x0633;&#x06cc; (fa) </a> "
 "(<a href=\"../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx"
 ">-dev-osx-i386-fa.zip.asc\" style=\"font-size: 90%;\">signature</a>)"
 msgstr ""
+"<a href=\"../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx"
+">-dev-osx-i386-fa.zip\">&#x0641;&#x0627;&#x0631;&#x0633;&#x06cc; (fa) </a> "
+"(<a href=\"../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx"
+">-dev-osx-i386-fa.zip.asc\" style=\"font-size: 90%;\">signature</a>)"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:143
+#: /home/runa/dev/website/projects/en/torbrowser.wml:143
 msgid ""
 "<a href=\"../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx"
 ">-dev-"
@@ -412,36 +575,54 @@
 "torbrowserbundleosx>-dev-osx-i386-fr.zip.asc\" style=\"font-size: "
 "90%;\">signature</a>)"
 msgstr ""
+"<a href=\"../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx"
+">-dev-"
+"osx-i386-fr.zip\">&#x0046;&#x0072;&#x0061;&#x006e;&#x00e7;&#x0061;&#x0069;&#x0073;"
+" (fr)</a> (<a href=\"../dist/torbrowser/osx/TorBrowser-<version-"
+"torbrowserbundleosx>-dev-osx-i386-fr.zip.asc\" style=\"font-size: "
+"90%;\">signature</a>)"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:146
+#: /home/runa/dev/website/projects/en/torbrowser.wml:146
 msgid ""
 "<a href=\"../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx"
 ">-dev-osx-i386-it.zip\">Italiano (it)</a> (<a "
 "href=\"../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-"
 "osx-i386-it.zip.asc\" style=\"font-size: 90%;\">signature</a>)"
 msgstr ""
+"<a href=\"../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx"
+">-dev-osx-i386-it.zip\">Italiano (it)</a> (<a "
+"href=\"../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-"
+"osx-i386-it.zip.asc\" style=\"font-size: 90%;\">signature</a>)"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:149
+#: /home/runa/dev/website/projects/en/torbrowser.wml:149
 msgid ""
 "<a href=\"../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx"
 ">-dev-osx-i386-nl.zip\">Nederlands (nl)</a> (<a "
 "href=\"../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-"
 "osx-i386-nl.zip.asc\" style=\"font-size: 90%;\">signature</a>)"
 msgstr ""
+"<a href=\"../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx"
+">-dev-osx-i386-nl.zip\">Nederlands (nl)</a> (<a "
+"href=\"../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-"
+"osx-i386-nl.zip.asc\" style=\"font-size: 90%;\">signature</a>)"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:152
+#: /home/runa/dev/website/projects/en/torbrowser.wml:152
 msgid ""
 "<a href=\"../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx"
 ">-dev-osx-i386-pl.zip\">Polish (pl)</a> (<a "
 "href=\"../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-"
 "osx-i386-pl.zip.asc\" style=\"font-size: 90%;\">signature</a>)"
 msgstr ""
+"<a href=\"../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx"
+">-dev-osx-i386-pl.zip\">Polish (pl)</a> (<a "
+"href=\"../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-"
+"osx-i386-pl.zip.asc\" style=\"font-size: 90%;\">signature</a>)"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:155
+#: /home/runa/dev/website/projects/en/torbrowser.wml:155
 msgid ""
 "<a href=\"../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx"
 ">-dev-osx-i386-pt-"
@@ -450,9 +631,15 @@
 "torbrowserbundleosx>-dev-osx-i386-pt-PT.zip.asc\" style=\"font-size: "
 "90%;\">signature</a>)"
 msgstr ""
+"<a href=\"../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx"
+">-dev-osx-i386-pt-"
+"PT.zip\">&#x0050;&#x006f;&#x0072;&#x0074;&#x0075;&#x0067;&#x0075;&#x00ea;&#x0073;"
+" (pt-PT)</a> (<a href=\"../dist/torbrowser/osx/TorBrowser-<version-"
+"torbrowserbundleosx>-dev-osx-i386-pt-PT.zip.asc\" style=\"font-size: "
+"90%;\">signature</a>)"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:158
+#: /home/runa/dev/website/projects/en/torbrowser.wml:158
 msgid ""
 "<a href=\"../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx"
 ">-dev-"
@@ -461,26 +648,39 @@
 "torbrowserbundleosx>-dev-osx-i386-ru.zip.asc\" style=\"font-size: "
 "90%;\">signature</a>)"
 msgstr ""
+"<a href=\"../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx"
+">-dev-"
+"osx-i386-ru.zip\">&#x0420;&#x0443;&#x0441;&#x0441;&#x043a;&#x0438;&#x0439; "
+"(ru)</a> (<a href=\"../dist/torbrowser/osx/TorBrowser-<version-"
+"torbrowserbundleosx>-dev-osx-i386-ru.zip.asc\" style=\"font-size: "
+"90%;\">signature</a>)"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:162
+#: /home/runa/dev/website/projects/en/torbrowser.wml:162
 msgid ""
 "<a href=\"../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx"
 ">-dev-osx-i386-zh-CN.zip\">&#x7b80;&#x4f53;&#x5b57; (zh-CN)</a> (<a "
 "href=\"../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-"
 "osx-i386-zh-CN.zip.asc\" style=\"font-size: 90%;\">signature</a>)"
 msgstr ""
+"<a href=\"../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx"
+">-dev-osx-i386-zh-CN.zip\">&#x7b80;&#x4f53;&#x5b57; (zh-CN)</a> (<a "
+"href=\"../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-"
+"osx-i386-zh-CN.zip.asc\" style=\"font-size: 90%;\">signature</a>)"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:169
+#: /home/runa/dev/website/projects/en/torbrowser.wml:169
 msgid ""
 "BETA: Tor Browser Bundle for Linux with Firefox (version <version-"
 "torbrowserbundlelinux32> (32-bit), <version-torbrowserbundlelinux64> "
 "(64-bit), 24 MB)"
 msgstr ""
+"نسخه آزمايشی: بسته مرورگر تور برای لينوکس با فايرفاکس (نسخه  <version-"
+"torbrowserbundlelinux32> (32-bit), <version-torbrowserbundlelinux64> "
+"(64-bit)، 24 مگابايت)"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:172
+#: /home/runa/dev/website/projects/en/torbrowser.wml:172
 msgid ""
 "English (en-US): <a href=\"../dist/torbrowser/linux/tor-browser-gnu-"
 "linux-i686-<version-torbrowserbundlelinux32>-dev-en-US.tar.gz\">32-bit</a> "
@@ -492,9 +692,18 @@
 "torbrowserbundlelinux64>-dev-en-US.tar.gz.asc\" style=\"font-size: "
 "90%;\">sig</a>)"
 msgstr ""
+"English (en-US): <a href=\"../dist/torbrowser/linux/tor-browser-gnu-"
+"linux-i686-<version-torbrowserbundlelinux32>-dev-en-US.tar.gz\">32-bit</a> "
+"(<a href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-"
+"torbrowserbundlelinux32>-dev-en-US.tar.gz.asc\" style=\"font-size: "
+"90%;\">sig</a>) | <a href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-"
+"x86_64-<version-torbrowserbundlelinux64>-dev-en-US.tar.gz\">64-bit</a> (<a "
+"href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-"
+"torbrowserbundlelinux64>-dev-en-US.tar.gz.asc\" style=\"font-size: "
+"90%;\">sig</a>)"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:175
+#: /home/runa/dev/website/projects/en/torbrowser.wml:175
 msgid ""
 "&#x0627;&#x0644;&#x0639;&#x0631;&#x0628;&#x064a;&#x0629; (ar): <a "
 "href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-"
@@ -507,9 +716,19 @@
 "torbrowserbundlelinux64>-dev-ar.tar.gz.asc\" style=\"font-size: "
 "90%;\">sig</a>)"
 msgstr ""
+"&#x0627;&#x0644;&#x0639;&#x0631;&#x0628;&#x064a;&#x0629; (ar): <a "
+"href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-"
+"torbrowserbundlelinux32>-dev-ar.tar.gz\">32-bit</a> (<a "
+"href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-"
+"torbrowserbundlelinux32>-dev-ar.tar.gz.asc\" style=\"font-size: "
+"90%;\">sig</a>) | <a href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-"
+"x86_64-<version-torbrowserbundlelinux64>-dev-ar.tar.gz\">64-bit</a> (<a "
+"href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-"
+"torbrowserbundlelinux64>-dev-ar.tar.gz.asc\" style=\"font-size: "
+"90%;\">sig</a>)"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:177
+#: /home/runa/dev/website/projects/en/torbrowser.wml:177
 msgid ""
 "Deutsch (de): <a href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-i686"
 "-<version-torbrowserbundlelinux32>-dev-de.tar.gz\">32-bit</a> (<a "
@@ -521,9 +740,18 @@
 "torbrowserbundlelinux64>-dev-de.tar.gz.asc\" style=\"font-size: "
 "90%;\">sig</a>)"
 msgstr ""
+"Deutsch (de): <a href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-i686"
+"-<version-torbrowserbundlelinux32>-dev-de.tar.gz\">32-bit</a> (<a "
+"href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-"
+"torbrowserbundlelinux32>-dev-de.tar.gz.asc\" style=\"font-size: "
+"90%;\">sig</a>) | <a href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-"
+"x86_64-<version-torbrowserbundlelinux64>-dev-de.tar.gz\">64-bit</a> (<a "
+"href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-"
+"torbrowserbundlelinux64>-dev-de.tar.gz.asc\" style=\"font-size: "
+"90%;\">sig</a>)"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:179
+#: /home/runa/dev/website/projects/en/torbrowser.wml:179
 msgid ""
 "&#x0045;&#x0073;&#x0070;&#x0061;&#x00f1;&#x006f;&#x006c; (es-ES): <a "
 "href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-"
@@ -536,9 +764,19 @@
 "torbrowserbundlelinux64>-dev-es-ES.tar.gz.asc\" style=\"font-size: "
 "90%;\">sig</a>)"
 msgstr ""
+"&#x0045;&#x0073;&#x0070;&#x0061;&#x00f1;&#x006f;&#x006c; (es-ES): <a "
+"href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-"
+"torbrowserbundlelinux32>-dev-es-ES.tar.gz\">32-bit</a> (<a "
+"href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-"
+"torbrowserbundlelinux32>-dev-es-ES.tar.gz.asc\" style=\"font-size: "
+"90%;\">sig</a>) | <a href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-"
+"x86_64-<version-torbrowserbundlelinux64>-dev-es-ES.tar.gz\">64-bit</a> (<a "
+"href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-"
+"torbrowserbundlelinux64>-dev-es-ES.tar.gz.asc\" style=\"font-size: "
+"90%;\">sig</a>)"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:181
+#: /home/runa/dev/website/projects/en/torbrowser.wml:181
 msgid ""
 "&#x0641;&#x0627;&#x0631;&#x0633;&#x06cc; (fa): <a "
 "href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-"
@@ -551,9 +789,19 @@
 "torbrowserbundlelinux64>-dev-fa.tar.gz.asc\" style=\"font-size: "
 "90%;\">sig</a>)"
 msgstr ""
+"&#x0641;&#x0627;&#x0631;&#x0633;&#x06cc; (fa): <a "
+"href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-"
+"torbrowserbundlelinux32>-dev-fa.tar.gz\">32-bit</a> (<a "
+"href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-"
+"torbrowserbundlelinux32>-dev-fa.tar.gz.asc\" style=\"font-size: "
+"90%;\">sig</a>) | <a href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-"
+"x86_64-<version-torbrowserbundlelinux64>-dev-fa.tar.gz\">64-bit</a> (<a "
+"href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-"
+"torbrowserbundlelinux64>-dev-fa.tar.gz.asc\" style=\"font-size: "
+"90%;\">sig</a>)"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:183
+#: /home/runa/dev/website/projects/en/torbrowser.wml:183
 msgid ""
 "&#x0046;&#x0072;&#x0061;&#x006e;&#x00e7;&#x0061;&#x0069;&#x0073; (fr): <a "
 "href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-"
@@ -566,9 +814,19 @@
 "torbrowserbundlelinux64>-dev-fr.tar.gz.asc\" style=\"font-size: "
 "90%;\">sig</a>)"
 msgstr ""
+"&#x0046;&#x0072;&#x0061;&#x006e;&#x00e7;&#x0061;&#x0069;&#x0073; (fr): <a "
+"href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-"
+"torbrowserbundlelinux32>-dev-fr.tar.gz\">32-bit</a> (<a "
+"href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-"
+"torbrowserbundlelinux32>-dev-fr.tar.gz.asc\" style=\"font-size: "
+"90%;\">sig</a>) | <a href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-"
+"x86_64-<version-torbrowserbundlelinux64>-dev-fr.tar.gz\">64-bit</a> (<a "
+"href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-"
+"torbrowserbundlelinux64>-dev-fr.tar.gz.asc\" style=\"font-size: "
+"90%;\">sig</a>)"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:185
+#: /home/runa/dev/website/projects/en/torbrowser.wml:185
 msgid ""
 "Italiano (it): <a href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-i686"
 "-<version-torbrowserbundlelinux32>-dev-it.tar.gz\">32-bit</a> (<a "
@@ -580,9 +838,18 @@
 "torbrowserbundlelinux64>-dev-it.tar.gz.asc\" style=\"font-size: "
 "90%;\">sig</a>)"
 msgstr ""
+"Italiano (it): <a href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-i686"
+"-<version-torbrowserbundlelinux32>-dev-it.tar.gz\">32-bit</a> (<a "
+"href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-"
+"torbrowserbundlelinux32>-dev-it.tar.gz.asc\" style=\"font-size: "
+"90%;\">sig</a>) | <a href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-"
+"x86_64-<version-torbrowserbundlelinux64>-dev-it.tar.gz\">64-bit</a> (<a "
+"href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-"
+"torbrowserbundlelinux64>-dev-it.tar.gz.asc\" style=\"font-size: "
+"90%;\">sig</a>)"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:187
+#: /home/runa/dev/website/projects/en/torbrowser.wml:187
 msgid ""
 "Nederlands (nl): <a href=\"../dist/torbrowser/linux/tor-browser-gnu-"
 "linux-i686-<version-torbrowserbundlelinux32>-dev-nl.tar.gz\">32-bit</a> (<a "
@@ -594,9 +861,18 @@
 "torbrowserbundlelinux64>-dev-nl.tar.gz.asc\" style=\"font-size: "
 "90%;\">sig</a>)"
 msgstr ""
+"Nederlands (nl): <a href=\"../dist/torbrowser/linux/tor-browser-gnu-"
+"linux-i686-<version-torbrowserbundlelinux32>-dev-nl.tar.gz\">32-bit</a> (<a "
+"href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-"
+"torbrowserbundlelinux32>-dev-nl.tar.gz.asc\" style=\"font-size: "
+"90%;\">sig</a>) | <a href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-"
+"x86_64-<version-torbrowserbundlelinux64>-dev-nl.tar.gz\">64-bit</a> (<a "
+"href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-"
+"torbrowserbundlelinux64>-dev-nl.tar.gz.asc\" style=\"font-size: "
+"90%;\">sig</a>)"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:189
+#: /home/runa/dev/website/projects/en/torbrowser.wml:189
 msgid ""
 "Polish (pl): <a href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-i686"
 "-<version-torbrowserbundlelinux32>-dev-pl.tar.gz\">32-bit</a> (<a "
@@ -608,9 +884,18 @@
 "torbrowserbundlelinux64>-dev-pl.tar.gz.asc\" style=\"font-size: "
 "90%;\">sig</a>)"
 msgstr ""
+"Polish (pl): <a href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-i686"
+"-<version-torbrowserbundlelinux32>-dev-pl.tar.gz\">32-bit</a> (<a "
+"href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-"
+"torbrowserbundlelinux32>-dev-pl.tar.gz.asc\" style=\"font-size: "
+"90%;\">sig</a>) | <a href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-"
+"x86_64-<version-torbrowserbundlelinux64>-dev-pl.tar.gz\">64-bit</a> (<a "
+"href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-"
+"torbrowserbundlelinux64>-dev-pl.tar.gz.asc\" style=\"font-size: "
+"90%;\">sig</a>)"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:191
+#: /home/runa/dev/website/projects/en/torbrowser.wml:191
 msgid ""
 "&#x0050;&#x006f;&#x0072;&#x0074;&#x0075;&#x0067;&#x0075;&#x00ea;&#x0073; "
 "(pt-PT): <a href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-i686"
@@ -623,9 +908,19 @@
 "torbrowserbundlelinux64>-dev-pt-PT.tar.gz.asc\" style=\"font-size: "
 "90%;\">sig</a>)"
 msgstr ""
+"&#x0050;&#x006f;&#x0072;&#x0074;&#x0075;&#x0067;&#x0075;&#x00ea;&#x0073; "
+"(pt-PT): <a href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-i686"
+"-<version-torbrowserbundlelinux32>-dev-pt-PT.tar.gz\">32-bit</a> (<a "
+"href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-"
+"torbrowserbundlelinux32>-dev-pt-PT.tar.gz.asc\" style=\"font-size: "
+"90%;\">sig</a>) | <a href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-"
+"x86_64-<version-torbrowserbundlelinux64>-dev-pt-PT.tar.gz\">64-bit</a> (<a "
+"href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-"
+"torbrowserbundlelinux64>-dev-pt-PT.tar.gz.asc\" style=\"font-size: "
+"90%;\">sig</a>)"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:193
+#: /home/runa/dev/website/projects/en/torbrowser.wml:193
 msgid ""
 "&#x0420;&#x0443;&#x0441;&#x0441;&#x043a;&#x0438;&#x0439; (ru): <a "
 "href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-"
@@ -638,9 +933,19 @@
 "torbrowserbundlelinux64>-dev-ru.tar.gz.asc\" style=\"font-size: "
 "90%;\">sig</a>)"
 msgstr ""
+"&#x0420;&#x0443;&#x0441;&#x0441;&#x043a;&#x0438;&#x0439; (ru): <a "
+"href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-"
+"torbrowserbundlelinux32>-dev-ru.tar.gz\">32-bit</a> (<a "
+"href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-"
+"torbrowserbundlelinux32>-dev-ru.tar.gz.asc\" style=\"font-size: "
+"90%;\">sig</a>) | <a href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-"
+"x86_64-<version-torbrowserbundlelinux64>-dev-ru.tar.gz\">64-bit</a> (<a "
+"href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-"
+"torbrowserbundlelinux64>-dev-ru.tar.gz.asc\" style=\"font-size: "
+"90%;\">sig</a>)"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:195
+#: /home/runa/dev/website/projects/en/torbrowser.wml:195
 msgid ""
 "&#x7b80;&#x4f53;&#x5b57; (zh-CN): <a href=\"../dist/torbrowser/linux/tor-"
 "browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-zh-"
@@ -652,9 +957,18 @@
 "linux-x86_64-<version-torbrowserbundlelinux64>-dev-zh-CN.tar.gz.asc\" style"
 "=\"font-size: 90%;\">sig</a>)"
 msgstr ""
+"&#x7b80;&#x4f53;&#x5b57; (zh-CN): <a href=\"../dist/torbrowser/linux/tor-"
+"browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-zh-"
+"CN.tar.gz\">32-bit</a> (<a href=\"../dist/torbrowser/linux/tor-browser-gnu-"
+"linux-i686-<version-torbrowserbundlelinux32>-dev-zh-CN.tar.gz.asc\" style"
+"=\"font-size: 90%;\">sig</a>) | <a href=\"../dist/torbrowser/linux/tor-"
+"browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64>-dev-zh-"
+"CN.tar.gz\">64-bit</a> (<a href=\"../dist/torbrowser/linux/tor-browser-gnu-"
+"linux-x86_64-<version-torbrowserbundlelinux64>-dev-zh-CN.tar.gz.asc\" style"
+"=\"font-size: 90%;\">sig</a>)"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:201
+#: /home/runa/dev/website/projects/en/torbrowser.wml:201
 msgid ""
 "See our instructions on <a href=\"<page docs/verifying-signatures>\">how to "
 "verify package signatures</a>, which allows you to make sure you've "
@@ -664,19 +978,28 @@
 "currently working with Mozilla to see if they want us to change the name to "
 "make this clearer."
 msgstr ""
+"لطفاً راهنمایی که برای <a href=\"<page docs/verifying-signatures>\">نحوه "
+"حصول اطمينان از امضای بسته‌ها</a>  تهيه کرده‌ايم را نيز مطالعه نماييد. اين "
+"کار به شما اجازه می‌دهد مطمئن شويد که فايلی که دانلود کرده‌ايد همان فايلی "
+"است که ما می‌خواستيم به دست شما برسد و در ميان راه دستکاری نشده است. علاوه "
+"بر اين، توجه داشته باشيد که نسخه فايرفاکس که در بسته‌های ما قرار دارد، در "
+"مقايسه با <a href=\"http://www.mozilla.com/firefox/\">نسخه اصلی فايرفاکس</a>"
+"  مقداری <a href=\"<tbbrepo>/build-scripts/config/\">تغيير داده شده</a>  "
+"است. ما هم اکنون در حال همکاری با سازمان موزيلا (سازنده فايرفاکس) هستيم تا "
+"ببينيم آيا نيازی به تغيير نام برای تأکيد اين موضوع وجود دارد يا خير."
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:211
+#: /home/runa/dev/website/projects/en/torbrowser.wml:211
 msgid "<a id=\"MacOSX\"></a>"
-msgstr ""
+msgstr "<a id=\"MacOSX\"></a>"
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:212
+#: /home/runa/dev/website/projects/en/torbrowser.wml:212
 msgid "<a class=\"anchor\" href=\"#MacOSX\">Mac OS X instructions</a>"
-msgstr ""
+msgstr "<a class=\"anchor\" href=\"#MacOSX\">راهنمای Mac OS X</a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:213
+#: /home/runa/dev/website/projects/en/torbrowser.wml:213
 msgid ""
 "Download the file above, save it somewhere, then click on it. Mac OS X will "
 "automatically unarchive it and you will have a TorBrowser application in "
@@ -684,19 +1007,34 @@
 "TorBrowser application to launch Vidalia.  Once Vidalia connects to Tor, it "
 "will launch Firefox."
 msgstr ""
+"فايل را از بالا دانلود کنيد، آن را در جایی ذخيره کنيد، و سپس روی آن کليک "
+"کنيد. Max OS X به طور خودکار بسته‌بندی آن را باز می‌کند و يک برنامه "
+"TorBrowser به زبان انتخابی‌تان در فهرست برنامه‌های شما قرار می‌گيرد (به "
+"عنوان مثال، TorBrowser_en-US.app). روی برنامه TorBrowser کليک کنيد تا "
+"Vidalia باز شود. هنگامی که Vidalia به تور وصل شد، خودش فايرفاکس را "
+"راه‌اندازی می‌کند."
 
+#. type: Content of: <div><div><p>
+#: /home/runa/dev/website/projects/en/torbrowser.wml:219
+msgid ""
+"<img src=\"$(IMGROOT)/screenshot-osx-torbrowser-icon.png\" alt=\"Screenshot "
+"Mac OS X bundle\" />"
+msgstr ""
+"<img src=\"$(IMGROOT)/screenshot-osx-torbrowser-icon.png\" alt=\"Screenshot "
+"Mac OS X bundle\" />"
+
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:219
+#: /home/runa/dev/website/projects/en/torbrowser.wml:221
 msgid "<a id=\"Linux\"></a>"
-msgstr ""
+msgstr "<a id=\"Linux\"></a>"
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:220
+#: /home/runa/dev/website/projects/en/torbrowser.wml:222
 msgid "<a class=\"anchor\" href=\"#Linux\">Linux instructions</a>"
-msgstr ""
+msgstr "<a class=\"anchor\" href=\"#Linux\">راهنمای لینوکس</a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:221
+#: /home/runa/dev/website/projects/en/torbrowser.wml:223
 msgid ""
 "Download the architecture-appropriate file above, save it somewhere, then "
 "run:<br> tar -xvzf tor-browser-gnu-linux-i686-<version-"
@@ -707,19 +1045,21 @@
 "This will launch Vidalia and once that connects to Tor, it will launch "
 "Firefox."
 msgstr ""
+"فايل مناسب برای معماری سيستم عامل خود را از بالا دانلود کنيد، آن را در جایی ذخيره کنيد و سپس دستور زير را اجرا کنيد:<br> tar -xvzf tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-LANG.tar.gz يا tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64>-dev-LANG.tar.gz    (که در آن LANG زبان انتخابی شما است.)\n"
+"سپس روی پوشه ساخته شده کليک کنيد يا با دستور cd وارد آن شويد. حال فايل start-tor-browser را اجرا کنيد. اين کار باعث باز شدن Vidalia می‌شود و هنگامی که Vidalia به تور وصل شد، خودش فايرفاکس را راه‌اندازی می‌کند.\n"
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:230
+#: /home/runa/dev/website/projects/en/torbrowser.wml:232
 msgid "<a id=\"Extraction\"></a>"
-msgstr ""
+msgstr "<a id=\"Extraction\"></a>"
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:231
+#: /home/runa/dev/website/projects/en/torbrowser.wml:233
 msgid "<a class=\"anchor\" href=\"#Extraction\">Extraction</a>"
-msgstr ""
+msgstr "<a class=\"anchor\" href=\"#Extraction\">بازگشایی بسته</a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:233
+#: /home/runa/dev/website/projects/en/torbrowser.wml:235
 msgid ""
 "Download the file above, and save it somewhere, then double click on it.  "
 "Click on the button labelled <strong>\"...\"</strong> (1) and select where "
@@ -729,59 +1069,77 @@
 " choice. If you want to move it to a different computer or limit the traces "
 "you leave behind, save it to a USB disk."
 msgstr ""
+"فايل مورد نظر را از بالا دانلود کنيد، آن را جایی ذخيره کنيد و سپس روی آن دو "
+"بار کليک کنيد. با فرض اينکه برای باز کردن فايل از نرم‌افزار 7-zip استفاده "
+"می‌کنيد، مطابق با تصوير زير روی دکمه «...» کليک کنيد (اين مرحله با شماره 1 "
+"در تصوير زير نشان داده شده است). حال مکان مورد نظر خود را برای ذخيره نسخه "
+"باز شده بسته انتخاب کنيد و دکمه OK را فشار دهيد (مرحله 2). حداقل 50 مگابايت "
+"فضای خالی بايد در مکان انتخابی شما آزاد باشد. اگر می‌خواهيد بسته را روی "
+"رايانه خود نگه داريد، ذخيره ‌سازی روی دسکتاپ (Desktop) گزينه مناسبی است. "
+"امّا اگر می‌خواهيد آن را به رايانه ديگری منتقل نماييد يا جای پای کمتری از "
+"خود روی رايانه‌ای بگذاريد، بسته را روی يک فلش درايو ذخيره‌ کنيد."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:241
+#: /home/runa/dev/website/projects/en/torbrowser.wml:243
 msgid ""
 "Click <strong>Extract</strong> (3) to begin extraction. This may take a few "
 "minutes to complete."
-msgstr ""
+msgstr "برای آغاز بازگشايی بسته روی Extract کليک کنيد (مرحله 3)."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:244
+#: /home/runa/dev/website/projects/en/torbrowser.wml:246
 msgid ""
 "<img src=\"$(IMGROOT)/tbb-screenshot1.png\" alt=\"Screenshot of extraction "
 "process\" />"
 msgstr ""
+"<img src=\"$(IMGROOT)/tbb-screenshot1.png\" alt=\"Screenshot of extraction "
+"process\" />"
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:247
+#: /home/runa/dev/website/projects/en/torbrowser.wml:249
 msgid "<a id=\"Usage\"></a>"
-msgstr ""
+msgstr "<a id=\"Usage\"></a>"
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:248
+#: /home/runa/dev/website/projects/en/torbrowser.wml:250
 msgid "<a class=\"anchor\" href=\"#Usage\">Usage</a>"
-msgstr ""
+msgstr "<a class=\"anchor\" href=\"#Usage\">استفاده</a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:250
+#: /home/runa/dev/website/projects/en/torbrowser.wml:252
 msgid ""
 "Once extraction is complete, open the folder <strong>Tor Browser</strong> "
 "from the location you saved the bundle."
 msgstr ""
+"هنگامی که بازگشايی بسته تکميل شد، پوشه Tor Browser موجود در مکان ذخيره سازی "
+"را باز کنيد."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:252
+#: /home/runa/dev/website/projects/en/torbrowser.wml:254
 msgid ""
 "Double click on the <strong>Start Tor Browser</strong> (4) application (it "
 "may be called <strong>Start Tor Browser.exe</strong> on some systems.)"
 msgstr ""
+"دو بار روی نشان Start Tor Browser کليک کنيد (مرحله 4 نشان داده شده در عکس "
+"زير). در برخی سيستم‌ها ممکن است اين نشان به صورت Start Tor Browser.exe ديده "
+"شود."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:255
+#: /home/runa/dev/website/projects/en/torbrowser.wml:257
 msgid "The Vidalia window will shortly appear."
-msgstr ""
+msgstr "صفحه Vidalia اندکی بعد باز خواهد شد."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:257
+#: /home/runa/dev/website/projects/en/torbrowser.wml:259
 msgid ""
 "<img src=\"$(IMGROOT)/tbb-screenshot2.png\" alt=\"Screenshot of bundle "
 "startup\" />"
 msgstr ""
+"<img src=\"$(IMGROOT)/tbb-screenshot2.png\" alt=\"Screenshot of bundle "
+"startup\" />"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:260
+#: /home/runa/dev/website/projects/en/torbrowser.wml:262
 msgid ""
 "Once Tor is ready, Firefox will automatically be opened. Only web pages "
 "visited through the included Firefox browser will be sent via Tor. Other web"
@@ -791,50 +1149,72 @@
 "while using the Tor Browser Bundle, and close existing Firefox windows "
 "before starting."
 msgstr ""
+"پس از آنکه تور آماده استفاده شد، فايرفاکس به طور خودکار باز خواهد شد. تنها "
+"صفحاتی از طريق تور فرستاده می‌شوند که از به وسيله مرورگر فايرفاکسی که همراه "
+"بسته می‌آيد مورد بازديد قرار گيرند. مرورگرهای ديگری که روی رايانه نصب باشند،"
+" تغييری نمی‌کنند. قبل از اينکه به استفاده از فايرفاکس شروع کنيد، مطمئن شويد "
+"که عبارت Tor Enabled را در گوشه سمت راست پايين مرورگر می‌بينيد (مرحله 5 نشان"
+" داده شده در شکل زير). برای کاهش خطر اشتباه، هنگام استفاده از بسته مرورگر "
+"تور از باز کردن نسخهه‌ای از فايرفاکس که در اين بسته نيامده خودداری کنيد، و "
+"قبل از شروع کار با اين بسته تمام صفحات باز فايرفاکس را ببنديد."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:267
+#: /home/runa/dev/website/projects/en/torbrowser.wml:269
 msgid ""
 "If you installed the Tor IM Browser Bundle, the Pidgin instant messaging "
 "client will also be automatically opened."
 msgstr ""
+"چنانچه بسته پيام‌رسان و مرورگر تور را نصب کرده باشيد، نرم‌افزار پيام‌رسان "
+"پيدگين (Pidgin) نيز به طور خودکار باز خواهد شد."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:269
+#: /home/runa/dev/website/projects/en/torbrowser.wml:271
 msgid ""
 "Once you are finished browsing, close any open Firefox windows by clicking "
 "on the <img src=\"$(IMGROOT)/tbb-close-button.png\" alt=\"Close button "
 "(&times;)\" /> (6).  For privacy reasons, the list of webpages you visited "
 "and any cookies will be deleted."
 msgstr ""
+"هر گاه کارتان با مرورگر تمام شد، با کليک کردن روی علامت <img src=\"$(IMGROOT"
+")/tbb-close-button.png\" alt=\"Close button (&times;)\" />  تمام صفحات باز "
+"فايرفاکس را ببنديد (مرحله 6). برای محافظت از حريم شخصی شما، فهرست صفحات مورد"
+" بازديدتان و هر گونه کلوچک (Cookie) که ممکن است در طول مرورگری تان روی "
+"رايانه شما نصب شده باشد، پاک خواهند شد."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:275
+#: /home/runa/dev/website/projects/en/torbrowser.wml:277
 msgid "<img src=\"$(IMGROOT)/tbb-screenshot3a.png\" alt=\"Screenshot of Firefox\" />"
-msgstr ""
+msgstr "<img src=\"$(IMGROOT)/tbb-screenshot3a.png\" alt=\"Screenshot of Firefox\" />"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:278
+#: /home/runa/dev/website/projects/en/torbrowser.wml:280
 msgid ""
 "With the Tor Browser Bundle, Vidalia and Tor will automatically close. With "
 "the Tor IM Browser Bundle you need to also close Pidgin by right-clicking on"
 " the Pidgin icon (7), and choosing Quit (8)."
 msgstr ""
+"هنگام بستن مرورگر، اگر فقط از بسته مرورگر تور استفاده می‌کنيد، Vidalia و تور"
+" به طور خودکار بسته خواهند شد. اگر از بسته پيام‌رسان و مرورگر استفاده "
+"می‌کنيد، بايد پيدگين را خودتان ببنديد. برای بستن پيدگين روی نشان آن مطابق با"
+" شکل زير کليک راست کنيد و گزينه Quit را انتخاب کنيد (مرحله 7 و 8)."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:280
+#: /home/runa/dev/website/projects/en/torbrowser.wml:282
 msgid "<img src=\"$(IMGROOT)/tbb-screenshot3b.png\" alt=\"Screenshot of Pidgin\" />"
-msgstr ""
+msgstr "<img src=\"$(IMGROOT)/tbb-screenshot3b.png\" alt=\"Screenshot of Pidgin\" />"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:283
+#: /home/runa/dev/website/projects/en/torbrowser.wml:285
 msgid ""
 "To use the Tor Browser Bundle or Tor IM Browser Bundle again, repeat the "
 "steps in <a href=\"#Usage\">\"Usage\"</a>."
 msgstr ""
+"هر گاه خواستيد دوباره از بسته مرورگر تور يا بسته پيام‌رسان و مرورگر تور "
+"استفاده کنيد، مراحل ذکر شده در بخش <a href=\"#Usage\">«استفاده» </a> را "
+"تکرار کنيد."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:285
+#: /home/runa/dev/website/projects/en/torbrowser.wml:287
 msgid ""
 "Remember that Tor anonymizes the origin of your traffic, and it encrypts "
 "everything inside the Tor network, but <a "
@@ -844,68 +1224,90 @@
 "normal scary Internet &mdash; use HTTPS or other end-to-end encryption and "
 "authentication."
 msgstr ""
+"به ياد داشته باشيد که تور مبدأ ترافيک اينترنتی توليد شده توسط شما را بی‌نام "
+"و نشان می‌کند، و همه چيز داخل شبکه تور را رمزنگاری می‌کند، امّا  <a "
+"href=\"<wikifaq>#ExitEavesdroppers\">نمی‌تواند ترافيک ميان شبکه تور و مقصد "
+"نهایی آن را رمزنگاری کند</a> . اگر اطلاعات حساسی را مبادله می‌کنيد، همان دقت"
+" نظر و احتياطی را به خرج دهيد که هنگام استفاده از اينترنت معمولی با تمام "
+"خطرهايش به خرج می‌دهيد، به عنوان مثال از https به جای http و ديگر روش‌های "
+"رمزنگاری پايانه به پايانه (end-to-end) و تصديق هويت (Authentication) استفاده"
+" نماييد."
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:293
+#: /home/runa/dev/website/projects/en/torbrowser.wml:295
 msgid "<a id=\"Feedback\"></a>"
-msgstr ""
+msgstr "<a id=\"Feedback\"></a>"
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:294
+#: /home/runa/dev/website/projects/en/torbrowser.wml:296
 msgid "<a class=\"anchor\" href=\"#Feedback\">Comments and suggestions</a>"
-msgstr ""
+msgstr "<a class=\"anchor\" href=\"#Feedback\">نظرات و پیشنهادات</a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:296
+#: /home/runa/dev/website/projects/en/torbrowser.wml:298
 msgid ""
 "The Tor Browser Bundle is under development and not yet complete.  To "
 "discuss improvements and submit comments, please use the <a "
 "href=\"http://archives.seul.org/or/talk/\">or-talk</a> mailing list."
 msgstr ""
+"بسته مرورگر تور همچنان در حال توسعه و ناکامل است. برای گفتگو درباره بهبود و "
+"ارائه نظرات خود، لطفاً از فهرست پست الکترونيکی<a "
+"href=\"http://archives.seul.org/or/talk/\">or-talk</a>  استفاده نماييد."
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:300
+#: /home/runa/dev/website/projects/en/torbrowser.wml:302
 msgid "<a id=\"More\"></a>"
-msgstr ""
+msgstr "<a id=\"More\"></a>"
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:301
+#: /home/runa/dev/website/projects/en/torbrowser.wml:303
 msgid "<a class=\"anchor\" href=\"#More\">More information</a>"
-msgstr ""
+msgstr "<a class=\"anchor\" href=\"#More\">اطلاعات بیشتر</a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:303
+#: /home/runa/dev/website/projects/en/torbrowser.wml:305
 msgid ""
 "<strong>What is Tor and why do I need it?</strong> To learn more about Tor, "
 "visit the <a href=\"<page index>\">Tor Project website</a>."
 msgstr ""
+"<strong>تور چيست و چرا به آن نياز دارم؟</strong>  برای کسب اطلاع بيشتر "
+"درباره تور، لطفاً به سايت پروژه تور سر بزنيد."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:307
+#: /home/runa/dev/website/projects/en/torbrowser.wml:309
 msgid ""
 "<strong>What is in the Tor Browser Bundle?</strong> It contains Tor, "
 "Vidalia, Polipo, Firefox, and Torbutton (<a href=\"<page projects"
 "/torbrowser-details>#contents\">learn more</a>)."
 msgstr ""
+"<strong>چه چيزهایی درون بسته مرورگر تور است؟</strong>  اين بسته شامل تور، "
+"Vidalia، Polipo، فايرفاکس، و Torbutton است (<a href=\"<page projects"
+"/torbrowser-details>#contents\">اطلاعات بيشتر</a> )"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:311
+#: /home/runa/dev/website/projects/en/torbrowser.wml:313
 msgid ""
 "<strong>What is in the Tor IM Browser Bundle?</strong> It contains Tor, "
 "Vidalia, Polipo, Firefox, Torbutton, Pidgin and OTR (<a href=\"<page "
 "projects/torbrowser-details>#contents\">learn more</a>)."
 msgstr ""
+"<strong>چه چيزهایی درون بسته پيام‌رسان و مرورگر تور است؟</strong>  ااين بسته"
+" شامل تور، Vidalia، Polipo، فايرفاکس، Torbutton و پيدگين با افزونه OTR است "
+"(<a href=\"<page projects/torbrowser-details>#contents\">اطلاعات بيشتر</a> )"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:315
+#: /home/runa/dev/website/projects/en/torbrowser.wml:317
 msgid ""
 "<strong>How can I make my own bundle?</strong> To download the source code "
 "and learn how to build the bundle yourself, read the <a href=\"<page "
 "projects/torbrowser-details>#build\">build instructions</a>."
 msgstr ""
+"<strong>چگونه می‌توانم بسته خودم را ايجاد کنم؟</strong>  برای دانلود کد منبع"
+" و ياد گرفتن ساختن بسته، <a href=\"<page projects/torbrowser-"
+"details>#build\">راهنمای ساختن</a>  را مطالعه کنيد."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:319
+#: /home/runa/dev/website/projects/en/torbrowser.wml:321
 msgid ""
 "Tor Browser Bundle is partially based on <a "
 "href=\"http://portableapps.com/apps/internet/firefox_portable\">Mozilla "
@@ -913,3 +1315,9 @@
 "href=\"http://portableapps.com/apps/internet/pidgin_portable\">Pidgin "
 "Portable</a> from <a href=\"http://portableapps.com/\">PortableApps.com</a>."
 msgstr ""
+"بسته مرورگر تور تا حدی مبتنی بر <a "
+"href=\"http://portableapps.com/apps/internet/firefox_portable\">نسخه قابل "
+"حمل موزيلا فايرفاکس</a>   و <a "
+"href=\"http://portableapps.com/apps/internet/pidgin_portable\">نسخه قابل حمل"
+" پيدگين</a>    از سايت <a "
+"href=\"http://portableapps.com/\">PortableApps.com</a> می‌باشد."

Modified: translation/trunk/projects/website/po/fr/1-high.index.po
===================================================================
--- translation/trunk/projects/website/po/fr/1-high.index.po	2011-04-12 16:15:00 UTC (rev 24594)
+++ translation/trunk/projects/website/po/fr/1-high.index.po	2011-04-12 16:19:31 UTC (rev 24595)
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-03-17 18:05+0000\n"
-"PO-Revision-Date: 2011-03-22 16:15+0000\n"
+"POT-Creation-Date: 2011-03-28 12:48+0200\n"
+"PO-Revision-Date: 2011-03-29 00:25+0000\n"
 "Last-Translator: runasand <runa.sandvik at gmail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
@@ -18,14 +18,14 @@
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 
 #. type: Content of: <div><div><div><div><ul><li>
-#: /home/runa/tor/website/en/index.wml:12
+#: /home/runa/dev/website/en/index.wml:12
 msgid "Tor prevents anyone from learning your location or browsing habits."
 msgstr ""
 "Tor empêche quiconque de repérer votre localisation ou vos habitudes de "
 "navigation"
 
 #. type: Content of: <div><div><div><div><ul><li>
-#: /home/runa/tor/website/en/index.wml:13
+#: /home/runa/dev/website/en/index.wml:13
 msgid ""
 "Tor is for web browsers, instant messaging clients, remote logins, and more."
 msgstr ""
@@ -33,18 +33,18 @@
 "instantanée, les connexions à distance, et encore plus"
 
 #. type: Content of: <div><div><div><div><ul><li>
-#: /home/runa/tor/website/en/index.wml:14
+#: /home/runa/dev/website/en/index.wml:14
 msgid "Tor is free and open source for Windows, Mac, Linux/Unix, and Android"
 msgstr ""
 "Tor est libre et open source pour Windows, Mac, GNU/Linux / Unix, et Android"
 
 #. type: Content of: <div><div><div><div><h1>
-#: /home/runa/tor/website/en/index.wml:16
+#: /home/runa/dev/website/en/index.wml:16
 msgid "Anonymity Online"
 msgstr "L'anonymat en ligne"
 
 #. type: Content of: <div><div><div><div><p>
-#: /home/runa/tor/website/en/index.wml:17
+#: /home/runa/dev/website/en/index.wml:17
 msgid ""
 "Protect your privacy. Defend yourself against network surveillance and "
 "traffic analysis."
@@ -53,7 +53,7 @@
 " l'analyse du trafic"
 
 #. type: Content of: <div><div><div><div><div>
-#: /home/runa/tor/website/en/index.wml:20
+#: /home/runa/dev/website/en/index.wml:20
 msgid ""
 "<a href=\"<page download/download>\"> <span class=\"download-tor\">Download "
 "Tor</span></a>"
@@ -62,12 +62,12 @@
 "tor\">Télécharger Tor</span></a>"
 
 #. type: Content of: <div><div><div><div><div><h2>
-#: /home/runa/tor/website/en/index.wml:26
+#: /home/runa/dev/website/en/index.wml:26
 msgid "What is Tor?"
 msgstr "Qu'est-ce que Tor ?"
 
 #. type: Content of: <div><div><div><div><div><p>
-#: /home/runa/tor/website/en/index.wml:26
+#: /home/runa/dev/website/en/index.wml:26
 msgid ""
 "Tor is free software and an open network that helps you defend against a "
 "form of network surveillance that threatens personal freedom and privacy, "
@@ -84,12 +84,12 @@
 "href=\"<page about/overview>\">En savoir plus sur Tor &raquo;</a></span>"
 
 #. type: Content of: <div><div><div><div><div><h2>
-#: /home/runa/tor/website/en/index.wml:36
+#: /home/runa/dev/website/en/index.wml:36
 msgid "Why Anonymity Matters"
 msgstr "Pourquoi l'anonymat est-il important"
 
 #. type: Content of: <div><div><div><div><div><p>
-#: /home/runa/tor/website/en/index.wml:37
+#: /home/runa/dev/website/en/index.wml:37
 msgid ""
 "Tor protects you by bouncing your communications around a distributed "
 "network of relays run by volunteers all around the world: it prevents "
@@ -111,22 +111,22 @@
 "dans Tor &raquo;</a></span>"
 
 #. type: Content of: <div><div><div><div><h2>
-#: /home/runa/tor/website/en/index.wml:50
+#: /home/runa/dev/website/en/index.wml:50
 msgid "Our Projects"
 msgstr "Nos projets"
 
 #. type: Content of: <div><div><div><div><table><tr><td>
-#: /home/runa/tor/website/en/index.wml:55
+#: /home/runa/dev/website/en/index.wml:55
 msgid "<img src=\"$(IMGROOT)/icon-TorButton.jpg\" alt=\"Torbutton Icon\">"
 msgstr "<img src=\"$(IMGROOT)/icon-TorButton.jpg\" alt=\"Torbutton Icon\">"
 
 #. type: Content of: <div><div><div><div><table><tr><td><h3>
-#: /home/runa/tor/website/en/index.wml:56
+#: /home/runa/dev/website/en/index.wml:56
 msgid "<a href=\"<page torbutton/index>\">Torbutton</a>"
 msgstr "<a href=\"<page torbutton/index>\">Torbutton</a>"
 
 #. type: Content of: <div><div><div><div><table><tr><td><p>
-#: /home/runa/tor/website/en/index.wml:57
+#: /home/runa/dev/website/en/index.wml:57
 msgid ""
 "Torbutton is a 1-click way for Firefox users to enable or disable Tor in "
 "Firefox."
@@ -135,32 +135,32 @@
 "Firefox"
 
 #. type: Content of: <div><div><div><div><table><tr><td>
-#: /home/runa/tor/website/en/index.wml:61
+#: /home/runa/dev/website/en/index.wml:61
 msgid "<img src=\"$(IMGROOT)/icon-TorCheck.jpg\" alt=\"Tor Check Icon\">"
 msgstr "<img src=\"$(IMGROOT)/icon-TorCheck.jpg\" alt=\"Tor Check Icon\">"
 
 #. type: Content of: <div><div><div><div><table><tr><td><h3>
-#: /home/runa/tor/website/en/index.wml:62
+#: /home/runa/dev/website/en/index.wml:62
 msgid "<a href=\"https://check.torproject.org/\">Check</a>"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><table><tr><td><p>
-#: /home/runa/tor/website/en/index.wml:63
+#: /home/runa/dev/website/en/index.wml:63
 msgid "Check determines if you are successfully browsing with Tor."
 msgstr "La vérification détermine si vous êtes protégé par Tor."
 
 #. type: Content of: <div><div><div><div><table><tr><td>
-#: /home/runa/tor/website/en/index.wml:69
+#: /home/runa/dev/website/en/index.wml:69
 msgid "<img src=\"$(IMGROOT)/icon-Vidalia.jpg\" alt=\"Vidalia Icon\">"
 msgstr "<img src=\"$(IMGROOT)/icon-Vidalia.jpg\" alt=\"Vidalia Icon\">"
 
 #. type: Content of: <div><div><div><div><table><tr><td><h3>
-#: /home/runa/tor/website/en/index.wml:70
+#: /home/runa/dev/website/en/index.wml:70
 msgid "<a href=\"<page projects/vidalia>\">Vidalia</a>"
 msgstr "<a href=\"<page projects/vidalia>\">Vidalia</a>"
 
 #. type: Content of: <div><div><div><div><table><tr><td><p>
-#: /home/runa/tor/website/en/index.wml:71
+#: /home/runa/dev/website/en/index.wml:71
 msgid ""
 "Vidalia is a graphical way to control and view Tor's connections and "
 "settings."
@@ -169,17 +169,17 @@
 "connexions Tor et ses paramètres."
 
 #. type: Content of: <div><div><div><div><table><tr><td>
-#: /home/runa/tor/website/en/index.wml:75
+#: /home/runa/dev/website/en/index.wml:75
 msgid "<img src=\"$(IMGROOT)/icon-TorBrowser.jpg\" alt=\"TorBrowser Icon\">"
 msgstr "<img src=\"$(IMGROOT)/icon-TorBrowser.jpg\" alt=\"TorBrowser Icon\">"
 
 #. type: Content of: <div><div><div><div><table><tr><td><h3>
-#: /home/runa/tor/website/en/index.wml:76
+#: /home/runa/dev/website/en/index.wml:76
 msgid "<a href=\"<page projects/torbrowser>\">Tor Browser</a>"
 msgstr "<a href=\"<page projects/torbrowser>\">navigateur Tor</a>"
 
 #. type: Content of: <div><div><div><div><table><tr><td><p>
-#: /home/runa/tor/website/en/index.wml:78
+#: /home/runa/dev/website/en/index.wml:78
 msgid ""
 "Tor Browser contains everything you need to safely browse the Internet."
 msgstr ""
@@ -187,19 +187,19 @@
 "sûreté sur Internet"
 
 #. type: Content of: <div><div><div><div><h2>
-#: /home/runa/tor/website/en/index.wml:90
+#: /home/runa/dev/website/en/index.wml:90
 msgid "Who Uses Tor?"
 msgstr "Qui utilise Tor?"
 
 #. type: Content of: <div><div><div><div><div><h3>
-#: /home/runa/tor/website/en/index.wml:93
+#: /home/runa/dev/website/en/index.wml:93
 msgid ""
 "<a href=\"<page about/torusers>#normalusers\"><img "
 "src=\"$(IMGROOT)/family.jpg\" alt=\"Normal People\">Family &amp; Friends</a>"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><div><p>
-#: /home/runa/tor/website/en/index.wml:95
+#: /home/runa/dev/website/en/index.wml:95
 msgid ""
 "People like you and your family use Tor to protect themselves, their "
 "children, and their dignity while using the Internet."
@@ -209,14 +209,14 @@
 "Internet."
 
 #. type: Content of: <div><div><div><div><div><h3>
-#: /home/runa/tor/website/en/index.wml:99
+#: /home/runa/dev/website/en/index.wml:99
 msgid ""
 "<a href=\"<page about/torusers>#executives\"><img "
 "src=\"$(IMGROOT)/consumers.jpg\" alt=\"Businesses\">Businesses</a>"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><div><p>
-#: /home/runa/tor/website/en/index.wml:101
+#: /home/runa/dev/website/en/index.wml:101
 msgid ""
 "Businesses use Tor to research competition, keep business strategies "
 "confidential, and facilitate internal accountability."
@@ -226,7 +226,7 @@
 "leurs comptes internes."
 
 #. type: Content of: <div><div><div><div><div><h3>
-#: /home/runa/tor/website/en/index.wml:105
+#: /home/runa/dev/website/en/index.wml:105
 msgid ""
 "<a href=\"<page about/torusers>#activists\"><img "
 "src=\"$(IMGROOT)/activists.jpg\" alt=\"Activists &amp; "
@@ -234,7 +234,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><div><div><div><p>
-#: /home/runa/tor/website/en/index.wml:107
+#: /home/runa/dev/website/en/index.wml:107
 msgid ""
 "Activists use Tor to anonymously report abuses from danger zones.  "
 "Whistleblowers use Tor to safely report on corruption."
@@ -244,14 +244,14 @@
 " des corruptions."
 
 #. type: Content of: <div><div><div><div><div><h3>
-#: /home/runa/tor/website/en/index.wml:111
+#: /home/runa/dev/website/en/index.wml:111
 msgid ""
 "<a href=\"<page about/torusers>#journalist\"><img "
 "src=\"$(IMGROOT)/media.jpg\" alt=\"Journalists and the Media\">Media</a>"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><div><p>
-#: /home/runa/tor/website/en/index.wml:113
+#: /home/runa/dev/website/en/index.wml:113
 msgid ""
 "Journalists and the media use Tor to protect their research and sources "
 "online."
@@ -260,7 +260,7 @@
 "sources en ligne."
 
 #. type: Content of: <div><div><div><div><div><h3>
-#: /home/runa/tor/website/en/index.wml:117
+#: /home/runa/dev/website/en/index.wml:117
 msgid ""
 "<a href=\"<page about/torusers>#military\"><img "
 "src=\"$(IMGROOT)/military.jpg\" alt=\"Military and Law "
@@ -268,7 +268,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><div><div><div><p>
-#: /home/runa/tor/website/en/index.wml:119
+#: /home/runa/dev/website/en/index.wml:119
 msgid ""
 "Militaries and law enforcement use Tor to protect their communications, "
 "investigations, and intelligence gathering online."
@@ -277,17 +277,32 @@
 "communications, investigations, et la collecte d'informations en ligne."
 
 #. type: Content of: <div><div><div><div><h2>
-#: /home/runa/tor/website/en/index.wml:123
+#: /home/runa/dev/website/en/index.wml:123
 msgid "Announcements"
 msgstr "Annonces"
 
 #. type: Content of: <div><div><div><div><table><tr><td><div>
-#: /home/runa/tor/website/en/index.wml:128
+#: /home/runa/dev/website/en/index.wml:128
+msgid "<span class=\"month\">Mar</span><br><span class=\"day\">23</span>"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><table><tr><td><p>
+#: /home/runa/dev/website/en/index.wml:129
+msgid ""
+"The Tor Project wins the \"Project of Social Benefit\" award from the Free "
+"Software Foundation and GNU Project. We are honored to win this award and to"
+" be listed amongst the former winners. <a "
+"href=\"https://blog.torproject.org/blog/tor-project-receives-fsf-"
+"award\">Read more</a> about this award."
+msgstr ""
+
+#. type: Content of: <div><div><div><div><table><tr><td><div>
+#: /home/runa/dev/website/en/index.wml:135
 msgid "<span class=\"month\">Feb</span><br><span class=\"day\">23</span>"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><table><tr><td><p>
-#: /home/runa/tor/website/en/index.wml:129
+#: /home/runa/dev/website/en/index.wml:136
 msgid ""
 "The latest stable Tor version, 0.2.1.30, is <a "
 "href=\"https://lists.torproject.org/pipermail/tor-"
@@ -297,21 +312,3 @@
 "reachable from Iran again.  We don't expect this tweak will win the arms "
 "race long-term, but it buys us time until we roll out a better solution."
 msgstr ""
-
-#. type: Content of: <div><div><div><div><table><tr><td><div>
-#: /home/runa/tor/website/en/index.wml:138
-msgid "<span class=\"month\">Jan</span><br><span class=\"day\">30</span>"
-msgstr "<span class=\"month\">Jan</span><br><span class=\"day\">30</span>"
-
-#. type: Content of: <div><div><div><div><table><tr><td><p>
-#: /home/runa/tor/website/en/index.wml:139
-msgid ""
-"Tor helping with Egypt.  Here's what we've learned <a "
-"href=\"https://blog.torproject.org/blog/recent-events-egypt\">about recent "
-"events in Egypt</a>. And we're keeping our <a href=\"<page "
-"press/inthemedia>\">In the media</a> page up to date with stories about how "
-"we're helping around the world."
-msgstr ""
-"Tor vient en aide à l'Egypte.\n"
-"\n"
-"Voici ce que nous avons appris <a href=\"https://blog.torproject.org/blog/recent-events-egypt\">à propos des récents évènements en Egypte</a>. Et nous maintenons notre page <a href=\"<page press/inthemedia>\">Dans les médias</a> à jour avec ces récits sur la façon dont nous aidons les gens dans le monde."

Modified: translation/trunk/projects/website/po/fr/about/3-low.contact.po
===================================================================
--- translation/trunk/projects/website/po/fr/about/3-low.contact.po	2011-04-12 16:15:00 UTC (rev 24594)
+++ translation/trunk/projects/website/po/fr/about/3-low.contact.po	2011-04-12 16:19:31 UTC (rev 24595)
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-02-12 12:19+0000\n"
-"PO-Revision-Date: 2011-03-22 16:18+0000\n"
+"POT-Creation-Date: 2011-03-28 12:49+0200\n"
+"PO-Revision-Date: 2011-03-29 00:25+0000\n"
 "Last-Translator: runasand <runa.sandvik at gmail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
@@ -18,7 +18,7 @@
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/about/en/contact.wml:9
+#: /home/runa/dev/website/about/en/contact.wml:9
 msgid ""
 "<a href=\"<page index>\">Home &raquo; </a> <a href=\"<page "
 "about/overview>\">About &raquo; </a> <a href=\"<page "
@@ -28,12 +28,12 @@
 "propos »</a> <a href=\"<page about/contact>\">Contact</a>"
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/about/en/contact.wml:14
+#: /home/runa/dev/website/about/en/contact.wml:14
 msgid "Tor: Contact"
 msgstr "Tor : Contacts"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/about/en/contact.wml:16
+#: /home/runa/dev/website/about/en/contact.wml:16
 msgid ""
 "First, if you have a problem or question about using Tor, go look at the <a "
 "href=\"<page docs/documentation>#Support\">Support section</a> for how to "
@@ -51,30 +51,30 @@
 "poliment de l'aide</a>."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/about/en/contact.wml:18
+#: /home/runa/dev/website/about/en/contact.wml:18
 msgid ""
-"If you really do need to reach us, here are some approaches. All of these "
-"addresses are @torproject.org. Please be patient and <a "
-"href=\"http://www.catb.org/~esr/faqs/smart-questions.html\">helpful</a>, and"
-" please make sure to write your mail in English."
+"If you really do need to reach us, here are some approaches. Please be "
+"patient and <a href=\"http://www.catb.org/~esr/faqs/smart-"
+"questions.html\">helpful</a>, and please make sure to write your mail in "
+"English."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/about/en/contact.wml:23
+#: /home/runa/dev/website/about/en/contact.wml:21
 msgid ""
-"<i>tor-assistants</i> is the catch-all address for everything. It can be "
-"used for:"
+"<i>tor-assistants at lists.torproject.org</i> is the catch-all address for "
+"everything. It can be used for:"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/about/en/contact.wml:27
+#: /home/runa/dev/website/about/en/contact.wml:25
 msgid ""
 "Contacting the people who manage the directory authorities. Use this if you "
 "run a Tor relay and have a question or problem with your relay."
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/about/en/contact.wml:30
+#: /home/runa/dev/website/about/en/contact.wml:28
 msgid ""
 "So we can fix typos on the website, change wrong statements or directions on"
 " the website, and add new sections and paragraphs that you send us. You "
@@ -83,7 +83,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/about/en/contact.wml:34
+#: /home/runa/dev/website/about/en/contact.wml:32
 msgid ""
 "Hearing about your documents, patches, testing, experiences with supporting "
 "applications, and so forth inspired by our <a href=\"<page "
@@ -95,72 +95,59 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/about/en/contact.wml:44
+#: /home/runa/dev/website/about/en/contact.wml:42
 msgid "A few other addresses are more specific:"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/about/en/contact.wml:47
+#: /home/runa/dev/website/about/en/contact.wml:45
 msgid ""
-"<i>tor-translation</i> can put new <a href=\"<page "
+"<i>tor-translation at lists.torproject.org</i> can put new <a href=\"<page "
 "getinvolved/translation>\">website translations</a> into place, and help "
 "answer questions about existing and new translations."
 msgstr ""
-"<i>tor-translation</i> peut mettre de nouvelles <a href=\"<page "
-"getinvolved/translation>\">traductions du site web</a> en place, et aider à "
-"répondre aux questions sur les traductions existantes et nouvelles."
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/about/en/contact.wml:50
+#: /home/runa/dev/website/about/en/contact.wml:48
 msgid ""
-"<i>tordnsel</i> is the alias for the people responsible for the tordns "
-"exitlist."
+"<i>tordnsel at torproject.org</i> is the alias for the people responsible "
+"for the tordns exitlist."
 msgstr ""
-"<i>tordnsel</i> est l'alias pour les personnes responsables de la tordns "
-"exitlist."
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/about/en/contact.wml:52
+#: /home/runa/dev/website/about/en/contact.wml:50
 msgid ""
-"<i>donations</i> is for questions and comments about <a href=\"<page "
-"donate/donate>\">getting money to the developers</a>. More donations means "
-"<a href=\"<page docs/faq>#Funding\">more Tor</a>. We're happy to help think "
-"about creative ways for you to contribute."
+"<i>donations at torproject.org</i> is for questions and comments about <a "
+"href=\"<page donate/donate>\">getting money to the developers</a>. More "
+"donations means <a href=\"<page docs/faq>#Funding\">more Tor</a>. We're "
+"happy to help think about creative ways for you to contribute."
 msgstr ""
-"<i>donations</i> s'occupe des questions et commentaires au sujet <a "
-"href=\"<page donate/donate>\">des dons aux développeurs</a> . Plus dons "
-"signifie <a href=\"<page docs/faq>#Funding\">plus de projet Tor</a> . Nous "
-"serons heureux de vous aider à réfléchir à des moyens créatifs pour vous de "
-"contribuer à ce projet."
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/about/en/contact.wml:57
+#: /home/runa/dev/website/about/en/contact.wml:55
 msgid ""
-"<i>execdir</i> is for press/media, questions and comments about Tor the non-"
-"profit corporation: trademark questions, affiliation and coordination, major"
-" gifts, contract inquiries, licensing and certification, etc."
+"<i>execdir at torproject.org</i> is for press/media, questions and comments "
+"about Tor the non-profit corporation: trademark questions, affiliation and "
+"coordination, major gifts, contract inquiries, licensing and certification, "
+"etc."
 msgstr ""
-"<i>execdir</i> est pour la presse / médias, questions et commentaires à "
-"propos de Tor la société à but non-lucratif : questions relatives aux "
-"marques, l'affiliation et la coordination, dons majeurs, les enquêtes "
-"contrat, licence et de certification, etc"
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/about/en/contact.wml:63
+#: /home/runa/dev/website/about/en/contact.wml:61
 msgid ""
 "<a id=\"irc\"></a> Tor users and developers can also be found in the "
 "following channels on <a href=\"http://www.oftc.net/oftc/\">oftc</a>:"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/about/en/contact.wml:68
+#: /home/runa/dev/website/about/en/contact.wml:66
 msgid ""
 "<i>#tor</i> - User and relay operation discussions. Having trouble running "
 "Tor or a question for other Tor users? Then this is the spot for you."
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/about/en/contact.wml:71
+#: /home/runa/dev/website/about/en/contact.wml:69
 msgid ""
 "<i>#tor-dev</i> - Channel for people who want to do development.  "
 "Discussions about Tor related coding, protocols, and <a href=\"<page "
@@ -168,7 +155,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/about/en/contact.wml:74
+#: /home/runa/dev/website/about/en/contact.wml:72
 msgid ""
 "<i>#nottor</i> - This is where Tor people hang out to talk about stuff that "
 "is not related to Tor."

Modified: translation/trunk/projects/website/po/it/1-high.index.po
===================================================================
--- translation/trunk/projects/website/po/it/1-high.index.po	2011-04-12 16:15:00 UTC (rev 24594)
+++ translation/trunk/projects/website/po/it/1-high.index.po	2011-04-12 16:19:31 UTC (rev 24595)
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-03-17 18:05+0000\n"
-"PO-Revision-Date: 2011-03-24 16:11+0000\n"
+"POT-Creation-Date: 2011-03-28 12:48+0200\n"
+"PO-Revision-Date: 2011-03-29 00:25+0000\n"
 "Last-Translator: jan <jan.reister at unimi.it>\n"
 "Language-Team: Italian <None>\n"
 "MIME-Version: 1.0\n"
@@ -18,14 +18,14 @@
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #. type: Content of: <div><div><div><div><ul><li>
-#: /home/runa/tor/website/en/index.wml:12
+#: /home/runa/dev/website/en/index.wml:12
 msgid "Tor prevents anyone from learning your location or browsing habits."
 msgstr ""
 "Tor impedisce a chiunque di conoscere la tua posizione o abitudini di "
 "navigazione."
 
 #. type: Content of: <div><div><div><div><ul><li>
-#: /home/runa/tor/website/en/index.wml:13
+#: /home/runa/dev/website/en/index.wml:13
 msgid ""
 "Tor is for web browsers, instant messaging clients, remote logins, and more."
 msgstr ""
@@ -33,17 +33,17 @@
 "account di accesso remoto e molto altro."
 
 #. type: Content of: <div><div><div><div><ul><li>
-#: /home/runa/tor/website/en/index.wml:14
+#: /home/runa/dev/website/en/index.wml:14
 msgid "Tor is free and open source for Windows, Mac, Linux/Unix, and Android"
 msgstr "Tor è libero ed open source per Windows, Mac, Linux / Unix, e Android"
 
 #. type: Content of: <div><div><div><div><h1>
-#: /home/runa/tor/website/en/index.wml:16
+#: /home/runa/dev/website/en/index.wml:16
 msgid "Anonymity Online"
 msgstr "Anonimato in rete"
 
 #. type: Content of: <div><div><div><div><p>
-#: /home/runa/tor/website/en/index.wml:17
+#: /home/runa/dev/website/en/index.wml:17
 msgid ""
 "Protect your privacy. Defend yourself against network surveillance and "
 "traffic analysis."
@@ -52,7 +52,7 @@
 "l'analisi del traffico."
 
 #. type: Content of: <div><div><div><div><div>
-#: /home/runa/tor/website/en/index.wml:20
+#: /home/runa/dev/website/en/index.wml:20
 msgid ""
 "<a href=\"<page download/download>\"> <span class=\"download-tor\">Download "
 "Tor</span></a>"
@@ -61,12 +61,12 @@
 "Tor</span></a>"
 
 #. type: Content of: <div><div><div><div><div><h2>
-#: /home/runa/tor/website/en/index.wml:26
+#: /home/runa/dev/website/en/index.wml:26
 msgid "What is Tor?"
 msgstr "Cos'è Tor?"
 
 #. type: Content of: <div><div><div><div><div><p>
-#: /home/runa/tor/website/en/index.wml:26
+#: /home/runa/dev/website/en/index.wml:26
 msgid ""
 "Tor is free software and an open network that helps you defend against a "
 "form of network surveillance that threatens personal freedom and privacy, "
@@ -82,12 +82,12 @@
 "&raquo;</a></span>"
 
 #. type: Content of: <div><div><div><div><div><h2>
-#: /home/runa/tor/website/en/index.wml:36
+#: /home/runa/dev/website/en/index.wml:36
 msgid "Why Anonymity Matters"
 msgstr "Perché l'anonimato è importante"
 
 #. type: Content of: <div><div><div><div><div><p>
-#: /home/runa/tor/website/en/index.wml:37
+#: /home/runa/dev/website/en/index.wml:37
 msgid ""
 "Tor protects you by bouncing your communications around a distributed "
 "network of relays run by volunteers all around the world: it prevents "
@@ -109,54 +109,54 @@
 "Tor &raquo;</a></span>"
 
 #. type: Content of: <div><div><div><div><h2>
-#: /home/runa/tor/website/en/index.wml:50
+#: /home/runa/dev/website/en/index.wml:50
 msgid "Our Projects"
 msgstr "I nostri progetti"
 
 #. type: Content of: <div><div><div><div><table><tr><td>
-#: /home/runa/tor/website/en/index.wml:55
+#: /home/runa/dev/website/en/index.wml:55
 msgid "<img src=\"$(IMGROOT)/icon-TorButton.jpg\" alt=\"Torbutton Icon\">"
 msgstr "<img src=\"$(IMGROOT)/icon-TorButton.jpg\" alt=\" Icona Torbutton\">"
 
 #. type: Content of: <div><div><div><div><table><tr><td><h3>
-#: /home/runa/tor/website/en/index.wml:56
+#: /home/runa/dev/website/en/index.wml:56
 msgid "<a href=\"<page torbutton/index>\">Torbutton</a>"
 msgstr "<a href=\"<page torbutton/index>\">Torbutton</a>"
 
 #. type: Content of: <div><div><div><div><table><tr><td><p>
-#: /home/runa/tor/website/en/index.wml:57
+#: /home/runa/dev/website/en/index.wml:57
 msgid ""
 "Torbutton is a 1-click way for Firefox users to enable or disable Tor in "
 "Firefox."
 msgstr "Torbutton serve ad abilitare o disabilitare Tor in Firefox."
 
 #. type: Content of: <div><div><div><div><table><tr><td>
-#: /home/runa/tor/website/en/index.wml:61
+#: /home/runa/dev/website/en/index.wml:61
 msgid "<img src=\"$(IMGROOT)/icon-TorCheck.jpg\" alt=\"Tor Check Icon\">"
 msgstr "<img src=\"$(IMGROOT)/icon-TorCheck.jpg\" alt=\"Tor  Icona Check\">"
 
 #. type: Content of: <div><div><div><div><table><tr><td><h3>
-#: /home/runa/tor/website/en/index.wml:62
+#: /home/runa/dev/website/en/index.wml:62
 msgid "<a href=\"https://check.torproject.org/\">Check</a>"
 msgstr "<a href=\"https://check.torproject.org/\">Check</a>"
 
 #. type: Content of: <div><div><div><div><table><tr><td><p>
-#: /home/runa/tor/website/en/index.wml:63
+#: /home/runa/dev/website/en/index.wml:63
 msgid "Check determines if you are successfully browsing with Tor."
 msgstr "Check verifica se si sta navigando con Tor."
 
 #. type: Content of: <div><div><div><div><table><tr><td>
-#: /home/runa/tor/website/en/index.wml:69
+#: /home/runa/dev/website/en/index.wml:69
 msgid "<img src=\"$(IMGROOT)/icon-Vidalia.jpg\" alt=\"Vidalia Icon\">"
 msgstr "<img src=\"$(IMGROOT)/icon-Vidalia.jpg\" alt=\" Icona Vidalia\">"
 
 #. type: Content of: <div><div><div><div><table><tr><td><h3>
-#: /home/runa/tor/website/en/index.wml:70
+#: /home/runa/dev/website/en/index.wml:70
 msgid "<a href=\"<page projects/vidalia>\">Vidalia</a>"
 msgstr "<a href=\"<page projects/vidalia>\">Vidalia</a>"
 
 #. type: Content of: <div><div><div><div><table><tr><td><p>
-#: /home/runa/tor/website/en/index.wml:71
+#: /home/runa/dev/website/en/index.wml:71
 msgid ""
 "Vidalia is a graphical way to control and view Tor's connections and "
 "settings."
@@ -165,17 +165,17 @@
 " e le impostazioni di Tor."
 
 #. type: Content of: <div><div><div><div><table><tr><td>
-#: /home/runa/tor/website/en/index.wml:75
+#: /home/runa/dev/website/en/index.wml:75
 msgid "<img src=\"$(IMGROOT)/icon-TorBrowser.jpg\" alt=\"TorBrowser Icon\">"
 msgstr "<img src=\"$(IMGROOT)/icon-TorBrowser.jpg\" alt=\" Icona TorBrowser\">"
 
 #. type: Content of: <div><div><div><div><table><tr><td><h3>
-#: /home/runa/tor/website/en/index.wml:76
+#: /home/runa/dev/website/en/index.wml:76
 msgid "<a href=\"<page projects/torbrowser>\">Tor Browser</a>"
 msgstr "<a href=\"<page projects/torbrowser>\">Tor Browser</a>"
 
 #. type: Content of: <div><div><div><div><table><tr><td><p>
-#: /home/runa/tor/website/en/index.wml:78
+#: /home/runa/dev/website/en/index.wml:78
 msgid ""
 "Tor Browser contains everything you need to safely browse the Internet."
 msgstr ""
@@ -183,12 +183,12 @@
 "sicuro."
 
 #. type: Content of: <div><div><div><div><h2>
-#: /home/runa/tor/website/en/index.wml:90
+#: /home/runa/dev/website/en/index.wml:90
 msgid "Who Uses Tor?"
 msgstr "Chi usa Tor?"
 
 #. type: Content of: <div><div><div><div><div><h3>
-#: /home/runa/tor/website/en/index.wml:93
+#: /home/runa/dev/website/en/index.wml:93
 msgid ""
 "<a href=\"<page about/torusers>#normalusers\"><img "
 "src=\"$(IMGROOT)/family.jpg\" alt=\"Normal People\">Family &amp; Friends</a>"
@@ -197,7 +197,7 @@
 "src=\"$(IMGROOT)/family.jpg\" alt=\"Persone normali\">Amici e famiglia</a>"
 
 #. type: Content of: <div><div><div><div><div><p>
-#: /home/runa/tor/website/en/index.wml:95
+#: /home/runa/dev/website/en/index.wml:95
 msgid ""
 "People like you and your family use Tor to protect themselves, their "
 "children, and their dignity while using the Internet."
@@ -206,7 +206,7 @@
 "loro figli, e la loro dignità, mentre l'uso di Internet."
 
 #. type: Content of: <div><div><div><div><div><h3>
-#: /home/runa/tor/website/en/index.wml:99
+#: /home/runa/dev/website/en/index.wml:99
 msgid ""
 "<a href=\"<page about/torusers>#executives\"><img "
 "src=\"$(IMGROOT)/consumers.jpg\" alt=\"Businesses\">Businesses</a>"
@@ -215,7 +215,7 @@
 "src=\"$(IMGROOT)/consumers.jpg\" alt=\"Aziende\">Aziende</a>"
 
 #. type: Content of: <div><div><div><div><div><p>
-#: /home/runa/tor/website/en/index.wml:101
+#: /home/runa/dev/website/en/index.wml:101
 msgid ""
 "Businesses use Tor to research competition, keep business strategies "
 "confidential, and facilitate internal accountability."
@@ -224,7 +224,7 @@
 "riservatezza negli affari e favorire la responsabilità interna."
 
 #. type: Content of: <div><div><div><div><div><h3>
-#: /home/runa/tor/website/en/index.wml:105
+#: /home/runa/dev/website/en/index.wml:105
 msgid ""
 "<a href=\"<page about/torusers>#activists\"><img "
 "src=\"$(IMGROOT)/activists.jpg\" alt=\"Activists &amp; "
@@ -235,7 +235,7 @@
 "informatori\">Attivisti</a>"
 
 #. type: Content of: <div><div><div><div><div><p>
-#: /home/runa/tor/website/en/index.wml:107
+#: /home/runa/dev/website/en/index.wml:107
 msgid ""
 "Activists use Tor to anonymously report abuses from danger zones.  "
 "Whistleblowers use Tor to safely report on corruption."
@@ -245,7 +245,7 @@
 "corruzione."
 
 #. type: Content of: <div><div><div><div><div><h3>
-#: /home/runa/tor/website/en/index.wml:111
+#: /home/runa/dev/website/en/index.wml:111
 msgid ""
 "<a href=\"<page about/torusers>#journalist\"><img "
 "src=\"$(IMGROOT)/media.jpg\" alt=\"Journalists and the Media\">Media</a>"
@@ -254,7 +254,7 @@
 "src=\"$(IMGROOT)/media.jpg\" alt=\"Giornalisti e media\">Media</a>"
 
 #. type: Content of: <div><div><div><div><div><p>
-#: /home/runa/tor/website/en/index.wml:113
+#: /home/runa/dev/website/en/index.wml:113
 msgid ""
 "Journalists and the media use Tor to protect their research and sources "
 "online."
@@ -263,7 +263,7 @@
 " on-line."
 
 #. type: Content of: <div><div><div><div><div><h3>
-#: /home/runa/tor/website/en/index.wml:117
+#: /home/runa/dev/website/en/index.wml:117
 msgid ""
 "<a href=\"<page about/torusers>#military\"><img "
 "src=\"$(IMGROOT)/military.jpg\" alt=\"Military and Law "
@@ -274,7 +274,7 @@
 "polizia</a>"
 
 #. type: Content of: <div><div><div><div><div><p>
-#: /home/runa/tor/website/en/index.wml:119
+#: /home/runa/dev/website/en/index.wml:119
 msgid ""
 "Militaries and law enforcement use Tor to protect their communications, "
 "investigations, and intelligence gathering online."
@@ -283,17 +283,32 @@
 "comunicazioni, per le indagini, e per la raccolta online di intelligence."
 
 #. type: Content of: <div><div><div><div><h2>
-#: /home/runa/tor/website/en/index.wml:123
+#: /home/runa/dev/website/en/index.wml:123
 msgid "Announcements"
 msgstr "Annunci"
 
 #. type: Content of: <div><div><div><div><table><tr><td><div>
-#: /home/runa/tor/website/en/index.wml:128
+#: /home/runa/dev/website/en/index.wml:128
+msgid "<span class=\"month\">Mar</span><br><span class=\"day\">23</span>"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><table><tr><td><p>
+#: /home/runa/dev/website/en/index.wml:129
+msgid ""
+"The Tor Project wins the \"Project of Social Benefit\" award from the Free "
+"Software Foundation and GNU Project. We are honored to win this award and to"
+" be listed amongst the former winners. <a "
+"href=\"https://blog.torproject.org/blog/tor-project-receives-fsf-"
+"award\">Read more</a> about this award."
+msgstr ""
+
+#. type: Content of: <div><div><div><div><table><tr><td><div>
+#: /home/runa/dev/website/en/index.wml:135
 msgid "<span class=\"month\">Feb</span><br><span class=\"day\">23</span>"
 msgstr "<span class=\"day\">23</span><br><span class=\"month\">Febbraio</span>"
 
 #. type: Content of: <div><div><div><div><table><tr><td><p>
-#: /home/runa/tor/website/en/index.wml:129
+#: /home/runa/dev/website/en/index.wml:136
 msgid ""
 "The latest stable Tor version, 0.2.1.30, is <a "
 "href=\"https://lists.torproject.org/pipermail/tor-"
@@ -311,23 +326,3 @@
 "versione. Non ci aspettiamo che questa modifica funzioni nel lungo periodo, "
 "ma ci fa guadagnare del tempo in attesa di realizzare una soluzione "
 "migliore."
-
-#. type: Content of: <div><div><div><div><table><tr><td><div>
-#: /home/runa/tor/website/en/index.wml:138
-msgid "<span class=\"month\">Jan</span><br><span class=\"day\">30</span>"
-msgstr "<span class=\"day\">30</span> <br> <span class=\"month\">Gen</span>"
-
-#. type: Content of: <div><div><div><div><table><tr><td><p>
-#: /home/runa/tor/website/en/index.wml:139
-msgid ""
-"Tor helping with Egypt.  Here's what we've learned <a "
-"href=\"https://blog.torproject.org/blog/recent-events-egypt\">about recent "
-"events in Egypt</a>. And we're keeping our <a href=\"<page "
-"press/inthemedia>\">In the media</a> page up to date with stories about how "
-"we're helping around the world."
-msgstr ""
-"Tor aiuta l'Egitto. Ecco quello che abbiamo imparato <a "
-"href=\"https://blog.torproject.org/blog/recent-events-egypt\">sui recenti "
-"avvenimenti in Egitto</a> . E stiamo mantenendo aggiornata la nostra pagina "
-"<a href=\"<page press/inthemedia>\">In the media</a> con storie su quel che "
-"facciamo in tutto il mondo."

Modified: translation/trunk/projects/website/po/it/about/3-low.contact.po
===================================================================
--- translation/trunk/projects/website/po/it/about/3-low.contact.po	2011-04-12 16:15:00 UTC (rev 24594)
+++ translation/trunk/projects/website/po/it/about/3-low.contact.po	2011-04-12 16:19:31 UTC (rev 24595)
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-02-12 12:19+0000\n"
-"PO-Revision-Date: 2011-03-22 16:18+0000\n"
+"POT-Creation-Date: 2011-03-28 12:49+0200\n"
+"PO-Revision-Date: 2011-03-29 00:25+0000\n"
 "Last-Translator: runasand <runa.sandvik at gmail.com>\n"
 "Language-Team: Italian <None>\n"
 "MIME-Version: 1.0\n"
@@ -18,7 +18,7 @@
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/about/en/contact.wml:9
+#: /home/runa/dev/website/about/en/contact.wml:9
 msgid ""
 "<a href=\"<page index>\">Home &raquo; </a> <a href=\"<page "
 "about/overview>\">About &raquo; </a> <a href=\"<page "
@@ -26,12 +26,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/about/en/contact.wml:14
+#: /home/runa/dev/website/about/en/contact.wml:14
 msgid "Tor: Contact"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/about/en/contact.wml:16
+#: /home/runa/dev/website/about/en/contact.wml:16
 msgid ""
 "First, if you have a problem or question about using Tor, go look at the <a "
 "href=\"<page docs/documentation>#Support\">Support section</a> for how to "
@@ -42,30 +42,30 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/about/en/contact.wml:18
+#: /home/runa/dev/website/about/en/contact.wml:18
 msgid ""
-"If you really do need to reach us, here are some approaches. All of these "
-"addresses are @torproject.org. Please be patient and <a "
-"href=\"http://www.catb.org/~esr/faqs/smart-questions.html\">helpful</a>, and"
-" please make sure to write your mail in English."
+"If you really do need to reach us, here are some approaches. Please be "
+"patient and <a href=\"http://www.catb.org/~esr/faqs/smart-"
+"questions.html\">helpful</a>, and please make sure to write your mail in "
+"English."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/about/en/contact.wml:23
+#: /home/runa/dev/website/about/en/contact.wml:21
 msgid ""
-"<i>tor-assistants</i> is the catch-all address for everything. It can be "
-"used for:"
+"<i>tor-assistants at lists.torproject.org</i> is the catch-all address for "
+"everything. It can be used for:"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/about/en/contact.wml:27
+#: /home/runa/dev/website/about/en/contact.wml:25
 msgid ""
 "Contacting the people who manage the directory authorities. Use this if you "
 "run a Tor relay and have a question or problem with your relay."
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/about/en/contact.wml:30
+#: /home/runa/dev/website/about/en/contact.wml:28
 msgid ""
 "So we can fix typos on the website, change wrong statements or directions on"
 " the website, and add new sections and paragraphs that you send us. You "
@@ -74,7 +74,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/about/en/contact.wml:34
+#: /home/runa/dev/website/about/en/contact.wml:32
 msgid ""
 "Hearing about your documents, patches, testing, experiences with supporting "
 "applications, and so forth inspired by our <a href=\"<page "
@@ -86,58 +86,59 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/about/en/contact.wml:44
+#: /home/runa/dev/website/about/en/contact.wml:42
 msgid "A few other addresses are more specific:"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/about/en/contact.wml:47
+#: /home/runa/dev/website/about/en/contact.wml:45
 msgid ""
-"<i>tor-translation</i> can put new <a href=\"<page "
+"<i>tor-translation at lists.torproject.org</i> can put new <a href=\"<page "
 "getinvolved/translation>\">website translations</a> into place, and help "
 "answer questions about existing and new translations."
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/about/en/contact.wml:50
+#: /home/runa/dev/website/about/en/contact.wml:48
 msgid ""
-"<i>tordnsel</i> is the alias for the people responsible for the tordns "
-"exitlist."
+"<i>tordnsel at torproject.org</i> is the alias for the people responsible "
+"for the tordns exitlist."
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/about/en/contact.wml:52
+#: /home/runa/dev/website/about/en/contact.wml:50
 msgid ""
-"<i>donations</i> is for questions and comments about <a href=\"<page "
-"donate/donate>\">getting money to the developers</a>. More donations means "
-"<a href=\"<page docs/faq>#Funding\">more Tor</a>. We're happy to help think "
-"about creative ways for you to contribute."
+"<i>donations at torproject.org</i> is for questions and comments about <a "
+"href=\"<page donate/donate>\">getting money to the developers</a>. More "
+"donations means <a href=\"<page docs/faq>#Funding\">more Tor</a>. We're "
+"happy to help think about creative ways for you to contribute."
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/about/en/contact.wml:57
+#: /home/runa/dev/website/about/en/contact.wml:55
 msgid ""
-"<i>execdir</i> is for press/media, questions and comments about Tor the non-"
-"profit corporation: trademark questions, affiliation and coordination, major"
-" gifts, contract inquiries, licensing and certification, etc."
+"<i>execdir at torproject.org</i> is for press/media, questions and comments "
+"about Tor the non-profit corporation: trademark questions, affiliation and "
+"coordination, major gifts, contract inquiries, licensing and certification, "
+"etc."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/about/en/contact.wml:63
+#: /home/runa/dev/website/about/en/contact.wml:61
 msgid ""
 "<a id=\"irc\"></a> Tor users and developers can also be found in the "
 "following channels on <a href=\"http://www.oftc.net/oftc/\">oftc</a>:"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/about/en/contact.wml:68
+#: /home/runa/dev/website/about/en/contact.wml:66
 msgid ""
 "<i>#tor</i> - User and relay operation discussions. Having trouble running "
 "Tor or a question for other Tor users? Then this is the spot for you."
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/about/en/contact.wml:71
+#: /home/runa/dev/website/about/en/contact.wml:69
 msgid ""
 "<i>#tor-dev</i> - Channel for people who want to do development.  "
 "Discussions about Tor related coding, protocols, and <a href=\"<page "
@@ -145,7 +146,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/about/en/contact.wml:74
+#: /home/runa/dev/website/about/en/contact.wml:72
 msgid ""
 "<i>#nottor</i> - This is where Tor people hang out to talk about stuff that "
 "is not related to Tor."

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

Modified: translation/trunk/projects/website/po/it/about/3-low.volunteers.po
===================================================================
--- translation/trunk/projects/website/po/it/about/3-low.volunteers.po	2011-04-12 16:15:00 UTC (rev 24594)
+++ translation/trunk/projects/website/po/it/about/3-low.volunteers.po	2011-04-12 16:19:31 UTC (rev 24595)
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-02-12 12:19+0000\n"
-"PO-Revision-Date: 2011-03-22 16:23+0000\n"
+"POT-Creation-Date: 2011-03-28 12:49+0200\n"
+"PO-Revision-Date: 2011-03-29 00:25+0000\n"
 "Last-Translator: runasand <runa.sandvik at gmail.com>\n"
 "Language-Team: Italian <None>\n"
 "MIME-Version: 1.0\n"
@@ -18,7 +18,7 @@
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/about/en/volunteers.wml:8
+#: /home/runa/dev/website/about/en/volunteers.wml:8
 msgid ""
 "<a href=\"<page index>\">Home &raquo; </a> <a href=\"<page "
 "about/overview>\">About &raquo; </a> <a href=\"<page "
@@ -26,27 +26,27 @@
 msgstr ""
 
 #. type: Content of: <div><div><h1>
-#: /home/runa/tor/website/about/en/volunteers.wml:13
+#: /home/runa/dev/website/about/en/volunteers.wml:13
 msgid "Volunteers"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/volunteers.wml:15
+#: /home/runa/dev/website/about/en/volunteers.wml:15
 msgid "Anonym"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/volunteers.wml:15
+#: /home/runa/dev/website/about/en/volunteers.wml:15
 msgid "Maintainer of the Incognito LiveCD."
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/volunteers.wml:16
+#: /home/runa/dev/website/about/en/volunteers.wml:16
 msgid "Kevin Bankston"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/volunteers.wml:16
+#: /home/runa/dev/website/about/en/volunteers.wml:16
 msgid ""
 "EFF lawyer who helped write the <a href=\"<page eff/tor-legal-faq>\">Tor "
 "Legal FAQ</a> and tirelessly answers the phone when somebody in the world "
@@ -54,148 +54,138 @@
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/volunteers.wml:20
+#: /home/runa/dev/website/about/en/volunteers.wml:20
 msgid "Marco Bonetti"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/volunteers.wml:20
+#: /home/runa/dev/website/about/en/volunteers.wml:20
 msgid "Focusing on MobileTor for the iPhone."
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/volunteers.wml:21
+#: /home/runa/dev/website/about/en/volunteers.wml:21
 msgid "Kasimir Gabert"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/volunteers.wml:21
+#: /home/runa/dev/website/about/en/volunteers.wml:21
 msgid ""
 "Maintains the <a href=\"https://torstatus.kgprog.com/\">TorStatus</a> "
 "statistics pages."
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/volunteers.wml:23
+#: /home/runa/dev/website/about/en/volunteers.wml:23
 msgid "Andreas Jonsson"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/volunteers.wml:23
+#: /home/runa/dev/website/about/en/volunteers.wml:23
 msgid "Works on OS X Tor Browser Bundle sandbox technology."
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/volunteers.wml:25
+#: /home/runa/dev/website/about/en/volunteers.wml:25
 msgid "Fabian Keil"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/volunteers.wml:25
+#: /home/runa/dev/website/about/en/volunteers.wml:25
 msgid ""
 "One of the core Privoxy developers, and also a Tor fan. He's the reason Tor "
 "and Privoxy still work well together."
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/volunteers.wml:27
+#: /home/runa/dev/website/about/en/volunteers.wml:27
 msgid "Bruce Leidl"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/volunteers.wml:27
+#: /home/runa/dev/website/about/en/volunteers.wml:27
 msgid "Working on a Tor client in Java."
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/volunteers.wml:28
+#: /home/runa/dev/website/about/en/volunteers.wml:28
 msgid "Julius Mittenzwei"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/volunteers.wml:28
+#: /home/runa/dev/website/about/en/volunteers.wml:28
 msgid ""
 "A lawyer with the CCC in Germany. Coordinates the German Tor community with "
 "respect to legal questions and concerns."
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/volunteers.wml:31
+#: /home/runa/dev/website/about/en/volunteers.wml:31
 msgid "Shava Nerad"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/volunteers.wml:31
+#: /home/runa/dev/website/about/en/volunteers.wml:31
 msgid ""
 "Our former Development Director. She still works on PR and community "
 "relations."
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/volunteers.wml:33
+#: /home/runa/dev/website/about/en/volunteers.wml:33
 msgid "Linus Nordberg"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/volunteers.wml:33
+#: /home/runa/dev/website/about/en/volunteers.wml:33
 msgid ""
 "Enjoys measuring the Tor network and helps with outreach in the Nordic "
 "countries."
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/volunteers.wml:35
+#: /home/runa/dev/website/about/en/volunteers.wml:35
 msgid "Lasse &Oslash;verlier"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/volunteers.wml:35
+#: /home/runa/dev/website/about/en/volunteers.wml:35
 msgid ""
 "Writes research papers on Tor: attacks, defenses, and resource management, "
 "especially for hidden services."
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/volunteers.wml:37
+#: /home/runa/dev/website/about/en/volunteers.wml:37
 msgid "Martin Peck"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/volunteers.wml:37
+#: /home/runa/dev/website/about/en/volunteers.wml:37
 msgid ""
 "Working on a VM-based transparent proxying approach for Tor clients on "
 "Windows."
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/volunteers.wml:39
-msgid "Robert Ransom"
-msgstr ""
-
-#. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/volunteers.wml:39
-msgid "Bug catcher and immensely helpful on irc and the email lists"
-msgstr ""
-
-#. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/volunteers.wml:41
+#: /home/runa/dev/website/about/en/volunteers.wml:39
 msgid "rovv (a pseudonym -- he's managed to stay anonymous even from us!)"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/volunteers.wml:42
+#: /home/runa/dev/website/about/en/volunteers.wml:40
 msgid ""
 "The most dedicated bug reporter we've ever heard from. He must read Tor "
 "source code every day over breakfast."
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/volunteers.wml:44
+#: /home/runa/dev/website/about/en/volunteers.wml:42
 msgid "tup (another pseudonym)"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/volunteers.wml:44
+#: /home/runa/dev/website/about/en/volunteers.wml:42
 msgid ""
 "Periodically adds new features for making Tor easier to use as a <a "
 "href=\"<wiki>TransparentProxy\">transparent proxy</a>. Also maintains the <a"
@@ -203,34 +193,24 @@
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/volunteers.wml:49
-msgid "Tomás Touceda"
-msgstr ""
-
-#. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/volunteers.wml:49
-msgid "Fantastic developer involved with the Vidalia project"
-msgstr ""
-
-#. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/volunteers.wml:51
+#: /home/runa/dev/website/about/en/volunteers.wml:47
 msgid "Kyle Williams"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/volunteers.wml:51
+#: /home/runa/dev/website/about/en/volunteers.wml:47
 msgid ""
 "Developer for JanusVM, a VMWare-based transparent Tor proxy that makes Tor "
 "easier to set up and use."
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/volunteers.wml:54
+#: /home/runa/dev/website/about/en/volunteers.wml:50
 msgid "Ethan Zuckerman"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/volunteers.wml:54
+#: /home/runa/dev/website/about/en/volunteers.wml:50
 msgid ""
 "A blogger who has written some <a "
 "href=\"http://www.ethanzuckerman.com/blog/?p=1019\">interesting</a> <a "
@@ -240,7 +220,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/volunteers.wml:59
+#: /home/runa/dev/website/about/en/volunteers.wml:55
 msgid ""
 "All our relay operators, people who write <a "
 "href=\"http://freehaven.net/anonbib/\">research papers</a> about Tor, people"

Modified: translation/trunk/projects/website/po/it/docs/1-high.proxychain.po
===================================================================
--- translation/trunk/projects/website/po/it/docs/1-high.proxychain.po	2011-04-12 16:15:00 UTC (rev 24594)
+++ translation/trunk/projects/website/po/it/docs/1-high.proxychain.po	2011-04-12 16:19:31 UTC (rev 24595)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-01-29 21:06+0000\n"
+"POT-Creation-Date: 2011-03-28 12:48+0200\n"
 "PO-Revision-Date: 2011-03-22 16:45+0000\n"
 "Last-Translator: runasand <runa.sandvik at gmail.com>\n"
 "Language-Team: Italian <None>\n"
@@ -18,7 +18,7 @@
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/proxychain.wml:8
+#: /home/runa/dev/website/docs/en/proxychain.wml:8
 msgid ""
 "<a href=\"<page index>\">Home &raquo; </a> <a href=\"<page "
 "docs/documentation>\">Documentation &raquo; </a> <a href=\"<page "
@@ -26,24 +26,24 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/proxychain.wml:13
+#: /home/runa/dev/website/docs/en/proxychain.wml:13
 msgid "<a id=\"proxychain\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/docs/en/proxychain.wml:14
+#: /home/runa/dev/website/docs/en/proxychain.wml:14
 msgid ""
 "<a class=\"anchor\" href=\"#proxychain\">Tor: Configuring Tor to use a "
 "Proxy</a>"
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/proxychain.wml:15
+#: /home/runa/dev/website/docs/en/proxychain.wml:15
 msgid "<hr>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/proxychain.wml:18
+#: /home/runa/dev/website/docs/en/proxychain.wml:18
 msgid ""
 "The current version of Tor and the Vidalia Graphical Tor Controller support "
 "the ability to use any HTTPS or SOCKS proxy to get access to the Tor "
@@ -55,7 +55,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/proxychain.wml:28
+#: /home/runa/dev/website/docs/en/proxychain.wml:28
 msgid ""
 "These steps assume you have a functional Tor/Vidalia configuration, and you "
 "have found a list of HTTPS, SOCKS4, or SOCKS5 proxies. (To clarify, an HTTPS"
@@ -63,50 +63,50 @@
 msgstr ""
 
 #. type: Content of: <div><div><p><ol><li>
-#: /home/runa/tor/website/docs/en/proxychain.wml:33
+#: /home/runa/dev/website/docs/en/proxychain.wml:33
 msgid "Open the Vidalia Control Panel, click on Settings."
 msgstr ""
 
 #. type: Content of: <div><div><p><ol><li>
-#: /home/runa/tor/website/docs/en/proxychain.wml:34
+#: /home/runa/dev/website/docs/en/proxychain.wml:34
 msgid "Click Network.  Select \"I use a proxy to access the Internet\"."
 msgstr ""
 
 #. type: Content of: <div><div><p><ol><li>
-#: /home/runa/tor/website/docs/en/proxychain.wml:35
+#: /home/runa/dev/website/docs/en/proxychain.wml:35
 msgid ""
 "On the Address line, enter the open proxy address.  This can be a hostname "
 "or IP Address."
 msgstr ""
 
 #. type: Content of: <div><div><p><ol><li>
-#: /home/runa/tor/website/docs/en/proxychain.wml:36
+#: /home/runa/dev/website/docs/en/proxychain.wml:36
 msgid "Enter the port for the proxy."
 msgstr ""
 
 #. type: Content of: <div><div><p><ol><li>
-#: /home/runa/tor/website/docs/en/proxychain.wml:37
+#: /home/runa/dev/website/docs/en/proxychain.wml:37
 msgid ""
 "Generally, you do not need a Username and Password.  If you do, enter the "
 "information in the proper fields."
 msgstr ""
 
 #. type: Content of: <div><div><p><ol><li>
-#: /home/runa/tor/website/docs/en/proxychain.wml:38
+#: /home/runa/dev/website/docs/en/proxychain.wml:38
 msgid ""
 "Choose the Type of proxy you are using, whether HTTP/HTTPS, SOCKS4, or "
 "SOCKS5."
 msgstr ""
 
 #. type: Content of: <div><div><p><ol><li>
-#: /home/runa/tor/website/docs/en/proxychain.wml:39
+#: /home/runa/dev/website/docs/en/proxychain.wml:39
 msgid ""
 "Push the Ok button.  Vidalia and Tor are now configured to use a proxy to "
 "access the rest of the Tor Network."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/proxychain.wml:42
+#: /home/runa/dev/website/docs/en/proxychain.wml:42
 msgid ""
 "<br><br> <img src=\"$(IMGROOT)/vidalia-proxy.png\" alt=\"Vidalia's Network "
 "Proxy settings page\"> <br><br>"

Modified: translation/trunk/projects/website/po/it/docs/2-medium.faq.po
===================================================================
--- translation/trunk/projects/website/po/it/docs/2-medium.faq.po	2011-04-12 16:15:00 UTC (rev 24594)
+++ translation/trunk/projects/website/po/it/docs/2-medium.faq.po	2011-04-12 16:19:31 UTC (rev 24595)
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-03-17 18:04+0000\n"
-"PO-Revision-Date: 2011-03-22 16:26+0000\n"
+"POT-Creation-Date: 2011-03-28 12:48+0200\n"
+"PO-Revision-Date: 2011-03-29 00:25+0000\n"
 "Last-Translator: runasand <runa.sandvik at gmail.com>\n"
 "Language-Team: Italian <None>\n"
 "MIME-Version: 1.0\n"
@@ -18,7 +18,7 @@
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:8
+#: /home/runa/dev/website/docs/en/faq.wml:8
 msgid ""
 "<a href=\"<page index>\">Home &raquo; </a> <a href=\"<page "
 "docs/documentation>\">Documentation &raquo; </a> <a href=\"<page "
@@ -26,288 +26,288 @@
 msgstr ""
 
 #. type: Content of: <div><div><h1>
-#: /home/runa/tor/website/docs/en/faq.wml:14
+#: /home/runa/dev/website/docs/en/faq.wml:14
 msgid "Tor FAQ"
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:15 /tmp/B_aDff_VuJ.xml:1646
+#: /home/runa/dev/website/docs/en/faq.wml:15 /tmp/tNikbgsymy.xml:1646
 msgid "<hr>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:17
+#: /home/runa/dev/website/docs/en/faq.wml:17
 msgid "General questions:"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:19
+#: /home/runa/dev/website/docs/en/faq.wml:19
 msgid "<a href=\"#WhatIsTor\">What is Tor?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:20
+#: /home/runa/dev/website/docs/en/faq.wml:20
 msgid "<a href=\"#Torisdifferent\">How is Tor different from other proxies?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:21
+#: /home/runa/dev/website/docs/en/faq.wml:21
 msgid "<a href=\"#CompatibleApplications\">What programs can I use with Tor?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:23
+#: /home/runa/dev/website/docs/en/faq.wml:23
 msgid "<a href=\"#WhyCalledTor\">Why is it called Tor?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:24
+#: /home/runa/dev/website/docs/en/faq.wml:24
 msgid "<a href=\"#Backdoor\">Is there a backdoor in Tor?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:25
+#: /home/runa/dev/website/docs/en/faq.wml:25
 msgid "<a href=\"#DistributingTor\">Can I distribute Tor on my magazine's CD?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:27
+#: /home/runa/dev/website/docs/en/faq.wml:27
 msgid ""
 "<a href=\"#SupportMail\">How can I get an answer to my Tor support mail?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:29
+#: /home/runa/dev/website/docs/en/faq.wml:29
 msgid "<a href=\"#WhySlow\">Why is Tor so slow?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:30
+#: /home/runa/dev/website/docs/en/faq.wml:30
 msgid "<a href=\"#Funding\">What would The Tor Project do with more funding?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:32
+#: /home/runa/dev/website/docs/en/faq.wml:32
 msgid ""
 "<a href=\"#Metrics\">How many people use Tor? How many relays or exit nodes "
 "are there?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:36
+#: /home/runa/dev/website/docs/en/faq.wml:36
 msgid "Compilation and Installation:"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:38
+#: /home/runa/dev/website/docs/en/faq.wml:38
 msgid "<a href=\"#HowUninstallTor\">How do I uninstall Tor?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:39
+#: /home/runa/dev/website/docs/en/faq.wml:39
 msgid "<a href=\"#PGPSigs\">What are these \"sig\" files on the download page?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:41
+#: /home/runa/dev/website/docs/en/faq.wml:41
 msgid ""
 "<a href=\"#GetTor\">Your website is blocked in my country. How do I download"
 " Tor?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:43
+#: /home/runa/dev/website/docs/en/faq.wml:43
 msgid "<a href=\"#CompileTorWindows\">How do I compile Tor under Windows?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:44
+#: /home/runa/dev/website/docs/en/faq.wml:44
 msgid ""
 "<a href=\"#VirusFalsePositives\">Why does my Tor executable appear to have a"
 " virus or spyware?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:46
+#: /home/runa/dev/website/docs/en/faq.wml:46
 msgid ""
 "<a href=\"#LiveCD\">Is there a LiveCD or other bundle that includes Tor?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:49
+#: /home/runa/dev/website/docs/en/faq.wml:49
 msgid "Running Tor:"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:51
+#: /home/runa/dev/website/docs/en/faq.wml:51
 msgid "<a href=\"#torrc\">I'm supposed to \"edit my torrc\". What does that mean?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:53
+#: /home/runa/dev/website/docs/en/faq.wml:53
 msgid "<a href=\"#Logs\">How do I set up logging, or see Tor's logs?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:57
+#: /home/runa/dev/website/docs/en/faq.wml:57
 msgid "Running a Tor client:"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:59
+#: /home/runa/dev/website/docs/en/faq.wml:59
 msgid ""
 "<a href=\"#DoesntWork\">I installed Tor and Polipo but it's not working.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:61
+#: /home/runa/dev/website/docs/en/faq.wml:61
 msgid ""
 "<a href=\"#VidaliaPassword\">Tor/Vidalia prompts for a password at "
 "start.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:63
+#: /home/runa/dev/website/docs/en/faq.wml:63
 msgid ""
 "<a href=\"#ChooseEntryExit\">Can I control which nodes (or country)  are "
 "used for entry/exit?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:65
+#: /home/runa/dev/website/docs/en/faq.wml:65
 msgid ""
 "<a href=\"#GoogleCaptcha\">Google makes me solve a Captcha or tells me I "
 "have spyware installed.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:67
+#: /home/runa/dev/website/docs/en/faq.wml:67
 msgid ""
 "<a href=\"#GmailWarning\">Gmail warns me that my account may have been "
 "compromised.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:69
+#: /home/runa/dev/website/docs/en/faq.wml:69
 msgid ""
 "<a href=\"#FirewallPorts\">My firewall only allows a few outgoing ports.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:73
+#: /home/runa/dev/website/docs/en/faq.wml:73
 msgid "Running a Tor relay:"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:75
+#: /home/runa/dev/website/docs/en/faq.wml:75
 msgid "<a href=\"#RelayFlexible\">How stable does my relay need to be?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:76
+#: /home/runa/dev/website/docs/en/faq.wml:76
 msgid ""
 "<a href=\"#ExitPolicies\">I'd run a relay, but I don't want to deal with "
 "abuse issues.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:78
+#: /home/runa/dev/website/docs/en/faq.wml:78
 msgid "<a href=\"#RelayOrBridge\">Should I be a normal relay or bridge relay?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:80
+#: /home/runa/dev/website/docs/en/faq.wml:80
 msgid "<a href=\"#MultipleRelays\">I want to run more than one relay.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:81
+#: /home/runa/dev/website/docs/en/faq.wml:81
 msgid "<a href=\"#RelayMemory\">Why is my Tor relay using so much memory?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:82
+#: /home/runa/dev/website/docs/en/faq.wml:82
 msgid "<a href=\"#WhyNotNamed\">Why is my Tor relay not named?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:85
+#: /home/runa/dev/website/docs/en/faq.wml:85
 msgid "Running a Tor hidden service:"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:87
+#: /home/runa/dev/website/docs/en/faq.wml:87
 msgid "Anonymity and Security:"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:89
+#: /home/runa/dev/website/docs/en/faq.wml:89
 msgid "<a href=\"#KeyManagement\">Tell me about all the keys Tor uses.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:90
+#: /home/runa/dev/website/docs/en/faq.wml:90
 msgid "<a href=\"#EntryGuards\">What are Entry Guards?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:93
+#: /home/runa/dev/website/docs/en/faq.wml:93
 msgid "Alternate designs that we don't do (yet):"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:95
+#: /home/runa/dev/website/docs/en/faq.wml:95
 msgid ""
 "<a href=\"#EverybodyARelay\">You should make every Tor user be a relay.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:97
+#: /home/runa/dev/website/docs/en/faq.wml:97
 msgid ""
 "<a href=\"#TransportIPnotTCP\">You should transport all IP packets, not just"
 " TCP packets.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:101
+#: /home/runa/dev/website/docs/en/faq.wml:101
 msgid "Abuse:"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:103
+#: /home/runa/dev/website/docs/en/faq.wml:103
 msgid "<a href=\"#Criminals\">Doesn't Tor enable criminals to do bad things?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:104
+#: /home/runa/dev/website/docs/en/faq.wml:104
 msgid ""
 "<a href=\"#RespondISP\">How do I respond to my ISP about my exit relay?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:108
+#: /home/runa/dev/website/docs/en/faq.wml:108
 msgid ""
 "For other questions not yet on this version of the FAQ, see the <a "
 "href=\"<wikifaq>\">wiki FAQ</a> for now."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:111
+#: /home/runa/dev/website/docs/en/faq.wml:111
 msgid "<hr> <a id=\"General\"></a> <a id=\"WhatIsTor\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:116
+#: /home/runa/dev/website/docs/en/faq.wml:116
 msgid "<a class=\"anchor\" href=\"#WhatIsTor\">What is Tor?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:119
+#: /home/runa/dev/website/docs/en/faq.wml:119
 msgid "The name \"Tor\" can refer to several different components."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:123
+#: /home/runa/dev/website/docs/en/faq.wml:123
 msgid ""
 "The Tor software is a program you can run on your computer that helps keep "
 "you safe on the Internet. Tor protects you by bouncing your communications "
@@ -320,26 +320,26 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:134
+#: /home/runa/dev/website/docs/en/faq.wml:134
 msgid ""
 "The Tor Project is a non-profit (charity) organization that maintains and "
 "develops the Tor software."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:138
+#: /home/runa/dev/website/docs/en/faq.wml:138
 msgid "<hr> <a id=\"Torisdifferent\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:141
+#: /home/runa/dev/website/docs/en/faq.wml:141
 msgid ""
 "<a class=\"anchor\" href=\"#Torisdifferent\">How is Tor different from other"
 " proxies?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:143
+#: /home/runa/dev/website/docs/en/faq.wml:143
 msgid ""
 "A typical proxy provider sets up a server somewhere on the Internet and "
 "allows you to use it to relay your traffic.  This creates a simple, easy to "
@@ -355,7 +355,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:156
+#: /home/runa/dev/website/docs/en/faq.wml:156
 msgid ""
 "Simple proxy providers also create a single point of failure.  The provider "
 "knows who you are and where you browse on the Internet.  They can see your "
@@ -367,7 +367,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:165
+#: /home/runa/dev/website/docs/en/faq.wml:165
 msgid ""
 "Tor passes your traffic through at least 3 different servers before sending "
 "it on to the destination.  Tor does not modify, or even know, what you are "
@@ -380,12 +380,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><p><dl><dt>
-#: /home/runa/tor/website/docs/en/faq.wml:175
+#: /home/runa/dev/website/docs/en/faq.wml:175
 msgid "Doesn't the first server see who I am?"
 msgstr ""
 
 #. type: Content of: <div><div><p><dl><dd>
-#: /home/runa/tor/website/docs/en/faq.wml:175
+#: /home/runa/dev/website/docs/en/faq.wml:175
 msgid ""
 "Possibly. A bad first of three servers can see encrypted Tor traffic coming "
 "from your computer.  It still doesn't know who you are and what you are "
@@ -396,12 +396,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><p><dl><dt>
-#: /home/runa/tor/website/docs/en/faq.wml:181
+#: /home/runa/dev/website/docs/en/faq.wml:181
 msgid "Can't the third server see my traffic?"
 msgstr ""
 
 #. type: Content of: <div><div><p><dl><dd>
-#: /home/runa/tor/website/docs/en/faq.wml:181
+#: /home/runa/dev/website/docs/en/faq.wml:181
 msgid ""
 "Possibly.  A bad third of three servers can see the traffic you sent into "
 "Tor.  It won't know who sent this traffic.  If you're using encryption, such"
@@ -413,19 +413,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:191
+#: /home/runa/dev/website/docs/en/faq.wml:191
 msgid "<hr> <a id=\"CompatibleApplications\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:194
+#: /home/runa/dev/website/docs/en/faq.wml:194
 msgid ""
 "<a class=\"anchor\" href=\"#CompatibleApplications\">What programs can I use"
 " with Tor?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:197
+#: /home/runa/dev/website/docs/en/faq.wml:197
 msgid ""
 "There are two pieces to \"Torifying\" a program: connection-level anonymity "
 "and application-level anonymity. Connection-level anonymity focuses on "
@@ -441,7 +441,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:211
+#: /home/runa/dev/website/docs/en/faq.wml:211
 msgid ""
 "Most of our work so far has focused on the Firefox web browser. The bundles "
 "on the <a href=\"<page download/download>\">download page</a> automatically "
@@ -452,7 +452,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:220
+#: /home/runa/dev/website/docs/en/faq.wml:220
 msgid ""
 "There are plenty of other programs you can use with Tor, but we haven't "
 "researched the application-level anonymity issues on them well enough to be "
@@ -465,17 +465,17 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:231
+#: /home/runa/dev/website/docs/en/faq.wml:231
 msgid "<hr> <a id=\"WhyCalledTor\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:234
+#: /home/runa/dev/website/docs/en/faq.wml:234
 msgid "<a class=\"anchor\" href=\"#WhyCalledTor\">Why is it called Tor?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:237
+#: /home/runa/dev/website/docs/en/faq.wml:237
 msgid ""
 "Because Tor is the onion routing network. When we were starting the new "
 "next-generation design and implementation of onion routing in 2001-2002, we "
@@ -486,12 +486,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:247
+#: /home/runa/dev/website/docs/en/faq.wml:247
 msgid "(It's also got a fine translation from German and Turkish.)"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:251
+#: /home/runa/dev/website/docs/en/faq.wml:251
 msgid ""
 "Note: even though it originally came from an acronym, Tor is not spelled "
 "\"TOR\". Only the first letter is capitalized. In fact, we can usually spot "
@@ -501,17 +501,17 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:258
+#: /home/runa/dev/website/docs/en/faq.wml:258
 msgid "<hr> <a id=\"Backdoor\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:261
+#: /home/runa/dev/website/docs/en/faq.wml:261
 msgid "<a class=\"anchor\" href=\"#Backdoor\">Is there a backdoor in Tor?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:264
+#: /home/runa/dev/website/docs/en/faq.wml:264
 msgid ""
 "There is absolutely no backdoor in Tor. Nobody has asked us to put one in, "
 "and we know some smart lawyers who say that it's unlikely that anybody will "
@@ -520,7 +520,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:271
+#: /home/runa/dev/website/docs/en/faq.wml:271
 msgid ""
 "We think that putting a backdoor in Tor would be tremendously irresponsible "
 "to our users, and a bad precedent for security software in general. If we "
@@ -530,7 +530,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:279
+#: /home/runa/dev/website/docs/en/faq.wml:279
 msgid ""
 "But that said, there are still plenty of subtle attacks people might try. "
 "Somebody might impersonate us, or break into our computers, or something "
@@ -543,7 +543,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:291
+#: /home/runa/dev/website/docs/en/faq.wml:291
 msgid ""
 "Also, there might be accidental bugs in Tor that could affect your "
 "anonymity. We periodically find and fix anonymity-related bugs, so make sure"
@@ -551,24 +551,24 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:296
+#: /home/runa/dev/website/docs/en/faq.wml:296
 msgid "<hr> <a id=\"DistributingTor\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:299
+#: /home/runa/dev/website/docs/en/faq.wml:299
 msgid ""
 "<a class=\"anchor\" href=\"#DistributingTor\">Can I distribute Tor on my "
 "magazine's CD?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:302
+#: /home/runa/dev/website/docs/en/faq.wml:302
 msgid "Yes."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:306
+#: /home/runa/dev/website/docs/en/faq.wml:306
 msgid ""
 "The Tor software is <a href=\"https://www.fsf.org/\">free software</a>. This"
 " means we give you the rights to redistribute the Tor software, either "
@@ -577,7 +577,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:313
+#: /home/runa/dev/website/docs/en/faq.wml:313
 msgid ""
 "However, if you want to redistribute the Tor software you must follow our <a"
 " href=\"<gitblob>LICENSE\">LICENSE</a>.  Essentially this means that you "
@@ -586,7 +586,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:320
+#: /home/runa/dev/website/docs/en/faq.wml:320
 msgid ""
 "Most people who ask us this question don't want to distribute just the Tor "
 "software, though. They want to distribute the Tor bundles, which typically "
@@ -604,7 +604,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:336
+#: /home/runa/dev/website/docs/en/faq.wml:336
 msgid ""
 "Also, you should make sure not to confuse your readers about what Tor is, "
 "who makes it, and what properties it provides (and doesn't provide). See our"
@@ -612,7 +612,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:342
+#: /home/runa/dev/website/docs/en/faq.wml:342
 msgid ""
 "Lastly, you should realize that we release new versions of the Tor software "
 "frequently, and sometimes we make backward incompatible changes. So if you "
@@ -622,78 +622,78 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:349
+#: /home/runa/dev/website/docs/en/faq.wml:349
 msgid "<hr> <a id=\"SupportMail\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:352
+#: /home/runa/dev/website/docs/en/faq.wml:352
 msgid ""
 "<a class=\"anchor\" href=\"#SupportMail\">How can I get an answer to my Tor "
 "support mail?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:354
+#: /home/runa/dev/website/docs/en/faq.wml:354
 msgid ""
 "There is no official support for Tor. Your best bet is to try the following:"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:356
+#: /home/runa/dev/website/docs/en/faq.wml:356
 msgid "Read through this <a href=\"<page docs/faq>\">FAQ</a>."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:357
+#: /home/runa/dev/website/docs/en/faq.wml:357
 msgid "Read through the <a href=\"<page docs/documentation>\">documentation</a>."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:358
+#: /home/runa/dev/website/docs/en/faq.wml:358
 msgid ""
 "Read through the <a href=\"http://archives.seul.org/or/talk\">OR-TALK "
 "Archives</a> and see if your question is already answered."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:361
+#: /home/runa/dev/website/docs/en/faq.wml:361
 msgid ""
 "Join our <a href=\"irc://irc.oftc.net#tor\">irc channel</a> and state the "
 "issue and wait for help."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:363
+#: /home/runa/dev/website/docs/en/faq.wml:363
 msgid ""
 "Send an email to tor-assistants at torproject.org. These are volunteers who "
 "may be able to help you but you may not get a response for days."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:368
+#: /home/runa/dev/website/docs/en/faq.wml:368
 msgid ""
 "If you find your answer, please stick around on the IRC channel or the "
 "mailing list and answer questions from others."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:371
+#: /home/runa/dev/website/docs/en/faq.wml:371
 msgid "<hr> <a id=\"WhySlow\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:374
+#: /home/runa/dev/website/docs/en/faq.wml:374
 msgid "<a class=\"anchor\" href=\"#WhySlow\">Why is Tor so slow?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:377
+#: /home/runa/dev/website/docs/en/faq.wml:377
 msgid "There are many reasons why the Tor network is currently slow."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:381
+#: /home/runa/dev/website/docs/en/faq.wml:381
 msgid ""
 "Before we answer, though, you should realize that Tor is never going to be "
 "blazing fast. Your traffic is bouncing through volunteers' computers in "
@@ -703,7 +703,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:389
+#: /home/runa/dev/website/docs/en/faq.wml:389
 msgid ""
 "But that doesn't mean that it can't be improved. The current Tor network is "
 "quite small compared to the number of people trying to use it, and many of "
@@ -712,7 +712,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:396
+#: /home/runa/dev/website/docs/en/faq.wml:396
 msgid ""
 "For the much more in-depth answer, see <a href=\"<blog>why-tor-is-"
 "slow\">Roger's blog post on the topic</a>, which includes both a detailed "
@@ -720,12 +720,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:403
+#: /home/runa/dev/website/docs/en/faq.wml:403
 msgid "What can you do to help?"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:409
+#: /home/runa/dev/website/docs/en/faq.wml:409
 msgid ""
 "<a href=\"<page docs/tor-doc-relay>\">Configure your Tor to relay traffic "
 "for others</a>. Help make the Tor network large enough that we can handle "
@@ -733,7 +733,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:415
+#: /home/runa/dev/website/docs/en/faq.wml:415
 msgid ""
 "<a href=\"<page projects/vidalia>\">Help us make Tor more usable</a>. We "
 "especially need people to help make it easier to configure your Tor as a "
@@ -742,7 +742,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:422
+#: /home/runa/dev/website/docs/en/faq.wml:422
 msgid ""
 "There are some bottlenecks in the current Tor network. Help us design "
 "experiments to track down and demonstrate where the problems are, and then "
@@ -750,7 +750,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:428
+#: /home/runa/dev/website/docs/en/faq.wml:428
 msgid ""
 "There are some steps that individuals can take to improve their Tor "
 "performance. <a href=\"<wiki>TheOnionRouter/FireFoxTorPerf\">You can "
@@ -763,7 +763,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:439
+#: /home/runa/dev/website/docs/en/faq.wml:439
 msgid ""
 "Tor needs some architectural changes too. One important change is to start "
 "providing <a href=\"#EverybodyARelay\">better service to people who relay "
@@ -772,7 +772,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:446
+#: /home/runa/dev/website/docs/en/faq.wml:446
 msgid ""
 "Help do other things so we can do the hard stuff. Please take a moment to "
 "figure out what your skills and interests are, and then <a href=\"<page "
@@ -780,7 +780,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:452
+#: /home/runa/dev/website/docs/en/faq.wml:452
 msgid ""
 "Help find sponsors for Tor. Do you work at a company or government agency "
 "that uses Tor or has a use for Internet privacy, e.g. to browse the "
@@ -791,7 +791,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:461
+#: /home/runa/dev/website/docs/en/faq.wml:461
 msgid ""
 "If you can't help out with any of the above, you can still help out "
 "individually by <a href=\"<page donate/donate>\">donating a bit of money to "
@@ -799,19 +799,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:468
+#: /home/runa/dev/website/docs/en/faq.wml:468
 msgid "<hr> <a id=\"Funding\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:471
+#: /home/runa/dev/website/docs/en/faq.wml:471
 msgid ""
 "<a class=\"anchor\" href=\"#Funding\">What would The Tor Project do with "
 "more funding?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:474
+#: /home/runa/dev/website/docs/en/faq.wml:474
 msgid ""
 "We have about 1800 relays right now, pushing over 150 MB/s average traffic. "
 "We have several hundred thousand active users. But the Tor network is not "
@@ -819,12 +819,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:480
+#: /home/runa/dev/website/docs/en/faq.wml:480
 msgid "There are six main development/maintenance pushes that need attention:"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:486
+#: /home/runa/dev/website/docs/en/faq.wml:486
 msgid ""
 "Scalability: We need to keep scaling and decentralizing the Tor architecture"
 " so it can handle thousands of relays and millions of users. The upcoming "
@@ -833,7 +833,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:493
+#: /home/runa/dev/website/docs/en/faq.wml:493
 msgid ""
 "User support: With this many users, a lot of people are asking questions all"
 " the time, offering to help out with things, and so on. We need good clean "
@@ -841,18 +841,18 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:499
+#: /home/runa/dev/website/docs/en/faq.wml:499
 msgid ""
 "Relay support: the Tor network is run by volunteers, but they still need "
 "attention with prompt bug fixes, explanations when things go wrong, "
 "reminders to upgrade, and so on. The network itself is a commons, and "
 "somebody needs to spend some energy making sure the relay operators stay "
-"happy. We also need to work on <a href=\"#RelayOS\">stability</a> on some "
-"platforms &mdash; e.g., Tor relays have problems on Win XP currently."
+"happy. We also need to work on stability on some platforms &mdash; e.g., Tor"
+" relays have problems on Win XP currently."
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:508
+#: /home/runa/dev/website/docs/en/faq.wml:508
 msgid ""
 "Usability: Beyond documentation, we also need to work on usability of the "
 "software itself. This includes installers, clean GUIs, easy configuration to"
@@ -863,7 +863,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:517
+#: /home/runa/dev/website/docs/en/faq.wml:517
 msgid ""
 "Incentives: We need to work on ways to encourage people to configure their "
 "Tors as relays and exit nodes rather than just clients.  <a "
@@ -872,7 +872,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:524
+#: /home/runa/dev/website/docs/en/faq.wml:524
 msgid ""
 "Research: The anonymous communications field is full of surprises and "
 "gotchas. In our copious free time, we also help run top anonymity and "
@@ -884,7 +884,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:537
+#: /home/runa/dev/website/docs/en/faq.wml:537
 msgid ""
 "We're continuing to move forward on all of these, but at this rate <a "
 "href=\"#WhySlow\">the Tor network is growing faster than the developers can "
@@ -893,14 +893,14 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:545
+#: /home/runa/dev/website/docs/en/faq.wml:545
 msgid ""
 "We are also excited about tackling related problems, such as censorship-"
 "resistance."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:550
+#: /home/runa/dev/website/docs/en/faq.wml:550
 msgid ""
 "We are proud to have <a href=\"<page about/sponsors>\">sponsorship and "
 "support</a> from the Omidyar Network, the International Broadcasting Bureau,"
@@ -910,7 +910,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:557
+#: /home/runa/dev/website/docs/en/faq.wml:557
 msgid ""
 "However, this support is not enough to keep Tor abreast of changes in the "
 "Internet privacy landscape. Please <a href=\"<page "
@@ -920,36 +920,36 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:563
+#: /home/runa/dev/website/docs/en/faq.wml:563
 msgid "<hr> <a id=\"Metrics\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:566
+#: /home/runa/dev/website/docs/en/faq.wml:566
 msgid ""
 "<a class=\"anchor\" href=\"#Metrics\">How many people use Tor? How many "
 "relays or exit nodes are there?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:568
+#: /home/runa/dev/website/docs/en/faq.wml:568
 msgid ""
 "All this and more about measuring Tor can be found at the <a "
 "href=\"https://metrics.torproject.org/\">Tor Metrics Portal</a>."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:570
+#: /home/runa/dev/website/docs/en/faq.wml:570
 msgid "<hr> <a id=\"HowUninstallTor\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:573
+#: /home/runa/dev/website/docs/en/faq.wml:573
 msgid "<a class=\"anchor\" href=\"#HowUninstallTor\">How do I uninstall Tor?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:576
+#: /home/runa/dev/website/docs/en/faq.wml:576
 msgid ""
 "This depends entirely on how you installed it and which operating system you"
 " have. If you installed a package, then hopefully your package has a way to "
@@ -959,35 +959,35 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:584
+#: /home/runa/dev/website/docs/en/faq.wml:584
 msgid ""
 "In your taskbar, right click on Vidalia (the green onion or the black head)"
 "  and choose exit."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:586
+#: /home/runa/dev/website/docs/en/faq.wml:586
 msgid ""
 "Right click on the taskbar to bring up TaskManager. Look for tor.exe in the "
 "Process List. If it's running, right click and choose End Process."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:588
+#: /home/runa/dev/website/docs/en/faq.wml:588
 msgid ""
 "Click the Start button, go to Programs, go to Vidalia, choose Uninstall.  "
 "This will remove the Vidalia bundle, which includes Tor and Polipo."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:590
+#: /home/runa/dev/website/docs/en/faq.wml:590
 msgid ""
 "Start Firefox. Go to the Tools menu, choose Add-ons. Select Torbutton.  "
 "Click the Uninstall button."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:595
+#: /home/runa/dev/website/docs/en/faq.wml:595
 msgid ""
 "If you do not follow these steps (for example by trying to uninstall "
 "Vidalia, Tor, and Polipo while they are still running), you will need to "
@@ -995,14 +995,14 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:601
+#: /home/runa/dev/website/docs/en/faq.wml:601
 msgid ""
 "For Mac OS X, follow the <a href=\"<page docs/tor-doc-"
 "osx>#uninstall\">uninstall directions</a>."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:606
+#: /home/runa/dev/website/docs/en/faq.wml:606
 msgid ""
 "If you installed by source, I'm afraid there is no easy uninstall method. "
 "But on the bright side, by default it only installs into /usr/local/ and it "
@@ -1010,45 +1010,45 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:611
+#: /home/runa/dev/website/docs/en/faq.wml:611
 msgid "<hr> <a id=\"PGPSigs\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:614
+#: /home/runa/dev/website/docs/en/faq.wml:614
 msgid ""
 "<a class=\"anchor\" href=\"#PGPSigs\">What are these \"sig\" files on the "
 "download page?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:617
+#: /home/runa/dev/website/docs/en/faq.wml:617
 msgid ""
 "These are PGP signatures, so you can verify that the file you've downloaded "
 "is exactly the one that we intended you to get."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:622
+#: /home/runa/dev/website/docs/en/faq.wml:622
 msgid ""
 "Please read the <a href=\"<page docs/verifying-signatures>\">verifying "
 "signatures</a> page for details."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:626
+#: /home/runa/dev/website/docs/en/faq.wml:626
 msgid "<hr> <a id=\"GetTor\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:629
+#: /home/runa/dev/website/docs/en/faq.wml:629
 msgid ""
 "<a class=\"anchor\" href=\"#GetTor\">Your website is blocked in my country. "
 "How do I download Tor?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:633
+#: /home/runa/dev/website/docs/en/faq.wml:633
 msgid ""
 "Some government or corporate firewalls censor connections to Tor's website. "
 "In those cases, you have three options. First, get it from a friend &mdash; "
@@ -1063,7 +1063,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:647
+#: /home/runa/dev/website/docs/en/faq.wml:647
 msgid ""
 "Be sure to <a href=\"<page docs/verifying-signatures>\">verify the "
 "signature</a> of any package you download, especially when you get it from "
@@ -1071,26 +1071,26 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:652
+#: /home/runa/dev/website/docs/en/faq.wml:652
 msgid "<hr> <a id=\"CompileTorWindows\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:655
+#: /home/runa/dev/website/docs/en/faq.wml:655
 msgid ""
 "<a class=\"anchor\" href=\"#CompileTorWindows\">How do I compile Tor under "
 "Windows?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:658
+#: /home/runa/dev/website/docs/en/faq.wml:658
 msgid ""
 "Try following the steps at <a href=\"<gitblob>doc/tor-win32-mingw-"
 "creation.txt\"> tor-win32-mingw-creation.txt</a>."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:663
+#: /home/runa/dev/website/docs/en/faq.wml:663
 msgid ""
 "(Note that you don't need to compile Tor yourself in order to use it. Most "
 "people just use the packages available on the <a href=\"<page "
@@ -1098,19 +1098,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:668
+#: /home/runa/dev/website/docs/en/faq.wml:668
 msgid "<hr> <a id=\"VirusFalsePositives\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:671
+#: /home/runa/dev/website/docs/en/faq.wml:671
 msgid ""
 "<a class=\"anchor\" href=\"#VirusFalsePositives\">Why does my Tor executable"
 " appear to have a virus or spyware?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:674
+#: /home/runa/dev/website/docs/en/faq.wml:674
 msgid ""
 "Sometimes, overzealous Windows virus and spyware detectors trigger on some "
 "parts of the Tor Windows binary. Our best guess is that these are false "
@@ -1121,7 +1121,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:682
+#: /home/runa/dev/website/docs/en/faq.wml:682
 msgid ""
 "In the meantime, we encourage you to not just take our word for it. Our job "
 "is to provide the source; if you're concerned, please do <a "
@@ -1129,19 +1129,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:687
+#: /home/runa/dev/website/docs/en/faq.wml:687
 msgid "<hr> <a id=\"LiveCD\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:690
+#: /home/runa/dev/website/docs/en/faq.wml:690
 msgid ""
 "<a class=\"anchor\" href=\"#LiveCD\">Is there a LiveCD or other bundle that "
 "includes Tor?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:693
+#: /home/runa/dev/website/docs/en/faq.wml:693
 msgid ""
 "Yes.  Use <a href=\"https://tails.boum.org/\">The Amnesic Incognito Live "
 "System</a> or <a href=\"<page projects/torbrowser>\">the Tor Browser "
@@ -1149,19 +1149,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:698
+#: /home/runa/dev/website/docs/en/faq.wml:698
 msgid "<hr> <a id=\"torrc\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:701
+#: /home/runa/dev/website/docs/en/faq.wml:701
 msgid ""
 "<a class=\"anchor\" href=\"#torrc\">I'm supposed to \"edit my torrc\". What "
 "does that mean?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:704
+#: /home/runa/dev/website/docs/en/faq.wml:704
 msgid ""
 "Tor installs a text file called torrc that contains configuration "
 "instructions for how your Tor program should behave. The default "
@@ -1171,12 +1171,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:712
+#: /home/runa/dev/website/docs/en/faq.wml:712
 msgid "The location of your torrc file depends on the way you installed Tor:"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:716
+#: /home/runa/dev/website/docs/en/faq.wml:716
 msgid ""
 "On Windows, if you installed a Tor bundle with Vidalia, you can find your "
 "torrc file in the Start menu under Programs -&gt; Vidalia Bundle -&gt; Tor, "
@@ -1189,14 +1189,14 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:725
+#: /home/runa/dev/website/docs/en/faq.wml:725
 msgid ""
 "On OS X, if you use Vidalia, edit <code>~/.vidalia/torrc</code>. Otherwise, "
 "open your favorite text editor and load <code>/Library/Tor/torrc</code>."
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:729
+#: /home/runa/dev/website/docs/en/faq.wml:729
 msgid ""
 "On Unix, if you installed a pre-built package, look for "
 "<code>/etc/tor/torrc</code> or <code>/etc/torrc</code> or consult your "
@@ -1204,7 +1204,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:733
+#: /home/runa/dev/website/docs/en/faq.wml:733
 msgid ""
 "Finally, if you installed from source, you may not have a torrc installed "
 "yet: look in <code>/usr/local/etc/</code> and note that you may need to "
@@ -1212,14 +1212,14 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:740
+#: /home/runa/dev/website/docs/en/faq.wml:740
 msgid ""
 "If you use Vidalia, be sure to exit both Tor and Vidalia before you edit "
 "your torrc file. Otherwise Vidalia might overwrite your changes."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:745
+#: /home/runa/dev/website/docs/en/faq.wml:745
 msgid ""
 "Once you've changed your torrc, you will need to restart Tor for the changes"
 " to take effect. (For advanced users on OS X and Unix, note that you "
@@ -1227,7 +1227,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:751
+#: /home/runa/dev/website/docs/en/faq.wml:751
 msgid ""
 "For other configuration options you can use, look at the <a href=\"<page "
 "docs/tor-manual>\">Tor manual page</a>. Remember, all lines beginning with #"
@@ -1235,19 +1235,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:757
+#: /home/runa/dev/website/docs/en/faq.wml:757
 msgid "<hr> <a id=\"Logs\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:760
+#: /home/runa/dev/website/docs/en/faq.wml:760
 msgid ""
 "<a class=\"anchor\" href=\"#Logs\">How do I set up logging, or see Tor's "
 "logs?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:763
+#: /home/runa/dev/website/docs/en/faq.wml:763
 msgid ""
 "If you installed a Tor bundle that includes Vidalia, then Vidalia has a "
 "window called \"Message Log\" that will show you Tor's log messages. You can"
@@ -1256,19 +1256,19 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:770
+#: /home/runa/dev/website/docs/en/faq.wml:770
 msgid ""
 "If you're not using Vidalia, you'll have to go find the log files by hand. "
 "Here are some likely places for your logs to be:"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:775
+#: /home/runa/dev/website/docs/en/faq.wml:775
 msgid "On OS X, Debian, Red Hat, etc, the logs are in /var/log/tor/"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:777
+#: /home/runa/dev/website/docs/en/faq.wml:777
 msgid ""
 "On Windows, there are no default log files currently. If you enable logs in "
 "your torrc file, they default to <code>\\username\\Application "
@@ -1276,7 +1276,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:781
+#: /home/runa/dev/website/docs/en/faq.wml:781
 msgid ""
 "If you compiled Tor from source, by default your Tor logs to <a "
 "href=\"http://en.wikipedia.org/wiki/Standard_streams\">\"stdout\"</a> at "
@@ -1285,7 +1285,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:789
+#: /home/runa/dev/website/docs/en/faq.wml:789
 msgid ""
 "To change your logging setup by hand, <a href=\"#torrc\">edit your torrc</a>"
 " and find the section (near the top of the file) which contains the "
@@ -1293,7 +1293,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><pre>
-#: /home/runa/tor/website/docs/en/faq.wml:795
+#: /home/runa/dev/website/docs/en/faq.wml:795
 #, no-wrap
 msgid ""
 "\\## Logs go to stdout at level \"notice\" unless redirected by something\n"
@@ -1301,7 +1301,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:800
+#: /home/runa/dev/website/docs/en/faq.wml:800
 msgid ""
 "For example, if you want Tor to send complete debug, info, notice, warn, and"
 " err level messages to a file, append the following line to the end of the "
@@ -1309,32 +1309,32 @@
 msgstr ""
 
 #. type: Content of: <div><div><pre>
-#: /home/runa/tor/website/docs/en/faq.wml:806
+#: /home/runa/dev/website/docs/en/faq.wml:806
 #, no-wrap
 msgid "Log debug file c:/program files/tor/debug.log\n"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:810
+#: /home/runa/dev/website/docs/en/faq.wml:810
 msgid ""
 "Replace <code>c:/program files/tor/debug.log</code> with a directory and "
 "filename for your Tor log."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:814
+#: /home/runa/dev/website/docs/en/faq.wml:814
 msgid "<hr> <a id=\"DoesntWork\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:817
+#: /home/runa/dev/website/docs/en/faq.wml:817
 msgid ""
 "<a class=\"anchor\" href=\"#DoesntWork\">I installed Tor and Polipo but it's"
 " not working.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:820
+#: /home/runa/dev/website/docs/en/faq.wml:820
 msgid ""
 "Once you've installed the Tor bundle, there are two questions to ask: first,"
 " is your Tor able to establish a circuit? Second, is your Firefox correctly "
@@ -1342,7 +1342,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:825
+#: /home/runa/dev/website/docs/en/faq.wml:825
 msgid ""
 "If Tor can establish a circuit, the onion icon in Vidalia will turn green. "
 "You can also check in the Vidalia Control Panel to make sure it says "
@@ -1352,19 +1352,19 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:835
+#: /home/runa/dev/website/docs/en/faq.wml:835
 msgid "If Tor can't establish a circuit, here are some hints:"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:839
+#: /home/runa/dev/website/docs/en/faq.wml:839
 msgid ""
 "Are you sure Tor is running? If you're using Vidalia, you may have to click "
 "on the onion and select \"Start\" to launch Tor."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:841
+#: /home/runa/dev/website/docs/en/faq.wml:841
 msgid ""
 "Check your system clock. If it's more than a few hours off, Tor will refuse "
 "to build circuits. For XP users, synchronize your clock under the clock "
@@ -1373,7 +1373,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:845
+#: /home/runa/dev/website/docs/en/faq.wml:845
 msgid ""
 "Is your Internet connection <a href=\"#FirewallPorts\">firewalled by "
 "port</a>, or do you normally need to use a <a "
@@ -1381,7 +1381,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:850
+#: /home/runa/dev/website/docs/en/faq.wml:850
 msgid ""
 "Are you running programs like Norton Internet Security or SELinux that block"
 " certain connections, even though you don't realize they do? They could be "
@@ -1389,7 +1389,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:853
+#: /home/runa/dev/website/docs/en/faq.wml:853
 msgid ""
 "Are you in China, or behind a restrictive corporate network firewall that "
 "blocks the public Tor relays? If so, you should learn about <a href=\"<page "
@@ -1397,14 +1397,14 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:856
+#: /home/runa/dev/website/docs/en/faq.wml:856
 msgid ""
 "Check your <a href=\"#Logs\">Tor logs</a>. Do they give you any hints about "
 "what's going wrong?"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:861
+#: /home/runa/dev/website/docs/en/faq.wml:861
 msgid ""
 "Step two is to confirm that Firefox is correctly configured to send its "
 "traffic through Tor. Try the <a href=\"https://check.torproject.org/\">Tor "
@@ -1414,12 +1414,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:869
+#: /home/runa/dev/website/docs/en/faq.wml:869
 msgid "If it thinks you're not using Tor, here are some hints:"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:873
+#: /home/runa/dev/website/docs/en/faq.wml:873
 msgid ""
 "Did you install the Torbutton extension for Firefox? The installation "
 "bundles include it, but sometimes people forget to install it. Make sure it "
@@ -1428,7 +1428,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:878
+#: /home/runa/dev/website/docs/en/faq.wml:878
 msgid ""
 "Do you have incompatible Firefox extensions like FoxyProxy installed? If so,"
 " uninstall them. (Note that using FoxyProxy is NOT a sufficient substitute "
@@ -1440,7 +1440,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:885
+#: /home/runa/dev/website/docs/en/faq.wml:885
 msgid ""
 "If your browser says \"The proxy server is refusing connections.\", check "
 "that Polipo (the http proxy that passes traffic between Firefox and Tor) is "
@@ -1450,7 +1450,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:890
+#: /home/runa/dev/website/docs/en/faq.wml:890
 msgid ""
 "If you're upgrading from OS X, some of the earlier OS X installers were "
 "broken in really unfortunate ways. You may find that <a href=\"<page docs"
@@ -1460,14 +1460,14 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:895
+#: /home/runa/dev/website/docs/en/faq.wml:895
 msgid ""
 "If you're on Linux, make sure Privoxy isn't running, since it will conflict "
 "with the port that our Polipo configuration file picks."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:897
+#: /home/runa/dev/website/docs/en/faq.wml:897
 msgid ""
 "If you installed Polipo yourself (not from a bundle), did you edit the "
 "config file as described? Did you restart Polipo after this change? Are you "
@@ -1475,7 +1475,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:900
+#: /home/runa/dev/website/docs/en/faq.wml:900
 msgid ""
 "For Red Hat Linux and related systems, do you have SELinux enabled? If so, "
 "it might be preventing Polipo from talking to Tor. We also run across BSD "
@@ -1484,19 +1484,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:906
+#: /home/runa/dev/website/docs/en/faq.wml:906
 msgid "<hr /> <a id=\"VidaliaPassword\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:909
+#: /home/runa/dev/website/docs/en/faq.wml:909
 msgid ""
 "<a class=\"anchor\" href=\"#VidaliaPassword\">Tor/Vidalia prompts for a "
 "password at start.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:912
+#: /home/runa/dev/website/docs/en/faq.wml:912
 msgid ""
 "Vidalia interacts with the Tor software via Tor's \"control port\". The "
 "control port lets Vidalia receive status updates from Tor, request a new "
@@ -1507,7 +1507,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:921
+#: /home/runa/dev/website/docs/en/faq.wml:921
 msgid ""
 "Usually this process of generating and setting a random control password "
 "happens in the background. There are three common situations, though, where "
@@ -1515,7 +1515,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:927
+#: /home/runa/dev/website/docs/en/faq.wml:927
 msgid ""
 "You're already running Vidalia and Tor. For example, this situation can "
 "happen if you installed the Vidalia bundle and now you're trying to run the "
@@ -1524,7 +1524,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:932
+#: /home/runa/dev/website/docs/en/faq.wml:932
 msgid ""
 "Vidalia crashed, but left Tor running with the last known random password. "
 "After you restart Vidalia, it generates a new random password, but Vidalia "
@@ -1538,7 +1538,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:945
+#: /home/runa/dev/website/docs/en/faq.wml:945
 msgid ""
 "You had previously set Tor to run as a Windows NT service. When Tor is set "
 "to run as a service, it starts up when the system boots. If you configured "
@@ -1553,19 +1553,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:960
+#: /home/runa/dev/website/docs/en/faq.wml:960
 msgid "<hr> <a id=\"ChooseEntryExit\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:963
+#: /home/runa/dev/website/docs/en/faq.wml:963
 msgid ""
 "<a class=\"anchor\" href=\"#ChooseEntryExit\">Can I control which nodes (or "
 "country) are used for entry/exit?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:966
+#: /home/runa/dev/website/docs/en/faq.wml:966
 msgid ""
 "Yes. You can set preferred entry and exit nodes as well as inform Tor which "
 "nodes you do not want to use.  The following options can be added to your "
@@ -1574,53 +1574,53 @@
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/docs/en/faq.wml:972
+#: /home/runa/dev/website/docs/en/faq.wml:972
 msgid "<tt>EntryNodes $fingerprint,$fingerprint,...</tt>"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/docs/en/faq.wml:973
+#: /home/runa/dev/website/docs/en/faq.wml:973
 msgid ""
 "A list of preferred nodes to use for the first hop in the circuit, if "
 "possible."
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/docs/en/faq.wml:975
+#: /home/runa/dev/website/docs/en/faq.wml:975
 msgid "<tt>ExitNodes $fingerprint,$fingerprint,...</tt>"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/docs/en/faq.wml:976
+#: /home/runa/dev/website/docs/en/faq.wml:976
 msgid ""
 "A list of preferred nodes to use for the last hop in the circuit, if "
 "possible."
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/docs/en/faq.wml:978
+#: /home/runa/dev/website/docs/en/faq.wml:978
 msgid "<tt>ExcludeNodes $fingerprint,$fingerprint,...</tt>"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/docs/en/faq.wml:979
+#: /home/runa/dev/website/docs/en/faq.wml:979
 msgid "A list of nodes to never use when building a circuit."
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/docs/en/faq.wml:981
+#: /home/runa/dev/website/docs/en/faq.wml:981
 msgid "<tt>ExcludeExitNodes $fingerprint,$fingerprint,...</tt>"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/docs/en/faq.wml:982
+#: /home/runa/dev/website/docs/en/faq.wml:982
 msgid ""
 "A list of nodes to never use when picking an exit.  Nodes listed in "
 "<tt>ExcludeNodes</tt> are automatically in this list."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:987
+#: /home/runa/dev/website/docs/en/faq.wml:987
 msgid ""
 "<em>We recommend you do not use these</em> &mdash; they are intended for "
 "testing and may disappear in future versions.  You get the best security "
@@ -1630,7 +1630,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:994
+#: /home/runa/dev/website/docs/en/faq.wml:994
 msgid ""
 "The <tt>EntryNodes</tt> and <tt>ExitNodes</tt> config options are treated as"
 " a request, meaning if the nodes are down or seem slow, Tor will still avoid"
@@ -1642,7 +1642,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1004
+#: /home/runa/dev/website/docs/en/faq.wml:1004
 msgid ""
 "Instead of <tt>$fingerprint</tt> you can also specify a 2 letter ISO3166 "
 "country code in curly braces (for example {de}), or an ip address pattern "
@@ -1651,7 +1651,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1010
+#: /home/runa/dev/website/docs/en/faq.wml:1010
 msgid ""
 "If you want to access a service directly through Tor's SOCKS interface (eg. "
 "using ssh via connect.c), another option is to set up an internal mapping in"
@@ -1660,26 +1660,26 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1016
+#: /home/runa/dev/website/docs/en/faq.wml:1016
 msgid "<hr> <a id=\"GoogleCaptcha\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1019
+#: /home/runa/dev/website/docs/en/faq.wml:1019
 msgid ""
 "<a class=\"anchor\" href=\"#GoogleCaptcha\">Google makes me solve a Captcha "
 "or tells me I have spyware installed.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1022
+#: /home/runa/dev/website/docs/en/faq.wml:1022
 msgid ""
 "This is a known and intermittent problem; it does not mean that Google "
 "considers Tor to be spyware."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1027
+#: /home/runa/dev/website/docs/en/faq.wml:1027
 msgid ""
 "When you use Tor, you are sending queries through exit relays that are also "
 "shared by thousands of other users. Tor users typically see this message "
@@ -1690,7 +1690,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1035
+#: /home/runa/dev/website/docs/en/faq.wml:1035
 msgid ""
 "An alternate explanation is that Google tries to detect certain kinds of "
 "spyware or viruses that send distinctive queries to Google Search. It notes "
@@ -1700,7 +1700,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1044
+#: /home/runa/dev/website/docs/en/faq.wml:1044
 msgid ""
 "To our knowledge, Google is not doing anything intentionally specifically to"
 " deter or block Tor use. The error message about an infected machine should "
@@ -1708,7 +1708,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1050
+#: /home/runa/dev/website/docs/en/faq.wml:1050
 msgid ""
 "Torbutton 1.2.5 (released in mid 2010) detects Google captchas and can "
 "automatically redirect you to a more Tor-friendly search engine such as "
@@ -1716,19 +1716,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1055
+#: /home/runa/dev/website/docs/en/faq.wml:1055
 msgid "<hr /> <a id=\"GmailWarning\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1058
+#: /home/runa/dev/website/docs/en/faq.wml:1058
 msgid ""
 "<a class=\"anchor\" href=\"#GmailWarning\">Gmail warns me that my account "
 "may have been compromised.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1061
+#: /home/runa/dev/website/docs/en/faq.wml:1061
 msgid ""
 "Sometimes, after you've used Gmail over Tor, Google presents a pop-up "
 "notification that your account may have been compromised.  The notification "
@@ -1737,7 +1737,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1068
+#: /home/runa/dev/website/docs/en/faq.wml:1068
 msgid ""
 "In general this is a false alarm: Google saw a bunch of logins from "
 "different places, as a result of running the service via Tor, and decided it"
@@ -1746,7 +1746,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1075
+#: /home/runa/dev/website/docs/en/faq.wml:1075
 msgid ""
 "Even though this may be a biproduct of using the service via tor, that "
 "doesn't mean you can entirely ignore the warning. It is <i>probably</i> a "
@@ -1755,7 +1755,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1082
+#: /home/runa/dev/website/docs/en/faq.wml:1082
 msgid ""
 "Cookie hijacking is possible by either physical access to your computer or "
 "by watching your network traffic.  In theory only physical access should "
@@ -1766,7 +1766,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1091
+#: /home/runa/dev/website/docs/en/faq.wml:1091
 msgid ""
 "And if somebody <i>did</i> steal your google cookie, they might end up "
 "logging in from unusual places (though of course they also might not). So "
@@ -1778,19 +1778,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1100
+#: /home/runa/dev/website/docs/en/faq.wml:1100
 msgid "<hr> <a id=\"FirewallPorts\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1103
+#: /home/runa/dev/website/docs/en/faq.wml:1103
 msgid ""
 "<a class=\"anchor\" href=\"#FirewallPorts\">My firewall only allows a few "
 "outgoing ports.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1106
+#: /home/runa/dev/website/docs/en/faq.wml:1106
 msgid ""
 "If your firewall works by blocking ports, then you can tell Tor to only use "
 "the ports that your firewall permits by adding \"FascistFirewall 1\" to your"
@@ -1800,7 +1800,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1114
+#: /home/runa/dev/website/docs/en/faq.wml:1114
 msgid ""
 "By default, when you set this Tor assumes that your firewall allows only "
 "port 80 and port 443 (HTTP and HTTPS respectively). You can select a "
@@ -1808,14 +1808,14 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1120
+#: /home/runa/dev/website/docs/en/faq.wml:1120
 msgid ""
 "If you want to be more fine-grained with your controls, you can also use the"
 " ReachableAddresses config options, e.g.:"
 msgstr ""
 
 #. type: Content of: <div><div><pre>
-#: /home/runa/tor/website/docs/en/faq.wml:1125
+#: /home/runa/dev/website/docs/en/faq.wml:1125
 #, no-wrap
 msgid ""
 "  ReachableDirAddresses *:80\n"
@@ -1823,24 +1823,24 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1129
+#: /home/runa/dev/website/docs/en/faq.wml:1129
 msgid "<hr> <a id=\"RelayFlexible\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1132
+#: /home/runa/dev/website/docs/en/faq.wml:1132
 msgid ""
 "<a class=\"anchor\" href=\"#RelayFlexible\">How stable does my relay need to"
 " be?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1135
+#: /home/runa/dev/website/docs/en/faq.wml:1135
 msgid "We aim to make setting up a Tor relay easy and convenient:"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1139
+#: /home/runa/dev/website/docs/en/faq.wml:1139
 msgid ""
 "Tor has built-in support for <a "
 "href=\"<wikifaq>#WhatbandwidthshapingoptionsareavailabletoTorrelays\"> rate "
@@ -1851,7 +1851,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1147
+#: /home/runa/dev/website/docs/en/faq.wml:1147
 msgid ""
 "Each Tor relay has an <a href=\"#ExitPolicies\">exit policy</a> that "
 "specifies what sort of outbound connections are allowed or refused from that"
@@ -1860,7 +1860,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1152
+#: /home/runa/dev/website/docs/en/faq.wml:1152
 msgid ""
 "It's fine if the relay goes offline sometimes. The directories notice this "
 "quickly and stop advertising the relay. Just try to make sure it's not too "
@@ -1868,14 +1868,14 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1157
+#: /home/runa/dev/website/docs/en/faq.wml:1157
 msgid ""
 "We can handle relays with dynamic IPs just fine &mdash; simply leave the "
 "Address config option blank, and Tor will try to guess."
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1160
+#: /home/runa/dev/website/docs/en/faq.wml:1160
 msgid ""
 "If your relay is behind a NAT and it doesn't know its public IP (e.g. it has"
 " an IP of 192.168.x.y), you'll need to set up port forwarding. Forwarding "
@@ -1885,7 +1885,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1166
+#: /home/runa/dev/website/docs/en/faq.wml:1166
 msgid ""
 "Your relay will passively estimate and advertise its recent bandwidth "
 "capacity, so high-bandwidth relays will attract more users than low-"
@@ -1893,24 +1893,24 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1172
+#: /home/runa/dev/website/docs/en/faq.wml:1172
 msgid "<hr> <a id=\"RunARelayBut\"></a> <a id=\"ExitPolicies\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1176
+#: /home/runa/dev/website/docs/en/faq.wml:1176
 msgid ""
 "<a class=\"anchor\" href=\"#ExitPolicies\">I'd run a relay, but I don't want"
 " to deal with abuse issues.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1179
+#: /home/runa/dev/website/docs/en/faq.wml:1179
 msgid "Great. That's exactly why we implemented exit policies."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1183
+#: /home/runa/dev/website/docs/en/faq.wml:1183
 msgid ""
 "Each Tor relay has an exit policy that specifies what sort of outbound "
 "connections are allowed or refused from that relay. The exit policies are "
@@ -1926,7 +1926,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1197
+#: /home/runa/dev/website/docs/en/faq.wml:1197
 msgid ""
 "The default exit policy allows access to many popular services (e.g. web "
 "browsing), but <a "
@@ -1942,7 +1942,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1211
+#: /home/runa/dev/website/docs/en/faq.wml:1211
 msgid ""
 "If you do allow any exit connections, make sure name resolution works (that "
 "is, your computer can resolve Internet addresses correctly).  If there are "
@@ -1952,19 +1952,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1219
+#: /home/runa/dev/website/docs/en/faq.wml:1219
 msgid "<hr> <a id=\"RelayOrBridge\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1222
+#: /home/runa/dev/website/docs/en/faq.wml:1222
 msgid ""
 "<a class=\"anchor\" href=\"#RelayOrBridge\">Should I be a normal relay or "
 "bridge relay?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1224
+#: /home/runa/dev/website/docs/en/faq.wml:1224
 msgid ""
 "<a href=\"<page docs/bridges>\">Bridge relays</a> (or \"bridges\" for short)"
 "  are <a href=\"<page docs/tor-doc-relay>\">Tor relays</a> that aren't "
@@ -1974,7 +1974,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1231
+#: /home/runa/dev/website/docs/en/faq.wml:1231
 msgid ""
 "Being a normal relay vs being a bridge relay is almost the same "
 "configuration: it's just a matter of whether your relay is listed publically"
@@ -1982,7 +1982,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1236
+#: /home/runa/dev/website/docs/en/faq.wml:1236
 msgid ""
 "Right now, there are a small number of places in the world that filter "
 "connections to the Tor network. So getting a lot of bridges running right "
@@ -1993,7 +1993,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1244
+#: /home/runa/dev/website/docs/en/faq.wml:1244
 msgid ""
 "So should you run a normal relay or bridge relay? If you have lots of "
 "bandwidth, you should definitely run a normal relay &mdash; bridge relays "
@@ -2004,19 +2004,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1252
+#: /home/runa/dev/website/docs/en/faq.wml:1252
 msgid "<hr> <a id=\"MultipleRelays\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1255
+#: /home/runa/dev/website/docs/en/faq.wml:1255
 msgid ""
 "<a class=\"anchor\" href=\"#MultipleRelays\">I want to run more than one "
 "relay.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1258
+#: /home/runa/dev/website/docs/en/faq.wml:1258
 msgid ""
 "Great. If you want to run several relays to donate more to the network, "
 "we're happy with that. But please don't run more than a few dozen on the "
@@ -2025,7 +2025,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1265
+#: /home/runa/dev/website/docs/en/faq.wml:1265
 msgid ""
 "If you do decide to run more than one relay, please set the \"MyFamily\" "
 "config option in the <a href=\"#torrc\">torrc</a> of each relay, listing all"
@@ -2033,13 +2033,13 @@
 msgstr ""
 
 #. type: Content of: <div><div><pre>
-#: /home/runa/tor/website/docs/en/faq.wml:1271
+#: /home/runa/dev/website/docs/en/faq.wml:1271
 #, no-wrap
 msgid "    MyFamily $fingerprint1,$fingerprint2,$fingerprint3\n"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1275
+#: /home/runa/dev/website/docs/en/faq.wml:1275
 msgid ""
 "where each fingerprint is the 40 character identity fingerprint (without "
 "spaces). You can also list them by nickname, but fingerprint is safer. Be "
@@ -2048,7 +2048,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1282
+#: /home/runa/dev/website/docs/en/faq.wml:1282
 msgid ""
 "That way clients will know to avoid using more than one of your relays in a "
 "single circuit. You should set MyFamily if you have administrative control "
@@ -2057,26 +2057,26 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1288
+#: /home/runa/dev/website/docs/en/faq.wml:1288
 msgid "<hr> <a id=\"RelayMemory\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1291
+#: /home/runa/dev/website/docs/en/faq.wml:1291
 msgid ""
 "<a class=\"anchor\" href=\"#RelayMemory\">Why is my Tor relay using so much "
 "memory?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1293
+#: /home/runa/dev/website/docs/en/faq.wml:1293
 msgid ""
 "If your Tor relay is using more memory than you'd like, here are some tips "
 "for reducing its footprint:"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1298
+#: /home/runa/dev/website/docs/en/faq.wml:1298
 msgid ""
 "If you're on Linux, you may be encountering memory fragmentation bugs in "
 "glibc's malloc implementation. That is, when Tor releases memory back to the"
@@ -2088,7 +2088,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1306
+#: /home/runa/dev/website/docs/en/faq.wml:1306
 msgid ""
 "If you're running a fast relay, meaning you have many TLS connections open, "
 "you are probably losing a lot of memory to OpenSSL's internal buffers (38KB+"
@@ -2100,7 +2100,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1314
+#: /home/runa/dev/website/docs/en/faq.wml:1314
 msgid ""
 "If you're running on Solaris, OpenBSD, NetBSD, or old FreeBSD, Tor is "
 "probably forking separate processes rather than using threads. Consider "
@@ -2110,7 +2110,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1320
+#: /home/runa/dev/website/docs/en/faq.wml:1320
 msgid ""
 "If you still can't handle the memory load, consider reducing the amount of "
 "bandwidth your relay advertises. Advertising less bandwidth means you will "
@@ -2119,60 +2119,60 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1329
+#: /home/runa/dev/website/docs/en/faq.wml:1329
 msgid ""
 "All of this said, fast Tor relays do use a lot of ram. It is not unusual for"
 " a fast exit relay to use 500-1000 MB of memory."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1333
+#: /home/runa/dev/website/docs/en/faq.wml:1333
 msgid "<hr> <a id=\"WhyNotNamed\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1336
+#: /home/runa/dev/website/docs/en/faq.wml:1336
 msgid "<a class=\"anchor\" href=\"#WhyNotNamed\">Why is my Tor relay not named?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1339
+#: /home/runa/dev/website/docs/en/faq.wml:1339
 msgid ""
 "We currently use these metrics to determine if your relay should be "
 "named:<br>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1342
+#: /home/runa/dev/website/docs/en/faq.wml:1342
 msgid ""
 "The name is not currently mapped to a different key. Existing mappings are "
 "removed after 6 months of inactivity from a relay."
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1344
+#: /home/runa/dev/website/docs/en/faq.wml:1344
 msgid "The relay must have been around for at least two weeks."
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1345
+#: /home/runa/dev/website/docs/en/faq.wml:1345
 msgid "No other router may have wanted the same name in the past month."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1348
+#: /home/runa/dev/website/docs/en/faq.wml:1348
 msgid "<hr> <a id=\"KeyManagement\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1351
+#: /home/runa/dev/website/docs/en/faq.wml:1351
 msgid ""
 "<a class=\"anchor\" href=\"#KeyManagement\">Tell me about all the keys Tor "
 "uses.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1354
+#: /home/runa/dev/website/docs/en/faq.wml:1354
 msgid ""
 "Tor uses a variety of different keys, with three goals in mind: 1)  "
 "encryption to ensure privacy of data within the Tor network, 2)  "
@@ -2182,7 +2182,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1362
+#: /home/runa/dev/website/docs/en/faq.wml:1362
 msgid ""
 "<b>Encryption</b>: first, all connections in Tor use TLS link encryption, so"
 " observers can't look inside to see which circuit a given cell is intended "
@@ -2193,7 +2193,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1372
+#: /home/runa/dev/website/docs/en/faq.wml:1372
 msgid ""
 "<b>Authentication</b>: Every Tor relay has a public decryption key called "
 "the \"onion key\".  When the Tor client establishes circuits, at each step "
@@ -2204,7 +2204,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1382
+#: /home/runa/dev/website/docs/en/faq.wml:1382
 msgid ""
 "<b>Coordination</b>: How do clients know what the relays are, and how do "
 "they know that they have the right keys for them? Each relay has a long-term"
@@ -2219,7 +2219,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1396
+#: /home/runa/dev/website/docs/en/faq.wml:1396
 msgid ""
 "How do clients know what the directory authorities are? The Tor software "
 "comes with a built-in list of location and public key for each directory "
@@ -2228,7 +2228,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1403
+#: /home/runa/dev/website/docs/en/faq.wml:1403
 msgid ""
 "How do users know they've got the right software? When we distribute the "
 "source code or a package, we digitally sign it with <a "
@@ -2238,7 +2238,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1411
+#: /home/runa/dev/website/docs/en/faq.wml:1411
 msgid ""
 "In order to be certain that it's really signed by us, you need to have met "
 "us in person and gotten a copy of our GPG key fingerprint, or you need to "
@@ -2248,17 +2248,17 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1418
+#: /home/runa/dev/website/docs/en/faq.wml:1418
 msgid "<hr> <a id=\"EntryGuards\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1421
+#: /home/runa/dev/website/docs/en/faq.wml:1421
 msgid "<a class=\"anchor\" href=\"#EntryGuards\">What are Entry Guards?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1424
+#: /home/runa/dev/website/docs/en/faq.wml:1424
 msgid ""
 "Tor (like all current practical low-latency anonymity designs) fails when "
 "the attacker can see both ends of the communications channel. For example, "
@@ -2270,7 +2270,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1434
+#: /home/runa/dev/website/docs/en/faq.wml:1434
 msgid ""
 "So, what should we do? Suppose the attacker controls, or can observe, "
 "<i>C</i> relays. Suppose there are <i>N</i> relays total. If you select new "
@@ -2284,7 +2284,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1446
+#: /home/runa/dev/website/docs/en/faq.wml:1446
 msgid ""
 "The solution is \"entry guards\": each user selects a few relays at random "
 "to use as entry points, and uses only those relays for her first hop. If "
@@ -2297,7 +2297,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1457
+#: /home/runa/dev/website/docs/en/faq.wml:1457
 msgid ""
 "You can read more at <a href=\"http://freehaven.net/anonbib/#wright02\">An "
 "Analysis of the Degradation of Anonymous Protocols</a>, <a "
@@ -2308,7 +2308,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1466
+#: /home/runa/dev/website/docs/en/faq.wml:1466
 msgid ""
 "Restricting your entry nodes may also help against attackers who want to run"
 " a few Tor nodes and easily enumerate all of the Tor user IP addresses. "
@@ -2319,19 +2319,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1474
+#: /home/runa/dev/website/docs/en/faq.wml:1474
 msgid "<hr> <a id=\"EverybodyARelay\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1477
+#: /home/runa/dev/website/docs/en/faq.wml:1477
 msgid ""
 "<a class=\"anchor\" href=\"#EverybodyARelay\">You should make every Tor user"
 " be a relay.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1480
+#: /home/runa/dev/website/docs/en/faq.wml:1480
 msgid ""
 "Requiring every Tor user to be a relay would help with scaling the network "
 "to handle all our users, and <a "
@@ -2346,7 +2346,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1493
+#: /home/runa/dev/website/docs/en/faq.wml:1493
 msgid ""
 "That said, we do want to encourage Tor users to run relays, so what we "
 "really want to do is simplify the process of setting up and maintaining a "
@@ -2357,12 +2357,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1502
+#: /home/runa/dev/website/docs/en/faq.wml:1502
 msgid "There are five steps we need to address before we can do this though:"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1506
+#: /home/runa/dev/website/docs/en/faq.wml:1506
 msgid ""
 "First, we need to make Tor stable as a relay on all common operating "
 "systems. The main remaining platform is Windows, and we plan to finally "
@@ -2372,7 +2372,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1514
+#: /home/runa/dev/website/docs/en/faq.wml:1514
 msgid ""
 "Second, we still need to get better at automatically estimating the right "
 "amount of bandwidth to allow. See item #7 on the <a href=\"<page "
@@ -2384,7 +2384,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1525
+#: /home/runa/dev/website/docs/en/faq.wml:1525
 msgid ""
 "Third, we need to work on scalability, both of the network (how to stop "
 "requiring that all Tor relays be able to connect to all Tor relays) and of "
@@ -2396,7 +2396,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1535
+#: /home/runa/dev/website/docs/en/faq.wml:1535
 msgid ""
 "Fourth, we need to better understand the risks from letting the attacker "
 "send traffic through your relay while you're also initiating your own "
@@ -2414,7 +2414,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1551
+#: /home/runa/dev/website/docs/en/faq.wml:1551
 msgid ""
 "Fifth, we might need some sort of incentive scheme to encourage people to "
 "relay traffic for others, and/or to become exit nodes. Here are our <a "
@@ -2423,24 +2423,24 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1558
+#: /home/runa/dev/website/docs/en/faq.wml:1558
 msgid "Please help on all of these!"
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1561
+#: /home/runa/dev/website/docs/en/faq.wml:1561
 msgid "<hr> <a id=\"TransportIPnotTCP\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1564
+#: /home/runa/dev/website/docs/en/faq.wml:1564
 msgid ""
 "<a class=\"anchor\" href=\"#TransportIPnotTCP\">You should transport all IP "
 "packets, not just TCP packets.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1567
+#: /home/runa/dev/website/docs/en/faq.wml:1567
 msgid ""
 "This would be handy, because it would make Tor better able to handle new "
 "protocols like VoIP, it could solve the whole need to socksify applications,"
@@ -2449,7 +2449,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1574
+#: /home/runa/dev/website/docs/en/faq.wml:1574
 msgid ""
 "We're heading in this direction: see <a "
 "href=\"https://trac.torproject.org/projects/tor/ticket/1855\">this trac "
@@ -2458,7 +2458,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1581
+#: /home/runa/dev/website/docs/en/faq.wml:1581
 msgid ""
 "IP packets reveal OS characteristics. We would still need to do IP-level "
 "packet normalization, to stop things like TCP fingerprinting attacks. Given "
@@ -2469,7 +2469,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1588
+#: /home/runa/dev/website/docs/en/faq.wml:1588
 msgid ""
 "Application-level streams still need scrubbing. We will still need user-side"
 " applications like Torbutton. So it won't become just a matter of capturing "
@@ -2477,7 +2477,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1592
+#: /home/runa/dev/website/docs/en/faq.wml:1592
 msgid ""
 "Certain protocols will still leak information. For example, we must rewrite "
 "DNS requests so they are delivered to an unlinkable DNS server rather than "
@@ -2486,7 +2486,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1597
+#: /home/runa/dev/website/docs/en/faq.wml:1597
 msgid ""
 "<a "
 "href=\"http://crypto.stanford.edu/~nagendra/projects/dtls/dtls.html\">DTLS</a>"
@@ -2497,7 +2497,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1604
+#: /home/runa/dev/website/docs/en/faq.wml:1604
 msgid ""
 "Exit policies for arbitrary IP packets mean building a secure IDS. Our node "
 "operators tell us that exit policies are one of the main reasons they're "
@@ -2515,7 +2515,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1618
+#: /home/runa/dev/website/docs/en/faq.wml:1618
 msgid ""
 "The Tor-internal name spaces would need to be redesigned. We support hidden "
 "service \".onion\" addresses by intercepting the addresses when they are "
@@ -2524,38 +2524,38 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1625
+#: /home/runa/dev/website/docs/en/faq.wml:1625
 msgid "<hr> <a id=\"Criminals\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1628
+#: /home/runa/dev/website/docs/en/faq.wml:1628
 msgid ""
 "<a class=\"anchor\" href=\"#Criminals\">Doesn't Tor enable criminals to do "
 "bad things?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1631
+#: /home/runa/dev/website/docs/en/faq.wml:1631
 msgid ""
 "For the answer to this question and others, please see our <a href=\"<page "
 "docs/faq-abuse>\">Tor Abuse FAQ</a>."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1635
+#: /home/runa/dev/website/docs/en/faq.wml:1635
 msgid "<hr> <a id=\"RespondISP\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1638
+#: /home/runa/dev/website/docs/en/faq.wml:1638
 msgid ""
 "<a class=\"anchor\" href=\"#RespondISP\">How do I respond to my ISP about my"
 " exit relay?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1641
+#: /home/runa/dev/website/docs/en/faq.wml:1641
 msgid ""
 "A collection of templates for successfully responding to ISPs is <a "
 "href=\"<wiki>TheOnionRouter/TorAbuseTemplates\">collected here</a>."

Modified: translation/trunk/projects/website/po/it/docs/2-medium.tor-doc-osx.po
===================================================================
--- translation/trunk/projects/website/po/it/docs/2-medium.tor-doc-osx.po	2011-04-12 16:15:00 UTC (rev 24594)
+++ translation/trunk/projects/website/po/it/docs/2-medium.tor-doc-osx.po	2011-04-12 16:19:31 UTC (rev 24595)
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-02-12 12:20+0000\n"
-"PO-Revision-Date: 2011-03-22 16:29+0000\n"
+"POT-Creation-Date: 2011-03-28 12:48+0200\n"
+"PO-Revision-Date: 2011-03-29 00:26+0000\n"
 "Last-Translator: runasand <runa.sandvik at gmail.com>\n"
 "Language-Team: Italian <None>\n"
 "MIME-Version: 1.0\n"
@@ -18,7 +18,7 @@
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:8
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:8
 msgid ""
 "<a href=\"<page index>\">Home &raquo; </a> <a href=\"<page "
 "docs/documentation>\">Documentation &raquo; </a> <a href=\"<page docs/tor-"
@@ -26,19 +26,19 @@
 msgstr ""
 
 #. type: Content of: <div><div><h1>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:13
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:13
 msgid "Running the <a href=\"<page index>\">Tor</a> client on Mac OS X"
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:14 /tmp/N9PceEMclo.xml:26
-#: /tmp/N9PceEMclo.xml:71 /tmp/N9PceEMclo.xml:104 /tmp/N9PceEMclo.xml:136
-#: /tmp/N9PceEMclo.xml:158
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:14 /tmp/dnqIbbGTnT.xml:26
+#: /tmp/dnqIbbGTnT.xml:71 /tmp/dnqIbbGTnT.xml:104 /tmp/dnqIbbGTnT.xml:136
+#: /tmp/dnqIbbGTnT.xml:158
 msgid "<br>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:17
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:17
 msgid ""
 "<b>Note that these are the installation instructions for running a Tor "
 "client on Mac OS X. If you want to relay traffic for others to help the "
@@ -47,19 +47,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:23
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:23
 msgid "<hr> <a id=\"installing\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:25
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:25
 msgid ""
 "<a class=\"anchor\" href=\"#installing\">Step One: Download and Install "
 "Tor</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:29
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:29
 msgid ""
 "The install for Macintosh OS X bundles <a href=\"<page index>\">Tor</a>, <a "
 "href=\"<page projects/vidalia>\">Vidalia</a> (a graphical interface for "
@@ -67,14 +67,14 @@
 "href=\"http://www.pps.jussieu.fr/~jch/software/polipo/\">Polipo</a> (a web "
 "proxy)  into one package, with the four applications pre-configured to work "
 "together.  Download either the <a href=\"<page "
-"download/download>#tor\">stable</a> or the <a href=\"<page "
-"download/download>#tor\">experimental</a> version of the OS X bundle, or "
+"download/download>#mac\">stable</a> or the <a href=\"<page "
+"download/download>#mac\">experimental</a> version of the OS X bundle, or "
 "look for more options on the <a href=\"<page download/download>\">download "
 "page</a>."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:42
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:42
 msgid ""
 "Once you've downloaded the dmg, double-click and let it mount.  Browse to "
 "the now open Vidalia Bundle in Finder.  It's easy to install the bundle; "
@@ -85,7 +85,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:49
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:49
 msgid ""
 "When you are finished installing, you can start Vidalia by selecting its "
 "icon from your Applications folder. A dark onion with a red X in your dock "
@@ -94,19 +94,19 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:55
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:55
 msgid "When Tor is running, Vidalia's dock icon will look like the following:"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:58
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:58
 msgid ""
 "<img alt=\"vidalia running tor\" src=\"$(IMGROOT)/screenshot-osx-"
 "vidalia.png\" />"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:61
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:61
 msgid ""
 "Polipo is installed as part of the Tor bundle package installer. Once it is "
 "installed, it will start automatically when your computer is restarted.  You"
@@ -115,26 +115,26 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:68
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:68
 msgid "<hr> <a id=\"using\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:70
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:70
 msgid ""
 "<a class=\"anchor\" href=\"#using\">Step Two: Configure your applications to"
 " use Tor</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:73
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:73
 msgid ""
 "After installing, 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-osx.wml:76
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:76
 msgid ""
 "You should use Tor with Firefox and Torbutton, for best safety.  Torbutton "
 "was installed for you.  Click on the red \"Tor Disabled\" toggle button to "
@@ -142,14 +142,14 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:80
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:80
 msgid ""
 "<img alt=\"Torbutton plugin for Firefox\" src=\"$(IMGROOT)/screenshot-"
 "torbutton.png\" />"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:83
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:83
 msgid ""
 "If you plan to run Firefox on a different computer than Tor, see the <a "
 "href=\"<wikifaq>#SocksListenAddress\">FAQ entry for running Tor on a "
@@ -157,7 +157,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:87
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:87
 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 "
@@ -170,24 +170,24 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:97
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:97
 msgid ""
 "For information on how to Torify other applications, check out the <a "
 "href=\"<wiki>/TheOnionRouter/TorifyHOWTO\">Torify HOWTO</a>."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:101
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:101
 msgid "<hr> <a id=\"verify\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:103
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:103
 msgid "<a class=\"anchor\" href=\"#verify\">Step Three: Make sure it's working</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:107
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:107
 msgid ""
 "Next, you should try using your browser with Tor and make sure that your IP "
 "address is being anonymized. Click on <a "
@@ -198,7 +198,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:115
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:115
 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"
@@ -208,31 +208,31 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:124
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:124
 msgid ""
 "If it's still not working, look at <a href=\"<page "
 "docs/faq>#DoesntWork\">this FAQ entry</a> for hints."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:128
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:128
 msgid ""
 "Once it's working, learn more about <a href=\"<page "
 "download/download>#Warning\">what Tor does and does not offer</a>."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:132
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:132
 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-osx.wml:135
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:135
 msgid "<a class=\"anchor\" href=\"#relay\">Step Four: Configure it as a relay</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:138
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:138
 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 "
@@ -243,7 +243,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:146
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:146
 msgid ""
 "Having relays in many different places on the Internet is what makes Tor "
 "users secure. <a href=\"<wikifaq>#RelayAnonymity\">You may also get stronger"
@@ -252,24 +252,24 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:152
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:152
 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-osx.wml:155
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:155
 msgid "<hr> <a id=\"uninstall\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:157
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:157
 msgid "<a class=\"anchor\" href=\"#uninstall\">How To Uninstall Tor and Polipo</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:160
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:160
 msgid ""
 "There are two ways to uninstall the bundle from your computer, using Finder "
 "or a command line or Terminal-based uninstaller.  If you want to remove Tor "
@@ -277,79 +277,79 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:164
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:164
 msgid ""
 "Change your application proxy settings back to their original values.  If "
 "you just want to stop using Tor, you can end at this point."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:168
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:168
 msgid ""
 "If you want to completely remove Tor, and your account has Admin Privileges,"
 " then proceed as follows:"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:172
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:172
 msgid "Open Finder and click on Applications."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:173
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:173
 msgid "Drag /Applications/Vidalia to the Trash."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:174
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:174
 msgid "Remove /Library/Torbutton from your system."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:175
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:175
 msgid ""
 "In your User or home directory, go to Library, remove the Vidalia directory"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:179
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:179
 msgid "Tor, Vidalia, and Polipo are now completely removed from your system."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:181
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:181
 msgid ""
 "If you're familiar with the command line or Terminal, you can manually type "
 "the following:"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:184
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:184
 msgid "rm -r /Applications/Vidalia.app"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:185
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:185
 msgid "rm -r /Library/Torbutton"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:186
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:186
 msgid "rm -r ~/Library/Vidalia"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:187
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:187
 msgid "rm -r ~/.tor"
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:190
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:190
 msgid "<hr>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:192
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:192
 msgid ""
 "If you have suggestions for improving this document, please <a href=\"<page "
 "about/contact>\">send them to us</a>. Thanks!"

Modified: translation/trunk/projects/website/po/it/docs/2-medium.tor-doc-relay.po
===================================================================
--- translation/trunk/projects/website/po/it/docs/2-medium.tor-doc-relay.po	2011-04-12 16:15:00 UTC (rev 24594)
+++ translation/trunk/projects/website/po/it/docs/2-medium.tor-doc-relay.po	2011-04-12 16:19:31 UTC (rev 24595)
@@ -7,9 +7,9 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-02-12 12:20+0000\n"
-"PO-Revision-Date: 2011-03-22 16:29+0000\n"
-"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
+"POT-Creation-Date: 2011-03-28 12:48+0200\n"
+"PO-Revision-Date: 2011-03-29 00:26+0000\n"
+"Last-Translator: Frate <gigibotti at alice.it>\n"
 "Language-Team: Italian <None>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,25 +18,28 @@
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:8
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:8
 msgid ""
 "<a href=\"<page index>\">Home &raquo; </a> <a href=\"<page "
 "docs/documentation>\">Documentation &raquo; </a> <a href=\"<page docs/tor-"
 "doc-relay>\">Configure Tor Relay</a>"
 msgstr ""
+"<a href=\"<page index>\">Home</a> <a href=\"<page "
+"docs/documentation>\">»Documentazione</a> <a href=\"<page docs/tor-doc-"
+"relay>\">Configura Tor relay</a>"
 
 #. type: Content of: <div><div><h1>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:14
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:14
 msgid "Configuring a Tor relay"
-msgstr ""
+msgstr "Configurare un relay Tor"
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:16 /tmp/eKLg46HT7B.xml:275
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:16 /tmp/ogZUlgnLzH.xml:275
 msgid "<hr>"
-msgstr ""
+msgstr "<hr>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:19
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:19
 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 "
@@ -46,76 +49,94 @@
 "bandwidth, exit policies so you can limit your exposure to abuse complaints,"
 " and support for dynamic IP addresses</a>."
 msgstr ""
+"La rete Tor si fonda sulla banda donata da volontari. Quante più persone "
+"hanno un relay, più veloce sarà la rete Tor. Se hai almeno 20 kilobyte / s "
+"ciascuno, per favore aiuta la rete Tor e configura il tuo Tor come relay. Ci"
+" sono tante funzionalità che rendono un Tor relay facile e pratico, come <a "
+"href=\"<page docs/faq>#ExitPolicies\">la limitazione della banda, exit "
+"policy che permettono di ridurre il rischio di lamentele e abusi, e il "
+"supporto per indirizzi IP dinamici</a> ."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:28
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:28
 msgid ""
-"You can run a Tor relay on <a href=\"<wikifaq>#RelayOS\">pretty much any</a>"
-" operating system. Tor relays work best on Linux, OS X Tiger or later, "
-"FreeBSD 5.x+, NetBSD 5.x+, and Windows Server 2003 or later."
+"You can run a Tor relay on pretty much any operating system. Tor relays work"
+" best on Linux, OS X Tiger or later, FreeBSD 5.x+, NetBSD 5.x+, and Windows "
+"Server 2003 or later."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:33
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:33
 msgid "<hr> <a id=\"zero\"></a> <a id=\"install\"></a>"
-msgstr ""
+msgstr "<hr> <a id=\"zero\"></a> <a id=\"install\"></a>"
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:36
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:36
 msgid "<a class=\"anchor\" href=\"#install\">Step One: Download and Install Tor</a>"
-msgstr ""
+msgstr "<a class=\"anchor\" href=\"#install\">Fase uno: Scarica e installa Tor</a>"
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:37 /tmp/eKLg46HT7B.xml:52
-#: /tmp/eKLg46HT7B.xml:141 /tmp/eKLg46HT7B.xml:165
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:37 /tmp/ogZUlgnLzH.xml:52
+#: /tmp/ogZUlgnLzH.xml:141 /tmp/ogZUlgnLzH.xml:165
 msgid "<br>"
-msgstr ""
+msgstr "<br>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:39
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:39
 msgid "Before you start, you need to make sure that Tor is up and running."
 msgstr ""
+"Prima di iniziare, è necessario assicurarsi che Tor sia installato e "
+"funzionante."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:42
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:42
 msgid ""
 "Visit our <a href=\"<page download/download>\">download page</a> and install"
 " the \"Installation Bundle\" for your OS."
 msgstr ""
+"Visita la nostra <a href=\"<page download/download>\">pagina di download</a>"
+" ed installa il \"Pacchetto di installazione\" per il vostro sistema "
+"operativo."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:46
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:46
 msgid ""
 "If it's convenient, you might also want to use it as a client for a while to"
 " make sure it's actually working."
 msgstr ""
+"Per comodità, si potrebbe anche decidere di utilizzarlo per un po' come "
+"client per essere sicuri che funzioni."
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:49
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:49
 msgid "<hr> <a id=\"setup\"></a>"
-msgstr ""
+msgstr "<hr> <a id=\"setup\"></a>"
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:51
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:51
 msgid "<a class=\"anchor\" href=\"#setup\">Step Two: Set it up as a relay</a>"
-msgstr ""
+msgstr "<a class=\"anchor\" href=\"#setup\">Fase due: Impostarlo come relay</a>"
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:54
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:54
 msgid ""
 "Verify that your clock and timezone are set correctly. If possible, "
 "synchronize your clock with public <a "
 "href=\"http://en.wikipedia.org/wiki/Network_Time_Protocol\">time "
 "servers</a>."
 msgstr ""
+"Controlla che l'orologio e il fuso orario siano impostati correttamente. Se "
+"possibile, sincronizzare l'orologio con un <a "
+"href=\"http://it.wikipedia.org/wiki/Network_Time_Protocol\">time server</a> "
+"pubblico."
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:60
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:60
 msgid "<strong>Manual Configuration</strong>:"
-msgstr ""
+msgstr "<strong>Configurazione manuale:</strong>"
 
 #. type: Content of: <div><div><ol><li><ul><li>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:62
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:62
 msgid ""
 "Edit the bottom part of <a href=\"<page docs/faq>#torrc\">your torrc "
 "file</a>. If you want to be a public relay (recommended), make sure to "
@@ -125,33 +146,45 @@
 "their Internet, just use <a href=\"<page "
 "docs/bridges>#RunningABridge\">these lines</a>."
 msgstr ""
+"Modifica la parte finale del <a href=\"<page docs/faq>#torrc\">file "
+"torrc</a>. Se vuoi essere un relay pubblico (consigliato), assicurarsi di "
+"definire ORPort e <a href=\"<page docs/faq>#ExitPolicies\">guardare "
+"ExitPolicy</a>, altrimenti se si vuole essere un <a href=\"<page "
+"docs/faq>#RelayOrBridge\">bridge</a> per gli utenti in paesi che censurano "
+"Internet, basta usare <a href=\"<page docs/bridges>#RunningABridge\">queste "
+"linee</a> ."
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:72
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:72
 msgid "<strong>Configuring Tor with the Vidalia Graphical Interface</strong>:"
 msgstr ""
+"<strong>Configurazione di Tor con l'interfaccia grafica Vidalia:</strong>"
 
 #. type: Content of: <div><div><ol><li><ol><li><dt>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:76
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:76
 msgid ""
 "Right click on the Vidalia icon in your task bar.  Choose <tt>Control "
 "Panel</tt>."
 msgstr ""
+"Fare clic destro sull'icona Vidalia nella barra delle applicazioni. "
+"Scegliere <tt>Pannello di controllo.</tt>"
 
 #. type: Content of: <div><div><ol><li><ol><li><dd>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:77
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:77
 msgid ""
 "<img alt=\"vidalia right click menu\" src=\"$(IMGROOT)/screenshot-"
 "win32-vidalia.png\" />"
 msgstr ""
+"<img alt=\"Vidalia tasto destro del mouse dal menu\" src=\"$(IMGROOT"
+")/screenshot-win32-vidalia.png\" />"
 
 #. type: Content of: <div><div><ol><li><ol><li>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:80
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:80
 msgid "Click <tt>Setup Relaying</tt>."
-msgstr ""
+msgstr "Fare clic su <tt>Configurazione del relaying.</tt>"
 
 #. type: Content of: <div><div><ol><li><ol><li><dt>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:83
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:83
 msgid ""
 "Choose <tt>Relay Traffic for the Tor network</tt> if you want to be a public"
 " relay (recommended), or choose <tt>Help censored users reach the Tor "
@@ -159,45 +192,61 @@
 "docs/faq>#RelayOrBridge\">bridge</a> for users in countries that censor "
 "their Internet."
 msgstr ""
+"Scegli <tt>Fai da relay e scambia traffico per la rete Tor</tt> se si vuole "
+"essere un relay pubblico (consigliato), o scegliere <tt>Aiuta gli utenti "
+"sotto censura a raggiungere la rete Tor</tt> se si vuole essere un <a "
+"href=\"<page docs/faq>#RelayOrBridge\">bridge</a> per gli utenti in paesi "
+"che censurano Internet."
 
 #. type: Content of: <div><div><ol><li><ol><li><dd>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:88
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:88
 msgid ""
 "<img alt=\"vidalia basic settings\" src=\"$(IMGROOT)/screenshot-win32"
 "-configure-relay-1.png\" />"
 msgstr ""
+"<img alt=\"Vidalia impostazioni di base\" src=\"$(IMGROOT)/screenshot-win32"
+"-configure-relay-1.png\" />"
 
 #. type: Content of: <div><div><ol><li><ol><li>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:91
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:91
 msgid ""
 "Enter a nickname for your relay, and enter contact information in case we "
 "need to contact you about problems."
 msgstr ""
+"Inserire un nickname per il tuo relay e informazioni di contatto nel caso "
+"abbiamo bisogno di contattarti per qualche problema."
 
 #. type: Content of: <div><div><ol><li><ol><li>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:94
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:94
 msgid ""
 "Leave <tt>Attempt to automatically configure port forwarding</tt> clicked.  "
 "Push the <tt>Test</tt> button to see if it works.  If it does work, great.  "
 "If not, see number 3 below."
 msgstr ""
+"Lasciare <tt>Tenta di configurare automaticamente il port forward</tt> "
+"cliccato. Premere il pulsante <tt>Test</tt> per vedere se funziona. Se "
+"funziona, bene. In caso contrario, vedere il numero 3 di seguito."
 
 #. type: Content of: <div><div><ol><li><ol><li><dt>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:98
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:98
 msgid ""
 "Choose the <tt>Bandwidth Limits</tt> tab.  Select how much bandwidth you "
 "want to provide for Tor users like yourself."
 msgstr ""
+"Scegliere la scheda <tt>Limiti di banda.</tt> Scegli quanta banda si "
+"desidera fornire agli utenti Tor come te."
 
 #. type: Content of: <div><div><ol><li><ol><li><dd>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:99
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:99
 msgid ""
 "<img alt=\"vidalia bandwidth limits\" src=\"$(IMGROOT)/screenshot-win32"
 "-configure-relay-2.png\" />"
 msgstr ""
+"<img alt=\"Vidalia limiti di larghezza di banda\" src=\"$(IMGROOT"
+")/screenshot-win32-configure-relay-2.png\" />"
 
 #. type: Content of: <div><div><ol><li><ol><li><dt>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:102
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:102
 msgid ""
 "Choose the <tt>Exit Policies</tt> tab.  If you want to allow others to use "
 "your relay for these services, don't change anything.  Un-check the services"
@@ -205,23 +254,32 @@
 "docs/faq>#ExitPolicies\">reach from your relay</a>.  If you want to be a "
 "non-exit relay, un-check all services."
 msgstr ""
+"Scegliere la scheda <tt>Exit Policy.</tt> Se si desidera consentire ad altri"
+" di usare il tuo relay per questi servizi, non cambiare nulla. Deseleziona i"
+" servizi che non si vuole permettere alle persone di <a href=\"<page "
+"docs/faq>#ExitPolicies\">raggiungere dal tuo relay</a> . Se vuoi essere un "
+"relay non-uscita, deseleziona tutti i servizi."
 
 #. type: Content of: <div><div><ol><li><ol><li><dd>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:107
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:107
 msgid ""
 "<img alt=\"vidalia exit policies\" src=\"$(IMGROOT)/screenshot-win32"
 "-configure-relay-3.png\" />"
 msgstr ""
+"<img alt=\"Vidalia uscita politiche\" src=\"$(IMGROOT)/screenshot-win32"
+"-configure-relay-3.png\" />"
 
 #. type: Content of: <div><div><ol><li><ol><li>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:110
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:110
 msgid ""
 "Click the <tt>Ok</tt> button.  See Step Three below for confirmation that "
 "the relay is working correctly."
 msgstr ""
+"Fare clic sul pulsante <tt>Ok.</tt> Vedere il Passo Tre sotto per "
+"controllare che il relay funzioni correttamente."
 
 #. type: Content of: <div><div><ol><li><li>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:114
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:114
 msgid ""
 "If you are using a firewall, open a hole in your firewall so incoming "
 "connections can reach the ports you configured (ORPort, plus DirPort if you "
@@ -230,16 +288,25 @@
 "Also, make sure you allow all <em>outgoing</em> connections too, so your "
 "relay can reach the other Tor relays."
 msgstr ""
+"Se si utilizza un firewall, aprire un buco nel firewall per consentire alle "
+"connessioni in ingresso di raggiungere le porte che hai configurato (ORPort,"
+" anche DirPort se l'hai abilitata). Se si dispone di un firewall hardware "
+"(box Linksys, cablemodem, etc) potrebbe interessarti <a "
+"href=\"http://portforward.com/\">portforward.com</a>. Inoltre, assicurarsi "
+"che siano permesse tutte le connessioni <em>in uscita,</em> in modo che il "
+"relay può raggiungere gli altri relay Tor."
 
 #. type: Content of: <div><div><ol><li><li>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:123
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:123
 msgid ""
 "Restart your relay. If it <a href=\"<page docs/faq>#Logs\">logs any "
 "warnings</a>, address them."
 msgstr ""
+"Riavviare il relay. Se si <a href=\"<page docs/faq>#Logs\">registra "
+"eventuali avvisi</a>, affrontali."
 
 #. type: Content of: <div><div><ol><li><li>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:128
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:128
 msgid ""
 "Subscribe to the <a href=\"http://archives.seul.org/or/announce/\">or-"
 "announce</a> mailing list. It is very low volume, and it will keep you "
@@ -247,19 +314,24 @@
 "href=\"<page docs/documentation>#MailingLists\">the higher-volume Tor "
 "lists</a> too."
 msgstr ""
+"Iscriviti alla <a href=\"http://archives.seul.org/or/announce/\">or-"
+"announce</a> mailing list. Ha un traffico molto basso e vi terremo informati"
+" sulle nuove versioni stabili. Potresti anche iscriverti anche alle <a "
+"href=\"<page docs/documentation>#MailingLists\">liste Tor di elevato "
+"volume</a>."
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:138
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:138
 msgid "<hr> <a id=\"check\"></a>"
-msgstr ""
+msgstr "<hr> <a id=\"check\"></a>"
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:140
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:140
 msgid "<a class=\"anchor\" href=\"#check\">Step Three: Make sure it is working</a>"
-msgstr ""
+msgstr "<a class=\"anchor\" href=\"#check\">Fase Tre: controlla che funzioni</a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:143
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:143
 msgid ""
 "As soon as your relay manages to connect to the network, it will try to "
 "determine whether the ports you configured are reachable from the outside. "
@@ -270,9 +342,17 @@
 "&mdash; you should re-check your firewalls, check that it's testing the IP "
 "and port you think it should be testing, etc."
 msgstr ""
+"Non appena il tuo relay si collega alla rete, cercherà di capire se le porte"
+" che hai configurato sono raggiungibili dall'esterno. Questo passaggio è "
+"generalmente veloce, ma può richiedere fino a 20 minuti. Cercare una <a "
+"href=\"<page docs/faq>#Logs\">voce del registro</a> come <tt>Self-testing "
+"indicates your ORPort is reachable from the outside. Excellent.</tt> Se non "
+"vedi questo messaggio, significa che il tuo relay non è raggiungibile "
+"dall'esterno - si dovrebbe ri-controllare il firewall, controlla che il test"
+" l'IP e la porta si pensa che dovrebbe essere di prova, ecc"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:153
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:153
 msgid ""
 "When it decides that it's reachable, it will upload a \"server descriptor\" "
 "to the directories, to let clients know what address, ports, keys, etc your "
@@ -282,49 +362,68 @@
 "there. You may need to wait up to one hour to give enough time for it to "
 "make a fresh directory."
 msgstr ""
+"Quando si decide di essere raggiungibili si invia un \"server descriptor\" "
+"alle directory per far sì che i client sapranno quale indirizzo, porte, "
+"chiavi, ecc il tuo relay utilizza. È possibile <a "
+"href=\"http://194.109.206.212/tor/status-vote/current/consensus\">caricare "
+"uno dei network status manualmente</a> e guardare attraverso di esso per "
+"trovare il nickname che hai configurato, per essere certo che sia lì. "
+"Potrebbe essere necessario attendere fino a un'ora per dare il tempo a "
+"creare una directory aggiornata."
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:162
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:162
 msgid "<hr> <a id=\"after\"></a>"
-msgstr ""
+msgstr "<hr> <a id=\"after\"></a>"
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:164
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:164
 msgid "<a class=\"anchor\" href=\"#after\">Step Four: Once it is working</a>"
-msgstr ""
+msgstr "<a class=\"anchor\" href=\"#after\">Fase Quattro: quando si sta lavorando</a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:168
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:168
 msgid "We recommend the following steps as well:"
-msgstr ""
+msgstr "Si consiglia di procedere come segue anche:"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:172
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:172
 msgid ""
 "6. Read <a href=\"<wiki>TheOnionRouter/OperationalSecurity\">about "
 "operational security</a> to get ideas how you can increase the security of "
 "your relay."
 msgstr ""
+"6. Leggi <a href=\"<wiki>TheOnionRouter/OperationalSecurity\">riguardo la "
+"sicurezza operativa</a> per sapere come si può aumentare la sicurezza del "
+"tuo relay."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:178
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:178
 msgid ""
 "7. If you want to run more than one relay that's great, but please set <a "
 "href=\"<page docs/faq>#MultipleRelays\">the MyFamily option</a> in all your "
 "relays' configuration files."
 msgstr ""
+"7. Se si desidera eseguire più di un relay che è fantastico, ma per favore "
+"impostare <a href=\"<page docs/faq>#MultipleRelays\">l'opzione MyFamily</a> "
+"in tutti i tuoi file di configurazione dei relay."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:184
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:184
 msgid ""
 "8. Decide about rate limiting. Cable modem, DSL, and other users who have "
 "asymmetric bandwidth (e.g. more down than up) should rate limit to their "
 "slower bandwidth, to avoid congestion. See the <a "
 "href=\"<wikifaq>#LimitBandwidth\">rate limiting FAQ entry</a> for details."
 msgstr ""
+"8. Decidere un limite di banda. Modem via cavo, DSL e altri utenti che hanno"
+" banda asimmetrica (es. più down che up) dovrebbero definire un limite "
+"rispetto alla banda più lenta, per evitare congestioni. Vedere la <a "
+"href=\"<wikifaq>#WhatbandwidthshapingoptionsareavailabletoTorrelays\">FAQ "
+"sui limiti di banda</a> per i dettagli."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:192
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:192
 msgid ""
 "9. Back up your Tor relay's private key (stored in \"keys/secret_id_key\" in"
 " your DataDirectory). This is your relay's \"identity,\" and you need to "
@@ -333,9 +432,16 @@
 "href=\"<wikifaq>#UpgradeRelay\">move or restore your Tor relay</a> if "
 "something goes wrong."
 msgstr ""
+"9. Eseguire il backup della chiave privata del tuo relay Tor (è in \"keys / "
+"secret_id_key\" nella tua DataDirectory). Questo è il tuo relay di "
+"\"identità\", ed è necessario mantenere al sicuro in modo che nessuno possa "
+"leggere il traffico che passa dal tuo relay. Questo è il file importante da "
+"conservare se è necessario <a "
+"href=\"<wikifaq>#Iwanttoupgrademovemyrelay.HowdoIkeepthesamekey\">spostare o"
+" ripristinare il tuo relay Tor</a> , se qualcosa va storto."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:202
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:202
 msgid ""
 "10. If you control the name servers for your domain, consider setting your "
 "reverse DNS hostname to 'anonymous-relay', 'proxy' or 'tor-proxy', so when "
@@ -345,9 +451,16 @@
 " to deterring abuse complaints to you and your ISP if you are running an "
 "exit node."
 msgstr ""
+"10. Se controlli il name server del tuo dominio, potresti impostare il "
+"reverse DNS hostname a 'anonymous-relay', 'proxy' o 'tor-proxy', così quando"
+" qualcuno vede il tuo indirizzo nel loro log, si può facilmente capire "
+"quello che sta succedendo. Aggiungere la <a href=\"<gitblob>contrib/tor-"
+"exit-notice.html\">Tor exit notice</a> su un vhost per questo nome può fare "
+"molto per evitare segnalazioni di abuso a te e al tuo ISP se si esegue un "
+"exit node."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:213
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:213
 msgid ""
 "11. If your computer isn't running a webserver, please consider changing "
 "your ORPort to 443 and your DirPort to 80. Many Tor users are stuck behind "
@@ -360,9 +473,20 @@
 "connections can reach their Tor relay. If you are using ports 80 and 443 "
 "already but still want to help out, other useful ports are 22, 110, and 143."
 msgstr ""
+"11. Se il computer non è in esecuzione un server web, per favore potresti "
+"cambiare la ORPort a 443 e la DirPort a 80. Molti utenti Tor si trovano "
+"dietro dei firewall che consentono solo di navigare sul web, e in questo "
+"modo potranno raggiungere comunque il tuo Tor relay. Win32 relay possono "
+"semplicemente cambiare la ORPort e DirPort nel file torrc e riavviare Tor. "
+"OS X o Unix relay non possono collegare direttamente queste porte (perché "
+"non girano come root), quindi sarà necessario istituire una sorta di <a "
+"href=\"<wikifaq>#HowcanImakemyrelayaccessibletopeoplestuckbehindrestrictivefirewalls\">"
+" port forwarding</a> in modo che le connessioni raggiungano il Tor relay. Se"
+" si utilizzano già le porte 80 e 443, ma si ha ancora voglia di aiutare "
+"comunque, altre porte molto utili sono la 22, 110 e 143."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:228
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:228
 msgid ""
 "12. If your Tor relay provides other services on the same IP address &mdash;"
 " such as a public webserver &mdash; make sure that connections to the "
@@ -372,9 +496,17 @@
 " and always build a circuit that ends at your relay. If you don't want to "
 "allow the connections, you must explicitly reject them in your exit policy."
 msgstr ""
+"12. Se il tuo relay Tor fornisce altri servizi sul medesimo indirizzo IP - "
+"ad esempio, un webserver - assicurarsi che le connessioni al webserver sono "
+"ammesse anche da localhost. È necessario permettere queste connessioni "
+"perché i client Tor rileveranno che il tuo relay Tor è il <a "
+"href=\"<wikifaq>#WhatisExitEnclaving\">modo più sicuro per raggiungere il "
+"webserver</a> , e creeranno sempre un circuito che termini sul tuo relay. Se"
+" non vuoi permettere queste connessioni, devi rifiutarle esplicitamente "
+"nella tua exit policy."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:239
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:239
 msgid ""
 "13. (Unix only). Make a separate user to run the relay. If you installed the"
 " OS X package or the deb or the rpm, this is already done. Otherwise, you "
@@ -384,9 +516,17 @@
 " sort, feel free to <a href=\"<wiki>TheOnionRouter/TorInChroot\">put Tor "
 "into a chroot jail</a>.)"
 msgstr ""
+"13. (Solo per Unix). Crea un utente separato per il relay. Se avete "
+"installato il pacchetto OS X, il deb o l'rpm, è già fatto. In caso "
+"contrario, è possibile farlo a mano. (Il relay Tor non ha bisogno di girare "
+"come root, quindi è buona prassi non eseguirlo come root. Girando come "
+"utente 'tor' si evitano problemi con identd e altri rilevano il nome "
+"dell'utente. Se sei una persona paranoica, sentitevi liberi di <a "
+"href=\"<wiki>TheOnionRouter/TorInChroot\">mettere Tor in un chroot jail</a> "
+".)"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:250
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:250
 msgid ""
 "14. (Unix only.) Your operating system probably limits the number of open "
 "file descriptors per process to 1024 (or even less). If you plan to be "
@@ -396,17 +536,28 @@
 "process), and then restart Tor if it's installed as a package (or log out "
 "and log back in if you run it yourself)."
 msgstr ""
+"14. (Solo per Unix.) Il tuo sistema operativo probabilmente limita il numero"
+" dei file descriptor aperti per ogni processo a 1024 (o anche meno). Se si "
+"prevede di essere in esecuzione un exit node veloce, questo probabilmente "
+"non basta. Su Linux, si dovrebbe aggiungere una riga come \"toruser hard "
+"nofile 8192\" al file / etc / security / limits.conf (dove toruser è "
+"l'utente che esegue il processo Tor), poi riavvia Tor se è stato installato "
+"da un pacchetto ( o logout e login se lo avvii tu stesso)."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:260
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:260
 msgid ""
 "15. If you installed Tor via some package or installer, it probably starts "
 "Tor for you automatically on boot. But if you installed from source, you may"
 " find the initscripts in contrib/tor.sh or contrib/torctl useful."
 msgstr ""
+"15. Se hai installato Tor da qualche pacchetto o installer, probabilmente "
+"Tor si avvia automaticamente al boot. Ma se hai installato dai sorgenti, è "
+"possibile trovare gli initscript in contrib / tor.sh o contrib / torctl "
+"utile."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:266
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:266
 msgid ""
 "When you change your Tor configuration, remember to verify that your relay "
 "still works correctly after the change. Be sure to set your \"ContactInfo\" "
@@ -416,10 +567,20 @@
 "about/contact>\">contact us</a> on the tor-ops list. Thanks for helping to "
 "make the Tor network grow!"
 msgstr ""
+"Quando si modifica la configurazione di Tor, ricordati di controllare che il"
+" tuo relay funzioni regolarmente dopo le modifiche. Assicurarsi di impostare"
+" la voce \"ContactInfo\" nel file torrc in modo che possiamo contattarti se "
+"ci fosse bisogno di aggiornare o qualcosa va storto. Se avete problemi o "
+"domande, consultare il <a href=\"<page "
+"docs/documentation>#Support\">supporto</a> di sezione o <a href=\"<page "
+"about/contact>\">contattarci</a> al tor-ops lista. Grazie per aver "
+"contribuito a far crescere la rete Tor!"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:277
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:277
 msgid ""
 "If you have suggestions for improving this document, please <a href=\"<page "
 "about/contact>\">send them to us</a>. Thanks!"
 msgstr ""
+"Se avete suggerimenti per migliorare questo documento, per favore <a "
+"href=\"<page about/contact>\">contattaci</a> . Grazie!"

Modified: translation/trunk/projects/website/po/it/getinvolved/4-optional.volunteer.po
===================================================================
--- translation/trunk/projects/website/po/it/getinvolved/4-optional.volunteer.po	2011-04-12 16:15:00 UTC (rev 24594)
+++ translation/trunk/projects/website/po/it/getinvolved/4-optional.volunteer.po	2011-04-12 16:19:31 UTC (rev 24595)
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-03-25 16:51+0000\n"
-"PO-Revision-Date: 2011-03-26 00:29+0000\n"
+"POT-Creation-Date: 2011-03-28 12:49+0200\n"
+"PO-Revision-Date: 2011-03-29 00:27+0000\n"
 "Last-Translator: runasand <runa.sandvik at gmail.com>\n"
 "Language-Team: Italian <None>\n"
 "MIME-Version: 1.0\n"
@@ -18,33 +18,33 @@
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:8
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:8
 msgid ""
 "<a href=\"<page index>\">Home &raquo; </a> <a href=\"<page "
 "getinvolved/volunteer>\">Volunteer</a>"
 msgstr ""
 
 #. type: Content of: <div><div><h1>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:13
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:13
 msgid "A few things everyone can do now:"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:15
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:15
 msgid ""
 "Please consider <a href=\"<page docs/tor-doc-relay>\">running a relay</a> to"
 " help the Tor network grow."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:17
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:17
 msgid ""
 "Tell your friends! Get them to run relays. Get them to run hidden services. "
 "Get them to tell their friends."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:19
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:19
 msgid ""
 "If you like Tor's goals, please <a href=\"<page donate/donate>\">take a "
 "moment to donate to support further Tor development</a>. We're also looking "
@@ -54,7 +54,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:24
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:24
 msgid ""
 "We're looking for more <a href=\"<page about/torusers>\">good examples of "
 "Tor users and Tor use cases</a>. If you use Tor for a scenario or purpose "
@@ -63,7 +63,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:30
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:30
 msgid ""
 "Tor has <a href=\"<page getinvolved/open-positions>\">two open "
 "positions</a>.  Please <a href=\"<page about/contact>\">contact us</a> if "
@@ -71,17 +71,17 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:33
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:33
 msgid "<a id=\"Documentation\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:34
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:34
 msgid "<a class=\"anchor\" href=\"#Documentation\">Documentation</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:36
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:36
 msgid ""
 "Help translate the web page and documentation into other languages. See the "
 "<a href=\"<page getinvolved/translation>\">translation guidelines</a> if you"
@@ -90,7 +90,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:40
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:40
 msgid ""
 "Evaluate and document <a "
 "href=\"https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorifyHOWTO\">our"
@@ -98,7 +98,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:43
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:43
 msgid ""
 "We have a huge list of <a "
 "href=\"https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/SupportPrograms\">potentially"
@@ -107,32 +107,24 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:49
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:49
 msgid "<a id=\"Advocacy\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:50
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:50
 msgid "<a class=\"anchor\" href=\"#Advocacy\">Advocacy</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:52
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:52
 msgid ""
-"Create a <a "
-"href=\"https://trac.torproject.org/projects/tor/wiki/CommunityLogos\">community"
-" logo</a> under a Creative Commons license that all can use and modify."
-msgstr ""
-
-#. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:55
-msgid ""
 "Create a presentation that can be used for various user group meetings "
 "around the world."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:57
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:54
 msgid ""
 "Create a video about the positive uses of Tor, what Tor is, or how to use "
 "it.  Some have already started on <a "
@@ -143,31 +135,31 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:63
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:60
 msgid ""
 "Create a poster, or a set of posters, around a theme, such as \"Tor for "
 "Freedom!\"."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:65
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:62
 msgid ""
 "Create a t-shirt design that incorporates \"Congratulations! You are using "
 "Tor!\" in any language."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:69
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:66
 msgid "<a id=\"Projects\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:70
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:67
 msgid "<a class=\"anchor\" href=\"#Projects\">Projects</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:73
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:70
 msgid ""
 "Below are a list of Tor related projects we're developing and/or "
 "maintaining. Most discussions happen on IRC so if you're interested in any "
@@ -178,333 +170,333 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><th>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:83
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:80
 msgid "Name"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><th>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:84
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:81
 msgid "Category"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><th>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:85
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:82
 msgid "Language"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><th>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:86
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:83
 msgid "Activity"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><th>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:87
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:84
 msgid "Contributors"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:91
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:88
 msgid "<a href=\"#project-tor\">Tor</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:92
-#: /tmp/OzLkyddxSC.xml:100
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:89
+#: /tmp/qxq11tAO2x.xml:97
 msgid "Core"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:93
-#: /tmp/OzLkyddxSC.xml:125
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:90
+#: /tmp/qxq11tAO2x.xml:122
 msgid "C"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:94
-#: /tmp/OzLkyddxSC.xml:118 /tmp/OzLkyddxSC.xml:150 /tmp/OzLkyddxSC.xml:190
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:91
+#: /tmp/qxq11tAO2x.xml:115 /tmp/qxq11tAO2x.xml:147 /tmp/qxq11tAO2x.xml:187
 msgid "Heavy"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:95
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:92
 msgid "nickm, arma, Sebastian"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:99
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:96
 msgid "*<a href=\"#project-jtor\">JTor</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:101
-#: /tmp/OzLkyddxSC.xml:157 /tmp/OzLkyddxSC.xml:189
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:98
+#: /tmp/qxq11tAO2x.xml:154 /tmp/qxq11tAO2x.xml:186
 msgid "Java"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:102
-#: /tmp/OzLkyddxSC.xml:198 /tmp/OzLkyddxSC.xml:222 /tmp/OzLkyddxSC.xml:246
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:99
+#: /tmp/qxq11tAO2x.xml:195 /tmp/qxq11tAO2x.xml:219 /tmp/qxq11tAO2x.xml:243
 msgid "None"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:107
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:104
 msgid "<a href=\"#project-tbb\">TBB</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:108
-#: /tmp/OzLkyddxSC.xml:116 /tmp/OzLkyddxSC.xml:124 /tmp/OzLkyddxSC.xml:132
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:105
+#: /tmp/qxq11tAO2x.xml:113 /tmp/qxq11tAO2x.xml:121 /tmp/qxq11tAO2x.xml:129
 msgid "Usability"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:109
-#: /tmp/OzLkyddxSC.xml:117 /tmp/OzLkyddxSC.xml:133
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:106
+#: /tmp/qxq11tAO2x.xml:114 /tmp/qxq11tAO2x.xml:130
 msgid "Sys Admin"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:110
-#: /tmp/OzLkyddxSC.xml:158 /tmp/OzLkyddxSC.xml:166 /tmp/OzLkyddxSC.xml:230
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:107
+#: /tmp/qxq11tAO2x.xml:155 /tmp/qxq11tAO2x.xml:163 /tmp/qxq11tAO2x.xml:227
 msgid "Moderate"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:111
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:108
 msgid "Erinn"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:115
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:112
 msgid "<a href=\"#project-tails\">Tails</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:119
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:116
 msgid "<a href=\"https://tails.boum.org/chat/\">#tails</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:123
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:120
 msgid "<a href=\"#project-torsocks\">Torsocks</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:126
-#: /tmp/OzLkyddxSC.xml:134 /tmp/OzLkyddxSC.xml:142 /tmp/OzLkyddxSC.xml:174
-#: /tmp/OzLkyddxSC.xml:182 /tmp/OzLkyddxSC.xml:206 /tmp/OzLkyddxSC.xml:214
-#: /tmp/OzLkyddxSC.xml:238
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:123
+#: /tmp/qxq11tAO2x.xml:131 /tmp/qxq11tAO2x.xml:139 /tmp/qxq11tAO2x.xml:171
+#: /tmp/qxq11tAO2x.xml:179 /tmp/qxq11tAO2x.xml:203 /tmp/qxq11tAO2x.xml:211
+#: /tmp/qxq11tAO2x.xml:235
 msgid "Light"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:127
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:124
 msgid "mwenge"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:131
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:128
 msgid "*<a href=\"#project-torouter\">Torouter</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:135
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:132
 msgid "ioerror, Runa"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:139
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:136
 msgid "<a href=\"#project-vidalia\">Vidalia</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:140
-#: /tmp/OzLkyddxSC.xml:148 /tmp/OzLkyddxSC.xml:156
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:137
+#: /tmp/qxq11tAO2x.xml:145 /tmp/qxq11tAO2x.xml:153
 msgid "User Interface"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:141
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:138
 msgid "C++, Qt"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:143
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:140
 msgid "chiiph"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:147
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:144
 msgid "<a href=\"#project-arm\">Arm</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:149
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:146
 msgid "Python, Curses"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:151
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:148
 msgid "atagar"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:155
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:152
 msgid "<a href=\"#project-orbot\">Orbot</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:159
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:156
 msgid "n8fr8"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:163
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:160
 msgid "<a href=\"#project-torbutton\">Torbutton</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:164
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:161
 msgid "Browser Add-on"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:165
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:162
 msgid "Javascript"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:167
-#: /tmp/OzLkyddxSC.xml:183 /tmp/OzLkyddxSC.xml:239
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:164
+#: /tmp/qxq11tAO2x.xml:180 /tmp/qxq11tAO2x.xml:236
 msgid "mikeperry"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:171
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:168
 msgid "*<a href=\"#project-thandy\">Thandy</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:172
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:169
 msgid "Updater"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:173
-#: /tmp/OzLkyddxSC.xml:181 /tmp/OzLkyddxSC.xml:205 /tmp/OzLkyddxSC.xml:213
-#: /tmp/OzLkyddxSC.xml:229 /tmp/OzLkyddxSC.xml:237 /tmp/OzLkyddxSC.xml:245
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:170
+#: /tmp/qxq11tAO2x.xml:178 /tmp/qxq11tAO2x.xml:202 /tmp/qxq11tAO2x.xml:210
+#: /tmp/qxq11tAO2x.xml:226 /tmp/qxq11tAO2x.xml:234 /tmp/qxq11tAO2x.xml:242
 msgid "Python"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:175
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:172
 msgid "Sebastian, Erinn, nickm"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:179
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:176
 msgid "<a href=\"#project-torctl\">TorCtl</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:180
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:177
 msgid "Library"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:187
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:184
 msgid "<a href=\"#project-metrics\">Metrics</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:188
-#: /tmp/OzLkyddxSC.xml:196 /tmp/OzLkyddxSC.xml:204 /tmp/OzLkyddxSC.xml:212
-#: /tmp/OzLkyddxSC.xml:220
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:185
+#: /tmp/qxq11tAO2x.xml:193 /tmp/qxq11tAO2x.xml:201 /tmp/qxq11tAO2x.xml:209
+#: /tmp/qxq11tAO2x.xml:217
 msgid "Client Service"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:191
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:188
 msgid "karsten"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:195
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:192
 msgid "<a href=\"#project-torstatus\">TorStatus</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:197
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:194
 msgid "PHP"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:203
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:200
 msgid "<a href=\"#project-weather\">Weather</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:207
-#: /tmp/OzLkyddxSC.xml:215
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:204
+#: /tmp/qxq11tAO2x.xml:212
 msgid "kaner"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:211
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:208
 msgid "<a href=\"#project-gettor\">GetTor</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:219
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:216
 msgid "<a href=\"#project-torcheck\">TorCheck</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:221
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:218
 msgid "Python, Perl"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:227
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:224
 msgid "<a href=\"#project-bridgedb\">BridgeDB</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:228
-#: /tmp/OzLkyddxSC.xml:236 /tmp/OzLkyddxSC.xml:244
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:225
+#: /tmp/qxq11tAO2x.xml:233 /tmp/qxq11tAO2x.xml:241
 msgid "Backend Service"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:231
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:228
 msgid "kaner, nickm"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:235
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:232
 msgid "<a href=\"#project-torflow\">TorFlow</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:243
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:240
 msgid "*<a href=\"#project-torbel\">TorBEL</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:247
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:244
 msgid "Sebastian"
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:251
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:248
 msgid ""
 "<sub> * Project is still in an alpha state.  </sub> <br /><br /> <a id"
 "=\"project-tor\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:258
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:255
 msgid ""
 "Tor (<a href=\"https://gitweb.torproject.org/tor.git\">code</a>, <a "
 "href=\"https://trac.torproject.org/projects/tor/query?status=accepted&status=assigned&status=needs_review&status=new&status=reopened&component=Tor+Client&component=Tor+Relay&component=vidalia&order=priority\">bug"
@@ -512,7 +504,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:263
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:260
 msgid ""
 "Central project, providing the core software for using and participating in "
 "the Tor network. Numerous people contribute to the project to varying "
@@ -520,7 +512,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:269
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:266
 msgid ""
 "<b>Project Ideas:</b><br /> <i><a href=\"#resistCensorship\">Improving Tor's"
 " ability to resist censorship</a></i><br /> <i><a "
@@ -530,12 +522,12 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:276
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:273
 msgid "<a id=\"project-jtor\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:277
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:274
 msgid ""
 "<a href=\"https://github.com/brl/JTor/wiki\">JTor</a> (<a "
 "href=\"https://github.com/brl/JTor\">code</a>, <a "
@@ -543,7 +535,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:283
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:280
 msgid ""
 "Java implementation of Tor and successor to <a "
 "href=\"http://onioncoffee.sourceforge.net/\">OnionCoffee</a>. This project "
@@ -551,12 +543,12 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:288
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:285
 msgid "<a id=\"project-tbb\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:289
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:286
 msgid ""
 "<a href=\"<page projects/torbrowser>\">Tor Browser Bundle</a> (<a "
 "href=\"https://gitweb.torproject.org/torbrowser.git\">code</a>, <a "
@@ -565,7 +557,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:295
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:292
 msgid ""
 "The Tor Browser Bundle is an easy-to-use portable package of Tor, Vidalia, "
 "and Firefox preconfigured to work together out of the box. This is actively "
@@ -573,7 +565,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:301
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:298
 msgid ""
 "<b>Project Ideas:</b><br /> <i><a href=\"#auditTBB\">Audit Tor Browser "
 "Bundles for data leaks</a></i><br /> <i><a "
@@ -581,12 +573,12 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:306
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:303
 msgid "<a id=\"project-tails\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:307
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:304
 msgid ""
 "<a href=\"https://tails.boum.org/\">The Amnesic Incognito Live System</a> "
 "(<a href=\"http://git.immerda.ch/?p=amnesia.git;a=summary\">code</a>, <a "
@@ -594,7 +586,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:313
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:310
 msgid ""
 "The Amnesic Incognito Live System is a live CD/USB distribution "
 "preconfigured so that everything is safely routed through Tor and leaves no "
@@ -604,7 +596,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:321
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:318
 msgid ""
 "<b>Project Ideas:</b><br /> <i><a href=\"#tailsStartMenu\">Custom GDM3 "
 "startup menu, aka.  tails-greeter</a></i><br /> <i><a "
@@ -614,12 +606,12 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:330
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:327
 msgid "<a id=\"project-torsocks\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:331
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:328
 msgid ""
 "<a href=\"http://code.google.com/p/torsocks/\">Torsocks</a> (<a "
 "href=\"https://gitweb.torproject.org/torsocks.git\">code</a>, <a "
@@ -628,7 +620,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:337
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:334
 msgid ""
 "Utility for adapting other applications to work with Tor. Development has "
 "slowed and compatibility issues remain with some platforms, but it's "
@@ -636,19 +628,19 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:343
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:340
 msgid ""
 "<b>Project Ideas:</b><br /> <i><a href=\"#torsocksForOSX\">Make "
 "torsocks/dsocks work on OS X</a></i>"
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:347
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:344
 msgid "<a id=\"project-torouter\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:348
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:345
 msgid ""
 "<a "
 "href=\"https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/Torouter\">Torouter</a>"
@@ -658,19 +650,19 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:354
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:351
 msgid ""
 "Project to provide an easy-to-use, embedded Tor instance for routers. This "
 "had high activity in late 2010, but has since been rather quiet."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:358
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:355
 msgid "<a id=\"project-vidalia\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:359
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:356
 msgid ""
 "<a href=\"<page projects/vidalia>\">Vidalia</a> (<a "
 "href=\"https://svn.torproject.org/vidalia/vidalia/trunk/\">code</a>, <a "
@@ -679,7 +671,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:365
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:362
 msgid ""
 "The most commonly used user interface for Tor. Matt Edman started the "
 "project in 2006 and brought it to its current stable state. Development "
@@ -688,7 +680,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:372
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:369
 msgid ""
 "<b>Project Ideas:</b><br /> <i><a href=\"#vidaliaStatusEventInterface\">Tor "
 "Controller Status Event Interface for Vidalia</a></i><br /> <i><a "
@@ -697,12 +689,12 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:377
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:374
 msgid "<a id=\"project-arm\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:378
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:375
 msgid ""
 "<a href=\"http://www.atagar.com/arm/\">Arm</a> (<a "
 "href=\"https://svn.torproject.org/svn/arm/trunk/\">code</a>, <a "
@@ -711,7 +703,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:384
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:381
 msgid ""
 "Command-line monitor for Tor. This has been under very active development by"
 " its author, Damian Johnson, since early 2009 to make it a better general-"
@@ -719,19 +711,19 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:390
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:387
 msgid ""
 "<b>Project Ideas:</b><br /> <i><a href=\"#armClientMode\">Client Mode Use "
 "Cases for Arm</a></i><br /> <i><a href=\"#armGui\">GUI for Arm</a></i>"
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:395
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:392
 msgid "<a id=\"project-orbot\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:396
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:393
 msgid ""
 "<a href=\"https://guardianproject.info/apps/orbot/\">Orbot</a> (<a "
 "href=\"https://svn.torproject.org/svn/projects/android/trunk/Orbot/\">code</a>,"
@@ -741,26 +733,30 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:402
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:399
 msgid ""
 "Provides Tor on the Android platform. This was under very active development"
 " up through Fall 2010, after which things have been quiet."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:407
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:404
 msgid ""
-"<b>Project Ideas:</b><br /> <i><a href=\"#orbotDevelopment\">More on Orbot "
-"&amp; Android OS-specific development</a></i>"
+"<b>Project Ideas:</b><br /> <i><a href=\"#orbot-torbutton\">TorButton for "
+"Mobile Firefox 4 or Custom Browser on Android</a></i><br /> <i><a href"
+"=\"#orbot-userInterface\">Build a better user interface for Orbot</a></i><br"
+" /> <i><a href=\"#orbot-optimisation\">Core Tor mobile "
+"optimisation</a></i><br /> <i><a href=\"#orbot-orlibAndOutreach\">Orbot "
+"integration library and community outreach</a></i>"
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:411
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:411
 msgid "<a id=\"project-torbutton\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:412
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:412
 msgid ""
 "<a href=\"<page torbutton/index>\">Torbutton</a> (<a "
 "href=\"https://gitweb.torproject.org/torbutton.git\">code</a>, <a "
@@ -769,7 +765,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:418
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:418
 msgid ""
 "Firefox addon that addresses many of the client-side threats to browsing the"
 " Internet anonymously. Mike has since continued to adapt it to new threats, "
@@ -779,7 +775,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:426
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:426
 msgid ""
 "<b>Project Ideas:</b><br /> <i><a "
 "href=\"#torbuttonForThunderbird\">Torbutton equivalent for "
@@ -787,17 +783,17 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:430
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:430
 msgid "<a id=\"project-thandy\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:431
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:431
 msgid "Thandy (<a href=\"https://gitweb.torproject.org/thandy.git\">code</a>)"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:435
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:435
 msgid ""
 "Updater for Tor. The project began in the Summer of 2008 but wasn't "
 "completed. Recently interest in it has been rekindled and many aspects of "
@@ -805,12 +801,12 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:440
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:440
 msgid "<a id=\"project-torctl\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:441
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:441
 msgid ""
 "TorCtl (<a href=\"https://gitweb.torproject.org/pytorctl.git\">code</a>, <a "
 "href=\"https://trac.torproject.org/projects/tor/query?status=accepted&status=assigned&status=needs_review&status=new&status=reopened&component=Torctl&order=priority\">bug"
@@ -818,19 +814,19 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:447
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:447
 msgid ""
 "Python bindings and utilities for using the Tor control port. It has been "
 "stable for several years, with only minor revisions."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:451
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:451
 msgid "<a id=\"project-metrics\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:452
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:452
 msgid ""
 "<a href=\"https://metrics.torproject.org/\">Metrics</a> (code: <a "
 "href=\"https://gitweb.torproject.org/metrics-db.git\">db</a>, <a "
@@ -841,7 +837,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:460
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:460
 msgid ""
 "Processing and analytics of consensus data, provided to users via the "
 "metrics portal. This has been under active development for several years by "
@@ -849,12 +845,12 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:465
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:465
 msgid "<a id=\"project-torstatus\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:466
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:466
 msgid ""
 "<a "
 "href=\"https://trac.torproject.org/projects/tor/wiki/projects/TorStatus\">TorStatus</a>"
@@ -862,7 +858,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:470
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:470
 msgid ""
 "Portal providing an overview of the Tor network, and details on any of its "
 "current relays. Though very actively used, this project has been "
@@ -870,12 +866,12 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:475
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:475
 msgid "<a id=\"project-weather\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:476
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:476
 msgid ""
 "<a "
 "href=\"https://trac.torproject.org/projects/tor/wiki/projects/Weather\">Weather</a>"
@@ -885,7 +881,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:482
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:482
 msgid ""
 "Provides automatic notification to subscribed relay operators when their "
 "relay's unreachable. This underwent a rewrite by the <a "
@@ -894,12 +890,12 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:488
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:488
 msgid "<a id=\"project-gettor\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:489
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:489
 msgid ""
 "<a "
 "href=\"https://trac.torproject.org/projects/tor/wiki/projects/EmailAutoResponder\">GetTor</a>"
@@ -909,19 +905,19 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:495
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:495
 msgid ""
 "E-mail autoresponder providing Tor's packages over SMTP. This has been "
 "relatively unchanged for quite a while."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:499
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:499
 msgid "<a id=\"project-torcheck\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:500
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:500
 msgid ""
 "<a "
 "href=\"https://trac.torproject.org/projects/tor/wiki/projects/TorCheck\">TorCheck</a>"
@@ -931,19 +927,19 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:506
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:506
 msgid ""
 "Provides a simple site for determining if the visitor is using Tor or not.  "
 "This has been relatively unchanged for quite a while."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:510
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:510
 msgid "<a id=\"project-bridgedb\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:511
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:511
 msgid ""
 "<a "
 "href=\"https://trac.torproject.org/projects/tor/wiki/projects/BridgeDB\">BridgeDB</a>"
@@ -953,19 +949,19 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:517
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:517
 msgid ""
 "Backend bridge distributor, handling the various pools they're distributed "
 "in. This was actively developed until Fall of 2010."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:521
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:521
 msgid "<a id=\"project-torflow\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:522
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:522
 msgid ""
 "<a "
 "href=\"https://trac.torproject.org/projects/tor/wiki/projects/TorFlow\">TorFlow</a>"
@@ -975,7 +971,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:528
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:528
 msgid ""
 "Library and collection of services for actively monitoring the Tor network."
 "  These include the Bandwidth Scanners (measuring throughput of relays) and "
@@ -986,12 +982,12 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:536
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:536
 msgid "<a id=\"project-torbel\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:537
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:537
 msgid ""
 "<a "
 "href=\"https://trac.torproject.org/projects/tor/wiki/projects/TorBulkExitlist\">TorBEL</a>"
@@ -1001,7 +997,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:544
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:544
 msgid ""
 "The Tor Bulk Exitlist provides a method of identifying if IPs belong to exit"
 " nodes or not. This is a replacement for TorDNSEL which is a stable (though "
@@ -1011,17 +1007,17 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:551
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:551
 msgid "<a id=\"Coding\"></a> <a id=\"Summer\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:553
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:553
 msgid "<a class=\"anchor\" href=\"#Coding\">Project Ideas</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:556
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:556
 msgid ""
 "You may find some of these projects to be good <a href=\"<page "
 "about/gsoc>\">Google Summer of Code 2011</a> ideas. We have labelled each "
@@ -1036,12 +1032,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:570
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:570
 msgid "<a id=\"auditTBB\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:572
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:572
 msgid ""
 "<b>Audit Tor Browser Bundles for data leaks</b> <br> Priority: <i>High</i> "
 "<br> Effort Level: <i>High</i> <br> Skill Level: <i>Medium</i> <br> Likely "
@@ -1049,7 +1045,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:581
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:581
 msgid ""
 "The Tor Browser Bundle incorporates Tor, Firefox, Polipo, and the Vidalia "
 "user interface (and optionally the <a href=\"http://pidgin.im/\">Pidgin</a> "
@@ -1060,7 +1056,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:587
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:587
 msgid ""
 "This project is to identify all of the traces left behind by using a Tor "
 "Browser Bundle on Windows, Mac OS X, or Linux.  Developing ways to stop, "
@@ -1068,7 +1064,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:590
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:590
 msgid ""
 "Students should be familiar with operating system analysis, application "
 "development on one or preferably all of Windows, Linux, and Mac OS X, and be"
@@ -1076,19 +1072,19 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:593
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:593
 msgid ""
 "If you would like to help extend or do security auditing for TBB, please "
 "contact Erinn."
 msgstr ""
 
 #. type: Content of: <div><div><ol>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:597
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:597
 msgid "<a id=\"firewallProbeTool\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:599
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:599
 msgid ""
 "<b>Develop a fully automatic firewall-probing system</b> <br> Priority: "
 "<i>High</i> <br> Effort Level: <i>Medium to High</i> <br> Skill Level: "
@@ -1096,7 +1092,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:608
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:608
 msgid ""
 "We would like to have a fully automatic firewall-probing system for blocking"
 " systems with no long-term state (i.e. firewalls that can examine each "
@@ -1105,7 +1101,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:612
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:612
 msgid ""
 "Ideally, volunteers would only need to set up one or more test servers, and "
 "run the probe client program on a publicly accessible computer behind the "
@@ -1113,38 +1109,38 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:615
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:615
 msgid "The test tool should:"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><ul><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:617
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:617
 msgid ""
 "generate packet captures on both ends (and send them out to the extent "
 "possible),"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><ul><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:619
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:619
 msgid ""
 "cycle through all the SSL configurations we might want to test through a "
 "censorship device, and"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><ul><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:621
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:621
 msgid ""
 "also test some other protocols to see whether they are allowed through the "
 "firewall (IMAP and other mail protocols, BitTorrent, DTLS, etc.)."
 msgstr ""
 
 #. type: Content of: <div><div><ol>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:627
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:627
 msgid "<a id=\"tailsStartMenu\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:629
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:629
 msgid ""
 "<b>Custom GDM3 startup menu, aka. tails-greeter</b> <br> Priority: "
 "<i>High</i> <br> Effort Level: <i>Medium</i> <br> Skill Level: <i>Medium to "
@@ -1152,14 +1148,14 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:638
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:638
 msgid ""
 "Several major upcoming Tails features need to gather user input at startup "
 "time: bridges support, persistence, MAC address anonymization, etc."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:641
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:641
 msgid ""
 "Existing boot menus lack the graphical widgets and generally user-"
 "friendliness needed. Hence it was decided to implement Tails startup menu in"
@@ -1169,7 +1165,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:646
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:646
 msgid ""
 "Anyone undertaking this project should be familiar with GNU/Linux and "
 "application development; no other skill is required, apart of the ability to"
@@ -1181,19 +1177,75 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:653
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:653
 msgid ""
 "For more information see <a "
 "href=\"https://tails.boum.org/todo/boot_menu/\">https://tails.boum.org/todo/boot_menu/</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ol>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:656
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:656
+msgid "<a id=\"orbot-torbutton\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><ol><li>
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:658
+msgid ""
+"<b>TorButton for Mobile Firefox 4 or Custom Browser on Android</b> <br> "
+"Priority: <i>High</i> <br> Effort Level: <i>High</i> <br> Skill Level: "
+"<i>High</i> <br> Likely Mentors: <i>Nathan (n8fr8), Jake, Mike Perry</i>"
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:667
+msgid ""
+"Initial work has been done on implementing a proxy-setting add-on for "
+"Firefox on Android (see <a "
+"href=\"https://github.com/guardianproject/ProxyMob\">ProxyMob</a>), but a "
+"full port of TorButton needs to be done (dependent upon Firefox 4 port of "
+"TorButton). The other approach is to implement a custom &quot;Tor "
+"Browser&quot; based on Firefox or Webkit browser. See <a "
+"href=\"http://code.google.com/p/torora/wiki/Android\">Torora</a> for "
+"progress on this so far."
+msgstr ""
+
+#. type: Content of: <div><div><ol>
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:677
+msgid "<a id=\"orbot-userInterface\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><ol><li>
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:679
+msgid ""
+"<b>Build a better user interface for Orbot</b> <br> Priority: <i>High</i> "
+"<br> Effort Level: <i>Medium</i> <br> Skill Level: <i>Medium</i> <br> Likely"
+" Mentors: <i>Nathan (n8fr8), Jake</i>"
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:688
+msgid ""
+"Improved home screen to show confirmation of connection (via a TorCheck API "
+"call), better statistics about data transferred (up/down), number of "
+"circuits connected, quality of connection and so on. The &quot;Tether "
+"Wifi&quot; Android application is a good model to follow in how it shows a "
+"realtime count of bytes transferred as well as notifications when wifi "
+"clients connect. In addition, better handling of Tor system and error "
+"messages would also be very helpful, include use of standard Android "
+"operating systems notifications. The addition of a wizard or tutorial "
+"walkthrough for novice users to explain to them exactly what is and what is "
+"not anonymized or protected would greatly improve the likelihood they will "
+"use Orbot correctly. All of this should work on the range of screens and "
+"device types now offered for Android, from 2&quot; phone to 10&quot; Tablet."
+msgstr ""
+
+#. type: Content of: <div><div><ol>
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:703
 msgid "<a id=\"resistCensorship\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:658
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:705
 msgid ""
 "<b>Improving Tor's ability to resist censorship</b> <br> Priority: <i>Medium"
 " to High</i> <br> Effort Level: <i>Medium to High</i> <br> Skill Level: "
@@ -1201,7 +1253,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:667
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:714
 msgid ""
 "The Tor 0.2.1.x series makes <a href=\"<svnprojects>design-"
 "paper/blocking.html\">significant improvements</a> in resisting national and"
@@ -1210,7 +1262,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:672
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:719
 msgid ""
 "One huge category of work is adding features to our <a "
 "href=\"https://gitweb.torproject.org/bridgedb.git?a=tree\">BridgeDB</a> "
@@ -1226,7 +1278,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:683
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:730
 msgid ""
 "If you want to get more into the guts of Tor itself (C), a more minor "
 "problem we should address is that current Tors can only listen on a single "
@@ -1237,7 +1289,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:690
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:737
 msgid ""
 "This project could involve a lot of research and design. One of the big "
 "challenges will be identifying and crafting approaches that can still resist"
@@ -1246,12 +1298,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:697
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:744
 msgid "<a id=\"geoIPUpgrade\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:699
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:746
 msgid ""
 "<b>Improve our GeoIP file format</b> <br> Priority: <i>Medium</i> <br> "
 "Effort Level: <i>Medium</i> <br> Skill Level: <i>Medium to High</i> <br> "
@@ -1259,7 +1311,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:708
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:755
 msgid ""
 "Currently, Tor bridges and relays read an entire IP->country database into "
 "memory from a text file during startup.  We would like to distribute this "
@@ -1268,7 +1320,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:713
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:760
 msgid ""
 "We have <a href='https://trac.torproject.org/projects/tor/ticket/2506'>a "
 "sketch of a design</a> for a moderately optimized format for IPv4 GeoIP "
@@ -1277,20 +1329,20 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:722
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:769
 msgid "<a id=\"armClientMode\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:724
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:771
 msgid ""
 "<b>Client Mode Use Cases for Arm</b> <br> Priority: <i>Medium</i> <br> "
 "Effort Level: <i>High</i> <br> Skill Level: <i>Medium</i> <br> Likely "
-"Mentors: <i>Damian</i>"
+"Mentors: <i>Damian (atagar)</i>"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:733
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:780
 msgid ""
 "<a href=\"<page projects/arm>\">Arm</a> is a Tor command line status monitor"
 " on *nix environments (Linux, Mac, and BSD). It functions much like top "
@@ -1301,14 +1353,14 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:741
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:788
 msgid ""
 "This would include UI design, experimenting, and a lot of python hacking. "
 "Here's some ideas for client functionality arm could provide:"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><ul><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:745
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:792
 msgid ""
 "A panel for client connections, showing each hop of the user's circuits with"
 " the ISP, country, and jurisdiction where those relays reside. Other "
@@ -1321,21 +1373,21 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><ul><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:754
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:801
 msgid ""
 "Options to let the user request new circuits (the &quot;New Identity&quot; "
 "feature in Vidalia), select the exit country, etc."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><ul><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:757
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:804
 msgid ""
 "A panel showing Internet application and if their connections are being "
 "routed through Tor or not (giving a warning if there's leaks)."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><ul><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:760
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:807
 msgid ""
 "The status of the bridges we're configured to use (ie, are they up?).  This "
 "would include adding control port functionality to Tor for <a "
@@ -1344,7 +1396,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><ul><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:765
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:812
 msgid ""
 "A one click option to set Tor to be a client, relay, or bridge. The goal "
 "would be to make it trivial for users to voluntarily contribute to the Tor "
@@ -1352,7 +1404,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><ul><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:769
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:816
 msgid ""
 "Menus as an alternative to hotkeys to make the interface more intuitive and "
 "usable for beginners (<a "
@@ -1360,13 +1412,13 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><ul><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:773
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:820
 msgid ""
 "Look at Vidalia and TorK for ideas and solicit input from the Tor community."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:777
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:824
 msgid ""
 "More information is available in the following sections of arm's dev notes: "
 "<a "
@@ -1379,12 +1431,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:781
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:828
 msgid "<a id=\"unitTesting\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:783
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:830
 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> Likely "
@@ -1392,7 +1444,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:792
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:839
 msgid ""
 "Tor needs to be tested far more thoroughly. This is a multi-part effort. To "
 "start with, our unit test coverage should rise substantially, especially in "
@@ -1402,7 +1454,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:798
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:845
 msgid ""
 "Additionally, we need to automate our performance testing. We've got "
 "buildbot to automate our regular integration and compile testing already "
@@ -1415,78 +1467,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:808
-msgid "<a id=\"orbotDevelopment\"></a>"
-msgstr ""
-
-#. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:810
-msgid ""
-"<b>More on Orbot &amp; Android OS-specific development</b> <br> Priority: "
-"<i>Medium</i> <br> Effort Level: <i>High</i> <br> Skill Level: <i>Medium to "
-"High</i> <br> Likely Mentors: <i>Nathan, Jake</i>"
-msgstr ""
-
-#. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:819
-msgid ""
-"<b>Android Java UI work:</b> Improved home screen to show better statistics "
-"about data transferred (up/down), number of circuits connected, quality of "
-"connection and so on. The \"Tether Wifi\" Android application is a good "
-"model to follow in how it shows a realtime count of bytes transferred as "
-"well as notifications when wifi clients connect. In addition, better "
-"display/handling of Tor system/error messages would also be very helpful. "
-"Finally, the addition of a wizard or tutorial walkthrough for novice users "
-"to explain to them exactly what is and what is not anonymized or protected "
-"would greatly improve the likelihood they will use Orbot correctly."
-msgstr ""
-
-#. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:831
-msgid ""
-"<b>Android Java OS/Core app work:</b> Better system-wide indication, either "
-"via the notification bar, \"Toast\" pop-up dialogs or some other indicator, "
-"that an application's traffic is indeed moving through Orbot/Tor. For "
-"instance, right now you need to first go to a torcheck web service to ensure"
-" your browser is routing via Tor. Orbot should be able to notify you that "
-"circuits are being opened, used, etc. The aforementioned data transfer "
-"tracker might provide this type of awareness as well."
-msgstr ""
-
-#. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:840
-msgid ""
-"<b>Android Java Library/Community Outreach work:</b> We need to package a "
-"simple library for use with third-party application to easily enable them to"
-" support \"Torification\" on non-rooted devices (i.e. w/o transparent "
-"proxying). This library should include a wrapper for the Apache HTTPClient "
-"library, a utility class for detecting the state of Orbot connectivity, and "
-"other relevant/useful things an Android app might need to anonymize itself. "
-"This work would include the creation of the library, documentation, and "
-"sample code. Outreach or effort to implement the library within other open-"
-"source apps would follow."
-msgstr ""
-
-#. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:851
-msgid ""
-"<b>Android OS/C/Linux work:</b> The port of Tor to Android is basically a "
-"straight cross-compile to Linux ARM. There has been no work done in looking "
-"the optimization of Tor within a mobile hardware environment, on the ARM "
-"processor or other Android hardware, or on mobile networks. It should be "
-"noted, that even without optimization, Tor is handling the mobile network "
-"environment very well, automatically detecting change in IP addresses, "
-"reconnecting circuits, etc. across switching from 2G to 3G to Wifi, and so "
-"forth."
-msgstr ""
-
-#. type: Content of: <div><div><ol>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:862
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:855
 msgid "<a id=\"simulateSlowConnections\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:864
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:857
 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> Likely"
@@ -1494,7 +1480,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:874
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:867
 msgid ""
 "Many users of Tor have poor-quality Internet connections, giving low "
 "bandwidth, high latency, and high packet loss/re-ordering. User experience "
@@ -1503,7 +1489,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:882
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:875
 msgid ""
 "This project would be to build a simulation environment which replicates the"
 " poor connectivity so that the effect on Tor performance can be measured. "
@@ -1513,7 +1499,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:890
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:883
 msgid ""
 "The tools used would be up to the student, but dummynet (for FreeBSD)  and "
 "nistnet (for Linux) are two potential components on which this project could"
@@ -1522,12 +1508,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:898
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:891
 msgid "<a id=\"torbuttonForThunderbird\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:900
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:893
 msgid ""
 "<b>Torbutton equivalent for Thunderbird</b> <br> Priority: <i>Medium</i> "
 "<br> Effort Level: <i>High</i> <br> Skill Level: <i>High</i> <br> Likely "
@@ -1535,7 +1521,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:910
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:903
 msgid ""
 "We're hearing from an increasing number of users that they want to use "
 "Thunderbird with Tor. However, there are plenty of application-level "
@@ -1545,12 +1531,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:918
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:911
 msgid "<a id=\"usabilityTesting\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:920
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:913
 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 "
@@ -1558,7 +1544,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:930
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:923
 msgid ""
 "Especially the browser bundle, ideally amongst our target demographic.  That"
 " would help a lot in knowing what needs to be done in terms of bug fixes or "
@@ -1567,19 +1553,19 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:937
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:930
 msgid ""
 "Please note that since this isn't a coding project, it isn't suitable for "
 "Google Summer of Code."
 msgstr ""
 
 #. type: Content of: <div><div><ol>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:942
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:935
 msgid "<a id=\"tailsMetadataAnonymizing\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:944
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:937
 msgid ""
 "<b>Meta-data anonymizing toolkit for file publication</b> <br> Priority: "
 "<i>Medium</i> <br> Effort Level: <i>Low to Medium</i> <br> Skill Level: "
@@ -1587,7 +1573,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:953
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:946
 msgid ""
 "Tor helps greatly in publishing files anonymously. However, much personal "
 "information can be enclosed *inside* such published files' meta-data: GPS "
@@ -1596,14 +1582,14 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:957
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:950
 msgid ""
 "A set of tools allowing users to easily inspect and clean up meta-data in "
 "files would benefit Tor users, and would e.g. be shipped in Tails."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:959
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:952
 msgid ""
 "A graphical user interface is a must, but library and command-line "
 "interfaces are most welcome so that future work can add support for cleaning"
@@ -1612,7 +1598,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:963
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:956
 msgid ""
 "This project mostly consists of writing glue between the many existing tools"
 " and libraries that provide read/write access to files' meta-data. An "
@@ -1621,7 +1607,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:967
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:960
 msgid ""
 "The meta-data cleaning toolkit would run at least on GNU/Linux; additional "
 "Windows and/or Mac OS X support would be welcome. The tools used would be up"
@@ -1630,12 +1616,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:973
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:966
 msgid "<a id=\"tailsDebianLive\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:975
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:968
 msgid ""
 "<b>Improve Debian Live support for persistence</b> <br> Priority: "
 "<i>Medium</i> <br> Effort Level: <i>Medium</i> <br> Skill Level: <i>Low to "
@@ -1643,7 +1629,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:984
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:977
 msgid ""
 "Data persistence is a somewhat tricky topic in a Live system context, "
 "especially one such as Tails, which is explicitly designed to avoid leaving "
@@ -1651,7 +1637,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:987
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:980
 msgid ""
 "Some real-life use cases, however, require some kind of data persistence. To"
 " start with, Tails should (carefully) support persistence of application-"
@@ -1661,7 +1647,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:992
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:985
 msgid ""
 "The backend work consists of improving Debian Live's existing persistence "
 "features to make them suit the specific context of Tails. A trust "
@@ -1672,7 +1658,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:998
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:991
 msgid ""
 "Anyone undertaking this project must be familiar with GNU/Linux, and "
 "preferably with Debian. Being able to (quickly learn to) write clean and "
@@ -1680,19 +1666,19 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1001
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:994
 msgid ""
 "For more information, see <a "
 "href=\"https://tails.boum.org/todo/persistence/\">https://tails.boum.org/todo/persistence/</a>."
 msgstr ""
 
 #. type: Content of: <div><div><ol>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1004
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:997
 msgid "<a id=\"torsocksForOSX\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1006
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:999
 msgid ""
 "<b>Make torsocks/dsocks work on OS X</b> <br> Priority: <i>Medium</i> <br> "
 "Effort Level: <i>Medium</i> <br> Skill Level: <i>Medium</i> <br> Likely "
@@ -1700,7 +1686,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1016
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1009
 msgid ""
 "<a href=\"https://code.google.com/p/torsocks/\">Torsocks</a> and <a "
 "href=\"https://code.google.com/p/dsocks/\">dsocks</a> are wrappers that will"
@@ -1720,12 +1706,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1035
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1028
 msgid "<a id=\"vidaliaStatusEventInterface\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1037
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1030
 msgid ""
 "<b>Tor Controller Status Event Interface for Vidalia</b> <br> Priority: "
 "<i>Medium</i> <br> Effort Level: <i>Medium</i> <br> Skill Level: <i>Low to "
@@ -1733,7 +1719,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1046
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1039
 msgid ""
 "There are a number of status changes inside Tor of which the user may need "
 "to be informed. For example, if the user is trying to set up his Tor as a "
@@ -1746,7 +1732,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1054
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1047
 msgid ""
 "Tor has the ability to inform Vidalia of many such status changes, and we "
 "recently implemented support for a couple of these events. Still, there are "
@@ -1755,7 +1741,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1059
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1052
 msgid ""
 "The goal of this project then is to design and implement a UI for displaying"
 " Tor status events to the user. For example, we might put a little badge on "
@@ -1767,7 +1753,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1067
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1060
 msgid ""
 "A person undertaking this project should have good UI design and layout "
 "skills and some C++ development experience. Previous experience with Qt and "
@@ -1779,12 +1765,91 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1076
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1069
+msgid "<a id=\"orbot-optimisation\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><ol><li>
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1071
+msgid ""
+"<b>Core Tor mobile optimisation</b> <br> Priority: <i>Medium</i> <br> Effort"
+" Level: <i>Medium</i> <br> Skill Level: <i>High</i> <br> Likely Mentors: "
+"<i>Nathan (n8fr8), Jake</i>"
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1081
+msgid ""
+"The existing port of Tor to Android is basically a straight cross-compile to"
+" Linux ARM. There has been no work done in looking at possible optimizations"
+" of Tor within a mobile hardware environment or on mobile networks. In "
+"addition, a number of additional Android OS APIs are available (such as "
+"wireless network status) that could be taken advantage of."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1090
+msgid ""
+"It should be noted, that even without optimisation, Tor is handling the "
+"mobile network environment very well, automatically detecting change in IP "
+"addresses, opening circuits, etc, as the device switches from no coverage to"
+" 2G, 3G or Wifi constantly as it changes position. However, this observation"
+" of &quot;very well&quot;, is just based on user experience, and not any "
+"detailed study of what exactly is happening, and what threats might exist "
+"because of this constantly changing network state."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1100
+msgid ""
+"Finally, the build process needs to be moved to the Android NDK from the "
+"custom GCC toolchain we are now using, and compatibility with Android 2.3 "
+"and 3.x Honeycomb OS need to be verified."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1106
+msgid ""
+"For more information see the <a "
+"href=\"https://svn.torproject.org/svn/projects/android/trunk/Orbot/BUILD\">Orbot"
+" build documentation</a>."
+msgstr ""
+
+#. type: Content of: <div><div><ol>
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1112
+msgid "<a id=\"orbot-orlibAndOutreach\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><ol><li>
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1114
+msgid ""
+"<b>Orbot integration library and community outreach</b> <br> Priority: "
+"<i>Medium</i> <br> Effort Level: <i>Low</i> <br> Skill Level: <i>Medium</i> "
+"<br> Likely Mentors: <i>Nathan (n8fr8)</i>"
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1124
+msgid ""
+"We need additional work on <a "
+"href=\"https://github.com/guardianproject/orlib\">ORLib</a>, our library for"
+" use with third-party application to easily enable them to support "
+"&quot;Torification&quot; on non-rooted devices (i.e. w/o transparent "
+"proxying). This library includes a SOCKS client, a wrapper for the Apache "
+"HTTPClient library, a utility class for detecting the state of Orbot "
+"connectivity, and other relevant/useful things an Android app might need to "
+"anonymize itself. This work would includes direct development of the "
+"library, documentation, and sample code. Outreach or effort to implement the"
+" library within other open-source apps is also needed."
+msgstr ""
+
+#. type: Content of: <div><div><ol>
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1137
 msgid "<a id=\"vidaliaNetworkMap\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1078
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1139
 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: "
@@ -1792,7 +1857,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1088
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1149
 msgid ""
 "One of Vidalia's existing features is a network map that shows the user the "
 "approximate geographic location of relays in the Tor network and plots the "
@@ -1807,7 +1872,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1102
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1163
 msgid ""
 "This project will first involve getting familiar with Vidalia and the Marble"
 " widget's API. One will then integrate the widget into Vidalia and customize"
@@ -1817,7 +1882,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1110
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1171
 msgid ""
 "A person undertaking this project should have good C++ development "
 "experience. Previous experience with Qt and CMake is helpful, but not "
@@ -1825,19 +1890,19 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1116
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1177
 msgid "<a id=\"armGui\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1118
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1179
 msgid ""
 "<b>GUI for Arm</b> <br> Priority: <i>Low</i> <br> Effort Level: <i>High</i> "
-"<br> Skill Level: <i>Medium</i> <br> Likely Mentors: <i>Damian</i>"
+"<br> Skill Level: <i>Medium</i> <br> Likely Mentors: <i>Damian (atagar)</i>"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1128
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1189
 msgid ""
 "Arm has several unique features, some of the most interesting being its "
 "connection listing (correlating netstat results against the Tor consensus)  "
@@ -1849,7 +1914,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1138
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1199
 msgid ""
 "The vast majority of arm's more interesting functionality lies in its "
 "backend <a "
@@ -1861,7 +1926,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1148
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1209
 msgid ""
 "<b>Bring up new ideas!</b> <br> Don't like any of these? Look at the <a "
 "href=\"/press/presskit/2008-12-19-roadmap-full.pdf\">Tor development "
@@ -1872,19 +1937,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1160
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1221
 msgid "<a id=\"OtherCoding\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1161
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1222
 msgid ""
 "<a class=\"anchor\" href=\"#OtherCoding\">Other Coding and Design related "
 "ideas</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1163
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1224
 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 "
@@ -1900,7 +1965,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1176
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1237
 msgid ""
 "We need to actually start building our <a href=\"<page "
 "docs/documentation>#DesignDoc\">blocking-resistance design</a>. This "
@@ -1910,7 +1975,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1182
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1243
 msgid ""
 "We need a flexible simulator framework for studying end-to-end traffic "
 "confirmation attacks. Many researchers have whipped up ad hoc simulators to "
@@ -1924,7 +1989,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1192
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1253
 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 "
@@ -1933,7 +1998,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1198
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1259
 msgid ""
 "Perform a security analysis of Tor with <a "
 "href=\"https://secure.wikimedia.org/wikipedia/en/wiki/Fuzz_testing\">\"fuzz\"</a>."
@@ -1942,7 +2007,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1203
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1264
 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 "
@@ -1955,7 +2020,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1214
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1275
 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 "
@@ -1963,7 +2028,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1218
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1279
 msgid ""
 "We need a way to generate the website diagrams (for example, the \"How Tor "
 "Works\" pictures on the <a href=\"<page about/overview>\">overview page</a> "
@@ -1974,7 +2039,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1225
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1286
 msgid ""
 "How can we make the various LiveCD/USB systems easier to maintain, improve, "
 "and document? One example is <a href=\"https://tails.boum.org/\">The Amnesic"
@@ -1982,7 +2047,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1232
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1293
 msgid ""
 "Another anti-censorship project is to try to make Tor more scanning-"
 "resistant.  Right now, an adversary can identify <a "
@@ -1996,17 +2061,17 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1246
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1307
 msgid "<a id=\"Research\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1247
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1308
 msgid "<a class=\"anchor\" href=\"#Research\">Research</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1249
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1310
 msgid ""
 "The \"end-to-end traffic confirmation attack\": by watching traffic at Alice"
 " and at Bob, we can <a "
@@ -2021,7 +2086,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1259
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1320
 msgid ""
 "A related question is: Does running a relay/bridge provide additional "
 "protection against these timing attacks? Can an external adversary that "
@@ -2041,7 +2106,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1274
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1335
 msgid ""
 "Repeat Murdoch and Danezis's <a "
 "href=\"http://www.cl.cam.ac.uk/~sjm217/projects/anon/#torta\">attack from "
@@ -2061,7 +2126,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1289
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1350
 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"
@@ -2076,7 +2141,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1299
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1360
 msgid ""
 "Other research questions regarding geographic diversity consider the "
 "tradeoff between choosing an efficient circuit and choosing a random "
@@ -2088,7 +2153,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1306
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1367
 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 "
@@ -2105,7 +2170,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1318
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1379
 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 "
@@ -2116,7 +2181,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1325
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1386
 msgid ""
 "Our censorship-resistance goals include preventing an attacker who's looking"
 " at Tor traffic on the wire from <a href=\"<svnprojects>design-"
@@ -2132,7 +2197,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1336
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1397
 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 "
@@ -2143,7 +2208,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1343
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1404
 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 "
@@ -2151,7 +2216,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1346
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1407
 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 "
@@ -2171,7 +2236,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1363
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1424
 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 "
@@ -2179,7 +2244,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1371
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1432
 msgid ""
 "<a href=\"<page about/contact>\">Let us know</a> if you've made progress on "
 "any of these!"

Modified: translation/trunk/projects/website/po/it/press/3-low.inthemedia.po
===================================================================
--- translation/trunk/projects/website/po/it/press/3-low.inthemedia.po	2011-04-12 16:15:00 UTC (rev 24594)
+++ translation/trunk/projects/website/po/it/press/3-low.inthemedia.po	2011-04-12 16:19:31 UTC (rev 24595)
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-03-25 16:51+0000\n"
-"PO-Revision-Date: 2011-03-26 00:32+0000\n"
+"POT-Creation-Date: 2011-03-28 12:48+0200\n"
+"PO-Revision-Date: 2011-03-29 00:27+0000\n"
 "Last-Translator: runasand <runa.sandvik at gmail.com>\n"
 "Language-Team: Italian <None>\n"
 "MIME-Version: 1.0\n"
@@ -18,7 +18,7 @@
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/press/en/inthemedia.wml:8
+#: /home/runa/dev/website/press/en/inthemedia.wml:8
 msgid ""
 "<a href=\"<page index>\">Home &raquo; </a> <a href=\"<page "
 "press/press>\">Press &raquo; </a> <a href=\"<page press/inthemedia>\">Tor in"
@@ -26,12 +26,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><h1>
-#: /home/runa/tor/website/press/en/inthemedia.wml:15
+#: /home/runa/dev/website/press/en/inthemedia.wml:15
 msgid "Media Appearances"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/press/en/inthemedia.wml:17
+#: /home/runa/dev/website/press/en/inthemedia.wml:17
 msgid ""
 "Major news organizations including the New York Times, Forbes, Al Jazeera, "
 "Washington Post, Le Monde, NPR, BBC, and more have sought out or quoted Tor "
@@ -40,7 +40,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/press/en/inthemedia.wml:21
+#: /home/runa/dev/website/press/en/inthemedia.wml:21
 msgid ""
 "Since Tor is widely used throughout the world, it is mentioned regularly in "
 "the press.  This list is not comprehensive, but illustrates some of the "
@@ -48,39 +48,39 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/press/en/inthemedia.wml:24
+#: /home/runa/dev/website/press/en/inthemedia.wml:24
 msgid ""
 "A sample of such media appearances and mentions is below in order of newest "
 "to oldest:"
 msgstr ""
 
 #. type: Content of: <div><div><table><thead><tr><th>
-#: /home/runa/tor/website/press/en/inthemedia.wml:30
+#: /home/runa/dev/website/press/en/inthemedia.wml:30
 msgid "Date"
 msgstr ""
 
 #. type: Content of: <div><div><table><thead><tr><th>
-#: /home/runa/tor/website/press/en/inthemedia.wml:31
+#: /home/runa/dev/website/press/en/inthemedia.wml:31
 msgid "Publication"
 msgstr ""
 
 #. type: Content of: <div><div><table><thead><tr><th>
-#: /home/runa/tor/website/press/en/inthemedia.wml:32
+#: /home/runa/dev/website/press/en/inthemedia.wml:32
 msgid "Topic"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:36
+#: /home/runa/dev/website/press/en/inthemedia.wml:36
 msgid "2011 March 18"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:37
+#: /home/runa/dev/website/press/en/inthemedia.wml:37
 msgid "Telegraph"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:38
+#: /home/runa/dev/website/press/en/inthemedia.wml:38
 msgid ""
 "<a href=\"http://www.telegraph.co.uk/news/worldnews/middleeast/iran/8388484"
 "/Iran-cracks-down-on-web-dissident-technology.html\">Iran cracks down on web"
@@ -88,17 +88,17 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:43
+#: /home/runa/dev/website/press/en/inthemedia.wml:43
 msgid "2011 March 17"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:44 /tmp/u3kTkswOVo.xml:241
+#: /home/runa/dev/website/press/en/inthemedia.wml:44 /tmp/Q2ndl8ZYsF.xml:228
 msgid "BusinessWeek"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:45
+#: /home/runa/dev/website/press/en/inthemedia.wml:45
 msgid ""
 "<a "
 "href=\"http://www.businessweek.com/magazine/content/11_13/b4221043353206.htm\">Social"
@@ -106,17 +106,17 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:50
+#: /home/runa/dev/website/press/en/inthemedia.wml:50
 msgid "2011 March 10"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:51
+#: /home/runa/dev/website/press/en/inthemedia.wml:51
 msgid "NyTeknik"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:52
+#: /home/runa/dev/website/press/en/inthemedia.wml:52
 msgid ""
 "<a "
 "href=\"http://www.nyteknik.se/nyheter/it_telekom/internet/article3123594.ece\">Svenska"
@@ -124,17 +124,17 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:57
+#: /home/runa/dev/website/press/en/inthemedia.wml:57
 msgid "2011 March 09"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:58
+#: /home/runa/dev/website/press/en/inthemedia.wml:58
 msgid "Washington Post"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:59
+#: /home/runa/dev/website/press/en/inthemedia.wml:59
 msgid ""
 "<a href=\"http://www.washingtonpost.com/wp-"
 "dyn/content/article/2011/03/09/AR2011030905157_pf.html\">U.S.  funding tech "
@@ -142,17 +142,17 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:65
+#: /home/runa/dev/website/press/en/inthemedia.wml:65
 msgid "2011 February 17"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:66
+#: /home/runa/dev/website/press/en/inthemedia.wml:66
 msgid "Walpole Times"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:67
+#: /home/runa/dev/website/press/en/inthemedia.wml:67
 msgid ""
 "<a href=\"http://www.wickedlocal.com/walpole/news/x95296113/Tor-Project-a"
 "-Walpole-based-company-helps-Egyptians-avoid-Internet-censorship-during-"
@@ -161,18 +161,18 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:72 /tmp/u3kTkswOVo.xml:88
-#: /tmp/u3kTkswOVo.xml:96 /tmp/u3kTkswOVo.xml:104
+#: /home/runa/dev/website/press/en/inthemedia.wml:72 /tmp/Q2ndl8ZYsF.xml:86
+#: /tmp/Q2ndl8ZYsF.xml:93 /tmp/Q2ndl8ZYsF.xml:100
 msgid "2011 January 31"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:73
+#: /home/runa/dev/website/press/en/inthemedia.wml:73
 msgid "NPR: WBUR"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:74
+#: /home/runa/dev/website/press/en/inthemedia.wml:74
 msgid ""
 "<a href=\"http://hereandnow.wbur.org/2011/01/31/egypt-internet-"
 "government\">Here &amp; Now: U.S. Activists Help Egyptian Protesters Elude "
@@ -180,74 +180,73 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:80
+#: /home/runa/dev/website/press/en/inthemedia.wml:80
 msgid "2011 February 01"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:81
+#: /home/runa/dev/website/press/en/inthemedia.wml:81
 msgid "Discovery News"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:82
+#: /home/runa/dev/website/press/en/inthemedia.wml:82
 msgid ""
 "<a href=\"http://news.discovery.com/tech/egypt-internet-online-"
-"protesters-110201.  html\">Egypt's Internet Block Incomplete But "
-"Damaging</a>"
+"protesters-110201.html\">Egypt's Internet Block Incomplete But Damaging</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:89
+#: /home/runa/dev/website/press/en/inthemedia.wml:87
 msgid "IDG Poland"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:90
+#: /home/runa/dev/website/press/en/inthemedia.wml:88
 msgid ""
 "<a "
-"href=\"http://www.idg.pl/news/366773/Egipt.blokuje.Internet.aktywisci.szukaja."
-"  alternatyw.html\">Egipt blokuje Internet, aktywiści szukają alternatyw</a>"
+"href=\"http://www.idg.pl/news/366773/Egipt.blokuje.Internet.aktywisci.szukaja.alternatyw.html\">Egipt"
+" blokuje Internet, aktywiści szukają alternatyw</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:97 /tmp/u3kTkswOVo.xml:713
+#: /home/runa/dev/website/press/en/inthemedia.wml:94 /tmp/Q2ndl8ZYsF.xml:677
 msgid "New Scientist"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:98
+#: /home/runa/dev/website/press/en/inthemedia.wml:95
 msgid ""
 "<a href=\"http://www.newscientist.com/blogs/onepercent/2011/01/egypt-"
-"remains- officially-offli.html\">How Egypt is getting online</a>"
+"remains-officially-offli.html\">How Egypt is getting online</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:105
+#: /home/runa/dev/website/press/en/inthemedia.wml:101
 msgid "El Pais"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:106
+#: /home/runa/dev/website/press/en/inthemedia.wml:102
 msgid ""
 "<a "
-"href=\"http://www.elpais.com/articulo/internacional/Sortear/censura/golpe/fax/"
-" elpepuint/20110130elpepuint_14/Tes\">Sortear la censura a golpe de fax</a>"
+"href=\"http://www.elpais.com/articulo/internacional/Sortear/censura/golpe/fax/elpepuint/20110130elpepuint_14/Tes\">Sortear"
+" la censura a golpe de fax</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:112 /tmp/u3kTkswOVo.xml:119
-#: /tmp/u3kTkswOVo.xml:126
+#: /home/runa/dev/website/press/en/inthemedia.wml:107 /tmp/Q2ndl8ZYsF.xml:114
+#: /tmp/Q2ndl8ZYsF.xml:121
 msgid "2011 January 30"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:113
+#: /home/runa/dev/website/press/en/inthemedia.wml:108
 msgid "Fox 25 News - Boston"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:114
+#: /home/runa/dev/website/press/en/inthemedia.wml:109
 msgid ""
 "<a href=\"http://www.myfoxboston.com/dpp/news/local/local-company-helps-"
 "give-egyptians-internet-access-20110130\">Local company helps give Egyptians"
@@ -255,12 +254,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:120
+#: /home/runa/dev/website/press/en/inthemedia.wml:115
 msgid "New England Cable News"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:121
+#: /home/runa/dev/website/press/en/inthemedia.wml:116
 msgid ""
 "<a href=\"http://www.necn.com/01/30/11/Mass-company-helps-activists-avoid-"
 "onlin/landing.html?blockID=400628&feedID=4213\">Mass.  company helps "
@@ -268,167 +267,166 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:127 /tmp/u3kTkswOVo.xml:269
+#: /home/runa/dev/website/press/en/inthemedia.wml:122 /tmp/Q2ndl8ZYsF.xml:253
 msgid "Boston Globe"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:128
+#: /home/runa/dev/website/press/en/inthemedia.wml:123
 msgid ""
 "<a "
-"href=\"http://www.boston.com/news/local/massachusetts/articles/2011/01/30/ "
-"mass_groups_software_helps_avoid_censorship/\">Foreign activists stay "
-"covered online</a>"
+"href=\"http://www.boston.com/news/local/massachusetts/articles/2011/01/30/mass_groups_software_helps_avoid_censorship/\">Foreign"
+" activists stay covered online</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:134 /tmp/u3kTkswOVo.xml:142
+#: /home/runa/dev/website/press/en/inthemedia.wml:128 /tmp/Q2ndl8ZYsF.xml:135
 msgid "2011 January 29"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:135
+#: /home/runa/dev/website/press/en/inthemedia.wml:129
 msgid "SvD.se"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:136
+#: /home/runa/dev/website/press/en/inthemedia.wml:130
 msgid ""
-"<a href=\"http://www.svd.se/nyheter/utrikes/tor-oppnar-dorrar-for- "
+"<a href=\"http://www.svd.se/nyheter/utrikes/tor-oppnar-dorrar-for-"
 "natdissidenter_5902693.svd\">Tor öppnar dörrar för nätdissidenter</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:143 /tmp/u3kTkswOVo.xml:351
+#: /home/runa/dev/website/press/en/inthemedia.wml:136 /tmp/Q2ndl8ZYsF.xml:329
 msgid "ComputerWorld"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:144
+#: /home/runa/dev/website/press/en/inthemedia.wml:137
 msgid ""
-"<a href=\"http://www.computerworld.com/s/article/9207058/ "
-"Without_Internet_Egyptians_find_new_ways_to_get_online?taxonomyId=16\">Without"
+"<a "
+"href=\"http://www.computerworld.com/s/article/9207058/Without_Internet_Egyptians_find_new_ways_to_get_online?taxonomyId=16\">Without"
 " Internet, Egyptians find new ways to get online.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:150
+#: /home/runa/dev/website/press/en/inthemedia.wml:142
 msgid "2011 January 28"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:151
+#: /home/runa/dev/website/press/en/inthemedia.wml:143
 msgid "Globe and Mail"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:152
+#: /home/runa/dev/website/press/en/inthemedia.wml:144
 msgid ""
 "<a href=\"https://www.theglobeandmail.com/news/technology/in-a-span-of-"
-"minutes-a- country-goes-offline/article1887207/\">In a span of minutes, a "
+"minutes-a-country-goes-offline/article1887207/\">In a span of minutes, a "
 "country goes offline</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:158
+#: /home/runa/dev/website/press/en/inthemedia.wml:149
 msgid "2010 December 22"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:159 /tmp/u3kTkswOVo.xml:235
-#: /tmp/u3kTkswOVo.xml:256 /tmp/u3kTkswOVo.xml:339 /tmp/u3kTkswOVo.xml:380
-#: /tmp/u3kTkswOVo.xml:664
+#: /home/runa/dev/website/press/en/inthemedia.wml:150 /tmp/Q2ndl8ZYsF.xml:222
+#: /tmp/Q2ndl8ZYsF.xml:241 /tmp/Q2ndl8ZYsF.xml:317 /tmp/Q2ndl8ZYsF.xml:355
+#: /tmp/Q2ndl8ZYsF.xml:628
 msgid "Technology Review"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:160
+#: /home/runa/dev/website/press/en/inthemedia.wml:151
 msgid ""
 "<a href=\"http://www.technologyreview.com/web/26981/\">Home Internet with "
 "Anonymity Built In</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:164
+#: /home/runa/dev/website/press/en/inthemedia.wml:155
 msgid "2010 December 17"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:165
+#: /home/runa/dev/website/press/en/inthemedia.wml:156
 msgid "New York Times Magazine"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:166
+#: /home/runa/dev/website/press/en/inthemedia.wml:157
 msgid ""
 "<a href=\"https://www.nytimes.com/2010/12/19/magazine/19FOB-"
 "Medium-t.html\">Granting Anonymity</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:171
+#: /home/runa/dev/website/press/en/inthemedia.wml:162
 msgid "2010 November 03"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:172
+#: /home/runa/dev/website/press/en/inthemedia.wml:163
 msgid "metro sverige"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:173
+#: /home/runa/dev/website/press/en/inthemedia.wml:164
 msgid ""
 "<a href=\"http://www.metro.se/2010/11/03/73897/sida-hjalper-utsatta-bli-"
-"anonyma-pa-n /\">Sida hjälper utsatta bli anonyma på nätet</a>"
+"anonyma-pa-n/\">Sida hjälper utsatta bli anonyma på nätet</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:178
+#: /home/runa/dev/website/press/en/inthemedia.wml:168
 msgid "2010 Sept 17"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:179
+#: /home/runa/dev/website/press/en/inthemedia.wml:169
 msgid "NPR: On the media"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:180
+#: /home/runa/dev/website/press/en/inthemedia.wml:170
 msgid ""
 "<a href=\"http://www.onthemedia.org/transcripts/2010/09/17/05\">On the "
 "Media: Interview with Jacob Appelbaum</a>."
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:184
+#: /home/runa/dev/website/press/en/inthemedia.wml:174
 msgid "2010 August 01"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:185
+#: /home/runa/dev/website/press/en/inthemedia.wml:175
 msgid "PC Format - Poland"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:186
+#: /home/runa/dev/website/press/en/inthemedia.wml:176
 msgid ""
 "<a href=\"http://www.pcformat.pl/index.php/artykul/aid/1236/t/google-"
-"facebook-nas- szpieguj-jak-chroni-prywatno-w-sieci\">Google and Facebook are"
-" spying on us</a>"
+"facebook-nas-szpieguj-jak-chroni-prywatno-w-sieci\">Google and Facebook are "
+"spying on us</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:192
+#: /home/runa/dev/website/press/en/inthemedia.wml:181
 msgid "2010 July 14"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:193
+#: /home/runa/dev/website/press/en/inthemedia.wml:182
 msgid "China Rights Forum"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:194
+#: /home/runa/dev/website/press/en/inthemedia.wml:183
 msgid ""
 "<a "
 "href=\"http://www.hrichina.org/public/contents/category?cid=175033\">China "
@@ -436,52 +434,52 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:200
+#: /home/runa/dev/website/press/en/inthemedia.wml:189
 msgid "2010 May 25"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:201
+#: /home/runa/dev/website/press/en/inthemedia.wml:190
 msgid "The Australian"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:202
+#: /home/runa/dev/website/press/en/inthemedia.wml:191
 msgid ""
 "<a href=\"http://www.theaustralian.com.au/australian-it/call-to-join-tor-"
-"network-to- fight-censorship/story-e6frgakx-1225870756466\"> Call to join "
-"Tor network to fight censorship</a>"
+"network-to-fight-censorship/story-e6frgakx-1225870756466\"> Call to join Tor"
+" network to fight censorship</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:208
+#: /home/runa/dev/website/press/en/inthemedia.wml:196
 msgid "2010 Mar 17"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:209
+#: /home/runa/dev/website/press/en/inthemedia.wml:197
 msgid "PC World Poland"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:210
+#: /home/runa/dev/website/press/en/inthemedia.wml:198
 msgid ""
 "<a href=\"http://www.idg.pl/news/356993/Anonimowosc.w.Sieci.html\">Anonymity"
 " in the Web</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:214
+#: /home/runa/dev/website/press/en/inthemedia.wml:202
 msgid "2010 Mar 11"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:215
+#: /home/runa/dev/website/press/en/inthemedia.wml:203
 msgid "ABC Australia"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:216
+#: /home/runa/dev/website/press/en/inthemedia.wml:204
 msgid ""
 "<a "
 "href=\"http://www.abc.net.au/rn/futuretense/stories/2010/2837736.htm\">Future"
@@ -489,91 +487,90 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:219
+#: /home/runa/dev/website/press/en/inthemedia.wml:207
 msgid "2010 Mar 09"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:220
+#: /home/runa/dev/website/press/en/inthemedia.wml:208
 msgid "PC Pro UK"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:221
+#: /home/runa/dev/website/press/en/inthemedia.wml:209
 msgid ""
 "<a href=\"http://www.pcpro.co.uk/features/356254/the-dark-side-of-the-"
 "web\">The dark side of the web</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:226
+#: /home/runa/dev/website/press/en/inthemedia.wml:214
 msgid "2009 Dec 29"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:227
+#: /home/runa/dev/website/press/en/inthemedia.wml:215
 msgid "Times Online"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:228
+#: /home/runa/dev/website/press/en/inthemedia.wml:216
 msgid ""
 "<a "
-"href=\"http://www.timesonline.co.uk/tol/news/world/middle_east/article6969958."
-"  ece\">When Iran’s regime falls this will be remembered as the YouTube "
-"revolution </a>"
+"href=\"http://www.timesonline.co.uk/tol/news/world/middle_east/article6969958.ece\">When"
+" Iran’s regime falls this will be remembered as the YouTube revolution </a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:234
+#: /home/runa/dev/website/press/en/inthemedia.wml:221
 msgid "2009 Oct 15"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:236
+#: /home/runa/dev/website/press/en/inthemedia.wml:223
 msgid ""
 "<a href=\"http://www.technologyreview.com/web/23736/?a=f\">China Cracks Down"
 " on Tor Anonymity Network</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:240
+#: /home/runa/dev/website/press/en/inthemedia.wml:227
 msgid "2009 Sep 30"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:242
+#: /home/runa/dev/website/press/en/inthemedia.wml:229
 msgid ""
 "<a "
-"href=\"http://www.businessweek.com/globalbiz/content/sep2009/gb20090930_620354."
-"  htm\">China's Online Censors Work Overtime</a>"
+"href=\"http://www.businessweek.com/globalbiz/content/sep2009/gb20090930_620354.htm\">China's"
+" Online Censors Work Overtime</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:247
+#: /home/runa/dev/website/press/en/inthemedia.wml:233
 msgid "2009 Aug 19"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:248
+#: /home/runa/dev/website/press/en/inthemedia.wml:234
 msgid "Reuters"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:249
+#: /home/runa/dev/website/press/en/inthemedia.wml:235
 msgid ""
-"<a href=\"http://www.reuters.com/article/internetNews/idUSTRE57I4IE20090819?"
-" pageNumber=1&amp;virtualBrandChannel=0&amp;sp=true\">Web tools help protect"
-" human rights activists</a>"
+"<a "
+"href=\"http://www.reuters.com/article/internetNews/idUSTRE57I4IE20090819?pageNumber=1&amp;virtualBrandChannel=0&amp;sp=true\">Web"
+" tools help protect human rights activists</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:255
+#: /home/runa/dev/website/press/en/inthemedia.wml:240
 msgid "2009 Aug 10"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:257
+#: /home/runa/dev/website/press/en/inthemedia.wml:242
 msgid ""
 "<a "
 "href=\"http://www.technologyreview.com/blog/editors/23958/?nlid=2255\">How "
@@ -581,162 +578,161 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:261 /tmp/u3kTkswOVo.xml:268
+#: /home/runa/dev/website/press/en/inthemedia.wml:246 /tmp/Q2ndl8ZYsF.xml:252
 msgid "2009 Jul 26"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:262 /tmp/u3kTkswOVo.xml:296
+#: /home/runa/dev/website/press/en/inthemedia.wml:247 /tmp/Q2ndl8ZYsF.xml:278
 msgid "Washington Times"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:263
+#: /home/runa/dev/website/press/en/inthemedia.wml:248
 msgid ""
 "<a href=\"http://www.washingtontimes.com/news/2009/jul/26/senate-help-iran-"
-"dodge- internet-censorship/\">Senate OKs funds to thwart Iran Web "
-"censors</a>"
+"dodge-internet-censorship/\">Senate OKs funds to thwart Iran Web censors</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:270
+#: /home/runa/dev/website/press/en/inthemedia.wml:254
 msgid ""
-"<a href=\"http://www.boston.com/news/nation/washington/articles/2009/07/26/ "
-"us_to_increase_funding_for_hackivists_aiding_iranians/\">US set to hike aid "
-"aimed at Iranians</a>"
+"<a "
+"href=\"http://www.boston.com/news/nation/washington/articles/2009/07/26/us_to_increase_funding_for_hackivists_aiding_iranians/\">US"
+" set to hike aid aimed at Iranians</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:276
+#: /home/runa/dev/website/press/en/inthemedia.wml:259
 msgid "2009 Jul 24"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:277
+#: /home/runa/dev/website/press/en/inthemedia.wml:260
 msgid "Associated Press"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:278
+#: /home/runa/dev/website/press/en/inthemedia.wml:261
 msgid ""
-"<a href=\"http://www.google.com/hostednews/ap/article/ALeqM5hTf- "
+"<a href=\"http://www.google.com/hostednews/ap/article/ALeqM5hTf-"
 "p6Iy3sWHK8BRR58npGosLC3AD99L01QO0\">Iran activists work to elude crackdown "
 "on Internet</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:284
+#: /home/runa/dev/website/press/en/inthemedia.wml:266
 msgid "2009 Jul 08"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:285
+#: /home/runa/dev/website/press/en/inthemedia.wml:267
 msgid "Tehran Bureau"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:286
+#: /home/runa/dev/website/press/en/inthemedia.wml:268
 msgid ""
 "<a href=\"http://tehranbureau.com/geeks-globe-rally-iranians-online/\">Geeks"
 " Around the Globe Rally to Help Iranians Online</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:290
+#: /home/runa/dev/website/press/en/inthemedia.wml:272
 msgid "2009 Jul 02"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:291
+#: /home/runa/dev/website/press/en/inthemedia.wml:273
 msgid "NED/CIMA"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:292
+#: /home/runa/dev/website/press/en/inthemedia.wml:274
 msgid ""
 "<a href=\"http://cima.ned.org/events/new-media-in-iran.html\">The Role of "
 "New Media in the Iranian Elections</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:295
+#: /home/runa/dev/website/press/en/inthemedia.wml:277
 msgid "2009 Jun 26"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:297
+#: /home/runa/dev/website/press/en/inthemedia.wml:279
 msgid ""
 "<a href=\"http://www.washingtontimes.com/news/2009/jun/26/protesters-use-"
-"navy- technology-to-avoid-censorship/?feat=home_headlines\">Iranian "
+"navy-technology-to-avoid-censorship/?feat=home_headlines\">Iranian "
 "protesters avoid censorship with Navy technology</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:303
+#: /home/runa/dev/website/press/en/inthemedia.wml:284
 msgid "2009 Jun 29"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:304
+#: /home/runa/dev/website/press/en/inthemedia.wml:285
 msgid "EFF"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:305
+#: /home/runa/dev/website/press/en/inthemedia.wml:286
 msgid ""
 "<a href=\"http://www.eff.org/deeplinks/2009/06/help-protesters-iran-run-tor-"
-"relays- bridges\">Help Protesters in Iran: Run a Tor Bridge or a Tor "
+"relays-bridges\">Help Protesters in Iran: Run a Tor Bridge or a Tor "
 "Relay</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:310
+#: /home/runa/dev/website/press/en/inthemedia.wml:290
 msgid "2009 Jun 24"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:311
+#: /home/runa/dev/website/press/en/inthemedia.wml:291
 msgid "Daily Finance"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:312
+#: /home/runa/dev/website/press/en/inthemedia.wml:292
 msgid ""
-"<a href=\"http://www.dailyfinance.com/2009/06/24/nokia-and-siemens-in-iran- "
+"<a href=\"http://www.dailyfinance.com/2009/06/24/nokia-and-siemens-in-iran-"
 "controversy/\">Nokia and Siemens in Iran controversy</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:317 /tmp/u3kTkswOVo.xml:332
-#: /tmp/u3kTkswOVo.xml:338
+#: /home/runa/dev/website/press/en/inthemedia.wml:296 /tmp/Q2ndl8ZYsF.xml:310
+#: /tmp/Q2ndl8ZYsF.xml:316
 msgid "2009 Jun 18"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:318 /tmp/u3kTkswOVo.xml:414
-#: /tmp/u3kTkswOVo.xml:658
+#: /home/runa/dev/website/press/en/inthemedia.wml:297 /tmp/Q2ndl8ZYsF.xml:386
+#: /tmp/Q2ndl8ZYsF.xml:622
 msgid "Wall Street Journal"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:319
+#: /home/runa/dev/website/press/en/inthemedia.wml:298
 msgid ""
 "<a href=\"http://blogs.wsj.com/digits/2009/06/18/iranians-using-tor-to-"
-"anonymize-web -use/\">Iranians Using Tor to Anonymize Web Use</a>"
+"anonymize-web-use/\">Iranians Using Tor to Anonymize Web Use</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:324
+#: /home/runa/dev/website/press/en/inthemedia.wml:302
 msgid "2009 Jun 19"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:325
+#: /home/runa/dev/website/press/en/inthemedia.wml:303
 msgid "O'Reilly Radar"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:326
+#: /home/runa/dev/website/press/en/inthemedia.wml:304
 msgid ""
 "<a href=\"http://radar.oreilly.com/2009/06/tor-and-the-legality-of-"
 "runnin.html\"> Dramatic Increase in Number of Tor Clients from Iran: "
@@ -744,98 +740,97 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:333
+#: /home/runa/dev/website/press/en/inthemedia.wml:311
 msgid "Deutsche Welle"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:334
+#: /home/runa/dev/website/press/en/inthemedia.wml:312
 msgid ""
 "<a href=\"http://www.dw-world.de/dw/article/0,,4400882,00.html\">Internet "
 "proxies let Iranians and others connect to blocked Web sites</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:340
+#: /home/runa/dev/website/press/en/inthemedia.wml:318
 msgid ""
 "<a href=\"http://www.technologyreview.com/web/22893/\">The Web vs. the "
 "Republic of Iran</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:344 /tmp/u3kTkswOVo.xml:350
+#: /home/runa/dev/website/press/en/inthemedia.wml:322 /tmp/Q2ndl8ZYsF.xml:328
 msgid "2009 Jun 17"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:345
+#: /home/runa/dev/website/press/en/inthemedia.wml:323
 msgid "CNet News"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:346
+#: /home/runa/dev/website/press/en/inthemedia.wml:324
 msgid ""
 "<a href=\"http://news.cnet.com/8301-13578_3-10267287-38.html\">Iranians find"
 " ways to bypass Net censors</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:352
+#: /home/runa/dev/website/press/en/inthemedia.wml:330
 msgid ""
 "<a "
-"href=\"http://www.computerworld.com/action/article.do?command=viewArticleBasic&"
-" amp;articleId=9134471&amp;intsrc=news_ts_head\">Iran's leaders fight "
-"Internet; Internet wins (so far)</a>"
+"href=\"http://www.computerworld.com/action/article.do?command=viewArticleBasic&amp;articleId=9134471&amp;intsrc=news_ts_head\">Iran's"
+" leaders fight Internet; Internet wins (so far)</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:358
+#: /home/runa/dev/website/press/en/inthemedia.wml:335
 msgid "2009 May 29"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:359 /tmp/u3kTkswOVo.xml:387
+#: /home/runa/dev/website/press/en/inthemedia.wml:336 /tmp/Q2ndl8ZYsF.xml:362
 msgid "Le Monde"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:360
+#: /home/runa/dev/website/press/en/inthemedia.wml:337
 msgid ""
 "<a href=\"http://www.lemonde.fr/actualite-medias/article/2009/05/29/les-"
-"censeurs-du- net_1199993_3236.html\">Les censeurs du Net</a>"
+"censeurs-du-net_1199993_3236.html\">Les censeurs du Net</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:365
+#: /home/runa/dev/website/press/en/inthemedia.wml:341
 msgid "2009 May 15"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:366
+#: /home/runa/dev/website/press/en/inthemedia.wml:342
 msgid "Mass High Tech"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:367
+#: /home/runa/dev/website/press/en/inthemedia.wml:343
 msgid ""
 "<a href=\"http://www.masshightech.com/stories/2009/05/11/newscolumn2-Tor-"
-"tackles-Net -privacy-game-makers-flock-to-Hub.html\">Tor tackles Net "
+"tackles-Net-privacy-game-makers-flock-to-Hub.html\">Tor tackles Net "
 "privacy</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:372
+#: /home/runa/dev/website/press/en/inthemedia.wml:347
 msgid "2009 May 01"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:373 /tmp/u3kTkswOVo.xml:669
-#: /tmp/u3kTkswOVo.xml:679
+#: /home/runa/dev/website/press/en/inthemedia.wml:348 /tmp/Q2ndl8ZYsF.xml:633
+#: /tmp/Q2ndl8ZYsF.xml:643
 msgid "New York Times"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:374
+#: /home/runa/dev/website/press/en/inthemedia.wml:349
 msgid ""
 "<a "
 "href=\"http://www.nytimes.com/2009/05/01/technology/01filter.html\">Iranians"
@@ -843,12 +838,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:379
+#: /home/runa/dev/website/press/en/inthemedia.wml:354
 msgid "2009 Apr 23"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:381
+#: /home/runa/dev/website/press/en/inthemedia.wml:356
 msgid ""
 "<a href=\"http://www.technologyreview.com/computing/22427/?a=f\">Dissent "
 "Made Safer: How anonymity technology could save free speech on the "
@@ -856,87 +851,87 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:386
+#: /home/runa/dev/website/press/en/inthemedia.wml:361
 msgid "2009 Apr 22"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:388
+#: /home/runa/dev/website/press/en/inthemedia.wml:363
 msgid ""
 "<a href=\"http://bugbrother.blog.lemonde.fr/2009/04/22/comment-contourner-"
-"la- cybersurveillance/\">How to circumvent cybersurveillance</a>"
+"la-cybersurveillance/\">How to circumvent cybersurveillance</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:393 /tmp/u3kTkswOVo.xml:400
+#: /home/runa/dev/website/press/en/inthemedia.wml:367 /tmp/Q2ndl8ZYsF.xml:373
 msgid "2009 Apr 06"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:394
+#: /home/runa/dev/website/press/en/inthemedia.wml:368
 msgid "Reader's Digest"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:395
+#: /home/runa/dev/website/press/en/inthemedia.wml:369
 msgid ""
 "<a href=\"http://www.rd.com/advice-and-know-how/how-to-hide-"
-"anything/article122219.  html\">How to Hide Anything</a>"
+"anything/article122219.html\">How to Hide Anything</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:401
+#: /home/runa/dev/website/press/en/inthemedia.wml:374
 msgid "Al Jazeera"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:402
+#: /home/runa/dev/website/press/en/inthemedia.wml:375
 msgid ""
 "<a href=\"http://www.youtube.com/watch?v=vuatxUN2cUQ\">Global Village Voices"
 " showcases Tor</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:406
+#: /home/runa/dev/website/press/en/inthemedia.wml:379
 msgid "2009 Mar 18"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:407
+#: /home/runa/dev/website/press/en/inthemedia.wml:380
 msgid "Marie Claire"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:408
+#: /home/runa/dev/website/press/en/inthemedia.wml:381
 msgid ""
 "<a href=\"http://www.marieclaire.com/career-money/career-coach/manage-online"
-"--web- image\">How to Manage Your Web Footprint</a>"
+"--web-image\">How to Manage Your Web Footprint</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:413
+#: /home/runa/dev/website/press/en/inthemedia.wml:385
 msgid "2009 Mar 13"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:415
+#: /home/runa/dev/website/press/en/inthemedia.wml:387
 msgid ""
 "<a href=\"http://online.wsj.com/article/SB123567809587886053.html\">The "
 "Kindness of Strangers</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:420
+#: /home/runa/dev/website/press/en/inthemedia.wml:392
 msgid "2009 Mar 12"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:421
+#: /home/runa/dev/website/press/en/inthemedia.wml:393
 msgid "BBC World Service"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:422
+#: /home/runa/dev/website/press/en/inthemedia.wml:394
 msgid ""
 "<a href=\"http://bbcworldservicetrust.wordpress.com/2009/03/12/12-march-"
 "world-day-against-cyber-censorship/\">Steven J Murdoch interviewed about Tor"
@@ -944,102 +939,102 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:425
+#: /home/runa/dev/website/press/en/inthemedia.wml:397
 msgid "2009 Mar 03"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:426
+#: /home/runa/dev/website/press/en/inthemedia.wml:398
 msgid "Orf Austria"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:427
+#: /home/runa/dev/website/press/en/inthemedia.wml:399
 msgid ""
 "<a href=\"http://futurezone.orf.at/stories/1503028/\">WIRTSCHAFTSKAMMER "
 "column</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:431
+#: /home/runa/dev/website/press/en/inthemedia.wml:403
 msgid "2009 Feb 18"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:432 /tmp/u3kTkswOVo.xml:589
+#: /home/runa/dev/website/press/en/inthemedia.wml:404 /tmp/Q2ndl8ZYsF.xml:553
 msgid "Bangkok Post"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:433
+#: /home/runa/dev/website/press/en/inthemedia.wml:405
 msgid ""
 "<a href=\"http://www.bangkokpost.com/tech/technews/11872/the-old-fake-404"
-"-not-found- routine\">The old fake \"404 not found\" routine</a>"
+"-not-found-routine\">The old fake \"404 not found\" routine</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:438
+#: /home/runa/dev/website/press/en/inthemedia.wml:409
 msgid "2009 Feb 13"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:439
+#: /home/runa/dev/website/press/en/inthemedia.wml:410
 msgid "Hearsay Culture"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:440
+#: /home/runa/dev/website/press/en/inthemedia.wml:411
 msgid ""
 "<a href=\"http://www.hearsayculture.com/?p=307\">Hearsay Culture Radio "
 "Interview/Podcast</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:443
+#: /home/runa/dev/website/press/en/inthemedia.wml:414
 msgid "2008 Dec 29"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:444
+#: /home/runa/dev/website/press/en/inthemedia.wml:415
 msgid "nu.nl"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:445
+#: /home/runa/dev/website/press/en/inthemedia.wml:416
 msgid ""
 "<a href=\"http://www.nu.nl/internet/1891289/anoniem-browsen-voor-gsm-in-de-"
 "maak.html\">Anoniem browsen voor gsm in de maak</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:449
+#: /home/runa/dev/website/press/en/inthemedia.wml:420
 msgid "2008 Dec 14"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:450
+#: /home/runa/dev/website/press/en/inthemedia.wml:421
 msgid "PC Magazine: Middle &amp; Near East"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:451
+#: /home/runa/dev/website/press/en/inthemedia.wml:422
 msgid ""
 "<a href=\"http://www.pcmag-mideast.com/FeatureDetail.aspx?ID=1039\">How To "
 "Reclaim Your Online Privacy</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:456
+#: /home/runa/dev/website/press/en/inthemedia.wml:427
 msgid "2008 Aug 21"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:457
+#: /home/runa/dev/website/press/en/inthemedia.wml:428
 msgid "CNN"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:458
+#: /home/runa/dev/website/press/en/inthemedia.wml:429
 msgid ""
 "<a "
 "href=\"http://www.cnn.com/2008/TECH/08/21/internet.filtering/index.html\">Experts:"
@@ -1047,51 +1042,51 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:463
+#: /home/runa/dev/website/press/en/inthemedia.wml:434
 msgid "2008 Aug 22"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:464
+#: /home/runa/dev/website/press/en/inthemedia.wml:435
 msgid "The Sydney Morning Herald"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:465
+#: /home/runa/dev/website/press/en/inthemedia.wml:436
 msgid ""
 "<a href=\"http://www.smh.com.au/news/web/the-china-"
-"syndrome/2008/08/20/1218911800889 .html\">The China Syndrome</a>"
+"syndrome/2008/08/20/1218911800889.html\">The China Syndrome</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:471
+#: /home/runa/dev/website/press/en/inthemedia.wml:441
 msgid "2008 Aug 20"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:472
+#: /home/runa/dev/website/press/en/inthemedia.wml:442
 msgid "Scientific American"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:473
+#: /home/runa/dev/website/press/en/inthemedia.wml:443
 msgid ""
 "<a href=\"http://www.sciam.com/article.cfm?id=cryptography-how-to-keep-your-"
-"secrets- safe\">Cryptography: How to Keep Your Secrets Safe</a>"
+"secrets-safe\">Cryptography: How to Keep Your Secrets Safe</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:479
+#: /home/runa/dev/website/press/en/inthemedia.wml:448
 msgid "2008 Aug 05"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:480
+#: /home/runa/dev/website/press/en/inthemedia.wml:449
 msgid "Guardian UK"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:481
+#: /home/runa/dev/website/press/en/inthemedia.wml:450
 msgid ""
 "<a "
 "href=\"http://www.guardian.co.uk/commentisfree/2008/aug/05/china.censorship\">"
@@ -1099,62 +1094,62 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:487
+#: /home/runa/dev/website/press/en/inthemedia.wml:456
 msgid "2008 Aug 10"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:488
+#: /home/runa/dev/website/press/en/inthemedia.wml:457
 msgid "Tech Radar UK"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:489
+#: /home/runa/dev/website/press/en/inthemedia.wml:458
 msgid ""
 "<a href=\"http://www.techradar.com/news/internet/web/freedom-stick-"
-"highlights- chinese-net-censorship-449233\">Freedom Stick highlights Chinese"
-" 'net censorship: USB drive promises anonymous surfing for the paranoid</a>"
+"highlights-chinese-net-censorship-449233\">Freedom Stick highlights Chinese "
+"'net censorship: USB drive promises anonymous surfing for the paranoid</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:497 /tmp/u3kTkswOVo.xml:505
-#: /tmp/u3kTkswOVo.xml:514 /tmp/u3kTkswOVo.xml:522
+#: /home/runa/dev/website/press/en/inthemedia.wml:465 /tmp/Q2ndl8ZYsF.xml:473
+#: /tmp/Q2ndl8ZYsF.xml:481 /tmp/Q2ndl8ZYsF.xml:489
 msgid "2008 Aug 07"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:498
+#: /home/runa/dev/website/press/en/inthemedia.wml:466
 msgid "Spiegel"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:499
+#: /home/runa/dev/website/press/en/inthemedia.wml:467
 msgid ""
 "<a href=\"http://www.spiegel.de/netzwelt/tech/0,1518,570421,00.html\">Tricks"
 " gegen Zensur und Überwachung</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:506 /tmp/u3kTkswOVo.xml:560
-#: /tmp/u3kTkswOVo.xml:628 /tmp/u3kTkswOVo.xml:742
+#: /home/runa/dev/website/press/en/inthemedia.wml:474 /tmp/Q2ndl8ZYsF.xml:524
+#: /tmp/Q2ndl8ZYsF.xml:592 /tmp/Q2ndl8ZYsF.xml:706
 msgid "PC World"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:507
+#: /home/runa/dev/website/press/en/inthemedia.wml:475
 msgid ""
 "<a "
-"href=\"http://www.pcworld.com/article/149399-3/15_great_free_privacy_downloads."
-"  html\">15 Great, Free Privacy Downloads</a>.  Tor is Number 1."
+"href=\"http://www.pcworld.com/article/149399-3/15_great_free_privacy_downloads.html\">15"
+" Great, Free Privacy Downloads</a>.  Tor is Number 1."
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:515
+#: /home/runa/dev/website/press/en/inthemedia.wml:482
 msgid "The Guardian UK"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:516
+#: /home/runa/dev/website/press/en/inthemedia.wml:483
 msgid ""
 "<a "
 "href=\"http://www.guardian.co.uk/technology/2008/aug/07/censorship.hacking\">Chaos"
@@ -1162,12 +1157,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:523
+#: /home/runa/dev/website/press/en/inthemedia.wml:490
 msgid "The Register UK"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:524
+#: /home/runa/dev/website/press/en/inthemedia.wml:491
 msgid ""
 "<a "
 "href=\"http://www.theregister.co.uk/2008/08/07/torbrowser_olympics/\">German"
@@ -1175,66 +1170,67 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:530
+#: /home/runa/dev/website/press/en/inthemedia.wml:497
 msgid "2008 May 24"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:531
+#: /home/runa/dev/website/press/en/inthemedia.wml:498
 msgid "Groupo Estado"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:532
+#: /home/runa/dev/website/press/en/inthemedia.wml:499
 msgid ""
-"<a href=\"http://blog.estadao.com.br/blog/cruz/?title= "
-"cfp08_navegacao_anonima_na_rede&amp;more=1&amp;c=1&amp;tb=1&amp;pb=1&amp;cat="
-" 525\">Interview at Computers, Freedom, and Privacy 2008 Conference</a>"
+"<a "
+"href=\"http://blog.estadao.com.br/blog/cruz/?title=cfp08_navegacao_anonima_na_rede&amp;more=1&amp;c=1&amp;tb=1&amp;pb=1&amp;cat=525\">Interview"
+" at Computers, Freedom, and Privacy 2008 Conference</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:540
+#: /home/runa/dev/website/press/en/inthemedia.wml:505
 msgid "2008 Mar 12"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:541
+#: /home/runa/dev/website/press/en/inthemedia.wml:506
 msgid "SearchSecurity.com"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:542
+#: /home/runa/dev/website/press/en/inthemedia.wml:507
 msgid ""
-"<a href=\"http://searchsecurity.techtarget.com/news/article/0,289142, "
-"sid14_gci1305120,00.html\"> Tor network 'bridges' help evade blockers</a>.  "
-"Covers new Tor features designed to overcome filtering and blocking that "
-"prevent access to the Tor network."
+"<a "
+"href=\"http://searchsecurity.techtarget.com/news/article/0,289142,sid14_gci1305120,00.html\">"
+" Tor network 'bridges' help evade blockers</a>.  Covers new Tor features "
+"designed to overcome filtering and blocking that prevent access to the Tor "
+"network."
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:552
+#: /home/runa/dev/website/press/en/inthemedia.wml:516
 msgid "2008 Feb 14"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:553
+#: /home/runa/dev/website/press/en/inthemedia.wml:517
 msgid "Wired: Compiler Blog"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:554
+#: /home/runa/dev/website/press/en/inthemedia.wml:518
 msgid ""
 "<a href=\"http://blog.wired.com/monkeybites/2008/02/how-to-set-up-a.html\"> "
 "How To: Set Up Anonymous Browsing in 30 Seconds or Less</a>."
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:559
+#: /home/runa/dev/website/press/en/inthemedia.wml:523
 msgid "2008 Feb 01"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:561
+#: /home/runa/dev/website/press/en/inthemedia.wml:525
 msgid ""
 "<a href=\"http://www.pcworld.com/article/id,142094-pg,1/article.html\"> "
 "Hackers Can Expose Masked Surfers, Study Says</a> A report on <a "
@@ -1246,17 +1242,17 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:568
+#: /home/runa/dev/website/press/en/inthemedia.wml:532
 msgid "2007 Sep 21"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:569
+#: /home/runa/dev/website/press/en/inthemedia.wml:533
 msgid "Wired HowTo Blog"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:570
+#: /home/runa/dev/website/press/en/inthemedia.wml:534
 msgid ""
 "<a "
 "href=\"http://howto.wired.com/wiredhowtos/index.cgi?page_name=be_a_whistle_blower;action=display;category=Work\">Be"
@@ -1265,17 +1261,17 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:573
+#: /home/runa/dev/website/press/en/inthemedia.wml:537
 msgid "2007 Sep 16"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:574
+#: /home/runa/dev/website/press/en/inthemedia.wml:538
 msgid "Cnet"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:575
+#: /home/runa/dev/website/press/en/inthemedia.wml:539
 msgid ""
 "<a href=\"http://news.cnet.com/8301-13739_3-9779225-46.html\">Tor anonymity "
 "server admin arrested</a>.  A Tor exit node operator from Germany was "
@@ -1290,18 +1286,18 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:578
+#: /home/runa/dev/website/press/en/inthemedia.wml:542
 msgid "2007 Sep 10"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:579 /tmp/u3kTkswOVo.xml:696
-#: /tmp/u3kTkswOVo.xml:772 /tmp/u3kTkswOVo.xml:881 /tmp/u3kTkswOVo.xml:893
+#: /home/runa/dev/website/press/en/inthemedia.wml:543 /tmp/Q2ndl8ZYsF.xml:660
+#: /tmp/Q2ndl8ZYsF.xml:736 /tmp/Q2ndl8ZYsF.xml:845 /tmp/Q2ndl8ZYsF.xml:857
 msgid "Wired"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:580
+#: /home/runa/dev/website/press/en/inthemedia.wml:544
 msgid ""
 "<a "
 "href=\"http://www.wired.com/politics/security/news/2007/09/embassy_hacks\"> "
@@ -1338,17 +1334,17 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:583
+#: /home/runa/dev/website/press/en/inthemedia.wml:547
 msgid "2007 Jul 27"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:584
+#: /home/runa/dev/website/press/en/inthemedia.wml:548
 msgid "Wired Blog"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:585
+#: /home/runa/dev/website/press/en/inthemedia.wml:549
 msgid ""
 "<a href=\"http://blog.wired.com/27bstroke6/2007/07/cyber-jihadists.html\"> "
 "Cyber Jihadists Embrace Tor</a><br/> A pointer to a <a "
@@ -1359,12 +1355,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:588
+#: /home/runa/dev/website/press/en/inthemedia.wml:552
 msgid "2007 Jun 22"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:590
+#: /home/runa/dev/website/press/en/inthemedia.wml:554
 msgid ""
 "<a href=\"http://www.asiamedia.ucla.edu/article-"
 "southeastasia.asp?parentid=72388\"> The problems with censorship</a>.  "
@@ -1373,17 +1369,17 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:593
+#: /home/runa/dev/website/press/en/inthemedia.wml:557
 msgid "2007 Mar 15"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:594
+#: /home/runa/dev/website/press/en/inthemedia.wml:558
 msgid "World Changing"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:595
+#: /home/runa/dev/website/press/en/inthemedia.wml:559
 msgid ""
 "<a href=\"http://www.worldchanging.com/archives/006309.html\"> Blogging "
 "Where Speech Isn’t Free</a><br/> Coverage of former Tor Executive Director "
@@ -1393,17 +1389,17 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:598
+#: /home/runa/dev/website/press/en/inthemedia.wml:562
 msgid "2007 Mar 8"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:599
+#: /home/runa/dev/website/press/en/inthemedia.wml:563
 msgid "Security Focus"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:600
+#: /home/runa/dev/website/press/en/inthemedia.wml:564
 msgid ""
 "<a href=\"http://www.securityfocus.com/news/11447/1\"> Tor hack proposed to "
 "catch criminals</a>.  Coverage of a toolset called \"Torment\" for "
@@ -1412,17 +1408,17 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:603
+#: /home/runa/dev/website/press/en/inthemedia.wml:567
 msgid "2007 Feb 1"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:604
+#: /home/runa/dev/website/press/en/inthemedia.wml:568
 msgid "Dr Dobb's"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:605
+#: /home/runa/dev/website/press/en/inthemedia.wml:569
 msgid ""
 "<a href=\"http://www.ddj.com/security/197002414\"> Tor Project Protects "
 "Anonymous Sources</a>.  An introduction to Tor, including technical and "
@@ -1430,17 +1426,17 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:608
+#: /home/runa/dev/website/press/en/inthemedia.wml:572
 msgid "2006 Oct 19"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:609
+#: /home/runa/dev/website/press/en/inthemedia.wml:573
 msgid "Wired Threat Level"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:610
+#: /home/runa/dev/website/press/en/inthemedia.wml:574
 msgid ""
 "<a href=\"http://blog.wired.com/27bstroke6/2006/10/the_onion_route.html\"> "
 "The Onion Router (TOR) is Leaky (Leeky)</a>.  Explains why you need "
@@ -1450,17 +1446,17 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:613
+#: /home/runa/dev/website/press/en/inthemedia.wml:577
 msgid "2006 Aug 18"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:614 /tmp/u3kTkswOVo.xml:702
+#: /home/runa/dev/website/press/en/inthemedia.wml:578 /tmp/Q2ndl8ZYsF.xml:666
 msgid "NPR"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:615
+#: /home/runa/dev/website/press/en/inthemedia.wml:579
 msgid ""
 "<a href=\"http://www.npr.org/templates/story/story.php?storyId=5168456\"> "
 "Tips for Protecting Privacy Online</a>.  Kevin Bankston of the EFF "
@@ -1469,17 +1465,17 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:618
+#: /home/runa/dev/website/press/en/inthemedia.wml:582
 msgid "2006 Jul 5"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:619
+#: /home/runa/dev/website/press/en/inthemedia.wml:583
 msgid "MSNBC"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:620
+#: /home/runa/dev/website/press/en/inthemedia.wml:584
 msgid ""
 "<a href=\"http://www.msnbc.msn.com/id/13718446/page/2/\"> Defending "
 "liberties in high-tech world</a>.  Mentions EFF funding for Tor as one of "
@@ -1487,17 +1483,17 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:622
+#: /home/runa/dev/website/press/en/inthemedia.wml:586
 msgid "2006 Apr 11"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:623
+#: /home/runa/dev/website/press/en/inthemedia.wml:587
 msgid "PBS Frontline"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:624
+#: /home/runa/dev/website/press/en/inthemedia.wml:588
 msgid ""
 "<a "
 "href=\"http://pbs.gen.in/wgbh/pages/frontline/tankman/internet/tech.html\">Chipping"
@@ -1505,12 +1501,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:627
+#: /home/runa/dev/website/press/en/inthemedia.wml:591
 msgid "2006 Feb 28"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:629
+#: /home/runa/dev/website/press/en/inthemedia.wml:593
 msgid ""
 "<a "
 "href=\"http://www.pcworld.com/article/id,124891-page,1/article.html\">Outsmarting"
@@ -1518,17 +1514,17 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:632
+#: /home/runa/dev/website/press/en/inthemedia.wml:596
 msgid "2006 Feb 27"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:633
+#: /home/runa/dev/website/press/en/inthemedia.wml:597
 msgid "Forbes"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:634
+#: /home/runa/dev/website/press/en/inthemedia.wml:598
 msgid ""
 "<a href=\"http://members.forbes.com/global/2006/0227/018A_2.html\"> Cracks "
 "In the Wall</a>.  Discussion of Tor being used for evading censorship by "
@@ -1536,35 +1532,35 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:637
+#: /home/runa/dev/website/press/en/inthemedia.wml:601
 msgid "2006 Feb 20"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:638
+#: /home/runa/dev/website/press/en/inthemedia.wml:602
 msgid "The Boston Globe"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:639
+#: /home/runa/dev/website/press/en/inthemedia.wml:603
 msgid ""
 "<a href=\"http://members.forbes.com/global/2006/0227/018A_2.html\"> Beating "
 "censorship on the Internet</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:642 /tmp/u3kTkswOVo.xml:647
-#: /tmp/u3kTkswOVo.xml:652 /tmp/u3kTkswOVo.xml:689
+#: /home/runa/dev/website/press/en/inthemedia.wml:606 /tmp/Q2ndl8ZYsF.xml:611
+#: /tmp/Q2ndl8ZYsF.xml:616 /tmp/Q2ndl8ZYsF.xml:653
 msgid "2006 Feb 15"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:643
+#: /home/runa/dev/website/press/en/inthemedia.wml:607
 msgid "CBS Evening News"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:644
+#: /home/runa/dev/website/press/en/inthemedia.wml:608
 msgid ""
 "<a "
 "href=\"http://www.cbsnews.com/stories/2006/02/15/eveningnews/main1321785.shtml?source=search_story\">"
@@ -1573,22 +1569,22 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:648
+#: /home/runa/dev/website/press/en/inthemedia.wml:612
 msgid "CNBC - Closing Bell"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:649
+#: /home/runa/dev/website/press/en/inthemedia.wml:613
 msgid "TV Appearance by Roger Dingledine at 4:25pm. (no link)"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:653
+#: /home/runa/dev/website/press/en/inthemedia.wml:617
 msgid "Network Secure"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:654
+#: /home/runa/dev/website/press/en/inthemedia.wml:618
 msgid ""
 "<a href=\"http://www.network-"
 "secure.de/index.php?option=com_content&amp;task=view&amp;id=3909\">Tor: "
@@ -1596,12 +1592,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:657
+#: /home/runa/dev/website/press/en/inthemedia.wml:621
 msgid "2006 Feb 13"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:659
+#: /home/runa/dev/website/press/en/inthemedia.wml:623
 msgid ""
 "<a href=\"http://online.wsj.com/article/SB113979965346572150.html\"> Chinese"
 " Censors Of Internet Face 'Hacktivists' in U.S.</a>Full article text can "
@@ -1610,53 +1606,53 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:663
+#: /home/runa/dev/website/press/en/inthemedia.wml:627
 msgid "2006 Jan 31"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:665
+#: /home/runa/dev/website/press/en/inthemedia.wml:629
 msgid ""
 "<a href=\"http://www.technologyreview.com/Infotech/16216/page2/\">Evading "
 "the Google Eye</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:668
+#: /home/runa/dev/website/press/en/inthemedia.wml:632
 msgid "2006 Jan 29"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:670
+#: /home/runa/dev/website/press/en/inthemedia.wml:634
 msgid ""
 "<a href=\"http://www.nytimes.com/2006/01/29/weekinreview/29basic.html\"> How"
 " to Outwit the World's Internet Censors</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:673
+#: /home/runa/dev/website/press/en/inthemedia.wml:637
 msgid "2006 Jan 27"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:674
+#: /home/runa/dev/website/press/en/inthemedia.wml:638
 msgid "Fox News/eWeek"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:675
+#: /home/runa/dev/website/press/en/inthemedia.wml:639
 msgid ""
 "<a href=\"http://www.foxnews.com/story/0,2933,183005,00.html\"> Web "
 "Anonymizers Suddenly Get Very Popular</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:678
+#: /home/runa/dev/website/press/en/inthemedia.wml:642
 msgid "2006 Jan 25"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:680
+#: /home/runa/dev/website/press/en/inthemedia.wml:644
 msgid ""
 "<a "
 "href=\"http://www.nytimes.com/2006/01/25/technology/techspecial2/25privacy.html?_r=1&amp;oref=slogin\">"
@@ -1664,17 +1660,17 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:683
+#: /home/runa/dev/website/press/en/inthemedia.wml:647
 msgid "2006 Jan 23"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:684
+#: /home/runa/dev/website/press/en/inthemedia.wml:648
 msgid "NPR Talk of the Nation"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:685
+#: /home/runa/dev/website/press/en/inthemedia.wml:649
 msgid ""
 "<a href=\"http://www.npr.org/templates/story/story.php?storyId=5168456\"> "
 "Search Engines and Privacy Rights on the Web</a><br/> <a "
@@ -1683,24 +1679,24 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:690
+#: /home/runa/dev/website/press/en/inthemedia.wml:654
 msgid "Punto Informatico"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:691
+#: /home/runa/dev/website/press/en/inthemedia.wml:655
 msgid ""
 "<a href=\"http://punto-informatico.it/p.aspx?i=1430903\"> TOR c'è</a> "
 "(Italian)"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:695 /tmp/u3kTkswOVo.xml:701
+#: /home/runa/dev/website/press/en/inthemedia.wml:659 /tmp/Q2ndl8ZYsF.xml:665
 msgid "2006 Jan 20"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:697
+#: /home/runa/dev/website/press/en/inthemedia.wml:661
 msgid ""
 "<a "
 "href=\"http://www.wired.com/science/discoveries/news/2006/01/70051?currentPage=2\">"
@@ -1708,53 +1704,53 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:703
+#: /home/runa/dev/website/press/en/inthemedia.wml:667
 msgid ""
 "<a href=\"http://www.npr.org/templates/story/story.php?storyId=5165854\"> "
 "Google Records Subpoena Raises Privacy Fears</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:707
+#: /home/runa/dev/website/press/en/inthemedia.wml:671
 msgid "2005 Sep 30"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:708
+#: /home/runa/dev/website/press/en/inthemedia.wml:672
 msgid "Viva o Linux"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:709
+#: /home/runa/dev/website/press/en/inthemedia.wml:673
 msgid ""
 "<a href=\"http://www.vivaolinux.com.br/artigos/verArtigo.php?codigo=2759\"> "
 "TOR: A Internet sem rastreabilidade</a> (Portuguese)"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:712
+#: /home/runa/dev/website/press/en/inthemedia.wml:676
 msgid "2005 Aug 6"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:714
+#: /home/runa/dev/website/press/en/inthemedia.wml:678
 msgid ""
 "<a href=\"http://www.eurekalert.org/pub_releases/2005-08/ns-"
 "wwa080305.php\">Why we all need pornography</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:717
+#: /home/runa/dev/website/press/en/inthemedia.wml:681
 msgid "2005 Jul 12"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:718
+#: /home/runa/dev/website/press/en/inthemedia.wml:682
 msgid "IEEE Computer Society's Technical Committee on Security and Privacy"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:719
+#: /home/runa/dev/website/press/en/inthemedia.wml:683
 msgid ""
 "<a href=\"http://www.ieee-"
 "security.org/Cipher/Newsbriefs/2005/071805.html#TOR\"> Onion routing "
@@ -1762,34 +1758,34 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:723
+#: /home/runa/dev/website/press/en/inthemedia.wml:687
 msgid "2005 Jun 22"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:724
+#: /home/runa/dev/website/press/en/inthemedia.wml:688
 msgid "The Unofficial Apple Blog"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:725
+#: /home/runa/dev/website/press/en/inthemedia.wml:689
 msgid ""
 "<a href=\"http://www.tuaw.com/2005/06/22/privacy-watch-tor/\"> Privacy "
 "Watch: Tor</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:729
+#: /home/runa/dev/website/press/en/inthemedia.wml:693
 msgid "2005 Jun 10"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:730
+#: /home/runa/dev/website/press/en/inthemedia.wml:694
 msgid "The New Zealand Herald"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:731
+#: /home/runa/dev/website/press/en/inthemedia.wml:695
 msgid ""
 "<a "
 "href=\"http://www.nzherald.co.nz/section/story.cfm?c_id=5&amp;objectid=10329896\">"
@@ -1797,104 +1793,104 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:735
+#: /home/runa/dev/website/press/en/inthemedia.wml:699
 msgid "2005 Jun 8"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:736
+#: /home/runa/dev/website/press/en/inthemedia.wml:700
 msgid "American Public Radio"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:737
+#: /home/runa/dev/website/press/en/inthemedia.wml:701
 msgid ""
 "<a href=\"http://www.publicradio.org/columns/futuretense/2005/06/08.shtml\">"
 " An Internet privacy tool called \"Tor\"</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:741 /tmp/u3kTkswOVo.xml:747
+#: /home/runa/dev/website/press/en/inthemedia.wml:705 /tmp/Q2ndl8ZYsF.xml:711
 msgid "2005 Jun 1"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:743
+#: /home/runa/dev/website/press/en/inthemedia.wml:707
 msgid ""
 "<a href=\"http://www.pcworld.com/article/id,120763-page,4/article.html\"> "
 "The 100 Best Products of 2005</a><br/> Tor is ranked #40 on the list."
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:748
+#: /home/runa/dev/website/press/en/inthemedia.wml:712
 msgid "Linux Weekly News"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:749
+#: /home/runa/dev/website/press/en/inthemedia.wml:713
 msgid ""
 "<a href=\"http://lwn.net/Articles/138242/\"> A Look at The Onion Router "
 "(Tor)</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:753
+#: /home/runa/dev/website/press/en/inthemedia.wml:717
 msgid "2005 May 22"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:754 /tmp/u3kTkswOVo.xml:839
+#: /home/runa/dev/website/press/en/inthemedia.wml:718 /tmp/Q2ndl8ZYsF.xml:803
 msgid "Slashdot"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:755
+#: /home/runa/dev/website/press/en/inthemedia.wml:719
 msgid ""
 "<a href=\"http://yro.slashdot.org/article.pl?sid=05/05/22/0113244\"> Tor "
 "Anonymity Network Reaches 100 Verified Nodes</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:759
+#: /home/runa/dev/website/press/en/inthemedia.wml:723
 msgid "2005 May 20"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:760
+#: /home/runa/dev/website/press/en/inthemedia.wml:724
 msgid "Security.uz"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:761
+#: /home/runa/dev/website/press/en/inthemedia.wml:725
 msgid ""
 "<a href=\"http://security.uz/news/default.asp?id=10541\"> Tor - мощный "
 "анонимайзер для всех ОС</a> (Russian)"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:765
+#: /home/runa/dev/website/press/en/inthemedia.wml:729
 msgid "2005 May 19"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:766
+#: /home/runa/dev/website/press/en/inthemedia.wml:730
 msgid "WebPlanet"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:767
+#: /home/runa/dev/website/press/en/inthemedia.wml:731
 msgid ""
 "<a href=\"http://webplanet.ru/news/security/2005/5/19/tor.html\"> Tor: "
 "распределенная система анонимного серфинга</a> (Russian)"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:771 /tmp/u3kTkswOVo.xml:778
+#: /home/runa/dev/website/press/en/inthemedia.wml:735 /tmp/Q2ndl8ZYsF.xml:742
 msgid "2005 May 17"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:773
+#: /home/runa/dev/website/press/en/inthemedia.wml:737
 msgid ""
 "<a "
 "href=\"http://www.wired.com/politics/security/news/2005/05/67542?currentPage=all\">"
@@ -1903,170 +1899,170 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:779
+#: /home/runa/dev/website/press/en/inthemedia.wml:743
 msgid "XBiz"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:780
+#: /home/runa/dev/website/press/en/inthemedia.wml:744
 msgid ""
 "<a href=\"http://xbiz.com/news/8761\"> Navy Project Allows Anonymous "
 "Browsing</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:784
+#: /home/runa/dev/website/press/en/inthemedia.wml:748
 msgid "2005 Apr 13"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:785
+#: /home/runa/dev/website/press/en/inthemedia.wml:749
 msgid "Heise online"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:786
+#: /home/runa/dev/website/press/en/inthemedia.wml:750
 msgid ""
 "<a href=\"http://www.heise.de/newsticker/meldung/58506\"> CFP: Vom "
 "kafkaesken Schwinden der Anonymität</a> (German)"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:790
+#: /home/runa/dev/website/press/en/inthemedia.wml:754
 msgid "2005 Apr 5"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:791
+#: /home/runa/dev/website/press/en/inthemedia.wml:755
 msgid "Libero"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:792
+#: /home/runa/dev/website/press/en/inthemedia.wml:756
 msgid ""
 "<a href=\"http://magazine.libero.it/internetlife/scienzaeweb/ne208.phtml\"> "
 "Anonimato on line, ecco Tor</a> (Italian)"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:796
+#: /home/runa/dev/website/press/en/inthemedia.wml:760
 msgid "2005 Jan 4"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:797
+#: /home/runa/dev/website/press/en/inthemedia.wml:761
 msgid "Internetnews"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:798
+#: /home/runa/dev/website/press/en/inthemedia.wml:762
 msgid ""
 "<a href=\"http://www.internetnews.com/dev-news/article.php/3454521\"> EFF "
 "Throws Support to 'Anonymous' Internet Project</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:802
+#: /home/runa/dev/website/press/en/inthemedia.wml:766
 msgid "2005 Mar 31"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:803
+#: /home/runa/dev/website/press/en/inthemedia.wml:767
 msgid "Linux.com"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:804
+#: /home/runa/dev/website/press/en/inthemedia.wml:768
 msgid ""
 "<a href=\"http://www.linux.com/articles/43713?tid=19&amp;tid=78\"> Securing "
 "your online privacy with Tor</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:808
+#: /home/runa/dev/website/press/en/inthemedia.wml:772
 msgid "2004 Dec 27"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:809
+#: /home/runa/dev/website/press/en/inthemedia.wml:773
 msgid "BoingBoing"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:810
+#: /home/runa/dev/website/press/en/inthemedia.wml:774
 msgid ""
 "<a href=\"http://www.boingboing.net/2004/12/27/eff-helping-produce-.html\"> "
 "EFF helping produce anonymizing software</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:814
+#: /home/runa/dev/website/press/en/inthemedia.wml:778
 msgid "2004 Dec 25"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:815
+#: /home/runa/dev/website/press/en/inthemedia.wml:779
 msgid "Kansas City infozine"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:816
+#: /home/runa/dev/website/press/en/inthemedia.wml:780
 msgid ""
 "<a href=\"http://www.infozine.com/news/stories/op/storiesView/sid/4933/\"> "
 "EFF Joins Forces with Tor Software Project</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:820 /tmp/u3kTkswOVo.xml:826
+#: /home/runa/dev/website/press/en/inthemedia.wml:784 /tmp/Q2ndl8ZYsF.xml:790
 msgid "2004 Dec 23"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:821
+#: /home/runa/dev/website/press/en/inthemedia.wml:785
 msgid "golem.de"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:822
+#: /home/runa/dev/website/press/en/inthemedia.wml:786
 msgid ""
 "<a href=\"http://www.golem.de/0412/35340.html\"> EFF unterstützt "
 "Anonymisierer Tor</a> (German)"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:827
+#: /home/runa/dev/website/press/en/inthemedia.wml:791
 msgid "SuicideGirls"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:828
+#: /home/runa/dev/website/press/en/inthemedia.wml:792
 msgid ""
 "<a href=\"http://suicidegirls.com/news/technology/6150/\"> New Routing "
 "Software Allows Anonymous Internet Use</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:832
+#: /home/runa/dev/website/press/en/inthemedia.wml:796
 msgid "2004 Dec 18"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:833
+#: /home/runa/dev/website/press/en/inthemedia.wml:797
 msgid "P2Pnet"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:834
+#: /home/runa/dev/website/press/en/inthemedia.wml:798
 msgid "<a href=\"http://p2pnet.net/story/3357\"> EFF to sponsor Tor</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:838
+#: /home/runa/dev/website/press/en/inthemedia.wml:802
 msgid "2004 Dec 22"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:840
+#: /home/runa/dev/website/press/en/inthemedia.wml:804
 msgid ""
 "<a "
 "href=\"http://yro.slashdot.org/article.pl?sid=04/12/22/2031229&amp;tid=95&amp;tid=158&amp;tid=153&amp;tid=17\">"
@@ -2074,106 +2070,106 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:844
+#: /home/runa/dev/website/press/en/inthemedia.wml:808
 msgid "2004 Nov 16"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:845
+#: /home/runa/dev/website/press/en/inthemedia.wml:809
 msgid "AlterNet"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:846
+#: /home/runa/dev/website/press/en/inthemedia.wml:810
 msgid ""
 "<a href=\"http://www.alternet.org/columnists/story/20523/\"> Heavy "
 "Traffic</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:850
+#: /home/runa/dev/website/press/en/inthemedia.wml:814
 msgid "2004 Aug 30"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:851
+#: /home/runa/dev/website/press/en/inthemedia.wml:815
 msgid "Newsweek"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:852
+#: /home/runa/dev/website/press/en/inthemedia.wml:816
 msgid "Technology: Instant Security (no link)"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:856
+#: /home/runa/dev/website/press/en/inthemedia.wml:820
 msgid "2004 Aug 16"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:857
+#: /home/runa/dev/website/press/en/inthemedia.wml:821
 msgid "Eweek"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:858
+#: /home/runa/dev/website/press/en/inthemedia.wml:822
 msgid ""
 "<a href=\"http://www.eweek.com/c/a/Security/Dont-Fear-Internet-Anonymity-"
 "Tools/\"> Don't Fear Internet Anonymity Tools</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:862 /tmp/u3kTkswOVo.xml:868
+#: /home/runa/dev/website/press/en/inthemedia.wml:826 /tmp/Q2ndl8ZYsF.xml:832
 msgid "2004 Aug 6"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:863
+#: /home/runa/dev/website/press/en/inthemedia.wml:827
 msgid "HCC magazine"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:864
+#: /home/runa/dev/website/press/en/inthemedia.wml:828
 msgid ""
 "<a href=\"http://www.hcc.nl/eCache/DEF/21/083.html\"> Anoniem surfen met "
 "hulp van marine VS</a> (Dutch)"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:869
+#: /home/runa/dev/website/press/en/inthemedia.wml:833
 msgid "Golem"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:870
+#: /home/runa/dev/website/press/en/inthemedia.wml:834
 msgid ""
 "<a href=\"http://www.golem.de/0408/32835.html\"> Tor: Anonymisierer nutzt "
 "Onion-Routing</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:874
+#: /home/runa/dev/website/press/en/inthemedia.wml:838
 msgid "2004 Aug 5"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:875
+#: /home/runa/dev/website/press/en/inthemedia.wml:839
 msgid "Network World Security"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:876
+#: /home/runa/dev/website/press/en/inthemedia.wml:840
 msgid ""
 "<a href=\"http://www.networkworld.com/details/7088.html\"> Onion routing</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:880
+#: /home/runa/dev/website/press/en/inthemedia.wml:844
 msgid "2004 May 8"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:882
+#: /home/runa/dev/website/press/en/inthemedia.wml:846
 msgid ""
 "<a href=\"http://www.wired.com/politics/security/news/2004/08/64464\"> Onion"
 " Routing Averts Prying Eyes</a>. Also in <a "
@@ -2181,29 +2177,29 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:886
+#: /home/runa/dev/website/press/en/inthemedia.wml:850
 msgid "2004 Mar 8"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:887
+#: /home/runa/dev/website/press/en/inthemedia.wml:851
 msgid "CNET Japan blog"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:888
+#: /home/runa/dev/website/press/en/inthemedia.wml:852
 msgid ""
 "<a href=\"http://japan.cnet.com/blog/umeda/2004/03/08/entry_post_126/\"> "
 "Yearning of hackers and insecurity</a> (Japanese)"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:892
+#: /home/runa/dev/website/press/en/inthemedia.wml:856
 msgid "1999 Apr 13"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:894
+#: /home/runa/dev/website/press/en/inthemedia.wml:858
 msgid ""
 "<a href=\"http://www.wired.com/science/discoveries/news/1999/04/19091\"> "
 "Anonymous Web Surfing? Uh-Uh</a>"

Modified: translation/trunk/projects/website/po/it/press/4-optional.2010-03-25-tor-store-press-release.po
===================================================================
--- translation/trunk/projects/website/po/it/press/4-optional.2010-03-25-tor-store-press-release.po	2011-04-12 16:15:00 UTC (rev 24594)
+++ translation/trunk/projects/website/po/it/press/4-optional.2010-03-25-tor-store-press-release.po	2011-04-12 16:19:31 UTC (rev 24595)
@@ -8,7 +8,7 @@
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
 "POT-Creation-Date: 2010-12-26 14:32+0000\n"
-"PO-Revision-Date: 2011-03-27 17:35+0000\n"
+"PO-Revision-Date: 2011-04-12 16:13+0000\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: Italian <None>\n"
 "MIME-Version: 1.0\n"

Modified: translation/trunk/projects/website/po/it/projects/1-high.torbrowser.po
===================================================================
--- translation/trunk/projects/website/po/it/projects/1-high.torbrowser.po	2011-04-12 16:15:00 UTC (rev 24594)
+++ translation/trunk/projects/website/po/it/projects/1-high.torbrowser.po	2011-04-12 16:19:31 UTC (rev 24595)
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-03-25 16:51+0000\n"
-"PO-Revision-Date: 2011-03-26 00:33+0000\n"
+"POT-Creation-Date: 2011-03-28 12:49+0200\n"
+"PO-Revision-Date: 2011-03-29 00:27+0000\n"
 "Last-Translator: runasand <runa.sandvik at gmail.com>\n"
 "Language-Team: Italian <None>\n"
 "MIME-Version: 1.0\n"
@@ -18,7 +18,7 @@
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:9
+#: /home/runa/dev/website/projects/en/torbrowser.wml:9
 msgid ""
 "<a href=\"<page index>\">Home &raquo; </a> <a href=\"<page "
 "projects/projects>\">Projects &raquo; </a> <a href=\"<page "
@@ -26,17 +26,17 @@
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:17
+#: /home/runa/dev/website/projects/en/torbrowser.wml:17
 msgid "Tor Browser Bundle"
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:18
+#: /home/runa/dev/website/projects/en/torbrowser.wml:18
 msgid "<hr/>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:20
+#: /home/runa/dev/website/projects/en/torbrowser.wml:20
 msgid ""
 "The <strong>Tor</strong> software protects you by bouncing your "
 "communications around a distributed network of relays run by volunteers all "
@@ -47,7 +47,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:27
+#: /home/runa/dev/website/projects/en/torbrowser.wml:27
 msgid ""
 "The <strong>Tor Browser Bundle</strong> lets you use Tor on Windows, Mac OS "
 "X, or Linux without needing to install any software.  It can run off a USB "
@@ -59,7 +59,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:39
+#: /home/runa/dev/website/projects/en/torbrowser.wml:39
 msgid ""
 "Freedom House has produced a video on how to find and use the Tor Browser "
 "Bundle.  If you don't see a video below, view it at <a "
@@ -68,19 +68,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:49
+#: /home/runa/dev/website/projects/en/torbrowser.wml:49
 msgid "<a id=\"Download\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:50
+#: /home/runa/dev/website/projects/en/torbrowser.wml:50
 msgid ""
 "<a class=\"anchor\" href=\"#Download\">Download Tor Browser Bundle and Tor "
 "IM Browser Bundle</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:52
+#: /home/runa/dev/website/projects/en/torbrowser.wml:52
 msgid ""
 "To start using the Tor Browser Bundle or Tor IM Browser Bundle, download the"
 " file for your preferred language. This file can be saved wherever is "
@@ -88,7 +88,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:56
+#: /home/runa/dev/website/projects/en/torbrowser.wml:56
 msgid ""
 "If you have an unreliable Internet connection, it may be easier for you to "
 "download the bundle edition which is <a href=\"<page projects/torbrowser-"
@@ -96,14 +96,14 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:58
+#: /home/runa/dev/website/projects/en/torbrowser.wml:58
 msgid ""
 "Tor Browser Bundle for Windows with Firefox (version <version-"
 "torbrowserbundle>, 16 MB)"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:62
+#: /home/runa/dev/website/projects/en/torbrowser.wml:62
 msgid ""
 "<a href=\"../dist/torbrowser/tor-browser-<version-torbrowserbundle>_en-"
 "US.exe\">English (en-US)</a> (<a href=\"../dist/torbrowser/tor-browser"
@@ -112,7 +112,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:64
+#: /home/runa/dev/website/projects/en/torbrowser.wml:64
 msgid ""
 "<a href=\"../dist/torbrowser/tor-browser-<version-"
 "torbrowserbundle>_ar.exe\">&#x0627;&#x0644;&#x0639;&#x0631;&#x0628;&#x064a;&#x0629;"
@@ -121,7 +121,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:66
+#: /home/runa/dev/website/projects/en/torbrowser.wml:66
 msgid ""
 "<a href=\"../dist/torbrowser/tor-browser-<version-"
 "torbrowserbundle>_de.exe\">Deutsch (de)</a> (<a href=\"../dist/torbrowser"
@@ -130,7 +130,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:68
+#: /home/runa/dev/website/projects/en/torbrowser.wml:68
 msgid ""
 "<a href=\"../dist/torbrowser/tor-browser-<version-torbrowserbundle>_es-"
 "ES.exe\">&#x0045;&#x0073;&#x0070;&#x0061;&#x00f1;&#x006f;&#x006c; (es-"
@@ -139,7 +139,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:70
+#: /home/runa/dev/website/projects/en/torbrowser.wml:70
 msgid ""
 "<a href=\"../dist/torbrowser/tor-browser-<version-"
 "torbrowserbundle>_fa.exe\">&#x0641;&#x0627;&#x0631;&#x0633;&#x06cc; (fa)</a>"
@@ -148,7 +148,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:72
+#: /home/runa/dev/website/projects/en/torbrowser.wml:72
 msgid ""
 "<a href=\"../dist/torbrowser/tor-browser-<version-"
 "torbrowserbundle>_fr.exe\">&#x0046;&#x0072;&#x0061;&#x006e;&#x00e7;&#x0061;&#x0069;&#x0073;"
@@ -157,7 +157,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:74
+#: /home/runa/dev/website/projects/en/torbrowser.wml:74
 msgid ""
 "<a href=\"../dist/torbrowser/tor-browser-<version-"
 "torbrowserbundle>_it.exe\">Italiano (it)</a> (<a href=\"../dist/torbrowser"
@@ -166,7 +166,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:76
+#: /home/runa/dev/website/projects/en/torbrowser.wml:76
 msgid ""
 "<a href=\"../dist/torbrowser/tor-browser-<version-"
 "torbrowserbundle>_nl.exe\">Nederlands (nl)</a> (<a href=\"../dist/torbrowser"
@@ -175,7 +175,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:78
+#: /home/runa/dev/website/projects/en/torbrowser.wml:78
 msgid ""
 "<a href=\"../dist/torbrowser/tor-browser-<version-"
 "torbrowserbundle>_pl.exe\">Polish (pl)</a> (<a href=\"../dist/torbrowser"
@@ -184,7 +184,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:80
+#: /home/runa/dev/website/projects/en/torbrowser.wml:80
 msgid ""
 "<a href=\"../dist/torbrowser/tor-browser-<version-torbrowserbundle>_pt-"
 "PT.exe\">&#x0050;&#x006f;&#x0072;&#x0074;&#x0075;&#x0067;&#x0075;&#x00ea;&#x0073;"
@@ -193,7 +193,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:82
+#: /home/runa/dev/website/projects/en/torbrowser.wml:82
 msgid ""
 "<a href=\"../dist/torbrowser/tor-browser-<version-"
 "torbrowserbundle>_ru.exe\">&#x0420;&#x0443;&#x0441;&#x0441;&#x043a;&#x0438;&#x0439;"
@@ -202,7 +202,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:84
+#: /home/runa/dev/website/projects/en/torbrowser.wml:84
 msgid ""
 "<a href=\"../dist/torbrowser/tor-browser-<version-"
 "torbrowserbundle>_vi.exe\">Vietnamese (vi)</a> (<a href=\"../dist/torbrowser"
@@ -211,7 +211,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:86
+#: /home/runa/dev/website/projects/en/torbrowser.wml:86
 msgid ""
 "<a href=\"../dist/torbrowser/tor-browser-<version-torbrowserbundle>_zh-"
 "CN.exe\">&#x7b80;&#x4f53;&#x5b57; (zh-CN)</a> (<a href=\"../dist/torbrowser"
@@ -220,14 +220,14 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:90
+#: /home/runa/dev/website/projects/en/torbrowser.wml:90
 msgid ""
 "Tor IM Browser Bundle for Windows with Firefox and Pidgin (version <version-"
 "torimbrowserbundle>, 25 MB)"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:94
+#: /home/runa/dev/website/projects/en/torbrowser.wml:94
 msgid ""
 "<a href=\"../dist/torbrowser/tor-im-browser-<version-torimbrowserbundle>_en-"
 "US.exe\">English (en-US)</a> (<a href=\"../dist/torbrowser/tor-im-browser"
@@ -236,7 +236,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:96
+#: /home/runa/dev/website/projects/en/torbrowser.wml:96
 msgid ""
 "<a href=\"../dist/torbrowser/tor-im-browser-<version-"
 "torimbrowserbundle>_ar.exe\">&#x0627;&#x0644;&#x0639;&#x0631;&#x0628;&#x064a;&#x0629;"
@@ -245,7 +245,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:98
+#: /home/runa/dev/website/projects/en/torbrowser.wml:98
 msgid ""
 "<a href=\"../dist/torbrowser/tor-im-browser-<version-"
 "torimbrowserbundle>_de.exe\">Deutsch (de)</a> (<a href=\"../dist/torbrowser"
@@ -254,7 +254,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:100
+#: /home/runa/dev/website/projects/en/torbrowser.wml:100
 msgid ""
 "<a href=\"../dist/torbrowser/tor-im-browser-<version-torimbrowserbundle>_es-"
 "ES.exe\">&#x0045;&#x0073;&#x0070;&#x0061;&#x00f1;&#x006f;&#x006c; (es-"
@@ -263,7 +263,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:102
+#: /home/runa/dev/website/projects/en/torbrowser.wml:102
 msgid ""
 "<a href=\"../dist/torbrowser/tor-im-browser-<version-"
 "torimbrowserbundle>_fa.exe\">&#x0641;&#x0627;&#x0631;&#x0633;&#x06cc; "
@@ -272,7 +272,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:104
+#: /home/runa/dev/website/projects/en/torbrowser.wml:104
 msgid ""
 "<a href=\"../dist/torbrowser/tor-im-browser-<version-"
 "torimbrowserbundle>_fr.exe\">&#x0046;&#x0072;&#x0061;&#x006e;&#x00e7;&#x0061;&#x0069;&#x0073;"
@@ -281,7 +281,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:106
+#: /home/runa/dev/website/projects/en/torbrowser.wml:106
 msgid ""
 "<a href=\"../dist/torbrowser/tor-im-browser-<version-"
 "torimbrowserbundle>_it.exe\">Italiano (it)</a> (<a href=\"../dist/torbrowser"
@@ -290,7 +290,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:108
+#: /home/runa/dev/website/projects/en/torbrowser.wml:108
 msgid ""
 "<a href=\"../dist/torbrowser/tor-im-browser-<version-"
 "torimbrowserbundle>_nl.exe\">Nederlands (nl)</a> (<a "
@@ -299,7 +299,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:110
+#: /home/runa/dev/website/projects/en/torbrowser.wml:110
 msgid ""
 "<a href=\"../dist/torbrowser/tor-im-browser-<version-"
 "torimbrowserbundle>_pl.exe\">Polish (pl)</a> (<a href=\"../dist/torbrowser"
@@ -308,7 +308,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:112
+#: /home/runa/dev/website/projects/en/torbrowser.wml:112
 msgid ""
 "<a href=\"../dist/torbrowser/tor-im-browser-<version-torimbrowserbundle>_pt-"
 "PT.exe\">&#x0050;&#x006f;&#x0072;&#x0074;&#x0075;&#x0067;&#x0075;&#x00ea;&#x0073;"
@@ -317,7 +317,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:114
+#: /home/runa/dev/website/projects/en/torbrowser.wml:114
 msgid ""
 "<a href=\"../dist/torbrowser/tor-im-browser-<version-"
 "torimbrowserbundle>_ru.exe\">&#x0420;&#x0443;&#x0441;&#x0441;&#x043a;&#x0438;&#x0439;"
@@ -326,7 +326,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:116
+#: /home/runa/dev/website/projects/en/torbrowser.wml:116
 msgid ""
 "<a href=\"../dist/torbrowser/tor-im-browser-<version-"
 "torimbrowserbundle>_vi.exe\">Vietnamese (vi)</a> (<a "
@@ -335,7 +335,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:118
+#: /home/runa/dev/website/projects/en/torbrowser.wml:118
 msgid ""
 "<a href=\"../dist/torbrowser/tor-im-browser-<version-torimbrowserbundle>_zh-"
 "CN.exe\">&#x7b80;&#x4f53;&#x5b57; (zh-CN)</a> (<a href=\"../dist/torbrowser"
@@ -344,14 +344,14 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:122
+#: /home/runa/dev/website/projects/en/torbrowser.wml:122
 msgid ""
-"BETA: Tor Browser Bundle for Intel Mac OS X with Firefox (version <version-"
-"torbrowserbundleosx>, 28 MB)"
+"BETA: Tor Browser Bundle for Intel Mac OS X 10.5 and higher with Firefox "
+"(version <version-torbrowserbundleosx>, 28 MB)"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:126
+#: /home/runa/dev/website/projects/en/torbrowser.wml:126
 msgid ""
 "<a href=\"../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx"
 ">-dev-osx-i386-en-US.zip\">English (en-US)</a> (<a "
@@ -360,7 +360,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:129
+#: /home/runa/dev/website/projects/en/torbrowser.wml:129
 msgid ""
 "<a href=\"../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx"
 ">-dev-"
@@ -371,7 +371,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:133
+#: /home/runa/dev/website/projects/en/torbrowser.wml:133
 msgid ""
 "<a href=\"../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx"
 ">-dev-osx-i386-de.zip\">Deutsch (de)</a> (<a "
@@ -380,7 +380,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:136
+#: /home/runa/dev/website/projects/en/torbrowser.wml:136
 msgid ""
 "<a href=\"../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx"
 ">-dev-osx-i386-es-"
@@ -391,7 +391,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:140
+#: /home/runa/dev/website/projects/en/torbrowser.wml:140
 msgid ""
 "<a href=\"../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx"
 ">-dev-osx-i386-fa.zip\">&#x0641;&#x0627;&#x0631;&#x0633;&#x06cc; (fa) </a> "
@@ -400,7 +400,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:143
+#: /home/runa/dev/website/projects/en/torbrowser.wml:143
 msgid ""
 "<a href=\"../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx"
 ">-dev-"
@@ -411,7 +411,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:146
+#: /home/runa/dev/website/projects/en/torbrowser.wml:146
 msgid ""
 "<a href=\"../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx"
 ">-dev-osx-i386-it.zip\">Italiano (it)</a> (<a "
@@ -420,7 +420,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:149
+#: /home/runa/dev/website/projects/en/torbrowser.wml:149
 msgid ""
 "<a href=\"../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx"
 ">-dev-osx-i386-nl.zip\">Nederlands (nl)</a> (<a "
@@ -429,7 +429,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:152
+#: /home/runa/dev/website/projects/en/torbrowser.wml:152
 msgid ""
 "<a href=\"../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx"
 ">-dev-osx-i386-pl.zip\">Polish (pl)</a> (<a "
@@ -438,7 +438,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:155
+#: /home/runa/dev/website/projects/en/torbrowser.wml:155
 msgid ""
 "<a href=\"../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx"
 ">-dev-osx-i386-pt-"
@@ -449,7 +449,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:158
+#: /home/runa/dev/website/projects/en/torbrowser.wml:158
 msgid ""
 "<a href=\"../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx"
 ">-dev-"
@@ -460,7 +460,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:162
+#: /home/runa/dev/website/projects/en/torbrowser.wml:162
 msgid ""
 "<a href=\"../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx"
 ">-dev-osx-i386-zh-CN.zip\">&#x7b80;&#x4f53;&#x5b57; (zh-CN)</a> (<a "
@@ -469,7 +469,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:169
+#: /home/runa/dev/website/projects/en/torbrowser.wml:169
 msgid ""
 "BETA: Tor Browser Bundle for Linux with Firefox (version <version-"
 "torbrowserbundlelinux32> (32-bit), <version-torbrowserbundlelinux64> "
@@ -477,7 +477,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:172
+#: /home/runa/dev/website/projects/en/torbrowser.wml:172
 msgid ""
 "English (en-US): <a href=\"../dist/torbrowser/linux/tor-browser-gnu-"
 "linux-i686-<version-torbrowserbundlelinux32>-dev-en-US.tar.gz\">32-bit</a> "
@@ -491,7 +491,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:175
+#: /home/runa/dev/website/projects/en/torbrowser.wml:175
 msgid ""
 "&#x0627;&#x0644;&#x0639;&#x0631;&#x0628;&#x064a;&#x0629; (ar): <a "
 "href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-"
@@ -506,7 +506,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:177
+#: /home/runa/dev/website/projects/en/torbrowser.wml:177
 msgid ""
 "Deutsch (de): <a href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-i686"
 "-<version-torbrowserbundlelinux32>-dev-de.tar.gz\">32-bit</a> (<a "
@@ -520,7 +520,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:179
+#: /home/runa/dev/website/projects/en/torbrowser.wml:179
 msgid ""
 "&#x0045;&#x0073;&#x0070;&#x0061;&#x00f1;&#x006f;&#x006c; (es-ES): <a "
 "href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-"
@@ -535,7 +535,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:181
+#: /home/runa/dev/website/projects/en/torbrowser.wml:181
 msgid ""
 "&#x0641;&#x0627;&#x0631;&#x0633;&#x06cc; (fa): <a "
 "href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-"
@@ -550,7 +550,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:183
+#: /home/runa/dev/website/projects/en/torbrowser.wml:183
 msgid ""
 "&#x0046;&#x0072;&#x0061;&#x006e;&#x00e7;&#x0061;&#x0069;&#x0073; (fr): <a "
 "href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-"
@@ -565,7 +565,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:185
+#: /home/runa/dev/website/projects/en/torbrowser.wml:185
 msgid ""
 "Italiano (it): <a href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-i686"
 "-<version-torbrowserbundlelinux32>-dev-it.tar.gz\">32-bit</a> (<a "
@@ -579,7 +579,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:187
+#: /home/runa/dev/website/projects/en/torbrowser.wml:187
 msgid ""
 "Nederlands (nl): <a href=\"../dist/torbrowser/linux/tor-browser-gnu-"
 "linux-i686-<version-torbrowserbundlelinux32>-dev-nl.tar.gz\">32-bit</a> (<a "
@@ -593,7 +593,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:189
+#: /home/runa/dev/website/projects/en/torbrowser.wml:189
 msgid ""
 "Polish (pl): <a href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-i686"
 "-<version-torbrowserbundlelinux32>-dev-pl.tar.gz\">32-bit</a> (<a "
@@ -607,7 +607,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:191
+#: /home/runa/dev/website/projects/en/torbrowser.wml:191
 msgid ""
 "&#x0050;&#x006f;&#x0072;&#x0074;&#x0075;&#x0067;&#x0075;&#x00ea;&#x0073; "
 "(pt-PT): <a href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-i686"
@@ -622,7 +622,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:193
+#: /home/runa/dev/website/projects/en/torbrowser.wml:193
 msgid ""
 "&#x0420;&#x0443;&#x0441;&#x0441;&#x043a;&#x0438;&#x0439; (ru): <a "
 "href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-"
@@ -637,7 +637,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:195
+#: /home/runa/dev/website/projects/en/torbrowser.wml:195
 msgid ""
 "&#x7b80;&#x4f53;&#x5b57; (zh-CN): <a href=\"../dist/torbrowser/linux/tor-"
 "browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-zh-"
@@ -651,7 +651,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:201
+#: /home/runa/dev/website/projects/en/torbrowser.wml:201
 msgid ""
 "See our instructions on <a href=\"<page docs/verifying-signatures>\">how to "
 "verify package signatures</a>, which allows you to make sure you've "
@@ -663,17 +663,17 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:211
+#: /home/runa/dev/website/projects/en/torbrowser.wml:211
 msgid "<a id=\"MacOSX\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:212
+#: /home/runa/dev/website/projects/en/torbrowser.wml:212
 msgid "<a class=\"anchor\" href=\"#MacOSX\">Mac OS X instructions</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:213
+#: /home/runa/dev/website/projects/en/torbrowser.wml:213
 msgid ""
 "Download the file above, save it somewhere, then click on it. Mac OS X will "
 "automatically unarchive it and you will have a TorBrowser application in "
@@ -682,18 +682,25 @@
 "will launch Firefox."
 msgstr ""
 
+#. type: Content of: <div><div><p>
+#: /home/runa/dev/website/projects/en/torbrowser.wml:219
+msgid ""
+"<img src=\"$(IMGROOT)/screenshot-osx-torbrowser-icon.png\" alt=\"Screenshot "
+"Mac OS X bundle\" />"
+msgstr ""
+
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:219
+#: /home/runa/dev/website/projects/en/torbrowser.wml:221
 msgid "<a id=\"Linux\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:220
+#: /home/runa/dev/website/projects/en/torbrowser.wml:222
 msgid "<a class=\"anchor\" href=\"#Linux\">Linux instructions</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:221
+#: /home/runa/dev/website/projects/en/torbrowser.wml:223
 msgid ""
 "Download the architecture-appropriate file above, save it somewhere, then "
 "run:<br> tar -xvzf tor-browser-gnu-linux-i686-<version-"
@@ -706,17 +713,17 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:230
+#: /home/runa/dev/website/projects/en/torbrowser.wml:232
 msgid "<a id=\"Extraction\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:231
+#: /home/runa/dev/website/projects/en/torbrowser.wml:233
 msgid "<a class=\"anchor\" href=\"#Extraction\">Extraction</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:233
+#: /home/runa/dev/website/projects/en/torbrowser.wml:235
 msgid ""
 "Download the file above, and save it somewhere, then double click on it.  "
 "Click on the button labelled <strong>\"...\"</strong> (1) and select where "
@@ -728,57 +735,57 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:241
+#: /home/runa/dev/website/projects/en/torbrowser.wml:243
 msgid ""
 "Click <strong>Extract</strong> (3) to begin extraction. This may take a few "
 "minutes to complete."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:244
+#: /home/runa/dev/website/projects/en/torbrowser.wml:246
 msgid ""
 "<img src=\"$(IMGROOT)/tbb-screenshot1.png\" alt=\"Screenshot of extraction "
 "process\" />"
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:247
+#: /home/runa/dev/website/projects/en/torbrowser.wml:249
 msgid "<a id=\"Usage\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:248
+#: /home/runa/dev/website/projects/en/torbrowser.wml:250
 msgid "<a class=\"anchor\" href=\"#Usage\">Usage</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:250
+#: /home/runa/dev/website/projects/en/torbrowser.wml:252
 msgid ""
 "Once extraction is complete, open the folder <strong>Tor Browser</strong> "
 "from the location you saved the bundle."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:252
+#: /home/runa/dev/website/projects/en/torbrowser.wml:254
 msgid ""
 "Double click on the <strong>Start Tor Browser</strong> (4) application (it "
 "may be called <strong>Start Tor Browser.exe</strong> on some systems.)"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:255
+#: /home/runa/dev/website/projects/en/torbrowser.wml:257
 msgid "The Vidalia window will shortly appear."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:257
+#: /home/runa/dev/website/projects/en/torbrowser.wml:259
 msgid ""
 "<img src=\"$(IMGROOT)/tbb-screenshot2.png\" alt=\"Screenshot of bundle "
 "startup\" />"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:260
+#: /home/runa/dev/website/projects/en/torbrowser.wml:262
 msgid ""
 "Once Tor is ready, Firefox will automatically be opened. Only web pages "
 "visited through the included Firefox browser will be sent via Tor. Other web"
@@ -790,14 +797,14 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:267
+#: /home/runa/dev/website/projects/en/torbrowser.wml:269
 msgid ""
 "If you installed the Tor IM Browser Bundle, the Pidgin instant messaging "
 "client will also be automatically opened."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:269
+#: /home/runa/dev/website/projects/en/torbrowser.wml:271
 msgid ""
 "Once you are finished browsing, close any open Firefox windows by clicking "
 "on the <img src=\"$(IMGROOT)/tbb-close-button.png\" alt=\"Close button "
@@ -806,12 +813,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:275
+#: /home/runa/dev/website/projects/en/torbrowser.wml:277
 msgid "<img src=\"$(IMGROOT)/tbb-screenshot3a.png\" alt=\"Screenshot of Firefox\" />"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:278
+#: /home/runa/dev/website/projects/en/torbrowser.wml:280
 msgid ""
 "With the Tor Browser Bundle, Vidalia and Tor will automatically close. With "
 "the Tor IM Browser Bundle you need to also close Pidgin by right-clicking on"
@@ -819,19 +826,19 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:280
+#: /home/runa/dev/website/projects/en/torbrowser.wml:282
 msgid "<img src=\"$(IMGROOT)/tbb-screenshot3b.png\" alt=\"Screenshot of Pidgin\" />"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:283
+#: /home/runa/dev/website/projects/en/torbrowser.wml:285
 msgid ""
 "To use the Tor Browser Bundle or Tor IM Browser Bundle again, repeat the "
 "steps in <a href=\"#Usage\">\"Usage\"</a>."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:285
+#: /home/runa/dev/website/projects/en/torbrowser.wml:287
 msgid ""
 "Remember that Tor anonymizes the origin of your traffic, and it encrypts "
 "everything inside the Tor network, but <a "
@@ -843,17 +850,17 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:293
+#: /home/runa/dev/website/projects/en/torbrowser.wml:295
 msgid "<a id=\"Feedback\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:294
+#: /home/runa/dev/website/projects/en/torbrowser.wml:296
 msgid "<a class=\"anchor\" href=\"#Feedback\">Comments and suggestions</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:296
+#: /home/runa/dev/website/projects/en/torbrowser.wml:298
 msgid ""
 "The Tor Browser Bundle is under development and not yet complete.  To "
 "discuss improvements and submit comments, please use the <a "
@@ -861,24 +868,24 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:300
+#: /home/runa/dev/website/projects/en/torbrowser.wml:302
 msgid "<a id=\"More\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:301
+#: /home/runa/dev/website/projects/en/torbrowser.wml:303
 msgid "<a class=\"anchor\" href=\"#More\">More information</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:303
+#: /home/runa/dev/website/projects/en/torbrowser.wml:305
 msgid ""
 "<strong>What is Tor and why do I need it?</strong> To learn more about Tor, "
 "visit the <a href=\"<page index>\">Tor Project website</a>."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:307
+#: /home/runa/dev/website/projects/en/torbrowser.wml:309
 msgid ""
 "<strong>What is in the Tor Browser Bundle?</strong> It contains Tor, "
 "Vidalia, Polipo, Firefox, and Torbutton (<a href=\"<page projects"
@@ -886,7 +893,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:311
+#: /home/runa/dev/website/projects/en/torbrowser.wml:313
 msgid ""
 "<strong>What is in the Tor IM Browser Bundle?</strong> It contains Tor, "
 "Vidalia, Polipo, Firefox, Torbutton, Pidgin and OTR (<a href=\"<page "
@@ -894,7 +901,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:315
+#: /home/runa/dev/website/projects/en/torbrowser.wml:317
 msgid ""
 "<strong>How can I make my own bundle?</strong> To download the source code "
 "and learn how to build the bundle yourself, read the <a href=\"<page "
@@ -902,7 +909,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:319
+#: /home/runa/dev/website/projects/en/torbrowser.wml:321
 msgid ""
 "Tor Browser Bundle is partially based on <a "
 "href=\"http://portableapps.com/apps/internet/firefox_portable\">Mozilla "

Modified: translation/trunk/projects/website/po/ja_JP/1-high.index.po
===================================================================
--- translation/trunk/projects/website/po/ja_JP/1-high.index.po	2011-04-12 16:15:00 UTC (rev 24594)
+++ translation/trunk/projects/website/po/ja_JP/1-high.index.po	2011-04-12 16:19:31 UTC (rev 24595)
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-03-17 18:05+0000\n"
-"PO-Revision-Date: 2011-03-22 16:15+0000\n"
+"POT-Creation-Date: 2011-03-28 12:48+0200\n"
+"PO-Revision-Date: 2011-03-29 00:25+0000\n"
 "Last-Translator: runasand <runa.sandvik at gmail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
@@ -18,35 +18,35 @@
 "Plural-Forms: nplurals=1; plural=0\n"
 
 #. type: Content of: <div><div><div><div><ul><li>
-#: /home/runa/tor/website/en/index.wml:12
+#: /home/runa/dev/website/en/index.wml:12
 msgid "Tor prevents anyone from learning your location or browsing habits."
 msgstr "Tor"
 
 #. type: Content of: <div><div><div><div><ul><li>
-#: /home/runa/tor/website/en/index.wml:13
+#: /home/runa/dev/website/en/index.wml:13
 msgid ""
 "Tor is for web browsers, instant messaging clients, remote logins, and more."
 msgstr "Torは"
 
 #. type: Content of: <div><div><div><div><ul><li>
-#: /home/runa/tor/website/en/index.wml:14
+#: /home/runa/dev/website/en/index.wml:14
 msgid "Tor is free and open source for Windows, Mac, Linux/Unix, and Android"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><h1>
-#: /home/runa/tor/website/en/index.wml:16
+#: /home/runa/dev/website/en/index.wml:16
 msgid "Anonymity Online"
 msgstr "オンラインでの匿名性を実現"
 
 #. type: Content of: <div><div><div><div><p>
-#: /home/runa/tor/website/en/index.wml:17
+#: /home/runa/dev/website/en/index.wml:17
 msgid ""
 "Protect your privacy. Defend yourself against network surveillance and "
 "traffic analysis."
 msgstr ""
 
 #. type: Content of: <div><div><div><div><div>
-#: /home/runa/tor/website/en/index.wml:20
+#: /home/runa/dev/website/en/index.wml:20
 msgid ""
 "<a href=\"<page download/download>\"> <span class=\"download-tor\">Download "
 "Tor</span></a>"
@@ -55,12 +55,12 @@
 "Tor</span></a>"
 
 #. type: Content of: <div><div><div><div><div><h2>
-#: /home/runa/tor/website/en/index.wml:26
+#: /home/runa/dev/website/en/index.wml:26
 msgid "What is Tor?"
 msgstr "Torって何ですか?"
 
 #. type: Content of: <div><div><div><div><div><p>
-#: /home/runa/tor/website/en/index.wml:26
+#: /home/runa/dev/website/en/index.wml:26
 msgid ""
 "Tor is free software and an open network that helps you defend against a "
 "form of network surveillance that threatens personal freedom and privacy, "
@@ -71,12 +71,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><div><div><div><h2>
-#: /home/runa/tor/website/en/index.wml:36
+#: /home/runa/dev/website/en/index.wml:36
 msgid "Why Anonymity Matters"
 msgstr "なぜ匿名性が必要なのですか?"
 
 #. type: Content of: <div><div><div><div><div><p>
-#: /home/runa/tor/website/en/index.wml:37
+#: /home/runa/dev/website/en/index.wml:37
 msgid ""
 "Tor protects you by bouncing your communications around a distributed "
 "network of relays run by volunteers all around the world: it prevents "
@@ -89,110 +89,110 @@
 msgstr ""
 
 #. type: Content of: <div><div><div><div><h2>
-#: /home/runa/tor/website/en/index.wml:50
+#: /home/runa/dev/website/en/index.wml:50
 msgid "Our Projects"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><table><tr><td>
-#: /home/runa/tor/website/en/index.wml:55
+#: /home/runa/dev/website/en/index.wml:55
 msgid "<img src=\"$(IMGROOT)/icon-TorButton.jpg\" alt=\"Torbutton Icon\">"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><table><tr><td><h3>
-#: /home/runa/tor/website/en/index.wml:56
+#: /home/runa/dev/website/en/index.wml:56
 msgid "<a href=\"<page torbutton/index>\">Torbutton</a>"
 msgstr "<a href=\"<page torbutton/index>\">Torbutton</a>"
 
 #. type: Content of: <div><div><div><div><table><tr><td><p>
-#: /home/runa/tor/website/en/index.wml:57
+#: /home/runa/dev/website/en/index.wml:57
 msgid ""
 "Torbutton is a 1-click way for Firefox users to enable or disable Tor in "
 "Firefox."
 msgstr ""
 
 #. type: Content of: <div><div><div><div><table><tr><td>
-#: /home/runa/tor/website/en/index.wml:61
+#: /home/runa/dev/website/en/index.wml:61
 msgid "<img src=\"$(IMGROOT)/icon-TorCheck.jpg\" alt=\"Tor Check Icon\">"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><table><tr><td><h3>
-#: /home/runa/tor/website/en/index.wml:62
+#: /home/runa/dev/website/en/index.wml:62
 msgid "<a href=\"https://check.torproject.org/\">Check</a>"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><table><tr><td><p>
-#: /home/runa/tor/website/en/index.wml:63
+#: /home/runa/dev/website/en/index.wml:63
 msgid "Check determines if you are successfully browsing with Tor."
 msgstr "ブラウザでTor"
 
 #. type: Content of: <div><div><div><div><table><tr><td>
-#: /home/runa/tor/website/en/index.wml:69
+#: /home/runa/dev/website/en/index.wml:69
 msgid "<img src=\"$(IMGROOT)/icon-Vidalia.jpg\" alt=\"Vidalia Icon\">"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><table><tr><td><h3>
-#: /home/runa/tor/website/en/index.wml:70
+#: /home/runa/dev/website/en/index.wml:70
 msgid "<a href=\"<page projects/vidalia>\">Vidalia</a>"
 msgstr "<a href=\"<page projects/vidalia>\">Vidalia</a>"
 
 #. type: Content of: <div><div><div><div><table><tr><td><p>
-#: /home/runa/tor/website/en/index.wml:71
+#: /home/runa/dev/website/en/index.wml:71
 msgid ""
 "Vidalia is a graphical way to control and view Tor's connections and "
 "settings."
 msgstr "VidaliaはTor"
 
 #. type: Content of: <div><div><div><div><table><tr><td>
-#: /home/runa/tor/website/en/index.wml:75
+#: /home/runa/dev/website/en/index.wml:75
 msgid "<img src=\"$(IMGROOT)/icon-TorBrowser.jpg\" alt=\"TorBrowser Icon\">"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><table><tr><td><h3>
-#: /home/runa/tor/website/en/index.wml:76
+#: /home/runa/dev/website/en/index.wml:76
 msgid "<a href=\"<page projects/torbrowser>\">Tor Browser</a>"
 msgstr "<a href=\"<page projects/torbrowser>\">Tor Browser</a>"
 
 #. type: Content of: <div><div><div><div><table><tr><td><p>
-#: /home/runa/tor/website/en/index.wml:78
+#: /home/runa/dev/website/en/index.wml:78
 msgid ""
 "Tor Browser contains everything you need to safely browse the Internet."
 msgstr "Tor Browser はインターネットで安全にブラウザを使うために必要な一式が含まれています。browse the Internet."
 
 #. type: Content of: <div><div><div><div><h2>
-#: /home/runa/tor/website/en/index.wml:90
+#: /home/runa/dev/website/en/index.wml:90
 msgid "Who Uses Tor?"
 msgstr "誰がTorを使っているのですか?"
 
 #. type: Content of: <div><div><div><div><div><h3>
-#: /home/runa/tor/website/en/index.wml:93
+#: /home/runa/dev/website/en/index.wml:93
 msgid ""
 "<a href=\"<page about/torusers>#normalusers\"><img "
 "src=\"$(IMGROOT)/family.jpg\" alt=\"Normal People\">Family &amp; Friends</a>"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><div><p>
-#: /home/runa/tor/website/en/index.wml:95
+#: /home/runa/dev/website/en/index.wml:95
 msgid ""
 "People like you and your family use Tor to protect themselves, their "
 "children, and their dignity while using the Internet."
 msgstr ""
 
 #. type: Content of: <div><div><div><div><div><h3>
-#: /home/runa/tor/website/en/index.wml:99
+#: /home/runa/dev/website/en/index.wml:99
 msgid ""
 "<a href=\"<page about/torusers>#executives\"><img "
 "src=\"$(IMGROOT)/consumers.jpg\" alt=\"Businesses\">Businesses</a>"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><div><p>
-#: /home/runa/tor/website/en/index.wml:101
+#: /home/runa/dev/website/en/index.wml:101
 msgid ""
 "Businesses use Tor to research competition, keep business strategies "
 "confidential, and facilitate internal accountability."
 msgstr ""
 
 #. type: Content of: <div><div><div><div><div><h3>
-#: /home/runa/tor/website/en/index.wml:105
+#: /home/runa/dev/website/en/index.wml:105
 msgid ""
 "<a href=\"<page about/torusers>#activists\"><img "
 "src=\"$(IMGROOT)/activists.jpg\" alt=\"Activists &amp; "
@@ -200,28 +200,28 @@
 msgstr ""
 
 #. type: Content of: <div><div><div><div><div><p>
-#: /home/runa/tor/website/en/index.wml:107
+#: /home/runa/dev/website/en/index.wml:107
 msgid ""
 "Activists use Tor to anonymously report abuses from danger zones.  "
 "Whistleblowers use Tor to safely report on corruption."
 msgstr ""
 
 #. type: Content of: <div><div><div><div><div><h3>
-#: /home/runa/tor/website/en/index.wml:111
+#: /home/runa/dev/website/en/index.wml:111
 msgid ""
 "<a href=\"<page about/torusers>#journalist\"><img "
 "src=\"$(IMGROOT)/media.jpg\" alt=\"Journalists and the Media\">Media</a>"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><div><p>
-#: /home/runa/tor/website/en/index.wml:113
+#: /home/runa/dev/website/en/index.wml:113
 msgid ""
 "Journalists and the media use Tor to protect their research and sources "
 "online."
 msgstr ""
 
 #. type: Content of: <div><div><div><div><div><h3>
-#: /home/runa/tor/website/en/index.wml:117
+#: /home/runa/dev/website/en/index.wml:117
 msgid ""
 "<a href=\"<page about/torusers>#military\"><img "
 "src=\"$(IMGROOT)/military.jpg\" alt=\"Military and Law "
@@ -229,24 +229,39 @@
 msgstr ""
 
 #. type: Content of: <div><div><div><div><div><p>
-#: /home/runa/tor/website/en/index.wml:119
+#: /home/runa/dev/website/en/index.wml:119
 msgid ""
 "Militaries and law enforcement use Tor to protect their communications, "
 "investigations, and intelligence gathering online."
 msgstr ""
 
 #. type: Content of: <div><div><div><div><h2>
-#: /home/runa/tor/website/en/index.wml:123
+#: /home/runa/dev/website/en/index.wml:123
 msgid "Announcements"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><table><tr><td><div>
-#: /home/runa/tor/website/en/index.wml:128
+#: /home/runa/dev/website/en/index.wml:128
+msgid "<span class=\"month\">Mar</span><br><span class=\"day\">23</span>"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><table><tr><td><p>
+#: /home/runa/dev/website/en/index.wml:129
+msgid ""
+"The Tor Project wins the \"Project of Social Benefit\" award from the Free "
+"Software Foundation and GNU Project. We are honored to win this award and to"
+" be listed amongst the former winners. <a "
+"href=\"https://blog.torproject.org/blog/tor-project-receives-fsf-"
+"award\">Read more</a> about this award."
+msgstr ""
+
+#. type: Content of: <div><div><div><div><table><tr><td><div>
+#: /home/runa/dev/website/en/index.wml:135
 msgid "<span class=\"month\">Feb</span><br><span class=\"day\">23</span>"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><table><tr><td><p>
-#: /home/runa/tor/website/en/index.wml:129
+#: /home/runa/dev/website/en/index.wml:136
 msgid ""
 "The latest stable Tor version, 0.2.1.30, is <a "
 "href=\"https://lists.torproject.org/pipermail/tor-"
@@ -256,18 +271,3 @@
 "reachable from Iran again.  We don't expect this tweak will win the arms "
 "race long-term, but it buys us time until we roll out a better solution."
 msgstr ""
-
-#. type: Content of: <div><div><div><div><table><tr><td><div>
-#: /home/runa/tor/website/en/index.wml:138
-msgid "<span class=\"month\">Jan</span><br><span class=\"day\">30</span>"
-msgstr ""
-
-#. type: Content of: <div><div><div><div><table><tr><td><p>
-#: /home/runa/tor/website/en/index.wml:139
-msgid ""
-"Tor helping with Egypt.  Here's what we've learned <a "
-"href=\"https://blog.torproject.org/blog/recent-events-egypt\">about recent "
-"events in Egypt</a>. And we're keeping our <a href=\"<page "
-"press/inthemedia>\">In the media</a> page up to date with stories about how "
-"we're helping around the world."
-msgstr ""

Modified: translation/trunk/projects/website/po/my/1-high.index.po
===================================================================
--- translation/trunk/projects/website/po/my/1-high.index.po	2011-04-12 16:15:00 UTC (rev 24594)
+++ translation/trunk/projects/website/po/my/1-high.index.po	2011-04-12 16:19:31 UTC (rev 24595)
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-03-17 18:05+0000\n"
-"PO-Revision-Date: 2011-03-27 17:33+0000\n"
+"POT-Creation-Date: 2011-03-28 12:48+0200\n"
+"PO-Revision-Date: 2011-04-12 16:13+0000\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
@@ -18,47 +18,47 @@
 "Plural-Forms: nplurals=1; plural=0\n"
 
 #. type: Content of: <div><div><div><div><ul><li>
-#: /home/runa/tor/website/en/index.wml:12
+#: /home/runa/dev/website/en/index.wml:12
 msgid "Tor prevents anyone from learning your location or browsing habits."
 msgstr ""
 
 #. type: Content of: <div><div><div><div><ul><li>
-#: /home/runa/tor/website/en/index.wml:13
+#: /home/runa/dev/website/en/index.wml:13
 msgid ""
 "Tor is for web browsers, instant messaging clients, remote logins, and more."
 msgstr ""
 
 #. type: Content of: <div><div><div><div><ul><li>
-#: /home/runa/tor/website/en/index.wml:14
+#: /home/runa/dev/website/en/index.wml:14
 msgid "Tor is free and open source for Windows, Mac, Linux/Unix, and Android"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><h1>
-#: /home/runa/tor/website/en/index.wml:16
+#: /home/runa/dev/website/en/index.wml:16
 msgid "Anonymity Online"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><p>
-#: /home/runa/tor/website/en/index.wml:17
+#: /home/runa/dev/website/en/index.wml:17
 msgid ""
 "Protect your privacy. Defend yourself against network surveillance and "
 "traffic analysis."
 msgstr ""
 
 #. type: Content of: <div><div><div><div><div>
-#: /home/runa/tor/website/en/index.wml:20
+#: /home/runa/dev/website/en/index.wml:20
 msgid ""
 "<a href=\"<page download/download>\"> <span class=\"download-tor\">Download "
 "Tor</span></a>"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><div><h2>
-#: /home/runa/tor/website/en/index.wml:26
+#: /home/runa/dev/website/en/index.wml:26
 msgid "What is Tor?"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><div><p>
-#: /home/runa/tor/website/en/index.wml:26
+#: /home/runa/dev/website/en/index.wml:26
 msgid ""
 "Tor is free software and an open network that helps you defend against a "
 "form of network surveillance that threatens personal freedom and privacy, "
@@ -69,12 +69,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><div><div><div><h2>
-#: /home/runa/tor/website/en/index.wml:36
+#: /home/runa/dev/website/en/index.wml:36
 msgid "Why Anonymity Matters"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><div><p>
-#: /home/runa/tor/website/en/index.wml:37
+#: /home/runa/dev/website/en/index.wml:37
 msgid ""
 "Tor protects you by bouncing your communications around a distributed "
 "network of relays run by volunteers all around the world: it prevents "
@@ -87,110 +87,110 @@
 msgstr ""
 
 #. type: Content of: <div><div><div><div><h2>
-#: /home/runa/tor/website/en/index.wml:50
+#: /home/runa/dev/website/en/index.wml:50
 msgid "Our Projects"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><table><tr><td>
-#: /home/runa/tor/website/en/index.wml:55
+#: /home/runa/dev/website/en/index.wml:55
 msgid "<img src=\"$(IMGROOT)/icon-TorButton.jpg\" alt=\"Torbutton Icon\">"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><table><tr><td><h3>
-#: /home/runa/tor/website/en/index.wml:56
+#: /home/runa/dev/website/en/index.wml:56
 msgid "<a href=\"<page torbutton/index>\">Torbutton</a>"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><table><tr><td><p>
-#: /home/runa/tor/website/en/index.wml:57
+#: /home/runa/dev/website/en/index.wml:57
 msgid ""
 "Torbutton is a 1-click way for Firefox users to enable or disable Tor in "
 "Firefox."
 msgstr ""
 
 #. type: Content of: <div><div><div><div><table><tr><td>
-#: /home/runa/tor/website/en/index.wml:61
+#: /home/runa/dev/website/en/index.wml:61
 msgid "<img src=\"$(IMGROOT)/icon-TorCheck.jpg\" alt=\"Tor Check Icon\">"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><table><tr><td><h3>
-#: /home/runa/tor/website/en/index.wml:62
+#: /home/runa/dev/website/en/index.wml:62
 msgid "<a href=\"https://check.torproject.org/\">Check</a>"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><table><tr><td><p>
-#: /home/runa/tor/website/en/index.wml:63
+#: /home/runa/dev/website/en/index.wml:63
 msgid "Check determines if you are successfully browsing with Tor."
 msgstr ""
 
 #. type: Content of: <div><div><div><div><table><tr><td>
-#: /home/runa/tor/website/en/index.wml:69
+#: /home/runa/dev/website/en/index.wml:69
 msgid "<img src=\"$(IMGROOT)/icon-Vidalia.jpg\" alt=\"Vidalia Icon\">"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><table><tr><td><h3>
-#: /home/runa/tor/website/en/index.wml:70
+#: /home/runa/dev/website/en/index.wml:70
 msgid "<a href=\"<page projects/vidalia>\">Vidalia</a>"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><table><tr><td><p>
-#: /home/runa/tor/website/en/index.wml:71
+#: /home/runa/dev/website/en/index.wml:71
 msgid ""
 "Vidalia is a graphical way to control and view Tor's connections and "
 "settings."
 msgstr ""
 
 #. type: Content of: <div><div><div><div><table><tr><td>
-#: /home/runa/tor/website/en/index.wml:75
+#: /home/runa/dev/website/en/index.wml:75
 msgid "<img src=\"$(IMGROOT)/icon-TorBrowser.jpg\" alt=\"TorBrowser Icon\">"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><table><tr><td><h3>
-#: /home/runa/tor/website/en/index.wml:76
+#: /home/runa/dev/website/en/index.wml:76
 msgid "<a href=\"<page projects/torbrowser>\">Tor Browser</a>"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><table><tr><td><p>
-#: /home/runa/tor/website/en/index.wml:78
+#: /home/runa/dev/website/en/index.wml:78
 msgid ""
 "Tor Browser contains everything you need to safely browse the Internet."
 msgstr ""
 
 #. type: Content of: <div><div><div><div><h2>
-#: /home/runa/tor/website/en/index.wml:90
+#: /home/runa/dev/website/en/index.wml:90
 msgid "Who Uses Tor?"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><div><h3>
-#: /home/runa/tor/website/en/index.wml:93
+#: /home/runa/dev/website/en/index.wml:93
 msgid ""
 "<a href=\"<page about/torusers>#normalusers\"><img "
 "src=\"$(IMGROOT)/family.jpg\" alt=\"Normal People\">Family &amp; Friends</a>"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><div><p>
-#: /home/runa/tor/website/en/index.wml:95
+#: /home/runa/dev/website/en/index.wml:95
 msgid ""
 "People like you and your family use Tor to protect themselves, their "
 "children, and their dignity while using the Internet."
 msgstr ""
 
 #. type: Content of: <div><div><div><div><div><h3>
-#: /home/runa/tor/website/en/index.wml:99
+#: /home/runa/dev/website/en/index.wml:99
 msgid ""
 "<a href=\"<page about/torusers>#executives\"><img "
 "src=\"$(IMGROOT)/consumers.jpg\" alt=\"Businesses\">Businesses</a>"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><div><p>
-#: /home/runa/tor/website/en/index.wml:101
+#: /home/runa/dev/website/en/index.wml:101
 msgid ""
 "Businesses use Tor to research competition, keep business strategies "
 "confidential, and facilitate internal accountability."
 msgstr ""
 
 #. type: Content of: <div><div><div><div><div><h3>
-#: /home/runa/tor/website/en/index.wml:105
+#: /home/runa/dev/website/en/index.wml:105
 msgid ""
 "<a href=\"<page about/torusers>#activists\"><img "
 "src=\"$(IMGROOT)/activists.jpg\" alt=\"Activists &amp; "
@@ -198,28 +198,28 @@
 msgstr ""
 
 #. type: Content of: <div><div><div><div><div><p>
-#: /home/runa/tor/website/en/index.wml:107
+#: /home/runa/dev/website/en/index.wml:107
 msgid ""
 "Activists use Tor to anonymously report abuses from danger zones.  "
 "Whistleblowers use Tor to safely report on corruption."
 msgstr ""
 
 #. type: Content of: <div><div><div><div><div><h3>
-#: /home/runa/tor/website/en/index.wml:111
+#: /home/runa/dev/website/en/index.wml:111
 msgid ""
 "<a href=\"<page about/torusers>#journalist\"><img "
 "src=\"$(IMGROOT)/media.jpg\" alt=\"Journalists and the Media\">Media</a>"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><div><p>
-#: /home/runa/tor/website/en/index.wml:113
+#: /home/runa/dev/website/en/index.wml:113
 msgid ""
 "Journalists and the media use Tor to protect their research and sources "
 "online."
 msgstr ""
 
 #. type: Content of: <div><div><div><div><div><h3>
-#: /home/runa/tor/website/en/index.wml:117
+#: /home/runa/dev/website/en/index.wml:117
 msgid ""
 "<a href=\"<page about/torusers>#military\"><img "
 "src=\"$(IMGROOT)/military.jpg\" alt=\"Military and Law "
@@ -227,24 +227,39 @@
 msgstr ""
 
 #. type: Content of: <div><div><div><div><div><p>
-#: /home/runa/tor/website/en/index.wml:119
+#: /home/runa/dev/website/en/index.wml:119
 msgid ""
 "Militaries and law enforcement use Tor to protect their communications, "
 "investigations, and intelligence gathering online."
 msgstr ""
 
 #. type: Content of: <div><div><div><div><h2>
-#: /home/runa/tor/website/en/index.wml:123
+#: /home/runa/dev/website/en/index.wml:123
 msgid "Announcements"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><table><tr><td><div>
-#: /home/runa/tor/website/en/index.wml:128
+#: /home/runa/dev/website/en/index.wml:128
+msgid "<span class=\"month\">Mar</span><br><span class=\"day\">23</span>"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><table><tr><td><p>
+#: /home/runa/dev/website/en/index.wml:129
+msgid ""
+"The Tor Project wins the \"Project of Social Benefit\" award from the Free "
+"Software Foundation and GNU Project. We are honored to win this award and to"
+" be listed amongst the former winners. <a "
+"href=\"https://blog.torproject.org/blog/tor-project-receives-fsf-"
+"award\">Read more</a> about this award."
+msgstr ""
+
+#. type: Content of: <div><div><div><div><table><tr><td><div>
+#: /home/runa/dev/website/en/index.wml:135
 msgid "<span class=\"month\">Feb</span><br><span class=\"day\">23</span>"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><table><tr><td><p>
-#: /home/runa/tor/website/en/index.wml:129
+#: /home/runa/dev/website/en/index.wml:136
 msgid ""
 "The latest stable Tor version, 0.2.1.30, is <a "
 "href=\"https://lists.torproject.org/pipermail/tor-"
@@ -254,18 +269,3 @@
 "reachable from Iran again.  We don't expect this tweak will win the arms "
 "race long-term, but it buys us time until we roll out a better solution."
 msgstr ""
-
-#. type: Content of: <div><div><div><div><table><tr><td><div>
-#: /home/runa/tor/website/en/index.wml:138
-msgid "<span class=\"month\">Jan</span><br><span class=\"day\">30</span>"
-msgstr ""
-
-#. type: Content of: <div><div><div><div><table><tr><td><p>
-#: /home/runa/tor/website/en/index.wml:139
-msgid ""
-"Tor helping with Egypt.  Here's what we've learned <a "
-"href=\"https://blog.torproject.org/blog/recent-events-egypt\">about recent "
-"events in Egypt</a>. And we're keeping our <a href=\"<page "
-"press/inthemedia>\">In the media</a> page up to date with stories about how "
-"we're helping around the world."
-msgstr ""

Modified: translation/trunk/projects/website/po/nl_NL/1-high.index.po
===================================================================
--- translation/trunk/projects/website/po/nl_NL/1-high.index.po	2011-04-12 16:15:00 UTC (rev 24594)
+++ translation/trunk/projects/website/po/nl_NL/1-high.index.po	2011-04-12 16:19:31 UTC (rev 24595)
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-03-17 18:05+0000\n"
-"PO-Revision-Date: 2011-03-22 16:15+0000\n"
+"POT-Creation-Date: 2011-03-28 12:48+0200\n"
+"PO-Revision-Date: 2011-03-29 00:25+0000\n"
 "Last-Translator: runasand <runa.sandvik at gmail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
@@ -18,29 +18,29 @@
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #. type: Content of: <div><div><div><div><ul><li>
-#: /home/runa/tor/website/en/index.wml:12
+#: /home/runa/dev/website/en/index.wml:12
 msgid "Tor prevents anyone from learning your location or browsing habits."
 msgstr "Tor voorkomt dat anderen uw locatie en surfgeschiedenis achterhalen."
 
 #. type: Content of: <div><div><div><div><ul><li>
-#: /home/runa/tor/website/en/index.wml:13
+#: /home/runa/dev/website/en/index.wml:13
 msgid ""
 "Tor is for web browsers, instant messaging clients, remote logins, and more."
 msgstr ""
 "Tor is voor web browsers, chatprogramma's, logins op afstand, en meer."
 
 #. type: Content of: <div><div><div><div><ul><li>
-#: /home/runa/tor/website/en/index.wml:14
+#: /home/runa/dev/website/en/index.wml:14
 msgid "Tor is free and open source for Windows, Mac, Linux/Unix, and Android"
 msgstr "Tor is gratis en open source voor Windows, Mac, Linux/Unix en Android"
 
 #. type: Content of: <div><div><div><div><h1>
-#: /home/runa/tor/website/en/index.wml:16
+#: /home/runa/dev/website/en/index.wml:16
 msgid "Anonymity Online"
 msgstr "Anonimiteit Online"
 
 #. type: Content of: <div><div><div><div><p>
-#: /home/runa/tor/website/en/index.wml:17
+#: /home/runa/dev/website/en/index.wml:17
 msgid ""
 "Protect your privacy. Defend yourself against network surveillance and "
 "traffic analysis."
@@ -49,7 +49,7 @@
 "analyse."
 
 #. type: Content of: <div><div><div><div><div>
-#: /home/runa/tor/website/en/index.wml:20
+#: /home/runa/dev/website/en/index.wml:20
 msgid ""
 "<a href=\"<page download/download>\"> <span class=\"download-tor\">Download "
 "Tor</span></a>"
@@ -58,12 +58,12 @@
 "Tor</span></a>"
 
 #. type: Content of: <div><div><div><div><div><h2>
-#: /home/runa/tor/website/en/index.wml:26
+#: /home/runa/dev/website/en/index.wml:26
 msgid "What is Tor?"
 msgstr "Wat is Tor?"
 
 #. type: Content of: <div><div><div><div><div><p>
-#: /home/runa/tor/website/en/index.wml:26
+#: /home/runa/dev/website/en/index.wml:26
 msgid ""
 "Tor is free software and an open network that helps you defend against a "
 "form of network surveillance that threatens personal freedom and privacy, "
@@ -80,12 +80,12 @@
 "href=\"<page about/overview>\">Leer meer over Tor&raquo;</a></span>"
 
 #. type: Content of: <div><div><div><div><div><h2>
-#: /home/runa/tor/website/en/index.wml:36
+#: /home/runa/dev/website/en/index.wml:36
 msgid "Why Anonymity Matters"
 msgstr "Waarom Anonimiteit belangrijk is"
 
 #. type: Content of: <div><div><div><div><div><p>
-#: /home/runa/tor/website/en/index.wml:37
+#: /home/runa/dev/website/en/index.wml:37
 msgid ""
 "Tor protects you by bouncing your communications around a distributed "
 "network of relays run by volunteers all around the world: it prevents "
@@ -107,22 +107,22 @@
 "bij Tor &raquo;</a></span>"
 
 #. type: Content of: <div><div><div><div><h2>
-#: /home/runa/tor/website/en/index.wml:50
+#: /home/runa/dev/website/en/index.wml:50
 msgid "Our Projects"
 msgstr "Onze Projecten"
 
 #. type: Content of: <div><div><div><div><table><tr><td>
-#: /home/runa/tor/website/en/index.wml:55
+#: /home/runa/dev/website/en/index.wml:55
 msgid "<img src=\"$(IMGROOT)/icon-TorButton.jpg\" alt=\"Torbutton Icon\">"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><table><tr><td><h3>
-#: /home/runa/tor/website/en/index.wml:56
+#: /home/runa/dev/website/en/index.wml:56
 msgid "<a href=\"<page torbutton/index>\">Torbutton</a>"
 msgstr "<a href=\"<page torbutton/index>\">Torbutton</a>"
 
 #. type: Content of: <div><div><div><div><table><tr><td><p>
-#: /home/runa/tor/website/en/index.wml:57
+#: /home/runa/dev/website/en/index.wml:57
 msgid ""
 "Torbutton is a 1-click way for Firefox users to enable or disable Tor in "
 "Firefox."
@@ -130,32 +130,32 @@
 "Torbutton is een 1-kliks methode om Tor aan of uit te zetten in Firefox."
 
 #. type: Content of: <div><div><div><div><table><tr><td>
-#: /home/runa/tor/website/en/index.wml:61
+#: /home/runa/dev/website/en/index.wml:61
 msgid "<img src=\"$(IMGROOT)/icon-TorCheck.jpg\" alt=\"Tor Check Icon\">"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><table><tr><td><h3>
-#: /home/runa/tor/website/en/index.wml:62
+#: /home/runa/dev/website/en/index.wml:62
 msgid "<a href=\"https://check.torproject.org/\">Check</a>"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><table><tr><td><p>
-#: /home/runa/tor/website/en/index.wml:63
+#: /home/runa/dev/website/en/index.wml:63
 msgid "Check determines if you are successfully browsing with Tor."
 msgstr "Check of u succesvol met Tor aan het surfen bent."
 
 #. type: Content of: <div><div><div><div><table><tr><td>
-#: /home/runa/tor/website/en/index.wml:69
+#: /home/runa/dev/website/en/index.wml:69
 msgid "<img src=\"$(IMGROOT)/icon-Vidalia.jpg\" alt=\"Vidalia Icon\">"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><table><tr><td><h3>
-#: /home/runa/tor/website/en/index.wml:70
+#: /home/runa/dev/website/en/index.wml:70
 msgid "<a href=\"<page projects/vidalia>\">Vidalia</a>"
 msgstr "<a href=\"<page projects/vidalia>\">Vidalia</a>"
 
 #. type: Content of: <div><div><div><div><table><tr><td><p>
-#: /home/runa/tor/website/en/index.wml:71
+#: /home/runa/dev/website/en/index.wml:71
 msgid ""
 "Vidalia is a graphical way to control and view Tor's connections and "
 "settings."
@@ -164,17 +164,17 @@
 "beheren."
 
 #. type: Content of: <div><div><div><div><table><tr><td>
-#: /home/runa/tor/website/en/index.wml:75
+#: /home/runa/dev/website/en/index.wml:75
 msgid "<img src=\"$(IMGROOT)/icon-TorBrowser.jpg\" alt=\"TorBrowser Icon\">"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><table><tr><td><h3>
-#: /home/runa/tor/website/en/index.wml:76
+#: /home/runa/dev/website/en/index.wml:76
 msgid "<a href=\"<page projects/torbrowser>\">Tor Browser</a>"
 msgstr "<a href=\"<page projects/torbrowser>\">Tor Browser</a>"
 
 #. type: Content of: <div><div><div><div><table><tr><td><p>
-#: /home/runa/tor/website/en/index.wml:78
+#: /home/runa/dev/website/en/index.wml:78
 msgid ""
 "Tor Browser contains everything you need to safely browse the Internet."
 msgstr ""
@@ -182,19 +182,19 @@
 "internet."
 
 #. type: Content of: <div><div><div><div><h2>
-#: /home/runa/tor/website/en/index.wml:90
+#: /home/runa/dev/website/en/index.wml:90
 msgid "Who Uses Tor?"
 msgstr "Wie gebruikt Tor?"
 
 #. type: Content of: <div><div><div><div><div><h3>
-#: /home/runa/tor/website/en/index.wml:93
+#: /home/runa/dev/website/en/index.wml:93
 msgid ""
 "<a href=\"<page about/torusers>#normalusers\"><img "
 "src=\"$(IMGROOT)/family.jpg\" alt=\"Normal People\">Family &amp; Friends</a>"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><div><p>
-#: /home/runa/tor/website/en/index.wml:95
+#: /home/runa/dev/website/en/index.wml:95
 msgid ""
 "People like you and your family use Tor to protect themselves, their "
 "children, and their dignity while using the Internet."
@@ -203,14 +203,14 @@
 "waardigheid te beschermen tijdens het surfen."
 
 #. type: Content of: <div><div><div><div><div><h3>
-#: /home/runa/tor/website/en/index.wml:99
+#: /home/runa/dev/website/en/index.wml:99
 msgid ""
 "<a href=\"<page about/torusers>#executives\"><img "
 "src=\"$(IMGROOT)/consumers.jpg\" alt=\"Businesses\">Businesses</a>"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><div><p>
-#: /home/runa/tor/website/en/index.wml:101
+#: /home/runa/dev/website/en/index.wml:101
 msgid ""
 "Businesses use Tor to research competition, keep business strategies "
 "confidential, and facilitate internal accountability."
@@ -219,7 +219,7 @@
 "geheim te houden en interne verantwoordelijken mogelijk te maken."
 
 #. type: Content of: <div><div><div><div><div><h3>
-#: /home/runa/tor/website/en/index.wml:105
+#: /home/runa/dev/website/en/index.wml:105
 msgid ""
 "<a href=\"<page about/torusers>#activists\"><img "
 "src=\"$(IMGROOT)/activists.jpg\" alt=\"Activists &amp; "
@@ -227,7 +227,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><div><div><div><p>
-#: /home/runa/tor/website/en/index.wml:107
+#: /home/runa/dev/website/en/index.wml:107
 msgid ""
 "Activists use Tor to anonymously report abuses from danger zones.  "
 "Whistleblowers use Tor to safely report on corruption."
@@ -237,14 +237,14 @@
 "het licht te brengen."
 
 #. type: Content of: <div><div><div><div><div><h3>
-#: /home/runa/tor/website/en/index.wml:111
+#: /home/runa/dev/website/en/index.wml:111
 msgid ""
 "<a href=\"<page about/torusers>#journalist\"><img "
 "src=\"$(IMGROOT)/media.jpg\" alt=\"Journalists and the Media\">Media</a>"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><div><p>
-#: /home/runa/tor/website/en/index.wml:113
+#: /home/runa/dev/website/en/index.wml:113
 msgid ""
 "Journalists and the media use Tor to protect their research and sources "
 "online."
@@ -253,7 +253,7 @@
 "internet te beschermen."
 
 #. type: Content of: <div><div><div><div><div><h3>
-#: /home/runa/tor/website/en/index.wml:117
+#: /home/runa/dev/website/en/index.wml:117
 msgid ""
 "<a href=\"<page about/torusers>#military\"><img "
 "src=\"$(IMGROOT)/military.jpg\" alt=\"Military and Law "
@@ -261,7 +261,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><div><div><div><p>
-#: /home/runa/tor/website/en/index.wml:119
+#: /home/runa/dev/website/en/index.wml:119
 msgid ""
 "Militaries and law enforcement use Tor to protect their communications, "
 "investigations, and intelligence gathering online."
@@ -270,17 +270,32 @@
 " en het verzamelen van inlichtingen op internet te beschermen."
 
 #. type: Content of: <div><div><div><div><h2>
-#: /home/runa/tor/website/en/index.wml:123
+#: /home/runa/dev/website/en/index.wml:123
 msgid "Announcements"
 msgstr "Aankondigingen"
 
 #. type: Content of: <div><div><div><div><table><tr><td><div>
-#: /home/runa/tor/website/en/index.wml:128
+#: /home/runa/dev/website/en/index.wml:128
+msgid "<span class=\"month\">Mar</span><br><span class=\"day\">23</span>"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><table><tr><td><p>
+#: /home/runa/dev/website/en/index.wml:129
+msgid ""
+"The Tor Project wins the \"Project of Social Benefit\" award from the Free "
+"Software Foundation and GNU Project. We are honored to win this award and to"
+" be listed amongst the former winners. <a "
+"href=\"https://blog.torproject.org/blog/tor-project-receives-fsf-"
+"award\">Read more</a> about this award."
+msgstr ""
+
+#. type: Content of: <div><div><div><div><table><tr><td><div>
+#: /home/runa/dev/website/en/index.wml:135
 msgid "<span class=\"month\">Feb</span><br><span class=\"day\">23</span>"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><table><tr><td><p>
-#: /home/runa/tor/website/en/index.wml:129
+#: /home/runa/dev/website/en/index.wml:136
 msgid ""
 "The latest stable Tor version, 0.2.1.30, is <a "
 "href=\"https://lists.torproject.org/pipermail/tor-"
@@ -290,18 +305,3 @@
 "reachable from Iran again.  We don't expect this tweak will win the arms "
 "race long-term, but it buys us time until we roll out a better solution."
 msgstr ""
-
-#. type: Content of: <div><div><div><div><table><tr><td><div>
-#: /home/runa/tor/website/en/index.wml:138
-msgid "<span class=\"month\">Jan</span><br><span class=\"day\">30</span>"
-msgstr ""
-
-#. type: Content of: <div><div><div><div><table><tr><td><p>
-#: /home/runa/tor/website/en/index.wml:139
-msgid ""
-"Tor helping with Egypt.  Here's what we've learned <a "
-"href=\"https://blog.torproject.org/blog/recent-events-egypt\">about recent "
-"events in Egypt</a>. And we're keeping our <a href=\"<page "
-"press/inthemedia>\">In the media</a> page up to date with stories about how "
-"we're helping around the world."
-msgstr ""

Modified: translation/trunk/projects/website/po/pl_PL/1-high.index.po
===================================================================
--- translation/trunk/projects/website/po/pl_PL/1-high.index.po	2011-04-12 16:15:00 UTC (rev 24594)
+++ translation/trunk/projects/website/po/pl_PL/1-high.index.po	2011-04-12 16:19:31 UTC (rev 24595)
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-03-17 18:05+0000\n"
-"PO-Revision-Date: 2011-03-22 16:15+0000\n"
+"POT-Creation-Date: 2011-03-28 12:48+0200\n"
+"PO-Revision-Date: 2011-04-03 12:50+0000\n"
 "Last-Translator: bogdrozd <bog.d at gazeta.pl>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
@@ -18,31 +18,31 @@
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
 #. type: Content of: <div><div><div><div><ul><li>
-#: /home/runa/tor/website/en/index.wml:12
+#: /home/runa/dev/website/en/index.wml:12
 msgid "Tor prevents anyone from learning your location or browsing habits."
 msgstr ""
 "Tor uniemożliwia komukolwiek poznanie Twojej lokalizacji i zwyczajów w "
 "sieci."
 
 #. type: Content of: <div><div><div><div><ul><li>
-#: /home/runa/tor/website/en/index.wml:13
+#: /home/runa/dev/website/en/index.wml:13
 msgid ""
 "Tor is for web browsers, instant messaging clients, remote logins, and more."
 msgstr ""
 "Tor jest dla przeglądarek, klientów rozmów, zdalnego logowania i innych."
 
 #. type: Content of: <div><div><div><div><ul><li>
-#: /home/runa/tor/website/en/index.wml:14
+#: /home/runa/dev/website/en/index.wml:14
 msgid "Tor is free and open source for Windows, Mac, Linux/Unix, and Android"
 msgstr "Tor jest darmowy i otwarty dla Windows, Mac, Linux/Unix, i Androida"
 
 #. type: Content of: <div><div><div><div><h1>
-#: /home/runa/tor/website/en/index.wml:16
+#: /home/runa/dev/website/en/index.wml:16
 msgid "Anonymity Online"
 msgstr "Anonimowość on-line"
 
 #. type: Content of: <div><div><div><div><p>
-#: /home/runa/tor/website/en/index.wml:17
+#: /home/runa/dev/website/en/index.wml:17
 msgid ""
 "Protect your privacy. Defend yourself against network surveillance and "
 "traffic analysis."
@@ -50,7 +50,7 @@
 "Chroń swoją prywatność. Broń się przed podsłuchem sieciowym i analizą ruchu."
 
 #. type: Content of: <div><div><div><div><div>
-#: /home/runa/tor/website/en/index.wml:20
+#: /home/runa/dev/website/en/index.wml:20
 msgid ""
 "<a href=\"<page download/download>\"> <span class=\"download-tor\">Download "
 "Tor</span></a>"
@@ -59,12 +59,12 @@
 "Tora</span></a>"
 
 #. type: Content of: <div><div><div><div><div><h2>
-#: /home/runa/tor/website/en/index.wml:26
+#: /home/runa/dev/website/en/index.wml:26
 msgid "What is Tor?"
 msgstr "Czym jest Tor?"
 
 #. type: Content of: <div><div><div><div><div><p>
-#: /home/runa/tor/website/en/index.wml:26
+#: /home/runa/dev/website/en/index.wml:26
 msgid ""
 "Tor is free software and an open network that helps you defend against a "
 "form of network surveillance that threatens personal freedom and privacy, "
@@ -81,12 +81,12 @@
 "about/overview>\">Dowiedz się więcej o Torze &raquo;</a></span>"
 
 #. type: Content of: <div><div><div><div><div><h2>
-#: /home/runa/tor/website/en/index.wml:36
+#: /home/runa/dev/website/en/index.wml:36
 msgid "Why Anonymity Matters"
 msgstr "Czemu anonimowość jest ważna"
 
 #. type: Content of: <div><div><div><div><div><p>
-#: /home/runa/tor/website/en/index.wml:37
+#: /home/runa/dev/website/en/index.wml:37
 msgid ""
 "Tor protects you by bouncing your communications around a distributed "
 "network of relays run by volunteers all around the world: it prevents "
@@ -108,22 +108,22 @@
 "getinvolved/volunteer>\">Dołącz do Tora &raquo;</a></span>"
 
 #. type: Content of: <div><div><div><div><h2>
-#: /home/runa/tor/website/en/index.wml:50
+#: /home/runa/dev/website/en/index.wml:50
 msgid "Our Projects"
 msgstr "Nasze projekty"
 
 #. type: Content of: <div><div><div><div><table><tr><td>
-#: /home/runa/tor/website/en/index.wml:55
+#: /home/runa/dev/website/en/index.wml:55
 msgid "<img src=\"$(IMGROOT)/icon-TorButton.jpg\" alt=\"Torbutton Icon\">"
 msgstr "<img src=\"$(IMGROOT)/icon-TorButton.jpg\" alt=\"Ikona Torbuttona\">"
 
 #. type: Content of: <div><div><div><div><table><tr><td><h3>
-#: /home/runa/tor/website/en/index.wml:56
+#: /home/runa/dev/website/en/index.wml:56
 msgid "<a href=\"<page torbutton/index>\">Torbutton</a>"
 msgstr "<a href=\"<page torbutton/index>\">Torbutton</a>"
 
 #. type: Content of: <div><div><div><div><table><tr><td><p>
-#: /home/runa/tor/website/en/index.wml:57
+#: /home/runa/dev/website/en/index.wml:57
 msgid ""
 "Torbutton is a 1-click way for Firefox users to enable or disable Tor in "
 "Firefox."
@@ -132,32 +132,32 @@
 "lub wyłączenie Tora w Firefoksie."
 
 #. type: Content of: <div><div><div><div><table><tr><td>
-#: /home/runa/tor/website/en/index.wml:61
+#: /home/runa/dev/website/en/index.wml:61
 msgid "<img src=\"$(IMGROOT)/icon-TorCheck.jpg\" alt=\"Tor Check Icon\">"
 msgstr "<img src=\"$(IMGROOT)/icon-TorCheck.jpg\" alt=\"Ikona Tor Check\">"
 
 #. type: Content of: <div><div><div><div><table><tr><td><h3>
-#: /home/runa/tor/website/en/index.wml:62
+#: /home/runa/dev/website/en/index.wml:62
 msgid "<a href=\"https://check.torproject.org/\">Check</a>"
 msgstr "<a href=\"https://check.torproject.org/\">Check</a>"
 
 #. type: Content of: <div><div><div><div><table><tr><td><p>
-#: /home/runa/tor/website/en/index.wml:63
+#: /home/runa/dev/website/en/index.wml:63
 msgid "Check determines if you are successfully browsing with Tor."
 msgstr "Check sprawdza, czy przeglądasz sieć poprzez Tora."
 
 #. type: Content of: <div><div><div><div><table><tr><td>
-#: /home/runa/tor/website/en/index.wml:69
+#: /home/runa/dev/website/en/index.wml:69
 msgid "<img src=\"$(IMGROOT)/icon-Vidalia.jpg\" alt=\"Vidalia Icon\">"
 msgstr "<img src=\"$(IMGROOT)/icon-Vidalia.jpg\" alt=\"Ikona Vidalii\">"
 
 #. type: Content of: <div><div><div><div><table><tr><td><h3>
-#: /home/runa/tor/website/en/index.wml:70
+#: /home/runa/dev/website/en/index.wml:70
 msgid "<a href=\"<page projects/vidalia>\">Vidalia</a>"
 msgstr "<a href=\"<page projects/vidalia>\">Vidalia</a>"
 
 #. type: Content of: <div><div><div><div><table><tr><td><p>
-#: /home/runa/tor/website/en/index.wml:71
+#: /home/runa/dev/website/en/index.wml:71
 msgid ""
 "Vidalia is a graphical way to control and view Tor's connections and "
 "settings."
@@ -166,17 +166,17 @@
 " Tora."
 
 #. type: Content of: <div><div><div><div><table><tr><td>
-#: /home/runa/tor/website/en/index.wml:75
+#: /home/runa/dev/website/en/index.wml:75
 msgid "<img src=\"$(IMGROOT)/icon-TorBrowser.jpg\" alt=\"TorBrowser Icon\">"
 msgstr "<img src=\"$(IMGROOT)/icon-TorBrowser.jpg\" alt=\"Ikona TorBrowser\">"
 
 #. type: Content of: <div><div><div><div><table><tr><td><h3>
-#: /home/runa/tor/website/en/index.wml:76
+#: /home/runa/dev/website/en/index.wml:76
 msgid "<a href=\"<page projects/torbrowser>\">Tor Browser</a>"
 msgstr "<a href=\"<page projects/torbrowser>\">Tor Browser</a>"
 
 #. type: Content of: <div><div><div><div><table><tr><td><p>
-#: /home/runa/tor/website/en/index.wml:78
+#: /home/runa/dev/website/en/index.wml:78
 msgid ""
 "Tor Browser contains everything you need to safely browse the Internet."
 msgstr ""
@@ -184,12 +184,12 @@
 "Internet."
 
 #. type: Content of: <div><div><div><div><h2>
-#: /home/runa/tor/website/en/index.wml:90
+#: /home/runa/dev/website/en/index.wml:90
 msgid "Who Uses Tor?"
 msgstr "Kto używa Tora?"
 
 #. type: Content of: <div><div><div><div><div><h3>
-#: /home/runa/tor/website/en/index.wml:93
+#: /home/runa/dev/website/en/index.wml:93
 msgid ""
 "<a href=\"<page about/torusers>#normalusers\"><img "
 "src=\"$(IMGROOT)/family.jpg\" alt=\"Normal People\">Family &amp; Friends</a>"
@@ -199,7 +199,7 @@
 "przyjaciele</a>"
 
 #. type: Content of: <div><div><div><div><div><p>
-#: /home/runa/tor/website/en/index.wml:95
+#: /home/runa/dev/website/en/index.wml:95
 msgid ""
 "People like you and your family use Tor to protect themselves, their "
 "children, and their dignity while using the Internet."
@@ -208,7 +208,7 @@
 "dzieci i swoją godność podczas korzystania z Internetu."
 
 #. type: Content of: <div><div><div><div><div><h3>
-#: /home/runa/tor/website/en/index.wml:99
+#: /home/runa/dev/website/en/index.wml:99
 msgid ""
 "<a href=\"<page about/torusers>#executives\"><img "
 "src=\"$(IMGROOT)/consumers.jpg\" alt=\"Businesses\">Businesses</a>"
@@ -217,7 +217,7 @@
 "src=\"$(IMGROOT)/consumers.jpg\" alt=\"Firmy\">Firmy</a>"
 
 #. type: Content of: <div><div><div><div><div><p>
-#: /home/runa/tor/website/en/index.wml:101
+#: /home/runa/dev/website/en/index.wml:101
 msgid ""
 "Businesses use Tor to research competition, keep business strategies "
 "confidential, and facilitate internal accountability."
@@ -226,7 +226,7 @@
 "tajemnicy i ułatwiania odpowiedzialności wewnętrznej."
 
 #. type: Content of: <div><div><div><div><div><h3>
-#: /home/runa/tor/website/en/index.wml:105
+#: /home/runa/dev/website/en/index.wml:105
 msgid ""
 "<a href=\"<page about/torusers>#activists\"><img "
 "src=\"$(IMGROOT)/activists.jpg\" alt=\"Activists &amp; "
@@ -237,7 +237,7 @@
 "nagłaśniacze\">Aktywiści</a>"
 
 #. type: Content of: <div><div><div><div><div><p>
-#: /home/runa/tor/website/en/index.wml:107
+#: /home/runa/dev/website/en/index.wml:107
 msgid ""
 "Activists use Tor to anonymously report abuses from danger zones.  "
 "Whistleblowers use Tor to safely report on corruption."
@@ -246,7 +246,7 @@
 " Nagłaśniacze używają Tora, by bezpiecznie zgłaszać korupcję."
 
 #. type: Content of: <div><div><div><div><div><h3>
-#: /home/runa/tor/website/en/index.wml:111
+#: /home/runa/dev/website/en/index.wml:111
 msgid ""
 "<a href=\"<page about/torusers>#journalist\"><img "
 "src=\"$(IMGROOT)/media.jpg\" alt=\"Journalists and the Media\">Media</a>"
@@ -255,7 +255,7 @@
 "src=\"$(IMGROOT)/media.jpg\" alt=\"Dziennikarze i media\">Media</a>"
 
 #. type: Content of: <div><div><div><div><div><p>
-#: /home/runa/tor/website/en/index.wml:113
+#: /home/runa/dev/website/en/index.wml:113
 msgid ""
 "Journalists and the media use Tor to protect their research and sources "
 "online."
@@ -264,7 +264,7 @@
 "źródła."
 
 #. type: Content of: <div><div><div><div><div><h3>
-#: /home/runa/tor/website/en/index.wml:117
+#: /home/runa/dev/website/en/index.wml:117
 msgid ""
 "<a href=\"<page about/torusers>#military\"><img "
 "src=\"$(IMGROOT)/military.jpg\" alt=\"Military and Law "
@@ -275,7 +275,7 @@
 "prawa\">Wojsko i przedstawiciele prawa</a>"
 
 #. type: Content of: <div><div><div><div><div><p>
-#: /home/runa/tor/website/en/index.wml:119
+#: /home/runa/dev/website/en/index.wml:119
 msgid ""
 "Militaries and law enforcement use Tor to protect their communications, "
 "investigations, and intelligence gathering online."
@@ -284,17 +284,36 @@
 "zbierania danych w sieci."
 
 #. type: Content of: <div><div><div><div><h2>
-#: /home/runa/tor/website/en/index.wml:123
+#: /home/runa/dev/website/en/index.wml:123
 msgid "Announcements"
 msgstr "Ogłoszenia"
 
 #. type: Content of: <div><div><div><div><table><tr><td><div>
-#: /home/runa/tor/website/en/index.wml:128
+#: /home/runa/dev/website/en/index.wml:128
+msgid "<span class=\"month\">Mar</span><br><span class=\"day\">23</span>"
+msgstr "<span class=\"month\">Mar</span><br><span class=\"day\">23</span>"
+
+#. type: Content of: <div><div><div><div><table><tr><td><p>
+#: /home/runa/dev/website/en/index.wml:129
+msgid ""
+"The Tor Project wins the \"Project of Social Benefit\" award from the Free "
+"Software Foundation and GNU Project. We are honored to win this award and to"
+" be listed amongst the former winners. <a "
+"href=\"https://blog.torproject.org/blog/tor-project-receives-fsf-"
+"award\">Read more</a> about this award."
+msgstr ""
+"Projekt Tor wygrał nagrodę \"Project of Social Benefit\" od Free Software "
+"Foundation i Projektu GNU. Wygranie tej nagrody i znalezienie się na liście "
+"zwycięzców to dla nas zaszczyt. <a href=\"https://blog.torproject.org/blog"
+"/tor-project-receives-fsf-award\">Przeczytaj więcej</a> o tej nagrodzie."
+
+#. type: Content of: <div><div><div><div><table><tr><td><div>
+#: /home/runa/dev/website/en/index.wml:135
 msgid "<span class=\"month\">Feb</span><br><span class=\"day\">23</span>"
 msgstr "<span class=\"month\">Luty</span><br><span class=\"day\">23</span>"
 
 #. type: Content of: <div><div><div><div><table><tr><td><p>
-#: /home/runa/tor/website/en/index.wml:129
+#: /home/runa/dev/website/en/index.wml:136
 msgid ""
 "The latest stable Tor version, 0.2.1.30, is <a "
 "href=\"https://lists.torproject.org/pipermail/tor-"
@@ -312,23 +331,3 @@
 "wersję są znów osiągalne z Iranu.  Nie oczekujemy, że ta poprawka wygra "
 "wyścig zbrojeń na dłuższą metę, ale kupi ona nam trochę czasu, zanim nie "
 "wyjdziemy z lepszym rozwiązaniem."
-
-#. type: Content of: <div><div><div><div><table><tr><td><div>
-#: /home/runa/tor/website/en/index.wml:138
-msgid "<span class=\"month\">Jan</span><br><span class=\"day\">30</span>"
-msgstr "<span class=\"month\">Sty</span><br><span class=\"day\">30</span>"
-
-#. type: Content of: <div><div><div><div><table><tr><td><p>
-#: /home/runa/tor/website/en/index.wml:139
-msgid ""
-"Tor helping with Egypt.  Here's what we've learned <a "
-"href=\"https://blog.torproject.org/blog/recent-events-egypt\">about recent "
-"events in Egypt</a>. And we're keeping our <a href=\"<page "
-"press/inthemedia>\">In the media</a> page up to date with stories about how "
-"we're helping around the world."
-msgstr ""
-"Tor pomaga w Egipcie. Oto, czego dowiedzieliśmy się <a "
-"href=\"https://blog.torproject.org/blog/recent-events-egypt\">o ostatnich "
-"wydarzeniach w Egipcie</a>. I utrzymujemy naszą stronę <a href=\"<page "
-"press/inthemedia>\">W mediach</a> aktualną odnośnie historii o tym, jak "
-"pomagamy na całym świecie."

Modified: translation/trunk/projects/website/po/pl_PL/about/2-medium.overview.po
===================================================================
--- translation/trunk/projects/website/po/pl_PL/about/2-medium.overview.po	2011-04-12 16:15:00 UTC (rev 24594)
+++ translation/trunk/projects/website/po/pl_PL/about/2-medium.overview.po	2011-04-12 16:19:31 UTC (rev 24595)
@@ -8,7 +8,7 @@
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
 "POT-Creation-Date: 2011-03-01 16:37+0000\n"
-"PO-Revision-Date: 2011-03-28 13:16+0000\n"
+"PO-Revision-Date: 2011-03-31 11:43+0000\n"
 "Last-Translator: runasand <runa.sandvik at gmail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
@@ -296,7 +296,7 @@
 #. type: Content of: <div><div>
 #: /home/runa/tor/website/about/en/overview.wml:137
 msgid "<img src=\"$(IMGROOT)/htw1.png\" alt=\"How Tor works\">"
-msgstr "<img src=\"$(IMGROOT)/htw1.png\" alt=\"Jak działa Tor\">"
+msgstr "<img src=\"$(IMGROOT)/htw1_pl.png\" alt=\"Jak działa Tor\">"
 
 #. type: Content of: <div><div><p>
 #: /home/runa/tor/website/about/en/overview.wml:140

Modified: translation/trunk/projects/website/po/pl_PL/about/3-low.contact.po
===================================================================
--- translation/trunk/projects/website/po/pl_PL/about/3-low.contact.po	2011-04-12 16:15:00 UTC (rev 24594)
+++ translation/trunk/projects/website/po/pl_PL/about/3-low.contact.po	2011-04-12 16:19:31 UTC (rev 24595)
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-02-12 12:19+0000\n"
-"PO-Revision-Date: 2011-03-22 16:18+0000\n"
+"POT-Creation-Date: 2011-03-28 12:49+0200\n"
+"PO-Revision-Date: 2011-04-03 11:54+0000\n"
 "Last-Translator: bogdrozd <bog.d at gazeta.pl>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
@@ -18,7 +18,7 @@
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/about/en/contact.wml:9
+#: /home/runa/dev/website/about/en/contact.wml:9
 msgid ""
 "<a href=\"<page index>\">Home &raquo; </a> <a href=\"<page "
 "about/overview>\">About &raquo; </a> <a href=\"<page "
@@ -29,12 +29,12 @@
 "about/contact>\">Kontakt</a>"
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/about/en/contact.wml:14
+#: /home/runa/dev/website/about/en/contact.wml:14
 msgid "Tor: Contact"
 msgstr "Tor: Kontakt"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/about/en/contact.wml:16
+#: /home/runa/dev/website/about/en/contact.wml:16
 msgid ""
 "First, if you have a problem or question about using Tor, go look at the <a "
 "href=\"<page docs/documentation>#Support\">Support section</a> for how to "
@@ -52,30 +52,29 @@
 "samodzielnie."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/about/en/contact.wml:18
+#: /home/runa/dev/website/about/en/contact.wml:18
 msgid ""
-"If you really do need to reach us, here are some approaches. All of these "
-"addresses are @torproject.org. Please be patient and <a "
-"href=\"http://www.catb.org/~esr/faqs/smart-questions.html\">helpful</a>, and"
-" please make sure to write your mail in English."
+"If you really do need to reach us, here are some approaches. Please be "
+"patient and <a href=\"http://www.catb.org/~esr/faqs/smart-"
+"questions.html\">helpful</a>, and please make sure to write your mail in "
+"English."
 msgstr ""
 "Jeśli naprawdę potrzebujesz skontaktować się z nami, poniżej znajduje się "
-"kilka wskazówek. Wszystkie adresy poniżej są na serwerze @torproject.org. "
-"Pamiętaj, że wszystkie z nich trafiają do tej samej, małej grupy ludzi, tak "
-"więc bądź cierpliwy i <a href=\"http://rtfm.killfile.pl\">zadawaj pytania "
-"mądrze</a>, i pamiętaj także, by pod poniższe adresy pisać wyłącznie po "
-"angielsku."
+"kilka wskazówek. Prosimy o cierpliwość i <a "
+"href=\"http://rtfm.killfile.pl\">zadawanie pytań mądrze</a>, i pamiętaj "
+"także, by pod poniższe adresy pisać wyłącznie po angielsku."
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/about/en/contact.wml:23
+#: /home/runa/dev/website/about/en/contact.wml:21
 msgid ""
-"<i>tor-assistants</i> is the catch-all address for everything. It can be "
-"used for:"
+"<i>tor-assistants at lists.torproject.org</i> is the catch-all address for "
+"everything. It can be used for:"
 msgstr ""
-"<i>tor-assistants</i> służy do wszelkich zagadnień. Można go używać do:"
+"<i>tor-assistants małpa lists.torproject.org</i> służy do wszelkich "
+"zagadnień. Można go używać do:"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/about/en/contact.wml:27
+#: /home/runa/dev/website/about/en/contact.wml:25
 msgid ""
 "Contacting the people who manage the directory authorities. Use this if you "
 "run a Tor relay and have a question or problem with your relay."
@@ -85,7 +84,7 @@
 "przekaźnikiem."
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/about/en/contact.wml:30
+#: /home/runa/dev/website/about/en/contact.wml:28
 msgid ""
 "So we can fix typos on the website, change wrong statements or directions on"
 " the website, and add new sections and paragraphs that you send us. You "
@@ -98,7 +97,7 @@
 "href=\"<wiki>\">wiki Tora</a>."
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/about/en/contact.wml:34
+#: /home/runa/dev/website/about/en/contact.wml:32
 msgid ""
 "Hearing about your documents, patches, testing, experiences with supporting "
 "applications, and so forth inspired by our <a href=\"<page "
@@ -119,50 +118,52 @@
 "dokonanym postępem."
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/about/en/contact.wml:44
+#: /home/runa/dev/website/about/en/contact.wml:42
 msgid "A few other addresses are more specific:"
-msgstr "Innme adresy są bardziej specyficzne:"
+msgstr "Inne adresy są bardziej specyficzne:"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/about/en/contact.wml:47
+#: /home/runa/dev/website/about/en/contact.wml:45
 msgid ""
-"<i>tor-translation</i> can put new <a href=\"<page "
+"<i>tor-translation at lists.torproject.org</i> can put new <a href=\"<page "
 "getinvolved/translation>\">website translations</a> into place, and help "
 "answer questions about existing and new translations."
 msgstr ""
-"<i>tor-translation</i> pozwala umieszczać nowe <a href=\"<page "
-"getinvolved/translation>\">tłumaczenia strony</a> na właściwym miejscu oraz "
-"pomaga odpowiadać na pytania związane z istniejącymi i nowymi tłumaczeniami."
+"<i>tor-translation małpa lists.torproject.org</i> pozwala umieszczać nowe <a"
+" href=\"<page getinvolved/translation>\">tłumaczenia strony</a> na właściwym"
+" miejscu oraz pomaga odpowiadać na pytania związane z istniejącymi i nowymi "
+"tłumaczeniami."
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/about/en/contact.wml:50
+#: /home/runa/dev/website/about/en/contact.wml:48
 msgid ""
-"<i>tordnsel</i> is the alias for the people responsible for the tordns "
-"exitlist."
+"<i>tordnsel at torproject.org</i> is the alias for the people responsible "
+"for the tordns exitlist."
 msgstr ""
-"<i>tordnsel</i> służy do kontaktów z ludźmi odpowiedzialnymi za listę "
-"punktów wyjściowych tordns."
+"<i>tordnsel małpa torproject.org</i> służy do kontaktów z ludźmi "
+"odpowiedzialnymi za listę punktów wyjściowych tordns."
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/about/en/contact.wml:52
+#: /home/runa/dev/website/about/en/contact.wml:50
 msgid ""
-"<i>donations</i> is for questions and comments about <a href=\"<page "
-"donate/donate>\">getting money to the developers</a>. More donations means "
-"<a href=\"<page docs/faq>#Funding\">more Tor</a>. We're happy to help think "
-"about creative ways for you to contribute."
+"<i>donations at torproject.org</i> is for questions and comments about <a "
+"href=\"<page donate/donate>\">getting money to the developers</a>. More "
+"donations means <a href=\"<page docs/faq>#Funding\">more Tor</a>. We're "
+"happy to help think about creative ways for you to contribute."
 msgstr ""
-"<i>donations</i> służy do pytania o i komentowania aspektów związanych z <a "
-"href=\"<page donate/donate>\">przekazywaniem pieniędzy do deweloperów</a>. "
-"Więcej dotacji oznacza <a href=\"<page docs/faq>#Funding\">więcej Tora</a>."
-"  Z przyjemnością pomożemy wymyśleć jakieś twórcze sposoby wniesienia "
-"swojego wkładu w projekt."
+"<i>donations małpa torproject.org</i> służy do pytania o i komentowania "
+"aspektów związanych z <a href=\"<page donate/donate>\">przekazywaniem "
+"pieniędzy do deweloperów</a>. Więcej dotacji oznacza <a href=\"<page "
+"docs/faq>#Funding\">więcej Tora</a>.  Z przyjemnością pomożemy wymyśleć "
+"jakieś twórcze sposoby wniesienia swojego wkładu w projekt."
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/about/en/contact.wml:57
+#: /home/runa/dev/website/about/en/contact.wml:55
 msgid ""
-"<i>execdir</i> is for press/media, questions and comments about Tor the non-"
-"profit corporation: trademark questions, affiliation and coordination, major"
-" gifts, contract inquiries, licensing and certification, etc."
+"<i>execdir at torproject.org</i> is for press/media, questions and comments "
+"about Tor the non-profit corporation: trademark questions, affiliation and "
+"coordination, major gifts, contract inquiries, licensing and certification, "
+"etc."
 msgstr ""
 "<i>execdir</i> jest przeznaczony dla prasy/mediów oraz komentarzy i pytań "
 "odnośnie organizacji non-profit Tora: znaki handlowe, przyłączanie i "
@@ -170,7 +171,7 @@
 "certyfikacja etc."
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/about/en/contact.wml:63
+#: /home/runa/dev/website/about/en/contact.wml:61
 msgid ""
 "<a id=\"irc\"></a> Tor users and developers can also be found in the "
 "following channels on <a href=\"http://www.oftc.net/oftc/\">oftc</a>:"
@@ -179,7 +180,7 @@
 "następująych kanałach na <a href=\"http://www.oftc.net/oftc/\">oftc</a>:"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/about/en/contact.wml:68
+#: /home/runa/dev/website/about/en/contact.wml:66
 msgid ""
 "<i>#tor</i> - User and relay operation discussions. Having trouble running "
 "Tor or a question for other Tor users? Then this is the spot for you."
@@ -189,7 +190,7 @@
 "jest miejsce dla Ciebie."
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/about/en/contact.wml:71
+#: /home/runa/dev/website/about/en/contact.wml:69
 msgid ""
 "<i>#tor-dev</i> - Channel for people who want to do development.  "
 "Discussions about Tor related coding, protocols, and <a href=\"<page "
@@ -200,7 +201,7 @@
 "getinvolved/volunteer>\">pomysły na projekty</a> są mile widziane."
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/about/en/contact.wml:74
+#: /home/runa/dev/website/about/en/contact.wml:72
 msgid ""
 "<i>#nottor</i> - This is where Tor people hang out to talk about stuff that "
 "is not related to Tor."

Modified: translation/trunk/projects/website/po/pl_PL/about/3-low.corepeople.po
===================================================================
--- translation/trunk/projects/website/po/pl_PL/about/3-low.corepeople.po	2011-04-12 16:15:00 UTC (rev 24594)
+++ translation/trunk/projects/website/po/pl_PL/about/3-low.corepeople.po	2011-04-12 16:19:31 UTC (rev 24595)
@@ -7,9 +7,9 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-03-01 16:37+0000\n"
-"PO-Revision-Date: 2011-03-28 13:14+0000\n"
-"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
+"POT-Creation-Date: 2011-03-28 12:49+0200\n"
+"PO-Revision-Date: 2011-04-03 11:57+0000\n"
+"Last-Translator: bogdrozd <bog.d at gazeta.pl>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,7 +18,7 @@
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/about/en/corepeople.wml:7
+#: /home/runa/dev/website/about/en/corepeople.wml:7
 msgid ""
 "<a href=\"<page index>\">Home &raquo; </a> <a href=\"<page "
 "about/overview>\">About &raquo; </a> <a href=\"<page about/corepeople>\">Tor"
@@ -29,7 +29,7 @@
 "about/corepeople>\">Ludzie Tora</a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/about/en/corepeople.wml:12
+#: /home/runa/dev/website/about/en/corepeople.wml:12
 msgid ""
 "The Tor Project is a 501(c)(3) non-profit based in the United States. The "
 "official address of the organization is:"
@@ -38,7 +38,7 @@
 "Oficjalny adres organizacji to:"
 
 #. type: Content of: <div><div><address>
-#: /home/runa/tor/website/about/en/corepeople.wml:17
+#: /home/runa/dev/website/about/en/corepeople.wml:17
 msgid ""
 "The Tor Project<br> 969 Main Street, Suite 206<br> Walpole, MA 02081-2972 "
 "USA<br><br>"
@@ -47,7 +47,7 @@
 "USA<br><br>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/about/en/corepeople.wml:22
+#: /home/runa/dev/website/about/en/corepeople.wml:22
 msgid ""
 "The organization consists of many volunteers and a few employees.  Please "
 "don't contact us individually about Tor topics &mdash; if you have a problem"
@@ -60,17 +60,17 @@
 "kontaktową</a>, by znaleźć odpowiedni adres."
 
 #. type: Content of: <div><div><h1>
-#: /home/runa/tor/website/about/en/corepeople.wml:27
+#: /home/runa/dev/website/about/en/corepeople.wml:27
 msgid "Core Tor People"
 msgstr "Główne osoby Tora"
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/corepeople.wml:29
+#: /home/runa/dev/website/about/en/corepeople.wml:29
 msgid "Jacob Appelbaum, Developer, Advocate, and Security Researcher"
 msgstr "Jacob Appelbaum, Deweloper, Adwokat i Badacz Bezpieczeństwa"
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/corepeople.wml:30
+#: /home/runa/dev/website/about/en/corepeople.wml:30
 msgid ""
 "Our main advocate.  Speaks at conferences and gives trainings all over the "
 "world to get people excited about Tor, explain how Tor is used in real world"
@@ -91,12 +91,12 @@
 " Laboratorium Badania Bezpieczeństwa i Prywatności Uniwersytetu Waszyngton."
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/corepeople.wml:40
+#: /home/runa/dev/website/about/en/corepeople.wml:40
 msgid "Erinn Clark, Packaging and Build Automation"
 msgstr "Erinn Clark, Automatyzacja pakowania i budowania"
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/corepeople.wml:41
+#: /home/runa/dev/website/about/en/corepeople.wml:41
 msgid ""
 "Erinn is tackling the growing needs for easy to install and configure "
 "packages on a variety of operating systems.  Also working on automating the "
@@ -111,12 +111,12 @@
 "publiczności na FSCONS, CodeBits.eu i różnych europejskich uniwersystetach."
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/corepeople.wml:47
+#: /home/runa/dev/website/about/en/corepeople.wml:47
 msgid "Christopher Davis, Libevent hacker"
 msgstr "Christopher Davis, haker Libevent"
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/corepeople.wml:48
+#: /home/runa/dev/website/about/en/corepeople.wml:48
 msgid ""
 "Worked during Google Summer of Code 2009 on porting Polipo to Windows.  He "
 "currently helps with the libevent bufferevent code."
@@ -125,12 +125,12 @@
 "Windows. Teraz pomaga z kodem bufferevent w libevent."
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/corepeople.wml:51
+#: /home/runa/dev/website/about/en/corepeople.wml:51
 msgid "Roger Dingledine, Project Leader; Director, Researcher"
 msgstr "Roger Dingledine, Lider Projektu; Dyrektor, Badacz"
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/corepeople.wml:52
+#: /home/runa/dev/website/about/en/corepeople.wml:52
 msgid ""
 "Original developer of Tor along with Nick Mathewson and Paul Syverson. "
 "Leading researcher in the anonymous communications field.  Frequent speaker "
@@ -143,12 +143,12 @@
 "koordynować badaczy akademickich."
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/corepeople.wml:57
+#: /home/runa/dev/website/about/en/corepeople.wml:57
 msgid "Matt Edman, Vidalia Developer; Researcher"
 msgstr "Matt Edman, Deweloper Vidalii; Badacz"
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/corepeople.wml:58
+#: /home/runa/dev/website/about/en/corepeople.wml:58
 msgid ""
 "Lead developer for <a href=\"<page projects/vidalia>\">Vidalia</a>, a cross-"
 "platform Tor Graphical User Interface included in the bundles."
@@ -157,12 +157,12 @@
 "międzyplatformowego interfejsu graficznego dla Tora zawartego w paczkach."
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/corepeople.wml:61
+#: /home/runa/dev/website/about/en/corepeople.wml:61
 msgid "Nathan Freitas, Mobile phone hacker"
 msgstr "Nathan Freitas, haker telefonów komórkowych"
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/corepeople.wml:62
+#: /home/runa/dev/website/about/en/corepeople.wml:62
 msgid ""
 "The driving force behind <a href=\"https://guardianproject.info\">The "
 "Guardian Project</a> and Tor on the Android platform in the form of <a "
@@ -181,12 +181,12 @@
 "mobilną o wzmocnionej prywatności</a>."
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/corepeople.wml:70
+#: /home/runa/dev/website/about/en/corepeople.wml:70
 msgid "Christian Fromme, Developer"
 msgstr "Christian Fromme, Deweloper"
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/corepeople.wml:71
+#: /home/runa/dev/website/about/en/corepeople.wml:71
 msgid ""
 "Christian works on all things python for Tor.  He enhanced and maintains a "
 "slew of codebases for us, such as the get-tor email auto-responder, "
@@ -198,12 +198,12 @@
 "itd."
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/corepeople.wml:75
+#: /home/runa/dev/website/about/en/corepeople.wml:75
 msgid "Melissa Gilroy, CFO and Internal Audit"
 msgstr "Melissa Gilroy, CFO i Audyt Wewnętrzny"
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/corepeople.wml:76
+#: /home/runa/dev/website/about/en/corepeople.wml:76
 msgid ""
 "With a strong background in non-profit accounting and auditing, Melissa is "
 "in charge of Tor's finances, audit compliance, and keeping Tor's financial "
@@ -214,12 +214,12 @@
 "finansowych Tora."
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/corepeople.wml:80
+#: /home/runa/dev/website/about/en/corepeople.wml:80
 msgid "Sebastian Hahn, Developer"
 msgstr "Sebastian Hahn, Deweloper"
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/corepeople.wml:81
+#: /home/runa/dev/website/about/en/corepeople.wml:81
 msgid ""
 "Worked during the 2008 Google Summer of Code on a networking application to "
 "automatically carry out tests for Tor and during the 2009 Google Summer of "
@@ -231,12 +231,12 @@
 "rozszerzeniem Thandy o obsługę BitTorrent. Ogólnie dużo pomaga."
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/corepeople.wml:86
+#: /home/runa/dev/website/about/en/corepeople.wml:86
 msgid "Thomas S. Benjamin, Researcher"
 msgstr "Thomas S. Benjamin, Badacz"
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/corepeople.wml:87
+#: /home/runa/dev/website/about/en/corepeople.wml:87
 msgid ""
 "Anonymous communications and bridge distribution researcher. His other work "
 "can be found on his <a href=\"http://cryptocracy.net/\">personal website</a>"
@@ -245,12 +245,12 @@
 "znaleźć na jego <a href=\"http://cryptocracy.net/\">osobistej stronie</a>"
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/corepeople.wml:90
+#: /home/runa/dev/website/about/en/corepeople.wml:90
 msgid "Robert Hogan, Developer"
 msgstr "Robert Hogan, Deweloper"
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/corepeople.wml:91
+#: /home/runa/dev/website/about/en/corepeople.wml:91
 msgid ""
 "Developer for the <a href=\"http://tork.sf.net/\">TorK</a> Tor controller, a"
 " <a href=\"http://code.google.com/p/torora/\">privacy-oriented Arora "
@@ -263,12 +263,12 @@
 "torsocks</a> i innych przydatnych narzędzi zewnętrznych."
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/corepeople.wml:97
+#: /home/runa/dev/website/about/en/corepeople.wml:97
 msgid "Damian Johnson, Arm Developer"
 msgstr "Damian Johnson, Deweloper Arma"
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/corepeople.wml:98
+#: /home/runa/dev/website/about/en/corepeople.wml:98
 msgid ""
 "Builds <a href=\"http://atagar.com/arm\">Arm</a>, a command-line application"
 " for monitoring Tor relays and providing real-time status information such "
@@ -280,7 +280,7 @@
 "log wiadomości etc."
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/corepeople.wml:102
+#: /home/runa/dev/website/about/en/corepeople.wml:102
 msgid ""
 "Andrew Lewman, Executive Director; Director; <a href=\"<page "
 "press/press>\">press contact</a>"
@@ -289,7 +289,7 @@
 "press/press>\">kontakt prasowy</a>"
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/corepeople.wml:103
+#: /home/runa/dev/website/about/en/corepeople.wml:103
 msgid ""
 "Manages the business operations of The Tor Project, Inc.  Plays roles of "
 "finance, advocacy, project management, strategy, press, and general support."
@@ -298,12 +298,12 @@
 "rozgłaszaniem, zarządzaniem projektem, strategią, prasą i ogólnym wsparciem."
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/corepeople.wml:106
+#: /home/runa/dev/website/about/en/corepeople.wml:106
 msgid "Dr. Karsten Loesing, Researcher and Developer"
 msgstr "Dr. Karsten Loesing, Badacz i Deweloper"
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/corepeople.wml:107
+#: /home/runa/dev/website/about/en/corepeople.wml:107
 msgid ""
 "Worked during the 2007 Google Summer of Code on <a "
 "href=\"<specblob>proposals/114-distributed-storage.txt\">distributing and "
@@ -318,12 +318,12 @@
 "href=\"http://metrics.torproject.org/\">sposobami mierzenia</a>."
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/corepeople.wml:114
+#: /home/runa/dev/website/about/en/corepeople.wml:114
 msgid "Nick Mathewson, Chief Architect, Researcher, Director"
 msgstr "Nick Mathewson, Główny Architekt, Badacz, Dyrektor"
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/corepeople.wml:115
+#: /home/runa/dev/website/about/en/corepeople.wml:115
 msgid ""
 "One of the three original designers of Tor; does a lot of the ongoing design"
 " work. One of the two main developers, along with Roger."
@@ -332,12 +332,12 @@
 "projektowych. Jeden z dwóch głównych deweloperów, razem z Rogerem."
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/corepeople.wml:118
+#: /home/runa/dev/website/about/en/corepeople.wml:118
 msgid "Dr. Steven Murdoch, Researcher and Developer"
 msgstr "Dr. Steven Murdoch, Badacz i Deweloper"
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/corepeople.wml:119
+#: /home/runa/dev/website/about/en/corepeople.wml:119
 msgid ""
 "Researcher at the University of Cambridge, currently funded by The Tor "
 "Project to improve the security, performance, and usability of Tor. Creator "
@@ -352,12 +352,12 @@
 "href=\"http://www.cl.cam.ac.uk/~sjm217/\">stronie zawodowej</a>."
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/corepeople.wml:126
+#: /home/runa/dev/website/about/en/corepeople.wml:126
 msgid "Linus Nordberg, Advocate"
 msgstr "Linus Nordberg, Adwokat"
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/corepeople.wml:127
+#: /home/runa/dev/website/about/en/corepeople.wml:127
 msgid ""
 "Swedish advocate for Tor, anonymous communications research, and employee at"
 " <a href=\"http://nordu.net\">NORDUnet</a>."
@@ -366,12 +366,12 @@
 "href=\"http://nordu.net\">NORDUnet</a>."
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/corepeople.wml:130
+#: /home/runa/dev/website/about/en/corepeople.wml:130
 msgid "Peter Palfrader, Sysadmin and Developer"
 msgstr "Peter Palfrader, Administrator i Deweloper"
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/corepeople.wml:131
+#: /home/runa/dev/website/about/en/corepeople.wml:131
 msgid ""
 "Manages the Debian packages, runs one of the directory authorities, runs the"
 " website and the wiki, and generally helps out a lot."
@@ -380,12 +380,12 @@
 "stronę i wiki oraz ogólnie dużo pomaga."
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/corepeople.wml:132
+#: /home/runa/dev/website/about/en/corepeople.wml:132
 msgid "Mike Perry, Torbutton and Tor Performance Developer"
 msgstr "Mike Perry, Deweloper Torbuttona i Tor Performance"
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/corepeople.wml:133
+#: /home/runa/dev/website/about/en/corepeople.wml:133
 msgid ""
 "Author of <a "
 "href=\"https://svn.torproject.org/svn/torflow/trunk/README\">TorFlow</a>, a "
@@ -399,12 +399,26 @@
 "torbutton/index>\">Torbuttonem</a>."
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/corepeople.wml:139
+#: /home/runa/dev/website/about/en/corepeople.wml:139
+msgid "Robert Ransom"
+msgstr "Robert Ransom"
+
+#. type: Content of: <div><div><dl><dd>
+#: /home/runa/dev/website/about/en/corepeople.wml:140
+msgid ""
+"Bug catcher and immensely helpful on irc and the email lists. Looking into "
+"hidden service performance and robustness."
+msgstr ""
+"Znajduje błędy i ogromnie pomaga na IRCu i listach mailingowych. Zajmuje się"
+" wydajnością i użytecznością usług ukrytych."
+
+#. type: Content of: <div><div><dl><dt>
+#: /home/runa/dev/website/about/en/corepeople.wml:143
 msgid "Karen Reilly, Development Director"
 msgstr "Karen Reilly, Dyrektor do spraw Rozwoju"
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/corepeople.wml:140
+#: /home/runa/dev/website/about/en/corepeople.wml:144
 msgid ""
 "Responsible for fundraising, advocacy, general marketing, policy outreach "
 "programs for Tor. She is also available to speak for audiences about the "
@@ -415,12 +429,12 @@
 "zyskach anonimowości w sieci, prywatności i Tora."
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/corepeople.wml:144
+#: /home/runa/dev/website/about/en/corepeople.wml:148
 msgid "Runa A. Sandvik, Translation Coordinator"
 msgstr "Runa A. Sandvik, Koordynator do spraw Tłumaczeń"
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/corepeople.wml:145
+#: /home/runa/dev/website/about/en/corepeople.wml:149
 msgid ""
 "Maintains the <a "
 "href=\"http://www.transifex.net/projects/p/torproject/\">Tor Translation "
@@ -439,12 +453,12 @@
 "projektami."
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/corepeople.wml:153
+#: /home/runa/dev/website/about/en/corepeople.wml:157
 msgid "Dr. Paul Syverson, Researcher"
 msgstr "Dr. Paul Syverson, Badacz"
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/corepeople.wml:154
+#: /home/runa/dev/website/about/en/corepeople.wml:158
 msgid ""
 "Inventor of <a href=\"http://www.onion-router.net/\">Onion Routing</a>, "
 "original designer of Tor along with Roger and Nick, and project leader for "
@@ -456,12 +470,12 @@
 "projektu, rozwoju i wydania Tora. Teraz pomaga z badaniami i projektowaniem."
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/corepeople.wml:159
+#: /home/runa/dev/website/about/en/corepeople.wml:163
 msgid "Jeremy Todaro, Illustration &amp; Design"
 msgstr "Jeremy Todaro, Ilustracje i Projekt"
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/corepeople.wml:160
+#: /home/runa/dev/website/about/en/corepeople.wml:164
 msgid ""
 "Works on the artwork and design for various projects, annual reports, and "
 "brochures. His other work can be found at <a "
@@ -470,3 +484,13 @@
 "Pracuje na wyglądem i projektem dla różnych projektów, rocznymi raportami i "
 "broszurami. Inne jego prace można znaleźć na <a "
 "href=\"http://jmtodaro.com/\">http://jmtodaro.com/</a>."
+
+#. type: Content of: <div><div><dl><dt>
+#: /home/runa/dev/website/about/en/corepeople.wml:167
+msgid "Tomás Touceda"
+msgstr "Tomás Touceda"
+
+#. type: Content of: <div><div><dl><dd>
+#: /home/runa/dev/website/about/en/corepeople.wml:168
+msgid "Maintenance and new development for Vidalia."
+msgstr "Utrzymanie i nowy rozwój Vidalii."

Modified: translation/trunk/projects/website/po/pl_PL/about/3-low.volunteers.po
===================================================================
--- translation/trunk/projects/website/po/pl_PL/about/3-low.volunteers.po	2011-04-12 16:15:00 UTC (rev 24594)
+++ translation/trunk/projects/website/po/pl_PL/about/3-low.volunteers.po	2011-04-12 16:19:31 UTC (rev 24595)
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-02-12 12:19+0000\n"
-"PO-Revision-Date: 2011-03-22 16:23+0000\n"
+"POT-Creation-Date: 2011-03-28 12:49+0200\n"
+"PO-Revision-Date: 2011-03-29 00:25+0000\n"
 "Last-Translator: bogdrozd <bog.d at gazeta.pl>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
@@ -18,7 +18,7 @@
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/about/en/volunteers.wml:8
+#: /home/runa/dev/website/about/en/volunteers.wml:8
 msgid ""
 "<a href=\"<page index>\">Home &raquo; </a> <a href=\"<page "
 "about/overview>\">About &raquo; </a> <a href=\"<page "
@@ -29,27 +29,27 @@
 "about/volunteers>\">Wolontariusze</a>"
 
 #. type: Content of: <div><div><h1>
-#: /home/runa/tor/website/about/en/volunteers.wml:13
+#: /home/runa/dev/website/about/en/volunteers.wml:13
 msgid "Volunteers"
 msgstr "Wolontariusze"
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/volunteers.wml:15
+#: /home/runa/dev/website/about/en/volunteers.wml:15
 msgid "Anonym"
 msgstr "Anonim"
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/volunteers.wml:15
+#: /home/runa/dev/website/about/en/volunteers.wml:15
 msgid "Maintainer of the Incognito LiveCD."
 msgstr "Zajmuje się projektem Incognito LiveCD."
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/volunteers.wml:16
+#: /home/runa/dev/website/about/en/volunteers.wml:16
 msgid "Kevin Bankston"
 msgstr "Kevin Bankston"
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/volunteers.wml:16
+#: /home/runa/dev/website/about/en/volunteers.wml:16
 msgid ""
 "EFF lawyer who helped write the <a href=\"<page eff/tor-legal-faq>\">Tor "
 "Legal FAQ</a> and tirelessly answers the phone when somebody in the world "
@@ -60,22 +60,22 @@
 "świecie ma prawne pytanie na temat Tora."
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/volunteers.wml:20
+#: /home/runa/dev/website/about/en/volunteers.wml:20
 msgid "Marco Bonetti"
 msgstr "Marco Bonetti"
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/volunteers.wml:20
+#: /home/runa/dev/website/about/en/volunteers.wml:20
 msgid "Focusing on MobileTor for the iPhone."
 msgstr "Skupia się na MobileTor dla iPhone."
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/volunteers.wml:21
+#: /home/runa/dev/website/about/en/volunteers.wml:21
 msgid "Kasimir Gabert"
 msgstr "Kasimir Gabert"
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/volunteers.wml:21
+#: /home/runa/dev/website/about/en/volunteers.wml:21
 msgid ""
 "Maintains the <a href=\"https://torstatus.kgprog.com/\">TorStatus</a> "
 "statistics pages."
@@ -84,23 +84,23 @@
 "statystykami."
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/volunteers.wml:23
+#: /home/runa/dev/website/about/en/volunteers.wml:23
 msgid "Andreas Jonsson"
 msgstr "Andreas Jonsson"
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/volunteers.wml:23
+#: /home/runa/dev/website/about/en/volunteers.wml:23
 msgid "Works on OS X Tor Browser Bundle sandbox technology."
 msgstr ""
 "Pracuje nad technologią piaskownicy dla Paczki Tora z Przeglądarką dla OS X"
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/volunteers.wml:25
+#: /home/runa/dev/website/about/en/volunteers.wml:25
 msgid "Fabian Keil"
 msgstr "Fabian Keil"
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/volunteers.wml:25
+#: /home/runa/dev/website/about/en/volunteers.wml:25
 msgid ""
 "One of the core Privoxy developers, and also a Tor fan. He's the reason Tor "
 "and Privoxy still work well together."
@@ -109,22 +109,22 @@
 "Privoxy nadal działają dobrze razem."
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/volunteers.wml:27
+#: /home/runa/dev/website/about/en/volunteers.wml:27
 msgid "Bruce Leidl"
 msgstr "Bruce Leidl"
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/volunteers.wml:27
+#: /home/runa/dev/website/about/en/volunteers.wml:27
 msgid "Working on a Tor client in Java."
 msgstr "Pracuje nad klientem Tora w Javie."
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/volunteers.wml:28
+#: /home/runa/dev/website/about/en/volunteers.wml:28
 msgid "Julius Mittenzwei"
 msgstr "Julius Mittenzwei"
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/volunteers.wml:28
+#: /home/runa/dev/website/about/en/volunteers.wml:28
 msgid ""
 "A lawyer with the CCC in Germany. Coordinates the German Tor community with "
 "respect to legal questions and concerns."
@@ -133,12 +133,12 @@
 "prawnych."
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/volunteers.wml:31
+#: /home/runa/dev/website/about/en/volunteers.wml:31
 msgid "Shava Nerad"
 msgstr "Shava Nerad"
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/volunteers.wml:31
+#: /home/runa/dev/website/about/en/volunteers.wml:31
 msgid ""
 "Our former Development Director. She still works on PR and community "
 "relations."
@@ -147,12 +147,12 @@
 "relations) i relacjami ze społeczeństwem."
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/volunteers.wml:33
+#: /home/runa/dev/website/about/en/volunteers.wml:33
 msgid "Linus Nordberg"
 msgstr "Linus Nordberg"
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/volunteers.wml:33
+#: /home/runa/dev/website/about/en/volunteers.wml:33
 msgid ""
 "Enjoys measuring the Tor network and helps with outreach in the Nordic "
 "countries."
@@ -161,12 +161,12 @@
 "nordyckich."
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/volunteers.wml:35
+#: /home/runa/dev/website/about/en/volunteers.wml:35
 msgid "Lasse &Oslash;verlier"
 msgstr "Lasse &Oslash;verlier"
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/volunteers.wml:35
+#: /home/runa/dev/website/about/en/volunteers.wml:35
 msgid ""
 "Writes research papers on Tor: attacks, defenses, and resource management, "
 "especially for hidden services."
@@ -175,12 +175,12 @@
 "zarządzanie zasobami, zwłaszcza dla usług ukrytych."
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/volunteers.wml:37
+#: /home/runa/dev/website/about/en/volunteers.wml:37
 msgid "Martin Peck"
 msgstr "Martin Peck"
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/volunteers.wml:37
+#: /home/runa/dev/website/about/en/volunteers.wml:37
 msgid ""
 "Working on a VM-based transparent proxying approach for Tor clients on "
 "Windows."
@@ -189,23 +189,13 @@
 "serwerów proxy dla klientów Tora na Windows."
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/volunteers.wml:39
-msgid "Robert Ransom"
-msgstr "Robert Ransom"
-
-#. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/volunteers.wml:39
-msgid "Bug catcher and immensely helpful on irc and the email lists"
-msgstr "Znajduje błędy i ogromnie pomaga na IRCu i listach mailingowych"
-
-#. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/volunteers.wml:41
+#: /home/runa/dev/website/about/en/volunteers.wml:39
 msgid "rovv (a pseudonym -- he's managed to stay anonymous even from us!)"
 msgstr ""
 "rovv (to jest pseudonim -- udało mu się pozostać anonimowym nawet dla nas!)"
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/volunteers.wml:42
+#: /home/runa/dev/website/about/en/volunteers.wml:40
 msgid ""
 "The most dedicated bug reporter we've ever heard from. He must read Tor "
 "source code every day over breakfast."
@@ -214,12 +204,12 @@
 "kod źródłowy Tora codziennie przy śniadaniu."
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/volunteers.wml:44
+#: /home/runa/dev/website/about/en/volunteers.wml:42
 msgid "tup (another pseudonym)"
 msgstr "tup (to też jest pseudonim)"
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/volunteers.wml:44
+#: /home/runa/dev/website/about/en/volunteers.wml:42
 msgid ""
 "Periodically adds new features for making Tor easier to use as a <a "
 "href=\"<wiki>TransparentProxy\">transparent proxy</a>. Also maintains the <a"
@@ -230,22 +220,12 @@
 " href=\"http://p56soo2ibjkx23xo.onion/\">kodem TorDNSEL</a>."
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/volunteers.wml:49
-msgid "Tomás Touceda"
-msgstr "Tomás Touceda"
-
-#. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/volunteers.wml:49
-msgid "Fantastic developer involved with the Vidalia project"
-msgstr "Fantastyczny deweloper związany z projektem Vidalia"
-
-#. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/volunteers.wml:51
+#: /home/runa/dev/website/about/en/volunteers.wml:47
 msgid "Kyle Williams"
 msgstr "Kyle Williams"
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/volunteers.wml:51
+#: /home/runa/dev/website/about/en/volunteers.wml:47
 msgid ""
 "Developer for JanusVM, a VMWare-based transparent Tor proxy that makes Tor "
 "easier to set up and use."
@@ -254,12 +234,12 @@
 "ułatwia zainstalowanie i używanie Tora."
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/volunteers.wml:54
+#: /home/runa/dev/website/about/en/volunteers.wml:50
 msgid "Ethan Zuckerman"
 msgstr "Ethan Zuckerman"
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/volunteers.wml:54
+#: /home/runa/dev/website/about/en/volunteers.wml:50
 msgid ""
 "A blogger who has written some <a "
 "href=\"http://www.ethanzuckerman.com/blog/?p=1019\">interesting</a> <a "
@@ -274,7 +254,7 @@
 " Torze i podobnych narzędziach."
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/volunteers.wml:59
+#: /home/runa/dev/website/about/en/volunteers.wml:55
 msgid ""
 "All our relay operators, people who write <a "
 "href=\"http://freehaven.net/anonbib/\">research papers</a> about Tor, people"

Modified: translation/trunk/projects/website/po/pl_PL/docs/1-high.proxychain.po
===================================================================
--- translation/trunk/projects/website/po/pl_PL/docs/1-high.proxychain.po	2011-04-12 16:15:00 UTC (rev 24594)
+++ translation/trunk/projects/website/po/pl_PL/docs/1-high.proxychain.po	2011-04-12 16:19:31 UTC (rev 24595)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-01-29 21:06+0000\n"
+"POT-Creation-Date: 2011-03-28 12:48+0200\n"
 "PO-Revision-Date: 2011-03-22 16:45+0000\n"
 "Last-Translator: bogdrozd <bog.d at gazeta.pl>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -18,7 +18,7 @@
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/proxychain.wml:8
+#: /home/runa/dev/website/docs/en/proxychain.wml:8
 msgid ""
 "<a href=\"<page index>\">Home &raquo; </a> <a href=\"<page "
 "docs/documentation>\">Documentation &raquo; </a> <a href=\"<page "
@@ -29,12 +29,12 @@
 "docs/proxychain>\">Konfiguracja Tora, by uzywał proxy</a>"
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/proxychain.wml:13
+#: /home/runa/dev/website/docs/en/proxychain.wml:13
 msgid "<a id=\"proxychain\"></a>"
 msgstr "<a id=\"proxychain\"></a>"
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/docs/en/proxychain.wml:14
+#: /home/runa/dev/website/docs/en/proxychain.wml:14
 msgid ""
 "<a class=\"anchor\" href=\"#proxychain\">Tor: Configuring Tor to use a "
 "Proxy</a>"
@@ -43,12 +43,12 @@
 "proxy</a>"
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/proxychain.wml:15
+#: /home/runa/dev/website/docs/en/proxychain.wml:15
 msgid "<hr>"
 msgstr "<hr>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/proxychain.wml:18
+#: /home/runa/dev/website/docs/en/proxychain.wml:18
 msgid ""
 "The current version of Tor and the Vidalia Graphical Tor Controller support "
 "the ability to use any HTTPS or SOCKS proxy to get access to the Tor "
@@ -67,7 +67,7 @@
 "ruchu, gdyż ten jest ciągle zabezpieczony szyfrowaniem."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/proxychain.wml:28
+#: /home/runa/dev/website/docs/en/proxychain.wml:28
 msgid ""
 "These steps assume you have a functional Tor/Vidalia configuration, and you "
 "have found a list of HTTPS, SOCKS4, or SOCKS5 proxies. (To clarify, an HTTPS"
@@ -78,19 +78,19 @@
 " typu HTTPS to proxy typu HTTP, które obsługuje też żądania CONNECT.)"
 
 #. type: Content of: <div><div><p><ol><li>
-#: /home/runa/tor/website/docs/en/proxychain.wml:33
+#: /home/runa/dev/website/docs/en/proxychain.wml:33
 msgid "Open the Vidalia Control Panel, click on Settings."
 msgstr "Otwórz Panel Sterowania Vidalii, kliknij Ustawienia (Settings)."
 
 #. type: Content of: <div><div><p><ol><li>
-#: /home/runa/tor/website/docs/en/proxychain.wml:34
+#: /home/runa/dev/website/docs/en/proxychain.wml:34
 msgid "Click Network.  Select \"I use a proxy to access the Internet\"."
 msgstr ""
 "Kliknij Sieć (Network). Zaznacz \"I use a proxy to access the "
 "Internet\"(\"Używam serwera proxy do łączenia się z Internetem\")."
 
 #. type: Content of: <div><div><p><ol><li>
-#: /home/runa/tor/website/docs/en/proxychain.wml:35
+#: /home/runa/dev/website/docs/en/proxychain.wml:35
 msgid ""
 "On the Address line, enter the open proxy address.  This can be a hostname "
 "or IP Address."
@@ -99,12 +99,12 @@
 " IP."
 
 #. type: Content of: <div><div><p><ol><li>
-#: /home/runa/tor/website/docs/en/proxychain.wml:36
+#: /home/runa/dev/website/docs/en/proxychain.wml:36
 msgid "Enter the port for the proxy."
 msgstr "Wpisz port proxy."
 
 #. type: Content of: <div><div><p><ol><li>
-#: /home/runa/tor/website/docs/en/proxychain.wml:37
+#: /home/runa/dev/website/docs/en/proxychain.wml:37
 msgid ""
 "Generally, you do not need a Username and Password.  If you do, enter the "
 "information in the proper fields."
@@ -113,14 +113,14 @@
 "potrzebujesz, wpisz je we właściwe pola."
 
 #. type: Content of: <div><div><p><ol><li>
-#: /home/runa/tor/website/docs/en/proxychain.wml:38
+#: /home/runa/dev/website/docs/en/proxychain.wml:38
 msgid ""
 "Choose the Type of proxy you are using, whether HTTP/HTTPS, SOCKS4, or "
 "SOCKS5."
 msgstr "ybierz typ proxy, którego używasz: HTTP/HTTPS, SOCKS4 lub SOCKS5."
 
 #. type: Content of: <div><div><p><ol><li>
-#: /home/runa/tor/website/docs/en/proxychain.wml:39
+#: /home/runa/dev/website/docs/en/proxychain.wml:39
 msgid ""
 "Push the Ok button.  Vidalia and Tor are now configured to use a proxy to "
 "access the rest of the Tor Network."
@@ -129,7 +129,7 @@
 "dostępu do reszty sieci Tora."
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/proxychain.wml:42
+#: /home/runa/dev/website/docs/en/proxychain.wml:42
 msgid ""
 "<br><br> <img src=\"$(IMGROOT)/vidalia-proxy.png\" alt=\"Vidalia's Network "
 "Proxy settings page\"> <br><br>"

Modified: translation/trunk/projects/website/po/pl_PL/docs/2-medium.faq.po
===================================================================
--- translation/trunk/projects/website/po/pl_PL/docs/2-medium.faq.po	2011-04-12 16:15:00 UTC (rev 24594)
+++ translation/trunk/projects/website/po/pl_PL/docs/2-medium.faq.po	2011-04-12 16:19:31 UTC (rev 24595)
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-03-17 18:04+0000\n"
-"PO-Revision-Date: 2011-03-22 16:26+0000\n"
+"POT-Creation-Date: 2011-03-28 12:48+0200\n"
+"PO-Revision-Date: 2011-04-03 12:01+0000\n"
 "Last-Translator: bogdrozd <bog.d at gazeta.pl>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
@@ -18,7 +18,7 @@
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:8
+#: /home/runa/dev/website/docs/en/faq.wml:8
 msgid ""
 "<a href=\"<page index>\">Home &raquo; </a> <a href=\"<page "
 "docs/documentation>\">Documentation &raquo; </a> <a href=\"<page "
@@ -29,74 +29,74 @@
 "docs/faq>\">FAQ</a>"
 
 #. type: Content of: <div><div><h1>
-#: /home/runa/tor/website/docs/en/faq.wml:14
+#: /home/runa/dev/website/docs/en/faq.wml:14
 msgid "Tor FAQ"
 msgstr "FAQ Tora"
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:15 /tmp/B_aDff_VuJ.xml:1646
+#: /home/runa/dev/website/docs/en/faq.wml:15 /tmp/tNikbgsymy.xml:1646
 msgid "<hr>"
 msgstr "<hr>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:17
+#: /home/runa/dev/website/docs/en/faq.wml:17
 msgid "General questions:"
 msgstr "Pytania ogólne:"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:19
+#: /home/runa/dev/website/docs/en/faq.wml:19
 msgid "<a href=\"#WhatIsTor\">What is Tor?</a>"
 msgstr "<a href=\"#WhatIsTor\">Czym jest Tor?</a>"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:20
+#: /home/runa/dev/website/docs/en/faq.wml:20
 msgid "<a href=\"#Torisdifferent\">How is Tor different from other proxies?</a>"
 msgstr ""
 "<a href=\"#Torisdifferent\">Czym różni się Tor od innych serwerów proxy?</a>"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:21
+#: /home/runa/dev/website/docs/en/faq.wml:21
 msgid "<a href=\"#CompatibleApplications\">What programs can I use with Tor?</a>"
 msgstr ""
 "<a href=\"#CompatibleApplications\">Jakich programów mogę używać z "
 "Torem?</a>"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:23
+#: /home/runa/dev/website/docs/en/faq.wml:23
 msgid "<a href=\"#WhyCalledTor\">Why is it called Tor?</a>"
 msgstr "<a href=\"#WhyCalledTor\">Czemu się to nazywa Tor?</a>"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:24
+#: /home/runa/dev/website/docs/en/faq.wml:24
 msgid "<a href=\"#Backdoor\">Is there a backdoor in Tor?</a>"
 msgstr "<a href=\"#Backdoor\">Czy jest tylna furtka w Torze?</a>"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:25
+#: /home/runa/dev/website/docs/en/faq.wml:25
 msgid "<a href=\"#DistributingTor\">Can I distribute Tor on my magazine's CD?</a>"
 msgstr ""
 "<a href=\"#DistributingTor\">Czy mogę rozprowadzać Tora na płycie CD mojego "
 "magazynu?</a>"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:27
+#: /home/runa/dev/website/docs/en/faq.wml:27
 msgid ""
 "<a href=\"#SupportMail\">How can I get an answer to my Tor support mail?</a>"
 msgstr ""
 "<a href=\"#SupportMail\">Jak mogę dostać odpowiedź na mój list o Torze?</a>"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:29
+#: /home/runa/dev/website/docs/en/faq.wml:29
 msgid "<a href=\"#WhySlow\">Why is Tor so slow?</a>"
 msgstr "<a href=\"#WhySlow\">Czemu Tor jest taki powolny?</a>"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:30
+#: /home/runa/dev/website/docs/en/faq.wml:30
 msgid "<a href=\"#Funding\">What would The Tor Project do with more funding?</a>"
 msgstr "<a href=\"#Funding\">Co Projekt Tor zrobiłby z większymi funduszami?</a>"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:32
+#: /home/runa/dev/website/docs/en/faq.wml:32
 msgid ""
 "<a href=\"#Metrics\">How many people use Tor? How many relays or exit nodes "
 "are there?</a>"
@@ -105,22 +105,22 @@
 "wyjściowych?</a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:36
+#: /home/runa/dev/website/docs/en/faq.wml:36
 msgid "Compilation and Installation:"
 msgstr "Kompilacja i instalacja:"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:38
+#: /home/runa/dev/website/docs/en/faq.wml:38
 msgid "<a href=\"#HowUninstallTor\">How do I uninstall Tor?</a>"
 msgstr "<a href=\"#HowUninstallTor\">Jak odinstalować Tora?</a>"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:39
+#: /home/runa/dev/website/docs/en/faq.wml:39
 msgid "<a href=\"#PGPSigs\">What are these \"sig\" files on the download page?</a>"
 msgstr "<a href=\"#PGPSigs\">Czym są te pliki \"sig\" na stronie pobierania?</a>"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:41
+#: /home/runa/dev/website/docs/en/faq.wml:41
 msgid ""
 "<a href=\"#GetTor\">Your website is blocked in my country. How do I download"
 " Tor?</a>"
@@ -129,12 +129,12 @@
 "pobrać Tora?</a>"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:43
+#: /home/runa/dev/website/docs/en/faq.wml:43
 msgid "<a href=\"#CompileTorWindows\">How do I compile Tor under Windows?</a>"
 msgstr "<a href=\"#CompileTorWindows\">Jak skompilować Tora pod Windows?</a>"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:44
+#: /home/runa/dev/website/docs/en/faq.wml:44
 msgid ""
 "<a href=\"#VirusFalsePositives\">Why does my Tor executable appear to have a"
 " virus or spyware?</a>"
@@ -143,7 +143,7 @@
 " lub oprogramowanie szpiegujące?</a>"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:46
+#: /home/runa/dev/website/docs/en/faq.wml:46
 msgid ""
 "<a href=\"#LiveCD\">Is there a LiveCD or other bundle that includes Tor?</a>"
 msgstr ""
@@ -151,27 +151,27 @@
 "Tora?</a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:49
+#: /home/runa/dev/website/docs/en/faq.wml:49
 msgid "Running Tor:"
 msgstr "Uruchamianie Tora:"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:51
+#: /home/runa/dev/website/docs/en/faq.wml:51
 msgid "<a href=\"#torrc\">I'm supposed to \"edit my torrc\". What does that mean?</a>"
 msgstr "<a href=\"#torrc\">Mam \"wyedytotwać swój plik torrc\". Co to znaczy?</a>"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:53
+#: /home/runa/dev/website/docs/en/faq.wml:53
 msgid "<a href=\"#Logs\">How do I set up logging, or see Tor's logs?</a>"
 msgstr "<a href=\"#Logs\">Jak uruchomić logowanie lub zobaczyć logi Tora?</a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:57
+#: /home/runa/dev/website/docs/en/faq.wml:57
 msgid "Running a Tor client:"
 msgstr "Uruchamianie klienta Tora:"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:59
+#: /home/runa/dev/website/docs/en/faq.wml:59
 msgid ""
 "<a href=\"#DoesntWork\">I installed Tor and Polipo but it's not working.</a>"
 msgstr ""
@@ -179,7 +179,7 @@
 "działają.</a>"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:61
+#: /home/runa/dev/website/docs/en/faq.wml:61
 msgid ""
 "<a href=\"#VidaliaPassword\">Tor/Vidalia prompts for a password at "
 "start.</a>"
@@ -188,7 +188,7 @@
 "uruchamiania</a>"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:63
+#: /home/runa/dev/website/docs/en/faq.wml:63
 msgid ""
 "<a href=\"#ChooseEntryExit\">Can I control which nodes (or country)  are "
 "used for entry/exit?</a>"
@@ -197,7 +197,7 @@
 "są używane do wchodzenia/wychodzenia?</a>"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:65
+#: /home/runa/dev/website/docs/en/faq.wml:65
 msgid ""
 "<a href=\"#GoogleCaptcha\">Google makes me solve a Captcha or tells me I "
 "have spyware installed.</a>"
@@ -206,7 +206,7 @@
 "mówi, że mam zainstalwoane oprogramowanie szpiegujące.</a>"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:67
+#: /home/runa/dev/website/docs/en/faq.wml:67
 msgid ""
 "<a href=\"#GmailWarning\">Gmail warns me that my account may have been "
 "compromised.</a>"
@@ -215,7 +215,7 @@
 "się włamać.</a>"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:69
+#: /home/runa/dev/website/docs/en/faq.wml:69
 msgid ""
 "<a href=\"#FirewallPorts\">My firewall only allows a few outgoing ports.</a>"
 msgstr ""
@@ -223,17 +223,17 @@
 " wychodzących.</a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:73
+#: /home/runa/dev/website/docs/en/faq.wml:73
 msgid "Running a Tor relay:"
 msgstr "Uruchamianie przekaźnika sieci Tora:"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:75
+#: /home/runa/dev/website/docs/en/faq.wml:75
 msgid "<a href=\"#RelayFlexible\">How stable does my relay need to be?</a>"
 msgstr "<a href=\"#RelayFlexible\">Jak stabilny musi być mój przekaźnik?</a>"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:76
+#: /home/runa/dev/website/docs/en/faq.wml:76
 msgid ""
 "<a href=\"#ExitPolicies\">I'd run a relay, but I don't want to deal with "
 "abuse issues.</a>"
@@ -242,58 +242,58 @@
 "chcę mieć do czynienia z przypadkami nadużyć.</a>"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:78
+#: /home/runa/dev/website/docs/en/faq.wml:78
 msgid "<a href=\"#RelayOrBridge\">Should I be a normal relay or bridge relay?</a>"
 msgstr ""
 "<a href=\"#RelayOrBridge\">Czy powinienem/am prowadzić normalny przekaźnik, "
 "czy przekaźnik mostkowy?</a>"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:80
+#: /home/runa/dev/website/docs/en/faq.wml:80
 msgid "<a href=\"#MultipleRelays\">I want to run more than one relay.</a>"
 msgstr ""
 "<a href=\"#MultipleRelays\">Chcę prowadzić więcej niż jeden przekaźnik.</a>"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:81
+#: /home/runa/dev/website/docs/en/faq.wml:81
 msgid "<a href=\"#RelayMemory\">Why is my Tor relay using so much memory?</a>"
 msgstr ""
 "<a href=\"#RelayMemory\">Czemu mój przekaźnik Tora zużywa tyle pamięci?</a>"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:82
+#: /home/runa/dev/website/docs/en/faq.wml:82
 msgid "<a href=\"#WhyNotNamed\">Why is my Tor relay not named?</a>"
 msgstr "<a href=\"#WhyNotNamed\">Czemu mój przekaźnik Tora nie ma nazwy?</a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:85
+#: /home/runa/dev/website/docs/en/faq.wml:85
 msgid "Running a Tor hidden service:"
 msgstr "Uruchamianie usługi ukrytej Tora:"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:87
+#: /home/runa/dev/website/docs/en/faq.wml:87
 msgid "Anonymity and Security:"
 msgstr "Anonimowość i bezpieczeństwo:"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:89
+#: /home/runa/dev/website/docs/en/faq.wml:89
 msgid "<a href=\"#KeyManagement\">Tell me about all the keys Tor uses.</a>"
 msgstr ""
 "<a href=\"#KeyManagement\">Opowiedzcie mi o wszystkich kluczach używanych "
 "przez Tora.</a>"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:90
+#: /home/runa/dev/website/docs/en/faq.wml:90
 msgid "<a href=\"#EntryGuards\">What are Entry Guards?</a>"
 msgstr "<a href=\"#EntryGuards\">Co to są Strażnicy Wejściowi?</a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:93
+#: /home/runa/dev/website/docs/en/faq.wml:93
 msgid "Alternate designs that we don't do (yet):"
 msgstr "Alternatywne projeky, których nie robimy (jeszcze):"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:95
+#: /home/runa/dev/website/docs/en/faq.wml:95
 msgid ""
 "<a href=\"#EverybodyARelay\">You should make every Tor user be a relay.</a>"
 msgstr ""
@@ -301,7 +301,7 @@
 "był przekaźnikiem.</a>"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:97
+#: /home/runa/dev/website/docs/en/faq.wml:97
 msgid ""
 "<a href=\"#TransportIPnotTCP\">You should transport all IP packets, not just"
 " TCP packets.</a>"
@@ -310,19 +310,19 @@
 "IP, nie tylko pakiety TCP.</a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:101
+#: /home/runa/dev/website/docs/en/faq.wml:101
 msgid "Abuse:"
 msgstr "Nadużycia"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:103
+#: /home/runa/dev/website/docs/en/faq.wml:103
 msgid "<a href=\"#Criminals\">Doesn't Tor enable criminals to do bad things?</a>"
 msgstr ""
 "<a href=\"#Criminals\">Czy Tor nie umożliwia przestępcom robienia złych "
 "rzeczy?</a>"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:104
+#: /home/runa/dev/website/docs/en/faq.wml:104
 msgid ""
 "<a href=\"#RespondISP\">How do I respond to my ISP about my exit relay?</a>"
 msgstr ""
@@ -330,7 +330,7 @@
 "przekaźniku wyjściowym?</a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:108
+#: /home/runa/dev/website/docs/en/faq.wml:108
 msgid ""
 "For other questions not yet on this version of the FAQ, see the <a "
 "href=\"<wikifaq>\">wiki FAQ</a> for now."
@@ -339,22 +339,22 @@
 " na <a href=\"<wikifaq>\">FAQ wiki</a>."
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:111
+#: /home/runa/dev/website/docs/en/faq.wml:111
 msgid "<hr> <a id=\"General\"></a> <a id=\"WhatIsTor\"></a>"
 msgstr "<hr> <a id=\"General\"></a> <a id=\"WhatIsTor\"></a>"
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:116
+#: /home/runa/dev/website/docs/en/faq.wml:116
 msgid "<a class=\"anchor\" href=\"#WhatIsTor\">What is Tor?</a>"
 msgstr "<a class=\"anchor\" href=\"#WhatIsTor\">Czym jest Tor?</a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:119
+#: /home/runa/dev/website/docs/en/faq.wml:119
 msgid "The name \"Tor\" can refer to several different components."
 msgstr "Nazwa \"Tor\" może odnosić się do kilku różnych komponentów."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:123
+#: /home/runa/dev/website/docs/en/faq.wml:123
 msgid ""
 "The Tor software is a program you can run on your computer that helps keep "
 "you safe on the Internet. Tor protects you by bouncing your communications "
@@ -376,7 +376,7 @@
 "about/overview>\">stronie wprowadzenia</a>."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:134
+#: /home/runa/dev/website/docs/en/faq.wml:134
 msgid ""
 "The Tor Project is a non-profit (charity) organization that maintains and "
 "develops the Tor software."
@@ -385,12 +385,12 @@
 "rozwija oprogramowanie Tor."
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:138
+#: /home/runa/dev/website/docs/en/faq.wml:138
 msgid "<hr> <a id=\"Torisdifferent\"></a>"
 msgstr "<hr> <a id=\"Torisdifferent\"></a>"
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:141
+#: /home/runa/dev/website/docs/en/faq.wml:141
 msgid ""
 "<a class=\"anchor\" href=\"#Torisdifferent\">How is Tor different from other"
 " proxies?</a>"
@@ -399,7 +399,7 @@
 "serwerów proxy?</a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:143
+#: /home/runa/dev/website/docs/en/faq.wml:143
 msgid ""
 "A typical proxy provider sets up a server somewhere on the Internet and "
 "allows you to use it to relay your traffic.  This creates a simple, easy to "
@@ -427,7 +427,7 @@
 "internetem wifi."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:156
+#: /home/runa/dev/website/docs/en/faq.wml:156
 msgid ""
 "Simple proxy providers also create a single point of failure.  The provider "
 "knows who you are and where you browse on the Internet.  They can see your "
@@ -446,7 +446,7 @@
 "szczegółów o Tobie."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:165
+#: /home/runa/dev/website/docs/en/faq.wml:165
 msgid ""
 "Tor passes your traffic through at least 3 different servers before sending "
 "it on to the destination.  Tor does not modify, or even know, what you are "
@@ -467,12 +467,12 @@
 " zaszyfrowane pakiety między sobą."
 
 #. type: Content of: <div><div><p><dl><dt>
-#: /home/runa/tor/website/docs/en/faq.wml:175
+#: /home/runa/dev/website/docs/en/faq.wml:175
 msgid "Doesn't the first server see who I am?"
 msgstr "Czy pierwszy serwer nie widzi, kim jestem?"
 
 #. type: Content of: <div><div><p><dl><dd>
-#: /home/runa/tor/website/docs/en/faq.wml:175
+#: /home/runa/dev/website/docs/en/faq.wml:175
 msgid ""
 "Possibly. A bad first of three servers can see encrypted Tor traffic coming "
 "from your computer.  It still doesn't know who you are and what you are "
@@ -489,12 +489,12 @@
 "idziesz w Internecie."
 
 #. type: Content of: <div><div><p><dl><dt>
-#: /home/runa/tor/website/docs/en/faq.wml:181
+#: /home/runa/dev/website/docs/en/faq.wml:181
 msgid "Can't the third server see my traffic?"
 msgstr "Czy trzeci serwer nie widzi mojego ruchu?"
 
 #. type: Content of: <div><div><p><dl><dd>
-#: /home/runa/tor/website/docs/en/faq.wml:181
+#: /home/runa/dev/website/docs/en/faq.wml:181
 msgid ""
 "Possibly.  A bad third of three servers can see the traffic you sent into "
 "Tor.  It won't know who sent this traffic.  If you're using encryption, such"
@@ -513,12 +513,12 @@
 "danych wysyłanych do ich miejsca przeznaczenia."
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:191
+#: /home/runa/dev/website/docs/en/faq.wml:191
 msgid "<hr> <a id=\"CompatibleApplications\"></a>"
 msgstr "<hr> <a id=\"CompatibleApplications\"></a>"
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:194
+#: /home/runa/dev/website/docs/en/faq.wml:194
 msgid ""
 "<a class=\"anchor\" href=\"#CompatibleApplications\">What programs can I use"
 " with Tor?</a>"
@@ -527,7 +527,7 @@
 "używać z Torem?</a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:197
+#: /home/runa/dev/website/docs/en/faq.wml:197
 msgid ""
 "There are two pieces to \"Torifying\" a program: connection-level anonymity "
 "and application-level anonymity. Connection-level anonymity focuses on "
@@ -555,7 +555,7 @@
 "Torem."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:211
+#: /home/runa/dev/website/docs/en/faq.wml:211
 msgid ""
 "Most of our work so far has focused on the Firefox web browser. The bundles "
 "on the <a href=\"<page download/download>\">download page</a> automatically "
@@ -572,7 +572,7 @@
 "poziomów połączenia i aplikacji."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:220
+#: /home/runa/dev/website/docs/en/faq.wml:220
 msgid ""
 "There are plenty of other programs you can use with Tor, but we haven't "
 "researched the application-level anonymity issues on them well enough to be "
@@ -594,17 +594,17 @@
 "faktycznym!"
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:231
+#: /home/runa/dev/website/docs/en/faq.wml:231
 msgid "<hr> <a id=\"WhyCalledTor\"></a>"
 msgstr "<hr> <a id=\"WhyCalledTor\"></a>"
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:234
+#: /home/runa/dev/website/docs/en/faq.wml:234
 msgid "<a class=\"anchor\" href=\"#WhyCalledTor\">Why is it called Tor?</a>"
 msgstr "<a class=\"anchor\" href=\"#WhyCalledTor\">Czemu się to nazywa Tor?</a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:237
+#: /home/runa/dev/website/docs/en/faq.wml:237
 msgid ""
 "Because Tor is the onion routing network. When we were starting the new "
 "next-generation design and implementation of onion routing in 2001-2002, we "
@@ -622,12 +622,12 @@
 "cebulowego</a>, prowadzonego przez Laboratorium Badawcze Marynarki Wojennej."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:247
+#: /home/runa/dev/website/docs/en/faq.wml:247
 msgid "(It's also got a fine translation from German and Turkish.)"
 msgstr "(Ma też niezłe tłumaczenie z niemieckiego i tureckiego.)"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:251
+#: /home/runa/dev/website/docs/en/faq.wml:251
 msgid ""
 "Note: even though it originally came from an acronym, Tor is not spelled "
 "\"TOR\". Only the first letter is capitalized. In fact, we can usually spot "
@@ -641,17 +641,17 @@
 " źle literuje nazwę."
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:258
+#: /home/runa/dev/website/docs/en/faq.wml:258
 msgid "<hr> <a id=\"Backdoor\"></a>"
 msgstr "<hr> <a id=\"Backdoor\"></a>"
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:261
+#: /home/runa/dev/website/docs/en/faq.wml:261
 msgid "<a class=\"anchor\" href=\"#Backdoor\">Is there a backdoor in Tor?</a>"
 msgstr "<a class=\"anchor\" href=\"#Backdoor\">Czy jest tylna furtka w Torze?</a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:264
+#: /home/runa/dev/website/docs/en/faq.wml:264
 msgid ""
 "There is absolutely no backdoor in Tor. Nobody has asked us to put one in, "
 "and we know some smart lawyers who say that it's unlikely that anybody will "
@@ -665,7 +665,7 @@
 "walczyć, i (jak mówią prawnicy) prawdopodobnie wygramy."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:271
+#: /home/runa/dev/website/docs/en/faq.wml:271
 msgid ""
 "We think that putting a backdoor in Tor would be tremendously irresponsible "
 "to our users, and a bad precedent for security software in general. If we "
@@ -681,7 +681,7 @@
 "nie zaufał naszym programom &mdash; z doskonałego powodu!"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:279
+#: /home/runa/dev/website/docs/en/faq.wml:279
 msgid ""
 "But that said, there are still plenty of subtle attacks people might try. "
 "Somebody might impersonate us, or break into our computers, or something "
@@ -703,7 +703,7 @@
 "miejscach dystrybucji."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:291
+#: /home/runa/dev/website/docs/en/faq.wml:291
 msgid ""
 "Also, there might be accidental bugs in Tor that could affect your "
 "anonymity. We periodically find and fix anonymity-related bugs, so make sure"
@@ -714,12 +714,12 @@
 "anonimowością, więc zawsze używaj najnowszej wersji Tora."
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:296
+#: /home/runa/dev/website/docs/en/faq.wml:296
 msgid "<hr> <a id=\"DistributingTor\"></a>"
 msgstr "<hr> <a id=\"DistributingTor\"></a>"
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:299
+#: /home/runa/dev/website/docs/en/faq.wml:299
 msgid ""
 "<a class=\"anchor\" href=\"#DistributingTor\">Can I distribute Tor on my "
 "magazine's CD?</a>"
@@ -728,12 +728,12 @@
 "płycie CD mojego magazynu?</a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:302
+#: /home/runa/dev/website/docs/en/faq.wml:302
 msgid "Yes."
 msgstr "Tak."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:306
+#: /home/runa/dev/website/docs/en/faq.wml:306
 msgid ""
 "The Tor software is <a href=\"https://www.fsf.org/\">free software</a>. This"
 " means we give you the rights to redistribute the Tor software, either "
@@ -746,7 +746,7 @@
 " Nie musisz nas pytać o szczególne pozwolenie."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:313
+#: /home/runa/dev/website/docs/en/faq.wml:313
 msgid ""
 "However, if you want to redistribute the Tor software you must follow our <a"
 " href=\"<gitblob>LICENSE\">LICENSE</a>.  Essentially this means that you "
@@ -759,7 +759,7 @@
 "rozpowszechniasz."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:320
+#: /home/runa/dev/website/docs/en/faq.wml:320
 msgid ""
 "Most people who ask us this question don't want to distribute just the Tor "
 "software, though. They want to distribute the Tor bundles, which typically "
@@ -790,7 +790,7 @@
 "Polipo</a>."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:336
+#: /home/runa/dev/website/docs/en/faq.wml:336
 msgid ""
 "Also, you should make sure not to confuse your readers about what Tor is, "
 "who makes it, and what properties it provides (and doesn't provide). See our"
@@ -802,7 +802,7 @@
 "handlowym</a> po więcej szczegółów."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:342
+#: /home/runa/dev/website/docs/en/faq.wml:342
 msgid ""
 "Lastly, you should realize that we release new versions of the Tor software "
 "frequently, and sometimes we make backward incompatible changes. So if you "
@@ -818,12 +818,12 @@
 "aktywnie rozwijane."
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:349
+#: /home/runa/dev/website/docs/en/faq.wml:349
 msgid "<hr> <a id=\"SupportMail\"></a>"
 msgstr "<hr> <a id=\"SupportMail\"></a>"
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:352
+#: /home/runa/dev/website/docs/en/faq.wml:352
 msgid ""
 "<a class=\"anchor\" href=\"#SupportMail\">How can I get an answer to my Tor "
 "support mail?</a>"
@@ -832,24 +832,24 @@
 "list o Torze?</a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:354
+#: /home/runa/dev/website/docs/en/faq.wml:354
 msgid ""
 "There is no official support for Tor. Your best bet is to try the following:"
 msgstr ""
 "Nie ma oficjalnego wsparcia dla Tora. Najlepiej wypróbuj następujące kroki:"
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:356
+#: /home/runa/dev/website/docs/en/faq.wml:356
 msgid "Read through this <a href=\"<page docs/faq>\">FAQ</a>."
 msgstr "Przeczytaj to <a href=\"<page docs/faq>\">FAQ</a>."
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:357
+#: /home/runa/dev/website/docs/en/faq.wml:357
 msgid "Read through the <a href=\"<page docs/documentation>\">documentation</a>."
 msgstr "Przeczytaj <a href=\"<page docs/documentation>\">dokumentację</a>."
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:358
+#: /home/runa/dev/website/docs/en/faq.wml:358
 msgid ""
 "Read through the <a href=\"http://archives.seul.org/or/talk\">OR-TALK "
 "Archives</a> and see if your question is already answered."
@@ -858,7 +858,7 @@
 "i sprawdź, czy na Twoje pytanie nie ma już odpowiedzi. "
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:361
+#: /home/runa/dev/website/docs/en/faq.wml:361
 msgid ""
 "Join our <a href=\"irc://irc.oftc.net#tor\">irc channel</a> and state the "
 "issue and wait for help."
@@ -867,7 +867,7 @@
 "problem i czekaj na pomoc."
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:363
+#: /home/runa/dev/website/docs/en/faq.wml:363
 msgid ""
 "Send an email to tor-assistants at torproject.org. These are volunteers who "
 "may be able to help you but you may not get a response for days."
@@ -877,7 +877,7 @@
 "wiele dni."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:368
+#: /home/runa/dev/website/docs/en/faq.wml:368
 msgid ""
 "If you find your answer, please stick around on the IRC channel or the "
 "mailing list and answer questions from others."
@@ -886,22 +886,22 @@
 "mailingowej i odpowiadaj na pytania od innych."
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:371
+#: /home/runa/dev/website/docs/en/faq.wml:371
 msgid "<hr> <a id=\"WhySlow\"></a>"
 msgstr "<hr> <a id=\"WhySlow\"></a>"
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:374
+#: /home/runa/dev/website/docs/en/faq.wml:374
 msgid "<a class=\"anchor\" href=\"#WhySlow\">Why is Tor so slow?</a>"
 msgstr "<a class=\"anchor\" href=\"#WhySlow\">Czemu Tor jest taki powolny?</a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:377
+#: /home/runa/dev/website/docs/en/faq.wml:377
 msgid "There are many reasons why the Tor network is currently slow."
 msgstr "Jest wiele powodów, dlaczego sieć Tora jest w tej chwili powolna."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:381
+#: /home/runa/dev/website/docs/en/faq.wml:381
 msgid ""
 "Before we answer, though, you should realize that Tor is never going to be "
 "blazing fast. Your traffic is bouncing through volunteers' computers in "
@@ -916,7 +916,7 @@
 "przepustowość w stylu uczelni."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:389
+#: /home/runa/dev/website/docs/en/faq.wml:389
 msgid ""
 "But that doesn't mean that it can't be improved. The current Tor network is "
 "quite small compared to the number of people trying to use it, and many of "
@@ -930,7 +930,7 @@
 "plików."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:396
+#: /home/runa/dev/website/docs/en/faq.wml:396
 msgid ""
 "For the much more in-depth answer, see <a href=\"<blog>why-tor-is-"
 "slow\">Roger's blog post on the topic</a>, which includes both a detailed "
@@ -941,12 +941,12 @@
 "zawiera zarówno szczegółowy PDF, jak i towarzyszące wideo."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:403
+#: /home/runa/dev/website/docs/en/faq.wml:403
 msgid "What can you do to help?"
 msgstr "Jak możesz pomóć?"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:409
+#: /home/runa/dev/website/docs/en/faq.wml:409
 msgid ""
 "<a href=\"<page docs/tor-doc-relay>\">Configure your Tor to relay traffic "
 "for others</a>. Help make the Tor network large enough that we can handle "
@@ -958,7 +958,7 @@
 "Internecie."
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:415
+#: /home/runa/dev/website/docs/en/faq.wml:415
 msgid ""
 "<a href=\"<page projects/vidalia>\">Help us make Tor more usable</a>. We "
 "especially need people to help make it easier to configure your Tor as a "
@@ -972,7 +972,7 @@
 "konfiguracji."
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:422
+#: /home/runa/dev/website/docs/en/faq.wml:422
 msgid ""
 "There are some bottlenecks in the current Tor network. Help us design "
 "experiments to track down and demonstrate where the problems are, and then "
@@ -983,7 +983,7 @@
 "problemy, a wtedy my będziemy mogli bardziej skupić się na ich naprawieniu."
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:428
+#: /home/runa/dev/website/docs/en/faq.wml:428
 msgid ""
 "There are some steps that individuals can take to improve their Tor "
 "performance. <a href=\"<wiki>TheOnionRouter/FireFoxTorPerf\">You can "
@@ -1003,7 +1003,7 @@
 "podziała, pomóż innym, dokumentując, co zrobiłeś, i dając nam o tym znać."
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:439
+#: /home/runa/dev/website/docs/en/faq.wml:439
 msgid ""
 "Tor needs some architectural changes too. One important change is to start "
 "providing <a href=\"#EverybodyARelay\">better service to people who relay "
@@ -1016,7 +1016,7 @@
 "skończymy szybciej, jeśli uda nam się spędzić przy tym więcej czasu."
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:446
+#: /home/runa/dev/website/docs/en/faq.wml:446
 msgid ""
 "Help do other things so we can do the hard stuff. Please take a moment to "
 "figure out what your skills and interests are, and then <a href=\"<page "
@@ -1028,7 +1028,7 @@
 "ochotników</a>."
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:452
+#: /home/runa/dev/website/docs/en/faq.wml:452
 msgid ""
 "Help find sponsors for Tor. Do you work at a company or government agency "
 "that uses Tor or has a use for Internet privacy, e.g. to browse the "
@@ -1046,7 +1046,7 @@
 "wolniejszy."
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:461
+#: /home/runa/dev/website/docs/en/faq.wml:461
 msgid ""
 "If you can't help out with any of the above, you can still help out "
 "individually by <a href=\"<page donate/donate>\">donating a bit of money to "
@@ -1057,12 +1057,12 @@
 "dotacji dla naszej sprawy</a>. To się przydaje!"
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:468
+#: /home/runa/dev/website/docs/en/faq.wml:468
 msgid "<hr> <a id=\"Funding\"></a>"
 msgstr "<hr> <a id=\"Funding\"></a>"
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:471
+#: /home/runa/dev/website/docs/en/faq.wml:471
 msgid ""
 "<a class=\"anchor\" href=\"#Funding\">What would The Tor Project do with "
 "more funding?</a>"
@@ -1071,7 +1071,7 @@
 "funduszami?</a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:474
+#: /home/runa/dev/website/docs/en/faq.wml:474
 msgid ""
 "We have about 1800 relays right now, pushing over 150 MB/s average traffic. "
 "We have several hundred thousand active users. But the Tor network is not "
@@ -1082,14 +1082,14 @@
 "jeszcze samopodtrzymująca się."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:480
+#: /home/runa/dev/website/docs/en/faq.wml:480
 msgid "There are six main development/maintenance pushes that need attention:"
 msgstr ""
 "Jest sześć głównych spraw programistycznych i związanych z utrzymaniem, "
 "które wymagają uwagi:"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:486
+#: /home/runa/dev/website/docs/en/faq.wml:486
 msgid ""
 "Scalability: We need to keep scaling and decentralizing the Tor architecture"
 " so it can handle thousands of relays and millions of users. The upcoming "
@@ -1102,7 +1102,7 @@
 "zrobienia w następnej kolejności, by utrzymać Tora szybkiego i stabilnego."
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:493
+#: /home/runa/dev/website/docs/en/faq.wml:493
 msgid ""
 "User support: With this many users, a lot of people are asking questions all"
 " the time, offering to help out with things, and so on. We need good clean "
@@ -1113,25 +1113,24 @@
 "dokumentacji i musimy poświęcić trochę wysiłku na koordynację wolontariuszy."
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:499
+#: /home/runa/dev/website/docs/en/faq.wml:499
 msgid ""
 "Relay support: the Tor network is run by volunteers, but they still need "
 "attention with prompt bug fixes, explanations when things go wrong, "
 "reminders to upgrade, and so on. The network itself is a commons, and "
 "somebody needs to spend some energy making sure the relay operators stay "
-"happy. We also need to work on <a href=\"#RelayOS\">stability</a> on some "
-"platforms &mdash; e.g., Tor relays have problems on Win XP currently."
+"happy. We also need to work on stability on some platforms &mdash; e.g., Tor"
+" relays have problems on Win XP currently."
 msgstr ""
 "Obsługa przekaźników sieci: sieć Tora jest prowadzona przez wolontariuszy, "
 "ale oni wymagają uwagi z usuwaniem błędów, tłumaczeniem, czemu coś nie "
 "działa, przypominaniem o aktualizacjach itd. Sama sieć jest czymś wspólnym i"
 " ktoś musi poświęcić trochę energii, by operatorzy przekaźników byli "
-"zadowoleni. Musimy też popracować nad <a href=\"#RelayOS\">stabilnością</a> "
-"na niektórych systemach &mdash; np. przekaźniki Tora mają aktualnie problemy"
-" na Win XP."
+"zadowoleni. Musimy też popracować nad stabilnością na niektórych systemach "
+"&mdash; np. przekaźniki Tora mają aktualnie problemy na Win XP."
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:508
+#: /home/runa/dev/website/docs/en/faq.wml:508
 msgid ""
 "Usability: Beyond documentation, we also need to work on usability of the "
 "software itself. This includes installers, clean GUIs, easy configuration to"
@@ -1149,7 +1148,7 @@
 "oprogramowania do prywatności nigdy nie była łatwa."
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:517
+#: /home/runa/dev/website/docs/en/faq.wml:517
 msgid ""
 "Incentives: We need to work on ways to encourage people to configure their "
 "Tors as relays and exit nodes rather than just clients.  <a "
@@ -1162,7 +1161,7 @@
 "stać się przekaźnikiem i musimy dać ludziom bodźce, by to robili.</a>"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:524
+#: /home/runa/dev/website/docs/en/faq.wml:524
 msgid ""
 "Research: The anonymous communications field is full of surprises and "
 "gotchas. In our copious free time, we also help run top anonymity and "
@@ -1182,7 +1181,7 @@
 " się dalsze."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:537
+#: /home/runa/dev/website/docs/en/faq.wml:537
 msgid ""
 "We're continuing to move forward on all of these, but at this rate <a "
 "href=\"#WhySlow\">the Tor network is growing faster than the developers can "
@@ -1195,7 +1194,7 @@
 "sprawy, byśmy mogli kontynuować wzrost sieci."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:545
+#: /home/runa/dev/website/docs/en/faq.wml:545
 msgid ""
 "We are also excited about tackling related problems, such as censorship-"
 "resistance."
@@ -1204,7 +1203,7 @@
 "ochrona przed cenzurą."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:550
+#: /home/runa/dev/website/docs/en/faq.wml:550
 msgid ""
 "We are proud to have <a href=\"<page about/sponsors>\">sponsorship and "
 "support</a> from the Omidyar Network, the International Broadcasting Bureau,"
@@ -1219,7 +1218,7 @@
 "wkład w projekt."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:557
+#: /home/runa/dev/website/docs/en/faq.wml:557
 msgid ""
 "However, this support is not enough to keep Tor abreast of changes in the "
 "Internet privacy landscape. Please <a href=\"<page "
@@ -1234,12 +1233,12 @@
 "dowiedzieć się, jak dokonywać większych wpłat lub grantów."
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:563
+#: /home/runa/dev/website/docs/en/faq.wml:563
 msgid "<hr> <a id=\"Metrics\"></a>"
 msgstr "<hr> <a id=\"Metrics\"></a>"
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:566
+#: /home/runa/dev/website/docs/en/faq.wml:566
 msgid ""
 "<a class=\"anchor\" href=\"#Metrics\">How many people use Tor? How many "
 "relays or exit nodes are there?</a>"
@@ -1248,7 +1247,7 @@
 "przekaźników lub węzłów wyjściowych?</a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:568
+#: /home/runa/dev/website/docs/en/faq.wml:568
 msgid ""
 "All this and more about measuring Tor can be found at the <a "
 "href=\"https://metrics.torproject.org/\">Tor Metrics Portal</a>."
@@ -1257,17 +1256,17 @@
 "href=\"https://metrics.torproject.org/\">Portalu Pomiarów Tora</a>."
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:570
+#: /home/runa/dev/website/docs/en/faq.wml:570
 msgid "<hr> <a id=\"HowUninstallTor\"></a>"
 msgstr "<hr> <a id=\"HowUninstallTor\"></a>"
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:573
+#: /home/runa/dev/website/docs/en/faq.wml:573
 msgid "<a class=\"anchor\" href=\"#HowUninstallTor\">How do I uninstall Tor?</a>"
 msgstr "<a class=\"anchor\" href=\"#HowUninstallTor\">Jak odinstaloawć Tora?</a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:576
+#: /home/runa/dev/website/docs/en/faq.wml:576
 msgid ""
 "This depends entirely on how you installed it and which operating system you"
 " have. If you installed a package, then hopefully your package has a way to "
@@ -1282,7 +1281,7 @@
 "Firefoksa i Polipo na dowolnym systemie Windows jest następujący:"
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:584
+#: /home/runa/dev/website/docs/en/faq.wml:584
 msgid ""
 "In your taskbar, right click on Vidalia (the green onion or the black head)"
 "  and choose exit."
@@ -1291,7 +1290,7 @@
 "czarna główka) i wybierz wyjście."
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:586
+#: /home/runa/dev/website/docs/en/faq.wml:586
 msgid ""
 "Right click on the taskbar to bring up TaskManager. Look for tor.exe in the "
 "Process List. If it's running, right click and choose End Process."
@@ -1301,7 +1300,7 @@
 "wybierz Zakończ Proces."
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:588
+#: /home/runa/dev/website/docs/en/faq.wml:588
 msgid ""
 "Click the Start button, go to Programs, go to Vidalia, choose Uninstall.  "
 "This will remove the Vidalia bundle, which includes Tor and Polipo."
@@ -1310,7 +1309,7 @@
 "(Uninstall). To usunie dystrybucję Vidalii, która zawiera Tora i Polipo."
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:590
+#: /home/runa/dev/website/docs/en/faq.wml:590
 msgid ""
 "Start Firefox. Go to the Tools menu, choose Add-ons. Select Torbutton.  "
 "Click the Uninstall button."
@@ -1319,7 +1318,7 @@
 "Torbutton. Kliknij przycisk Odinstaluj."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:595
+#: /home/runa/dev/website/docs/en/faq.wml:595
 msgid ""
 "If you do not follow these steps (for example by trying to uninstall "
 "Vidalia, Tor, and Polipo while they are still running), you will need to "
@@ -1331,7 +1330,7 @@
 "Files\\Vidalia Bundle\"."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:601
+#: /home/runa/dev/website/docs/en/faq.wml:601
 msgid ""
 "For Mac OS X, follow the <a href=\"<page docs/tor-doc-"
 "osx>#uninstall\">uninstall directions</a>."
@@ -1340,7 +1339,7 @@
 "osx>#uninstall\">instrukcji odinstalowania</a>."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:606
+#: /home/runa/dev/website/docs/en/faq.wml:606
 msgid ""
 "If you installed by source, I'm afraid there is no easy uninstall method. "
 "But on the bright side, by default it only installs into /usr/local/ and it "
@@ -1351,12 +1350,12 @@
 "instaluję się do /usr/local/, a tam powinno łatwo być zauważyć nowe rzeczy."
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:611
+#: /home/runa/dev/website/docs/en/faq.wml:611
 msgid "<hr> <a id=\"PGPSigs\"></a>"
 msgstr "<hr> <a id=\"PGPSigs\"></a>"
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:614
+#: /home/runa/dev/website/docs/en/faq.wml:614
 msgid ""
 "<a class=\"anchor\" href=\"#PGPSigs\">What are these \"sig\" files on the "
 "download page?</a>"
@@ -1365,7 +1364,7 @@
 "pobierania?</a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:617
+#: /home/runa/dev/website/docs/en/faq.wml:617
 msgid ""
 "These are PGP signatures, so you can verify that the file you've downloaded "
 "is exactly the one that we intended you to get."
@@ -1374,7 +1373,7 @@
 "jest dokładnie tym, który daliśmy do ściągnięcia."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:622
+#: /home/runa/dev/website/docs/en/faq.wml:622
 msgid ""
 "Please read the <a href=\"<page docs/verifying-signatures>\">verifying "
 "signatures</a> page for details."
@@ -1383,12 +1382,12 @@
 "signatures>\">weryfikacji podpisów</a>, by dowiedzieć się więcej."
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:626
+#: /home/runa/dev/website/docs/en/faq.wml:626
 msgid "<hr> <a id=\"GetTor\"></a>"
 msgstr "<hr> <a id=\"GetTor\"></a>"
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:629
+#: /home/runa/dev/website/docs/en/faq.wml:629
 msgid ""
 "<a class=\"anchor\" href=\"#GetTor\">Your website is blocked in my country. "
 "How do I download Tor?</a>"
@@ -1397,7 +1396,7 @@
 "kraju. Jak mam pobrać Tora?</a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:633
+#: /home/runa/dev/website/docs/en/faq.wml:633
 msgid ""
 "Some government or corporate firewalls censor connections to Tor's website. "
 "In those cases, you have three options. First, get it from a friend &mdash; "
@@ -1423,7 +1422,7 @@
 "odbieranie bardzo dużych załączników."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:647
+#: /home/runa/dev/website/docs/en/faq.wml:647
 msgid ""
 "Be sure to <a href=\"<page docs/verifying-signatures>\">verify the "
 "signature</a> of any package you download, especially when you get it from "
@@ -1434,12 +1433,12 @@
 "strony niż nasza oficjalna strona HTTPS."
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:652
+#: /home/runa/dev/website/docs/en/faq.wml:652
 msgid "<hr> <a id=\"CompileTorWindows\"></a>"
 msgstr "<hr> <a id=\"CompileTorWindows\"></a>"
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:655
+#: /home/runa/dev/website/docs/en/faq.wml:655
 msgid ""
 "<a class=\"anchor\" href=\"#CompileTorWindows\">How do I compile Tor under "
 "Windows?</a>"
@@ -1448,7 +1447,7 @@
 "Windows?</a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:658
+#: /home/runa/dev/website/docs/en/faq.wml:658
 msgid ""
 "Try following the steps at <a href=\"<gitblob>doc/tor-win32-mingw-"
 "creation.txt\"> tor-win32-mingw-creation.txt</a>."
@@ -1457,7 +1456,7 @@
 "creation.txt\"> tor-win32-mingw-creation.txt</a>."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:663
+#: /home/runa/dev/website/docs/en/faq.wml:663
 msgid ""
 "(Note that you don't need to compile Tor yourself in order to use it. Most "
 "people just use the packages available on the <a href=\"<page "
@@ -1468,12 +1467,12 @@
 "download/download>\">stronie pobierania</a>.)"
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:668
+#: /home/runa/dev/website/docs/en/faq.wml:668
 msgid "<hr> <a id=\"VirusFalsePositives\"></a>"
 msgstr "<hr> <a id=\"VirusFalsePositives\"></a>"
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:671
+#: /home/runa/dev/website/docs/en/faq.wml:671
 msgid ""
 "<a class=\"anchor\" href=\"#VirusFalsePositives\">Why does my Tor executable"
 " appear to have a virus or spyware?</a>"
@@ -1482,7 +1481,7 @@
 "zdaje się mieć wirusa lub oprogramowanie szpiegujące?</a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:674
+#: /home/runa/dev/website/docs/en/faq.wml:674
 msgid ""
 "Sometimes, overzealous Windows virus and spyware detectors trigger on some "
 "parts of the Tor Windows binary. Our best guess is that these are false "
@@ -1499,7 +1498,7 @@
 " daje fałszywe pozytywne wyniki. Albo wybierz lepszego producenta."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:682
+#: /home/runa/dev/website/docs/en/faq.wml:682
 msgid ""
 "In the meantime, we encourage you to not just take our word for it. Our job "
 "is to provide the source; if you're concerned, please do <a "
@@ -1510,12 +1509,12 @@
 "<a href=\"#CompileTorWindows\">skompiluj program własnoręcznie</a>."
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:687
+#: /home/runa/dev/website/docs/en/faq.wml:687
 msgid "<hr> <a id=\"LiveCD\"></a>"
 msgstr "<hr> <a id=\"LiveCD\"></a>"
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:690
+#: /home/runa/dev/website/docs/en/faq.wml:690
 msgid ""
 "<a class=\"anchor\" href=\"#LiveCD\">Is there a LiveCD or other bundle that "
 "includes Tor?</a>"
@@ -1524,7 +1523,7 @@
 "dystrybucja/paczka zawierająca Tora?</a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:693
+#: /home/runa/dev/website/docs/en/faq.wml:693
 msgid ""
 "Yes.  Use <a href=\"https://tails.boum.org/\">The Amnesic Incognito Live "
 "System</a> or <a href=\"<page projects/torbrowser>\">the Tor Browser "
@@ -1535,12 +1534,12 @@
 "Przeglądarką</a>."
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:698
+#: /home/runa/dev/website/docs/en/faq.wml:698
 msgid "<hr> <a id=\"torrc\"></a>"
 msgstr "<hr> <a id=\"torrc\"></a>"
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:701
+#: /home/runa/dev/website/docs/en/faq.wml:701
 msgid ""
 "<a class=\"anchor\" href=\"#torrc\">I'm supposed to \"edit my torrc\". What "
 "does that mean?</a>"
@@ -1549,7 +1548,7 @@
 "to znaczy?</a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:704
+#: /home/runa/dev/website/docs/en/faq.wml:704
 msgid ""
 "Tor installs a text file called torrc that contains configuration "
 "instructions for how your Tor program should behave. The default "
@@ -1565,12 +1564,12 @@
 "modyfikować swój plik torrc."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:712
+#: /home/runa/dev/website/docs/en/faq.wml:712
 msgid "The location of your torrc file depends on the way you installed Tor:"
 msgstr "Lokalizacja Twojego pliku torrc zależy od posobu instalacji Tora:"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:716
+#: /home/runa/dev/website/docs/en/faq.wml:716
 msgid ""
 "On Windows, if you installed a Tor bundle with Vidalia, you can find your "
 "torrc file in the Start menu under Programs -&gt; Vidalia Bundle -&gt; Tor, "
@@ -1591,7 +1590,7 @@
 "Settings\\<i>nazwa użytkownika</i>\\Application Data\\tor\\torrc</code>."
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:725
+#: /home/runa/dev/website/docs/en/faq.wml:725
 msgid ""
 "On OS X, if you use Vidalia, edit <code>~/.vidalia/torrc</code>. Otherwise, "
 "open your favorite text editor and load <code>/Library/Tor/torrc</code>."
@@ -1601,7 +1600,7 @@
 "<code>/Library/Tor/torrc</code>."
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:729
+#: /home/runa/dev/website/docs/en/faq.wml:729
 msgid ""
 "On Unix, if you installed a pre-built package, look for "
 "<code>/etc/tor/torrc</code> or <code>/etc/torrc</code> or consult your "
@@ -1612,7 +1611,7 @@
 "dokumentację swojej paczki."
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:733
+#: /home/runa/dev/website/docs/en/faq.wml:733
 msgid ""
 "Finally, if you installed from source, you may not have a torrc installed "
 "yet: look in <code>/usr/local/etc/</code> and note that you may need to "
@@ -1623,7 +1622,7 @@
 "ręcznie skopiować <code>torrc.sample</code> do <code>torrc</code>."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:740
+#: /home/runa/dev/website/docs/en/faq.wml:740
 msgid ""
 "If you use Vidalia, be sure to exit both Tor and Vidalia before you edit "
 "your torrc file. Otherwise Vidalia might overwrite your changes."
@@ -1632,7 +1631,7 @@
 "swój plik torrc. W innym przypadku Vidalia może nadpisać Twoje zmiany."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:745
+#: /home/runa/dev/website/docs/en/faq.wml:745
 msgid ""
 "Once you've changed your torrc, you will need to restart Tor for the changes"
 " to take effect. (For advanced users on OS X and Unix, note that you "
@@ -1643,7 +1642,7 @@
 " wysłać Torowi sygnał HUP, nie musisz go restartować.)"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:751
+#: /home/runa/dev/website/docs/en/faq.wml:751
 msgid ""
 "For other configuration options you can use, look at the <a href=\"<page "
 "docs/tor-manual>\">Tor manual page</a>. Remember, all lines beginning with #"
@@ -1655,12 +1654,12 @@
 "nie mają wpływu na konfigurację Tora."
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:757
+#: /home/runa/dev/website/docs/en/faq.wml:757
 msgid "<hr> <a id=\"Logs\"></a>"
 msgstr "<hr> <a id=\"Logs\"></a>"
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:760
+#: /home/runa/dev/website/docs/en/faq.wml:760
 msgid ""
 "<a class=\"anchor\" href=\"#Logs\">How do I set up logging, or see Tor's "
 "logs?</a>"
@@ -1669,7 +1668,7 @@
 " Tora?</a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:763
+#: /home/runa/dev/website/docs/en/faq.wml:763
 msgid ""
 "If you installed a Tor bundle that includes Vidalia, then Vidalia has a "
 "window called \"Message Log\" that will show you Tor's log messages. You can"
@@ -1682,7 +1681,7 @@
 "wiadomości do pliku. Wszystko gotowe."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:770
+#: /home/runa/dev/website/docs/en/faq.wml:770
 msgid ""
 "If you're not using Vidalia, you'll have to go find the log files by hand. "
 "Here are some likely places for your logs to be:"
@@ -1691,12 +1690,12 @@
 "prawdopodobnych miejsc, w których mogą być Twoje logi:"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:775
+#: /home/runa/dev/website/docs/en/faq.wml:775
 msgid "On OS X, Debian, Red Hat, etc, the logs are in /var/log/tor/"
 msgstr "Pod OS X, Debianem, Red Hatem, etc, logi są w /var/log/tor/"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:777
+#: /home/runa/dev/website/docs/en/faq.wml:777
 msgid ""
 "On Windows, there are no default log files currently. If you enable logs in "
 "your torrc file, they default to <code>\\username\\Application "
@@ -1708,7 +1707,7 @@
 "<code>\\Application Data\\tor\\log\\</code>"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:781
+#: /home/runa/dev/website/docs/en/faq.wml:781
 msgid ""
 "If you compiled Tor from source, by default your Tor logs to <a "
 "href=\"http://en.wikipedia.org/wiki/Standard_streams\">\"stdout\"</a> at "
@@ -1721,7 +1720,7 @@
 "one kierowane do <code>/usr/local/var/log/tor/</code>."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:789
+#: /home/runa/dev/website/docs/en/faq.wml:789
 msgid ""
 "To change your logging setup by hand, <a href=\"#torrc\">edit your torrc</a>"
 " and find the section (near the top of the file) which contains the "
@@ -1732,7 +1731,7 @@
 "linię:"
 
 #. type: Content of: <div><div><pre>
-#: /home/runa/tor/website/docs/en/faq.wml:795
+#: /home/runa/dev/website/docs/en/faq.wml:795
 #, no-wrap
 msgid ""
 "\\## Logs go to stdout at level \"notice\" unless redirected by something\n"
@@ -1742,7 +1741,7 @@
 "\\## else, like one of the below lines.\n"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:800
+#: /home/runa/dev/website/docs/en/faq.wml:800
 msgid ""
 "For example, if you want Tor to send complete debug, info, notice, warn, and"
 " err level messages to a file, append the following line to the end of the "
@@ -1753,13 +1752,13 @@
 "sekcji:"
 
 #. type: Content of: <div><div><pre>
-#: /home/runa/tor/website/docs/en/faq.wml:806
+#: /home/runa/dev/website/docs/en/faq.wml:806
 #, no-wrap
 msgid "Log debug file c:/program files/tor/debug.log\n"
 msgstr "Log debug file c:/program files/tor/debug.log\n"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:810
+#: /home/runa/dev/website/docs/en/faq.wml:810
 msgid ""
 "Replace <code>c:/program files/tor/debug.log</code> with a directory and "
 "filename for your Tor log."
@@ -1768,12 +1767,12 @@
 "Twojego pliku logowania Tora."
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:814
+#: /home/runa/dev/website/docs/en/faq.wml:814
 msgid "<hr> <a id=\"DoesntWork\"></a>"
 msgstr "<hr> <a id=\"DoesntWork\"></a>"
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:817
+#: /home/runa/dev/website/docs/en/faq.wml:817
 msgid ""
 "<a class=\"anchor\" href=\"#DoesntWork\">I installed Tor and Polipo but it's"
 " not working.</a>"
@@ -1782,7 +1781,7 @@
 "ale nie działają.</a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:820
+#: /home/runa/dev/website/docs/en/faq.wml:820
 msgid ""
 "Once you've installed the Tor bundle, there are two questions to ask: first,"
 " is your Tor able to establish a circuit? Second, is your Firefox correctly "
@@ -1793,7 +1792,7 @@
 "skonfigurowany tak, by wysyłał swój ruch przez Tora?"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:825
+#: /home/runa/dev/website/docs/en/faq.wml:825
 msgid ""
 "If Tor can establish a circuit, the onion icon in Vidalia will turn green. "
 "You can also check in the Vidalia Control Panel to make sure it says "
@@ -1810,12 +1809,12 @@
 " obwód. Wygląda na to, że funkcjonalność klienta działa.\")"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:835
+#: /home/runa/dev/website/docs/en/faq.wml:835
 msgid "If Tor can't establish a circuit, here are some hints:"
 msgstr "Jeśli Tor nie może nawiązać obwodu, oto kilka wskazówek:"
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:839
+#: /home/runa/dev/website/docs/en/faq.wml:839
 msgid ""
 "Are you sure Tor is running? If you're using Vidalia, you may have to click "
 "on the onion and select \"Start\" to launch Tor."
@@ -1824,7 +1823,7 @@
 "cebulę i wybrać \"Start\", by uruchomić Tora."
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:841
+#: /home/runa/dev/website/docs/en/faq.wml:841
 msgid ""
 "Check your system clock. If it's more than a few hours off, Tor will refuse "
 "to build circuits. For XP users, synchronize your clock under the clock "
@@ -1837,7 +1836,7 @@
 "karcie 'Data i czas'."
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:845
+#: /home/runa/dev/website/docs/en/faq.wml:845
 msgid ""
 "Is your Internet connection <a href=\"#FirewallPorts\">firewalled by "
 "port</a>, or do you normally need to use a <a "
@@ -1848,7 +1847,7 @@
 "href=\"<wikifaq>#MyInternetconnectionrequiresanHTTPorSOCKSproxy.\">proxy</a>?"
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:850
+#: /home/runa/dev/website/docs/en/faq.wml:850
 msgid ""
 "Are you running programs like Norton Internet Security or SELinux that block"
 " certain connections, even though you don't realize they do? They could be "
@@ -1859,7 +1858,7 @@
 "tego sprawy? Mogą przeszkadzać Torowi w nawiązywaniu połączeń sieciowych."
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:853
+#: /home/runa/dev/website/docs/en/faq.wml:853
 msgid ""
 "Are you in China, or behind a restrictive corporate network firewall that "
 "blocks the public Tor relays? If so, you should learn about <a href=\"<page "
@@ -1870,7 +1869,7 @@
 "href=\"<page docs/bridges>\">mostkach Tora</a>."
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:856
+#: /home/runa/dev/website/docs/en/faq.wml:856
 msgid ""
 "Check your <a href=\"#Logs\">Tor logs</a>. Do they give you any hints about "
 "what's going wrong?"
@@ -1879,7 +1878,7 @@
 "wskazówki a tym, co jest nie tak?"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:861
+#: /home/runa/dev/website/docs/en/faq.wml:861
 msgid ""
 "Step two is to confirm that Firefox is correctly configured to send its "
 "traffic through Tor. Try the <a href=\"https://check.torproject.org/\">Tor "
@@ -1895,12 +1894,12 @@
 " do FAQ o Tor Check</a>, by dowiedzieć się więcej."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:869
+#: /home/runa/dev/website/docs/en/faq.wml:869
 msgid "If it thinks you're not using Tor, here are some hints:"
 msgstr "Jeśli według tej strony nie używas Tora, oto kilka wskazówek:"
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:873
+#: /home/runa/dev/website/docs/en/faq.wml:873
 msgid ""
 "Did you install the Torbutton extension for Firefox? The installation "
 "bundles include it, but sometimes people forget to install it. Make sure it "
@@ -1914,7 +1913,7 @@
 "8118.)"
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:878
+#: /home/runa/dev/website/docs/en/faq.wml:878
 msgid ""
 "Do you have incompatible Firefox extensions like FoxyProxy installed? If so,"
 " uninstall them. (Note that using FoxyProxy is NOT a sufficient substitute "
@@ -1933,7 +1932,7 @@
 "Torbuttona</a>.)"
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:885
+#: /home/runa/dev/website/docs/en/faq.wml:885
 msgid ""
 "If your browser says \"The proxy server is refusing connections.\", check "
 "that Polipo (the http proxy that passes traffic between Firefox and Tor) is "
@@ -1948,7 +1947,7 @@
 "i otwórz Terminal.app. Potem uruchom \"ps aux|grep polipo\"."
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:890
+#: /home/runa/dev/website/docs/en/faq.wml:890
 msgid ""
 "If you're upgrading from OS X, some of the earlier OS X installers were "
 "broken in really unfortunate ways. You may find that <a href=\"<page docs"
@@ -1963,7 +1962,7 @@
 " już nie zgadzać się z Twoją paczką. Przepraszamy."
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:895
+#: /home/runa/dev/website/docs/en/faq.wml:895
 msgid ""
 "If you're on Linux, make sure Privoxy isn't running, since it will conflict "
 "with the port that our Polipo configuration file picks."
@@ -1972,7 +1971,7 @@
 "konflikt z portem, który jest wybrany w naszej konfiguracji Polipo."
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:897
+#: /home/runa/dev/website/docs/en/faq.wml:897
 msgid ""
 "If you installed Polipo yourself (not from a bundle), did you edit the "
 "config file as described? Did you restart Polipo after this change? Are you "
@@ -1983,7 +1982,7 @@
 "zmianie? Na pewno?"
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:900
+#: /home/runa/dev/website/docs/en/faq.wml:900
 msgid ""
 "For Red Hat Linux and related systems, do you have SELinux enabled? If so, "
 "it might be preventing Polipo from talking to Tor. We also run across BSD "
@@ -1996,12 +1995,12 @@
 "niektórym połaczeniom do localhosta."
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:906
+#: /home/runa/dev/website/docs/en/faq.wml:906
 msgid "<hr /> <a id=\"VidaliaPassword\"></a>"
 msgstr "<hr /> <a id=\"VidaliaPassword\"></a>"
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:909
+#: /home/runa/dev/website/docs/en/faq.wml:909
 msgid ""
 "<a class=\"anchor\" href=\"#VidaliaPassword\">Tor/Vidalia prompts for a "
 "password at start.</a>"
@@ -2010,7 +2009,7 @@
 "podczas uruchamiania</a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:912
+#: /home/runa/dev/website/docs/en/faq.wml:912
 msgid ""
 "Vidalia interacts with the Tor software via Tor's \"control port\". The "
 "control port lets Vidalia receive status updates from Tor, request a new "
@@ -2027,7 +2026,7 @@
 "potencjalnie zepsucie Twojej anonimowości."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:921
+#: /home/runa/dev/website/docs/en/faq.wml:921
 msgid ""
 "Usually this process of generating and setting a random control password "
 "happens in the background. There are three common situations, though, where "
@@ -2037,7 +2036,7 @@
 " tle. Są jedna trzy sytuacje, w których Vidalia może poprosić Cię o hasło:"
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:927
+#: /home/runa/dev/website/docs/en/faq.wml:927
 msgid ""
 "You're already running Vidalia and Tor. For example, this situation can "
 "happen if you installed the Vidalia bundle and now you're trying to run the "
@@ -2050,7 +2049,7 @@
 "uruchomisz nową."
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:932
+#: /home/runa/dev/website/docs/en/faq.wml:932
 msgid ""
 "Vidalia crashed, but left Tor running with the last known random password. "
 "After you restart Vidalia, it generates a new random password, but Vidalia "
@@ -2073,7 +2072,7 @@
 "uruchomienia Tora i wszystko znów będzie działać."
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:945
+#: /home/runa/dev/website/docs/en/faq.wml:945
 msgid ""
 "You had previously set Tor to run as a Windows NT service. When Tor is set "
 "to run as a service, it starts up when the system boots. If you configured "
@@ -2098,12 +2097,12 @@
 "usługi Windows NT</a> po więcej informacji o tym, jak usunąć usługę Tora."
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:960
+#: /home/runa/dev/website/docs/en/faq.wml:960
 msgid "<hr> <a id=\"ChooseEntryExit\"></a>"
 msgstr "<hr> <a id=\"ChooseEntryExit\"></a>"
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:963
+#: /home/runa/dev/website/docs/en/faq.wml:963
 msgid ""
 "<a class=\"anchor\" href=\"#ChooseEntryExit\">Can I control which nodes (or "
 "country) are used for entry/exit?</a>"
@@ -2112,7 +2111,7 @@
 "węzły (lub kraje) są używane do wchodzenia/wychodzenia?</a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:966
+#: /home/runa/dev/website/docs/en/faq.wml:966
 msgid ""
 "Yes. You can set preferred entry and exit nodes as well as inform Tor which "
 "nodes you do not want to use.  The following options can be added to your "
@@ -2125,12 +2124,12 @@
 "href=\"#torrc\">\"torrc\"</a> lub podane na linii poleceń:"
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/docs/en/faq.wml:972
+#: /home/runa/dev/website/docs/en/faq.wml:972
 msgid "<tt>EntryNodes $fingerprint,$fingerprint,...</tt>"
 msgstr "<tt>EntryNodes $fingerprint,$fingerprint,...</tt>"
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/docs/en/faq.wml:973
+#: /home/runa/dev/website/docs/en/faq.wml:973
 msgid ""
 "A list of preferred nodes to use for the first hop in the circuit, if "
 "possible."
@@ -2139,12 +2138,12 @@
 "jeśli możliwe."
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/docs/en/faq.wml:975
+#: /home/runa/dev/website/docs/en/faq.wml:975
 msgid "<tt>ExitNodes $fingerprint,$fingerprint,...</tt>"
 msgstr "<tt>ExitNodes $fingerprint,$fingerprint,...</tt>"
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/docs/en/faq.wml:976
+#: /home/runa/dev/website/docs/en/faq.wml:976
 msgid ""
 "A list of preferred nodes to use for the last hop in the circuit, if "
 "possible."
@@ -2153,22 +2152,22 @@
 " możliwe."
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/docs/en/faq.wml:978
+#: /home/runa/dev/website/docs/en/faq.wml:978
 msgid "<tt>ExcludeNodes $fingerprint,$fingerprint,...</tt>"
 msgstr "<tt>ExcludeNodes $fingerprint,$fingerprint,...</tt>"
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/docs/en/faq.wml:979
+#: /home/runa/dev/website/docs/en/faq.wml:979
 msgid "A list of nodes to never use when building a circuit."
 msgstr "Lista węzłów, których nigdy nie używać do budowania obwodu."
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/docs/en/faq.wml:981
+#: /home/runa/dev/website/docs/en/faq.wml:981
 msgid "<tt>ExcludeExitNodes $fingerprint,$fingerprint,...</tt>"
 msgstr "<tt>ExcludeExitNodes $fingerprint,$fingerprint,...</tt>"
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/docs/en/faq.wml:982
+#: /home/runa/dev/website/docs/en/faq.wml:982
 msgid ""
 "A list of nodes to never use when picking an exit.  Nodes listed in "
 "<tt>ExcludeNodes</tt> are automatically in this list."
@@ -2177,7 +2176,7 @@
 "<tt>ExcludeNodes</tt> są automatycznie na tej liście."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:987
+#: /home/runa/dev/website/docs/en/faq.wml:987
 msgid ""
 "<em>We recommend you do not use these</em> &mdash; they are intended for "
 "testing and may disappear in future versions.  You get the best security "
@@ -2192,7 +2191,7 @@
 "nie rozumiemy."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:994
+#: /home/runa/dev/website/docs/en/faq.wml:994
 msgid ""
 "The <tt>EntryNodes</tt> and <tt>ExitNodes</tt> config options are treated as"
 " a request, meaning if the nodes are down or seem slow, Tor will still avoid"
@@ -2212,7 +2211,7 @@
 "Tora</a>, by znaleźć węzły, które można wybrać."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1004
+#: /home/runa/dev/website/docs/en/faq.wml:1004
 msgid ""
 "Instead of <tt>$fingerprint</tt> you can also specify a 2 letter ISO3166 "
 "country code in curly braces (for example {de}), or an ip address pattern "
@@ -2225,7 +2224,7 @@
 "między przecinkami a elementami list."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1010
+#: /home/runa/dev/website/docs/en/faq.wml:1010
 msgid ""
 "If you want to access a service directly through Tor's SOCKS interface (eg. "
 "using ssh via connect.c), another option is to set up an internal mapping in"
@@ -2238,12 +2237,12 @@
 "<tt>MapAddress</tt>. Przeczytaj stronę podręcznika, by poznać szczegóły."
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1016
+#: /home/runa/dev/website/docs/en/faq.wml:1016
 msgid "<hr> <a id=\"GoogleCaptcha\"></a>"
 msgstr "<hr> <a id=\"GoogleCaptcha\"></a>"
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1019
+#: /home/runa/dev/website/docs/en/faq.wml:1019
 msgid ""
 "<a class=\"anchor\" href=\"#GoogleCaptcha\">Google makes me solve a Captcha "
 "or tells me I have spyware installed.</a>"
@@ -2252,7 +2251,7 @@
 " Captcha lub mówi, że mam zainstalwoane oprogramowanie szpiegujące.</a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1022
+#: /home/runa/dev/website/docs/en/faq.wml:1022
 msgid ""
 "This is a known and intermittent problem; it does not mean that Google "
 "considers Tor to be spyware."
@@ -2261,7 +2260,7 @@
 "Google Tor to oprogramowanie szpiegujące."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1027
+#: /home/runa/dev/website/docs/en/faq.wml:1027
 msgid ""
 "When you use Tor, you are sending queries through exit relays that are also "
 "shared by thousands of other users. Tor users typically see this message "
@@ -2278,7 +2277,7 @@
 "strony i zwalnia ruch z tego adresu IP na krótki czas."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1035
+#: /home/runa/dev/website/docs/en/faq.wml:1035
 msgid ""
 "An alternate explanation is that Google tries to detect certain kinds of "
 "spyware or viruses that send distinctive queries to Google Search. It notes "
@@ -2294,7 +2293,7 @@
 "zarażenie."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1044
+#: /home/runa/dev/website/docs/en/faq.wml:1044
 msgid ""
 "To our knowledge, Google is not doing anything intentionally specifically to"
 " deter or block Tor use. The error message about an infected machine should "
@@ -2305,7 +2304,7 @@
 "powinna zniknąć po krótkim czasie."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1050
+#: /home/runa/dev/website/docs/en/faq.wml:1050
 msgid ""
 "Torbutton 1.2.5 (released in mid 2010) detects Google captchas and can "
 "automatically redirect you to a more Tor-friendly search engine such as "
@@ -2316,12 +2315,12 @@
 "Torowi, jak Ixquick czy Bing."
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1055
+#: /home/runa/dev/website/docs/en/faq.wml:1055
 msgid "<hr /> <a id=\"GmailWarning\"></a>"
 msgstr "<hr /> <a id=\"GmailWarning\"></a>"
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1058
+#: /home/runa/dev/website/docs/en/faq.wml:1058
 msgid ""
 "<a class=\"anchor\" href=\"#GmailWarning\">Gmail warns me that my account "
 "may have been compromised.</a>"
@@ -2330,7 +2329,7 @@
 "konto ktoś mógł się włamać.</a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1061
+#: /home/runa/dev/website/docs/en/faq.wml:1061
 msgid ""
 "Sometimes, after you've used Gmail over Tor, Google presents a pop-up "
 "notification that your account may have been compromised.  The notification "
@@ -2342,7 +2341,7 @@
 "miejsc na całym świecie, z których ostatnio korzystano z Twojego konta."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1068
+#: /home/runa/dev/website/docs/en/faq.wml:1068
 msgid ""
 "In general this is a false alarm: Google saw a bunch of logins from "
 "different places, as a result of running the service via Tor, and decided it"
@@ -2354,7 +2353,7 @@
 "będzie potwierdzić, że konta używa prawowity właściciel."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1075
+#: /home/runa/dev/website/docs/en/faq.wml:1075
 msgid ""
 "Even though this may be a biproduct of using the service via tor, that "
 "doesn't mean you can entirely ignore the warning. It is <i>probably</i> a "
@@ -2367,7 +2366,7 @@
 " ktoś kiedyś ukradł Twoje ciasteczko Google."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1082
+#: /home/runa/dev/website/docs/en/faq.wml:1082
 msgid ""
 "Cookie hijacking is possible by either physical access to your computer or "
 "by watching your network traffic.  In theory only physical access should "
@@ -2384,7 +2383,7 @@
 "hijacking\">znacznie bardziej skomplikowane</a>."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1091
+#: /home/runa/dev/website/docs/en/faq.wml:1091
 msgid ""
 "And if somebody <i>did</i> steal your google cookie, they might end up "
 "logging in from unusual places (though of course they also might not). So "
@@ -2403,12 +2402,12 @@
 " logowałeś/aś."
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1100
+#: /home/runa/dev/website/docs/en/faq.wml:1100
 msgid "<hr> <a id=\"FirewallPorts\"></a>"
 msgstr "<hr> <a id=\"FirewallPorts\"></a>"
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1103
+#: /home/runa/dev/website/docs/en/faq.wml:1103
 msgid ""
 "<a class=\"anchor\" href=\"#FirewallPorts\">My firewall only allows a few "
 "outgoing ports.</a>"
@@ -2417,7 +2416,7 @@
 "tylko na kilka portów wychodzących.</a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1106
+#: /home/runa/dev/website/docs/en/faq.wml:1106
 msgid ""
 "If your firewall works by blocking ports, then you can tell Tor to only use "
 "the ports that your firewall permits by adding \"FascistFirewall 1\" to your"
@@ -2433,7 +2432,7 @@
 "porty\") w oknie Ustawień Sieciowych (Network Settings) programu Vidalia."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1114
+#: /home/runa/dev/website/docs/en/faq.wml:1114
 msgid ""
 "By default, when you set this Tor assumes that your firewall allows only "
 "port 80 and port 443 (HTTP and HTTPS respectively). You can select a "
@@ -2444,7 +2443,7 @@
 "portów z opcją FirewallPorts pliku torrc."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1120
+#: /home/runa/dev/website/docs/en/faq.wml:1120
 msgid ""
 "If you want to be more fine-grained with your controls, you can also use the"
 " ReachableAddresses config options, e.g.:"
@@ -2453,7 +2452,7 @@
 "konfiguracyjnych ReachableAddresses, np."
 
 #. type: Content of: <div><div><pre>
-#: /home/runa/tor/website/docs/en/faq.wml:1125
+#: /home/runa/dev/website/docs/en/faq.wml:1125
 #, no-wrap
 msgid ""
 "  ReachableDirAddresses *:80\n"
@@ -2463,12 +2462,12 @@
 "  ReachableORAddresses *:443\n"
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1129
+#: /home/runa/dev/website/docs/en/faq.wml:1129
 msgid "<hr> <a id=\"RelayFlexible\"></a>"
 msgstr "<hr> <a id=\"RelayFlexible\"></a>"
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1132
+#: /home/runa/dev/website/docs/en/faq.wml:1132
 msgid ""
 "<a class=\"anchor\" href=\"#RelayFlexible\">How stable does my relay need to"
 " be?</a>"
@@ -2477,14 +2476,14 @@
 "przekaźnik?</a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1135
+#: /home/runa/dev/website/docs/en/faq.wml:1135
 msgid "We aim to make setting up a Tor relay easy and convenient:"
 msgstr ""
 "Naszym celem jest uczynienie uruchomienia przekaźnika Tora czynnością łatwą "
 "i wygodną:"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1139
+#: /home/runa/dev/website/docs/en/faq.wml:1139
 msgid ""
 "Tor has built-in support for <a "
 "href=\"<wikifaq>#WhatbandwidthshapingoptionsareavailabletoTorrelays\"> rate "
@@ -2501,7 +2500,7 @@
 " hibernacji</a>."
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1147
+#: /home/runa/dev/website/docs/en/faq.wml:1147
 msgid ""
 "Each Tor relay has an <a href=\"#ExitPolicies\">exit policy</a> that "
 "specifies what sort of outbound connections are allowed or refused from that"
@@ -2515,7 +2514,7 @@
 "na połączenia tylko do innych przekaźników Tora."
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1152
+#: /home/runa/dev/website/docs/en/faq.wml:1152
 msgid ""
 "It's fine if the relay goes offline sometimes. The directories notice this "
 "quickly and stop advertising the relay. Just try to make sure it's not too "
@@ -2527,7 +2526,7 @@
 "korzystające z przekaźnika w chwili jego rozłączenia."
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1157
+#: /home/runa/dev/website/docs/en/faq.wml:1157
 msgid ""
 "We can handle relays with dynamic IPs just fine &mdash; simply leave the "
 "Address config option blank, and Tor will try to guess."
@@ -2537,7 +2536,7 @@
 "zgadnąć."
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1160
+#: /home/runa/dev/website/docs/en/faq.wml:1160
 msgid ""
 "If your relay is behind a NAT and it doesn't know its public IP (e.g. it has"
 " an IP of 192.168.x.y), you'll need to set up port forwarding. Forwarding "
@@ -2552,7 +2551,7 @@
 "przykładów, jak to wykonać."
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1166
+#: /home/runa/dev/website/docs/en/faq.wml:1166
 msgid ""
 "Your relay will passively estimate and advertise its recent bandwidth "
 "capacity, so high-bandwidth relays will attract more users than low-"
@@ -2564,12 +2563,12 @@
 "przydatne."
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1172
+#: /home/runa/dev/website/docs/en/faq.wml:1172
 msgid "<hr> <a id=\"RunARelayBut\"></a> <a id=\"ExitPolicies\"></a>"
 msgstr "<hr> <a id=\"RunARelayBut\"></a> <a id=\"ExitPolicies\"></a>"
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1176
+#: /home/runa/dev/website/docs/en/faq.wml:1176
 msgid ""
 "<a class=\"anchor\" href=\"#ExitPolicies\">I'd run a relay, but I don't want"
 " to deal with abuse issues.</a>"
@@ -2578,12 +2577,12 @@
 "przekaźnik, ale nie chcę mieć do czynienia z przypadkami nadużyć.</a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1179
+#: /home/runa/dev/website/docs/en/faq.wml:1179
 msgid "Great. That's exactly why we implemented exit policies."
 msgstr "Wspaniale. To właśnie po to zaimplementowaliśmy polityki wyjścia."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1183
+#: /home/runa/dev/website/docs/en/faq.wml:1183
 msgid ""
 "Each Tor relay has an exit policy that specifies what sort of outbound "
 "connections are allowed or refused from that relay. The exit policies are "
@@ -2611,7 +2610,7 @@
 "narażeniem</a> Mike'a Perry'ego."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1197
+#: /home/runa/dev/website/docs/en/faq.wml:1197
 msgid ""
 "The default exit policy allows access to many popular services (e.g. web "
 "browsing), but <a "
@@ -2640,7 +2639,7 @@
 "usług."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1211
+#: /home/runa/dev/website/docs/en/faq.wml:1211
 msgid ""
 "If you do allow any exit connections, make sure name resolution works (that "
 "is, your computer can resolve Internet addresses correctly).  If there are "
@@ -2656,12 +2655,12 @@
 "&mdash; w innym przypadku miałoby to wpływ też na użytkowników Tora."
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1219
+#: /home/runa/dev/website/docs/en/faq.wml:1219
 msgid "<hr> <a id=\"RelayOrBridge\"></a>"
 msgstr "<hr> <a id=\"RelayOrBridge\"></a>"
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1222
+#: /home/runa/dev/website/docs/en/faq.wml:1222
 msgid ""
 "<a class=\"anchor\" href=\"#RelayOrBridge\">Should I be a normal relay or "
 "bridge relay?</a>"
@@ -2670,7 +2669,7 @@
 "prowadzić normalny przekaźnik, czy przekaźnik mostkowy?</a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1224
+#: /home/runa/dev/website/docs/en/faq.wml:1224
 msgid ""
 "<a href=\"<page docs/bridges>\">Bridge relays</a> (or \"bridges\" for short)"
 "  are <a href=\"<page docs/tor-doc-relay>\">Tor relays</a> that aren't "
@@ -2685,7 +2684,7 @@
 "sieci Tora prawdopodobnie nie będzie mógł zablokować wszystkich mostków."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1231
+#: /home/runa/dev/website/docs/en/faq.wml:1231
 msgid ""
 "Being a normal relay vs being a bridge relay is almost the same "
 "configuration: it's just a matter of whether your relay is listed publically"
@@ -2696,7 +2695,7 @@
 "publicznych listach, czy nie."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1236
+#: /home/runa/dev/website/docs/en/faq.wml:1236
 msgid ""
 "Right now, there are a small number of places in the world that filter "
 "connections to the Tor network. So getting a lot of bridges running right "
@@ -2713,7 +2712,7 @@
 "adresem IP publicznego przekaźnika Tora."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1244
+#: /home/runa/dev/website/docs/en/faq.wml:1244
 msgid ""
 "So should you run a normal relay or bridge relay? If you have lots of "
 "bandwidth, you should definitely run a normal relay &mdash; bridge relays "
@@ -2730,12 +2729,12 @@
 "łącza, rzuć monetą. Dziękujemy za zgłoszenie!"
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1252
+#: /home/runa/dev/website/docs/en/faq.wml:1252
 msgid "<hr> <a id=\"MultipleRelays\"></a>"
 msgstr "<hr> <a id=\"MultipleRelays\"></a>"
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1255
+#: /home/runa/dev/website/docs/en/faq.wml:1255
 msgid ""
 "<a class=\"anchor\" href=\"#MultipleRelays\">I want to run more than one "
 "relay.</a>"
@@ -2744,7 +2743,7 @@
 " przekaźnik.</a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1258
+#: /home/runa/dev/website/docs/en/faq.wml:1258
 msgid ""
 "Great. If you want to run several relays to donate more to the network, "
 "we're happy with that. But please don't run more than a few dozen on the "
@@ -2756,7 +2755,7 @@
 "tej samej sieci, gdyż część celów sieci Tora to rozproszenie i różnorodność."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1265
+#: /home/runa/dev/website/docs/en/faq.wml:1265
 msgid ""
 "If you do decide to run more than one relay, please set the \"MyFamily\" "
 "config option in the <a href=\"#torrc\">torrc</a> of each relay, listing all"
@@ -2768,13 +2767,13 @@
 "są pod Twoją kontrolą:"
 
 #. type: Content of: <div><div><pre>
-#: /home/runa/tor/website/docs/en/faq.wml:1271
+#: /home/runa/dev/website/docs/en/faq.wml:1271
 #, no-wrap
 msgid "    MyFamily $fingerprint1,$fingerprint2,$fingerprint3\n"
 msgstr "    MyFamily $fingerprint1,$fingerprint2,$fingerprint3\n"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1275
+#: /home/runa/dev/website/docs/en/faq.wml:1275
 msgid ""
 "where each fingerprint is the 40 character identity fingerprint (without "
 "spaces). You can also list them by nickname, but fingerprint is safer. Be "
@@ -2787,7 +2786,7 @@
 " by odcisk palca w pliku konfiguracyjnym nie został pomylony z nazwą."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1282
+#: /home/runa/dev/website/docs/en/faq.wml:1282
 msgid ""
 "That way clients will know to avoid using more than one of your relays in a "
 "single circuit. You should set MyFamily if you have administrative control "
@@ -2800,12 +2799,12 @@
 "siecią, nawet jeśli nie są w tej samej lokalizacji geograficznej."
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1288
+#: /home/runa/dev/website/docs/en/faq.wml:1288
 msgid "<hr> <a id=\"RelayMemory\"></a>"
 msgstr "<hr> <a id=\"RelayMemory\"></a>"
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1291
+#: /home/runa/dev/website/docs/en/faq.wml:1291
 msgid ""
 "<a class=\"anchor\" href=\"#RelayMemory\">Why is my Tor relay using so much "
 "memory?</a>"
@@ -2814,7 +2813,7 @@
 "tyle pamięci?</a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1293
+#: /home/runa/dev/website/docs/en/faq.wml:1293
 msgid ""
 "If your Tor relay is using more memory than you'd like, here are some tips "
 "for reducing its footprint:"
@@ -2823,7 +2822,7 @@
 "wskazówek, jak zmniejszyć tę ilość:"
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1298
+#: /home/runa/dev/website/docs/en/faq.wml:1298
 msgid ""
 "If you're on Linux, you may be encountering memory fragmentation bugs in "
 "glibc's malloc implementation. That is, when Tor releases memory back to the"
@@ -2842,7 +2841,7 @@
 "malloc: <tt>./configure --enable-openbsd-malloc</tt>"
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1306
+#: /home/runa/dev/website/docs/en/faq.wml:1306
 msgid ""
 "If you're running a fast relay, meaning you have many TLS connections open, "
 "you are probably losing a lot of memory to OpenSSL's internal buffers (38KB+"
@@ -2861,7 +2860,7 @@
 "skorzysta z tej cechy."
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1314
+#: /home/runa/dev/website/docs/en/faq.wml:1314
 msgid ""
 "If you're running on Solaris, OpenBSD, NetBSD, or old FreeBSD, Tor is "
 "probably forking separate processes rather than using threads. Consider "
@@ -2875,7 +2874,7 @@
 "system operacyjny</a>."
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1320
+#: /home/runa/dev/website/docs/en/faq.wml:1320
 msgid ""
 "If you still can't handle the memory load, consider reducing the amount of "
 "bandwidth your relay advertises. Advertising less bandwidth means you will "
@@ -2889,7 +2888,7 @@
 "Spójrz na opcję <tt>MaxAdvertisedBandwidth</tt> na stronie podręcznika."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1329
+#: /home/runa/dev/website/docs/en/faq.wml:1329
 msgid ""
 "All of this said, fast Tor relays do use a lot of ram. It is not unusual for"
 " a fast exit relay to use 500-1000 MB of memory."
@@ -2898,19 +2897,19 @@
 "Nierzadko szybkie przekaźniki używają 500-1000 MB pamięci."
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1333
+#: /home/runa/dev/website/docs/en/faq.wml:1333
 msgid "<hr> <a id=\"WhyNotNamed\"></a>"
 msgstr "<hr> <a id=\"WhyNotNamed\"></a>"
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1336
+#: /home/runa/dev/website/docs/en/faq.wml:1336
 msgid "<a class=\"anchor\" href=\"#WhyNotNamed\">Why is my Tor relay not named?</a>"
 msgstr ""
 "<a class=\"anchor\" href=\"#WhyNotNamed\">Czemu mój przekaźnik Tora nie ma "
 "nazwy?</a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1339
+#: /home/runa/dev/website/docs/en/faq.wml:1339
 msgid ""
 "We currently use these metrics to determine if your relay should be "
 "named:<br>"
@@ -2919,7 +2918,7 @@
 "przekaźnik powinien mieć nazwę:<br>"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1342
+#: /home/runa/dev/website/docs/en/faq.wml:1342
 msgid ""
 "The name is not currently mapped to a different key. Existing mappings are "
 "removed after 6 months of inactivity from a relay."
@@ -2928,22 +2927,22 @@
 "usuwane po 6 miesiącach nieaktywności przekaźnika."
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1344
+#: /home/runa/dev/website/docs/en/faq.wml:1344
 msgid "The relay must have been around for at least two weeks."
 msgstr "Przekaźnik musi działać przez co najmniej 2 tygodnie."
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1345
+#: /home/runa/dev/website/docs/en/faq.wml:1345
 msgid "No other router may have wanted the same name in the past month."
 msgstr "Żaden inny router nie chciał tej nazwy w poprzednim miesiącu."
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1348
+#: /home/runa/dev/website/docs/en/faq.wml:1348
 msgid "<hr> <a id=\"KeyManagement\"></a>"
 msgstr "<hr> <a id=\"KeyManagement\"></a>"
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1351
+#: /home/runa/dev/website/docs/en/faq.wml:1351
 msgid ""
 "<a class=\"anchor\" href=\"#KeyManagement\">Tell me about all the keys Tor "
 "uses.</a>"
@@ -2952,7 +2951,7 @@
 "używanych przez Tora.</a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1354
+#: /home/runa/dev/website/docs/en/faq.wml:1354
 msgid ""
 "Tor uses a variety of different keys, with three goals in mind: 1)  "
 "encryption to ensure privacy of data within the Tor network, 2)  "
@@ -2967,7 +2966,7 @@
 "ten sam zestaw przekaźników sieci."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1362
+#: /home/runa/dev/website/docs/en/faq.wml:1362
 msgid ""
 "<b>Encryption</b>: first, all connections in Tor use TLS link encryption, so"
 " observers can't look inside to see which circuit a given cell is intended "
@@ -2985,7 +2984,7 @@
 "przekaźnika w celu odkrycia klucza nie podziała."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1372
+#: /home/runa/dev/website/docs/en/faq.wml:1372
 msgid ""
 "<b>Authentication</b>: Every Tor relay has a public decryption key called "
 "the \"onion key\".  When the Tor client establishes circuits, at each step "
@@ -3003,7 +3002,7 @@
 " w tygodniu."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1382
+#: /home/runa/dev/website/docs/en/faq.wml:1382
 msgid ""
 "<b>Coordination</b>: How do clients know what the relays are, and how do "
 "they know that they have the right keys for them? Each relay has a long-term"
@@ -3028,7 +3027,7 @@
 "innych przekaźników sieci."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1396
+#: /home/runa/dev/website/docs/en/faq.wml:1396
 msgid ""
 "How do clients know what the directory authorities are? The Tor software "
 "comes with a built-in list of location and public key for each directory "
@@ -3041,7 +3040,7 @@
 "sieci Tora jest danie im specjalnie zmodyfikowanej wersji programu."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1403
+#: /home/runa/dev/website/docs/en/faq.wml:1403
 msgid ""
 "How do users know they've got the right software? When we distribute the "
 "source code or a package, we digitally sign it with <a "
@@ -3056,7 +3055,7 @@
 "podpisów Tora</a>."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1411
+#: /home/runa/dev/website/docs/en/faq.wml:1411
 msgid ""
 "In order to be certain that it's really signed by us, you need to have met "
 "us in person and gotten a copy of our GPG key fingerprint, or you need to "
@@ -3071,17 +3070,17 @@
 "z bezpieczeństwem i zacząć poznawać ludzi."
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1418
+#: /home/runa/dev/website/docs/en/faq.wml:1418
 msgid "<hr> <a id=\"EntryGuards\"></a>"
 msgstr "<hr> <a id=\"EntryGuards\"></a>"
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1421
+#: /home/runa/dev/website/docs/en/faq.wml:1421
 msgid "<a class=\"anchor\" href=\"#EntryGuards\">What are Entry Guards?</a>"
 msgstr "<a class=\"anchor\" href=\"#EntryGuards\">Co to są Strażnicy Wejściowi?</a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1424
+#: /home/runa/dev/website/docs/en/faq.wml:1424
 msgid ""
 "Tor (like all current practical low-latency anonymity designs) fails when "
 "the attacker can see both ends of the communications channel. For example, "
@@ -3101,7 +3100,7 @@
 " na dwóch końcach."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1434
+#: /home/runa/dev/website/docs/en/faq.wml:1434
 msgid ""
 "So, what should we do? Suppose the attacker controls, or can observe, "
 "<i>C</i> relays. Suppose there are <i>N</i> relays total. If you select new "
@@ -3126,7 +3125,7 @@
 "tego typu napastnika."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1446
+#: /home/runa/dev/website/docs/en/faq.wml:1446
 msgid ""
 "The solution is \"entry guards\": each user selects a few relays at random "
 "to use as entry points, and uses only those relays for her first hop. If "
@@ -3148,7 +3147,7 @@
 "profilowania, a przedtem nie miał żadnych."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1457
+#: /home/runa/dev/website/docs/en/faq.wml:1457
 msgid ""
 "You can read more at <a href=\"http://freehaven.net/anonbib/#wright02\">An "
 "Analysis of the Degradation of Anonymous Protocols</a>, <a "
@@ -3167,7 +3166,7 @@
 "Servers</a> (Lokalizowanie Usług Ukrytych)."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1466
+#: /home/runa/dev/website/docs/en/faq.wml:1466
 msgid ""
 "Restricting your entry nodes may also help against attackers who want to run"
 " a few Tor nodes and easily enumerate all of the Tor user IP addresses. "
@@ -3185,12 +3184,12 @@
 "serwerów katalogowych\"."
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1474
+#: /home/runa/dev/website/docs/en/faq.wml:1474
 msgid "<hr> <a id=\"EverybodyARelay\"></a>"
 msgstr "<hr> <a id=\"EverybodyARelay\"></a>"
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1477
+#: /home/runa/dev/website/docs/en/faq.wml:1477
 msgid ""
 "<a class=\"anchor\" href=\"#EverybodyARelay\">You should make every Tor user"
 " be a relay.</a>"
@@ -3199,7 +3198,7 @@
 "użytkownik Tora był przekaźnikiem.</a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1480
+#: /home/runa/dev/website/docs/en/faq.wml:1480
 msgid ""
 "Requiring every Tor user to be a relay would help with scaling the network "
 "to handle all our users, and <a "
@@ -3225,7 +3224,7 @@
 "anonimowości."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1493
+#: /home/runa/dev/website/docs/en/faq.wml:1493
 msgid ""
 "That said, we do want to encourage Tor users to run relays, so what we "
 "really want to do is simplify the process of setting up and maintaining a "
@@ -3243,12 +3242,12 @@
 "zaoferować."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1502
+#: /home/runa/dev/website/docs/en/faq.wml:1502
 msgid "There are five steps we need to address before we can do this though:"
 msgstr "Jest jednak pięć kroków, którymi musimy się najpierw zająć:"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1506
+#: /home/runa/dev/website/docs/en/faq.wml:1506
 msgid ""
 "First, we need to make Tor stable as a relay on all common operating "
 "systems. The main remaining platform is Windows, and we plan to finally "
@@ -3263,7 +3262,7 @@
 "release\">naszego planu rozwojowego</a>."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1514
+#: /home/runa/dev/website/docs/en/faq.wml:1514
 msgid ""
 "Second, we still need to get better at automatically estimating the right "
 "amount of bandwidth to allow. See item #7 on the <a href=\"<page "
@@ -3283,7 +3282,7 @@
 "odpowiedzią."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1525
+#: /home/runa/dev/website/docs/en/faq.wml:1525
 msgid ""
 "Third, we need to work on scalability, both of the network (how to stop "
 "requiring that all Tor relays be able to connect to all Tor relays) and of "
@@ -3302,7 +3301,7 @@
 "szczegóły. Ponownie, transport UDP by tu pomógł."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1535
+#: /home/runa/dev/website/docs/en/faq.wml:1535
 msgid ""
 "Fourth, we need to better understand the risks from letting the attacker "
 "send traffic through your relay while you're also initiating your own "
@@ -3333,7 +3332,7 @@
 "zagrożenie i nauczyć się je łagodzić."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1551
+#: /home/runa/dev/website/docs/en/faq.wml:1551
 msgid ""
 "Fifth, we might need some sort of incentive scheme to encourage people to "
 "relay traffic for others, and/or to become exit nodes. Here are our <a "
@@ -3346,17 +3345,17 @@
 "Tora</a>."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1558
+#: /home/runa/dev/website/docs/en/faq.wml:1558
 msgid "Please help on all of these!"
 msgstr "Prosimy o pomoc przy każdym z tych punktów!"
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1561
+#: /home/runa/dev/website/docs/en/faq.wml:1561
 msgid "<hr> <a id=\"TransportIPnotTCP\"></a>"
 msgstr "<hr> <a id=\"TransportIPnotTCP\"></a>"
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1564
+#: /home/runa/dev/website/docs/en/faq.wml:1564
 msgid ""
 "<a class=\"anchor\" href=\"#TransportIPnotTCP\">You should transport all IP "
 "packets, not just TCP packets.</a>"
@@ -3365,7 +3364,7 @@
 "wszystkie pakiety IP, nie tylko pakiety TCP.</a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1567
+#: /home/runa/dev/website/docs/en/faq.wml:1567
 msgid ""
 "This would be handy, because it would make Tor better able to handle new "
 "protocols like VoIP, it could solve the whole need to socksify applications,"
@@ -3379,7 +3378,7 @@
 "otwartym."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1574
+#: /home/runa/dev/website/docs/en/faq.wml:1574
 msgid ""
 "We're heading in this direction: see <a "
 "href=\"https://trac.torproject.org/projects/tor/ticket/1855\">this trac "
@@ -3392,7 +3391,7 @@
 "trudnych problemów to:"
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1581
+#: /home/runa/dev/website/docs/en/faq.wml:1581
 msgid ""
 "IP packets reveal OS characteristics. We would still need to do IP-level "
 "packet normalization, to stop things like TCP fingerprinting attacks. Given "
@@ -3410,7 +3409,7 @@
 " jest dstarczenie własnego stosu TCP w przestrzeni użytkownika."
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1588
+#: /home/runa/dev/website/docs/en/faq.wml:1588
 msgid ""
 "Application-level streams still need scrubbing. We will still need user-side"
 " applications like Torbutton. So it won't become just a matter of capturing "
@@ -3421,7 +3420,7 @@
 "tylko kwestia przechwytywania pakietów i anonimizacji ich w warstwie IP."
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1592
+#: /home/runa/dev/website/docs/en/faq.wml:1592
 msgid ""
 "Certain protocols will still leak information. For example, we must rewrite "
 "DNS requests so they are delivered to an unlinkable DNS server rather than "
@@ -3434,7 +3433,7 @@
 "uzytkownika; tak więc musimy rozumieć protokoły, które transportujemy."
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1597
+#: /home/runa/dev/website/docs/en/faq.wml:1597
 msgid ""
 "<a "
 "href=\"http://crypto.stanford.edu/~nagendra/projects/dtls/dtls.html\">DTLS</a>"
@@ -3452,7 +3451,7 @@
 "na kasowanie pakietów, retransmisje itp."
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1604
+#: /home/runa/dev/website/docs/en/faq.wml:1604
 msgid ""
 "Exit policies for arbitrary IP packets mean building a secure IDS. Our node "
 "operators tell us that exit policies are one of the main reasons they're "
@@ -3484,7 +3483,7 @@
 "wysłać w sesji, zanim wybiorą swój węzeł wyjściowy!"
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1618
+#: /home/runa/dev/website/docs/en/faq.wml:1618
 msgid ""
 "The Tor-internal name spaces would need to be redesigned. We support hidden "
 "service \".onion\" addresses by intercepting the addresses when they are "
@@ -3498,12 +3497,12 @@
 "rozwiżaywaniem nazw DNS."
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1625
+#: /home/runa/dev/website/docs/en/faq.wml:1625
 msgid "<hr> <a id=\"Criminals\"></a>"
 msgstr "<hr> <a id=\"Criminals\"></a>"
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1628
+#: /home/runa/dev/website/docs/en/faq.wml:1628
 msgid ""
 "<a class=\"anchor\" href=\"#Criminals\">Doesn't Tor enable criminals to do "
 "bad things?</a>"
@@ -3512,7 +3511,7 @@
 "robienia złych rzeczy?</a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1631
+#: /home/runa/dev/website/docs/en/faq.wml:1631
 msgid ""
 "For the answer to this question and others, please see our <a href=\"<page "
 "docs/faq-abuse>\">Tor Abuse FAQ</a>."
@@ -3521,12 +3520,12 @@
 "/faq-abuse>\">FAQ o nadużyciach Tora</a>."
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1635
+#: /home/runa/dev/website/docs/en/faq.wml:1635
 msgid "<hr> <a id=\"RespondISP\"></a>"
 msgstr "<hr> <a id=\"RespondISP\"></a>"
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1638
+#: /home/runa/dev/website/docs/en/faq.wml:1638
 msgid ""
 "<a class=\"anchor\" href=\"#RespondISP\">How do I respond to my ISP about my"
 " exit relay?</a>"
@@ -3535,7 +3534,7 @@
 "Internetu o moim przekaźniku wyjściowym?</a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1641
+#: /home/runa/dev/website/docs/en/faq.wml:1641
 msgid ""
 "A collection of templates for successfully responding to ISPs is <a "
 "href=\"<wiki>TheOnionRouter/TorAbuseTemplates\">collected here</a>."

Modified: translation/trunk/projects/website/po/pl_PL/docs/2-medium.tor-doc-osx.po
===================================================================
--- translation/trunk/projects/website/po/pl_PL/docs/2-medium.tor-doc-osx.po	2011-04-12 16:15:00 UTC (rev 24594)
+++ translation/trunk/projects/website/po/pl_PL/docs/2-medium.tor-doc-osx.po	2011-04-12 16:19:31 UTC (rev 24595)
@@ -7,9 +7,9 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-02-12 12:20+0000\n"
-"PO-Revision-Date: 2011-03-28 13:05+0000\n"
-"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
+"POT-Creation-Date: 2011-03-28 12:48+0200\n"
+"PO-Revision-Date: 2011-04-03 12:04+0000\n"
+"Last-Translator: bogdrozd <bog.d at gazeta.pl>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,7 +18,7 @@
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:8
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:8
 msgid ""
 "<a href=\"<page index>\">Home &raquo; </a> <a href=\"<page "
 "docs/documentation>\">Documentation &raquo; </a> <a href=\"<page docs/tor-"
@@ -29,19 +29,19 @@
 "doc-osx>\">Klient na Mac OS X</a>"
 
 #. type: Content of: <div><div><h1>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:13
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:13
 msgid "Running the <a href=\"<page index>\">Tor</a> client on Mac OS X"
 msgstr "Uruchamianie klienta <a href=\"<page index>\">Tor</a> na Mac OS X"
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:14 /tmp/N9PceEMclo.xml:26
-#: /tmp/N9PceEMclo.xml:71 /tmp/N9PceEMclo.xml:104 /tmp/N9PceEMclo.xml:136
-#: /tmp/N9PceEMclo.xml:158
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:14 /tmp/dnqIbbGTnT.xml:26
+#: /tmp/dnqIbbGTnT.xml:71 /tmp/dnqIbbGTnT.xml:104 /tmp/dnqIbbGTnT.xml:136
+#: /tmp/dnqIbbGTnT.xml:158
 msgid "<br>"
 msgstr "<br>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:17
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:17
 msgid ""
 "<b>Note that these are the installation instructions for running a Tor "
 "client on Mac OS X. If you want to relay traffic for others to help the "
@@ -54,12 +54,12 @@
 "przekaźnika sieci Tor</a>.</b>"
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:23
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:23
 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-osx.wml:25
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:25
 msgid ""
 "<a class=\"anchor\" href=\"#installing\">Step One: Download and Install "
 "Tor</a>"
@@ -68,7 +68,7 @@
 "Tora</a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:29
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:29
 msgid ""
 "The install for Macintosh OS X bundles <a href=\"<page index>\">Tor</a>, <a "
 "href=\"<page projects/vidalia>\">Vidalia</a> (a graphical interface for "
@@ -76,25 +76,25 @@
 "href=\"http://www.pps.jussieu.fr/~jch/software/polipo/\">Polipo</a> (a web "
 "proxy)  into one package, with the four applications pre-configured to work "
 "together.  Download either the <a href=\"<page "
-"download/download>#tor\">stable</a> or the <a href=\"<page "
-"download/download>#tor\">experimental</a> version of the OS X bundle, or "
+"download/download>#mac\">stable</a> or the <a href=\"<page "
+"download/download>#mac\">experimental</a> version of the OS X bundle, or "
 "look for more options on the <a href=\"<page download/download>\">download "
 "page</a>."
 msgstr ""
 "Wersje instalacyjne dla Macintosh OS X zawierają <a href=\"<page "
 "index>\">Tora</a>, <a href=\"<page projects/vidalia>\">Vidalia</a> "
 "(graficzny interfejs dla Tora), <a href=\"<page "
-"torbutton/index>\">Torbutton</a>, i <a "
+"torbutton/index>\">Torbutton</a> i <a "
 "href=\"http://www.pps.jussieu.fr/~jch/software/polipo/\">Polipo</a> (serwer "
 "pośredniczący proxy) w jednej paczce, ze wszystkimi czterema programami "
 "prekonfigurowanymi do współpracy ze sobą. Pobierz albo <a href=\"<page "
-"download/download>#tor\">stabilną</a> albo <a href=\"<page "
-"download/download>#tor\">eksperymentalną</a> wersję paczki dla OS X na "
-"Intelach, lub poszukaj innych rozwiązań na <a href=\"<page "
-"download/download>\">stronie pobierania</a>."
+"download/download>#mac\">stabilną</a> albo <a href=\"<page "
+"download/download>#mac\">eksperymentalną</a> wersję paczki dla OS X lub "
+"poszukaj innych rozwiązań na <a href=\"<page download/download>\">stronie "
+"pobierania</a>."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:42
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:42
 msgid ""
 "Once you've downloaded the dmg, double-click and let it mount.  Browse to "
 "the now open Vidalia Bundle in Finder.  It's easy to install the bundle; "
@@ -111,7 +111,7 @@
 "Torbuttona ze strony z dodatkami Mozilli, wyszukując \"torbutton\"."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:49
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:49
 msgid ""
 "When you are finished installing, you can start Vidalia by selecting its "
 "icon from your Applications folder. A dark onion with a red X in your dock "
@@ -124,12 +124,12 @@
 "uruchomić Tora wybierając Start z menu \"Tor\" u góry ekranu."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:55
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:55
 msgid "When Tor is running, Vidalia's dock icon will look like the following:"
 msgstr "Gdy Tor działa, ikonka programu Vidalia wygląda następująco:"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:58
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:58
 msgid ""
 "<img alt=\"vidalia running tor\" src=\"$(IMGROOT)/screenshot-osx-"
 "vidalia.png\" />"
@@ -138,7 +138,7 @@
 "vidalia.png\" />"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:61
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:61
 msgid ""
 "Polipo is installed as part of the Tor bundle package installer. Once it is "
 "installed, it will start automatically when your computer is restarted.  You"
@@ -151,12 +151,12 @@
 "została zainstalowana jako część pakietu instalacyjnego."
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:68
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:68
 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-osx.wml:70
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:70
 msgid ""
 "<a class=\"anchor\" href=\"#using\">Step Two: Configure your applications to"
 " use Tor</a>"
@@ -165,7 +165,7 @@
 "używały Tora</a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:73
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:73
 msgid ""
 "After installing, you need to configure your applications to use them. The "
 "first step is to set up web browsing."
@@ -174,7 +174,7 @@
 "Pierwszym krokiem jest ustawienie sposobu przeglądania sieci WWW."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:76
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:76
 msgid ""
 "You should use Tor with Firefox and Torbutton, for best safety.  Torbutton "
 "was installed for you.  Click on the red \"Tor Disabled\" toggle button to "
@@ -186,7 +186,7 @@
 "gotowe:"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:80
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:80
 msgid ""
 "<img alt=\"Torbutton plugin for Firefox\" src=\"$(IMGROOT)/screenshot-"
 "torbutton.png\" />"
@@ -195,7 +195,7 @@
 ")/screenshot-torbutton.png\" />"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:83
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:83
 msgid ""
 "If you plan to run Firefox on a different computer than Tor, see the <a "
 "href=\"<wikifaq>#SocksListenAddress\">FAQ entry for running Tor on a "
@@ -206,7 +206,7 @@
 "uruchamiania Tora na innym komputerze</a>."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:87
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:87
 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 "
@@ -228,7 +228,7 @@
 "href=\"http://www.dest-unreach.org/socat/\">socat</a>."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:97
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:97
 msgid ""
 "For information on how to Torify other applications, check out the <a "
 "href=\"<wiki>/TheOnionRouter/TorifyHOWTO\">Torify HOWTO</a>."
@@ -237,19 +237,19 @@
 "href=\"<wiki>/TheOnionRouter/TorifyHOWTO\">Torify HOWTO</a>."
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:101
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:101
 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-osx.wml:103
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:103
 msgid "<a class=\"anchor\" href=\"#verify\">Step Three: Make sure it's working</a>"
 msgstr ""
 "<a class=\"anchor\" href=\"#verify\">Krok 3: Upewnij się, że wszystko "
 "działa</a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:107
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:107
 msgid ""
 "Next, you should try using your browser with Tor and make sure that your IP "
 "address is being anonymized. Click on <a "
@@ -266,7 +266,7 @@
 "by poznać więcej sposobów na testowanie swojego Tora.)"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:115
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:115
 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"
@@ -281,7 +281,7 @@
 "czym przeczytaj <a href=\"<wikifaq>#FirewalledClient\">ten wpis do FAQ</a>."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:124
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:124
 msgid ""
 "If it's still not working, look at <a href=\"<page "
 "docs/faq>#DoesntWork\">this FAQ entry</a> for hints."
@@ -290,7 +290,7 @@
 " wpis FAQ</a>, by poszukać wskazówek."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:128
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:128
 msgid ""
 "Once it's working, learn more about <a href=\"<page "
 "download/download>#Warning\">what Tor does and does not offer</a>."
@@ -299,19 +299,19 @@
 "download/download>#Warning\">co Tor oferuje, a czego nie</a>."
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:132
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:132
 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-osx.wml:135
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:135
 msgid "<a class=\"anchor\" href=\"#relay\">Step Four: Configure it as a relay</a>"
 msgstr ""
 "<a class=\"anchor\" href=\"#relay\">Krok 4: Konfiguracja Tora jako "
 "przekaźnika sieci</a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:138
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:138
 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 "
@@ -329,7 +329,7 @@
 "oraz obsługą dynamicznych adresów IP."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:146
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:146
 msgid ""
 "Having relays in many different places on the Internet is what makes Tor "
 "users secure. <a href=\"<wikifaq>#RelayAnonymity\">You may also get stronger"
@@ -343,7 +343,7 @@
 "zostało przekierowane z innych."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:152
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:152
 msgid ""
 "Read more at our <a href=\"<page docs/tor-doc-relay>\">Configuring a "
 "relay</a> guide."
@@ -352,17 +352,17 @@
 "relay>\">Konfiguracji przekaźnika sieci Tor</a>."
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:155
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:155
 msgid "<hr> <a id=\"uninstall\"></a>"
 msgstr "<hr> <a id=\"uninstall\"></a>"
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:157
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:157
 msgid "<a class=\"anchor\" href=\"#uninstall\">How To Uninstall Tor and Polipo</a>"
 msgstr "<a class=\"anchor\" href=\"#uninstall\">Jak odinstalować Tora i Polipo</a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:160
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:160
 msgid ""
 "There are two ways to uninstall the bundle from your computer, using Finder "
 "or a command line or Terminal-based uninstaller.  If you want to remove Tor "
@@ -373,7 +373,7 @@
 "(Terminala). Jeśli chcesz usunąć Tora z systemu OSX, oto jak to zrobić:"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:164
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:164
 msgid ""
 "Change your application proxy settings back to their original values.  If "
 "you just want to stop using Tor, you can end at this point."
@@ -382,7 +382,7 @@
 "chcesz tylko przestać używać Tora, możesz przerwać na tym kroku."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:168
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:168
 msgid ""
 "If you want to completely remove Tor, and your account has Admin Privileges,"
 " then proceed as follows:"
@@ -391,33 +391,33 @@
 "wykonaj co następuje:"
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:172
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:172
 msgid "Open Finder and click on Applications."
 msgstr "Otwórz Findera i kliknij Aplikacje."
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:173
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:173
 msgid "Drag /Applications/Vidalia to the Trash."
 msgstr "Przeciągnij /Applications/Vidalia do Kosza."
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:174
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:174
 msgid "Remove /Library/Torbutton from your system."
 msgstr "Usuń /Library/Torbutton z systemu."
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:175
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:175
 msgid ""
 "In your User or home directory, go to Library, remove the Vidalia directory"
 msgstr "W swoim katalogu domowym przejdź do Library, usuń katalog Vidalia"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:179
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:179
 msgid "Tor, Vidalia, and Polipo are now completely removed from your system."
 msgstr "Tor, Vidalia i Polipo są teraz całkowicie usunięte z systemu."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:181
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:181
 msgid ""
 "If you're familiar with the command line or Terminal, you can manually type "
 "the following:"
@@ -426,32 +426,32 @@
 "komendy:"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:184
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:184
 msgid "rm -r /Applications/Vidalia.app"
 msgstr "rm -r /Applications/Vidalia.app"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:185
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:185
 msgid "rm -r /Library/Torbutton"
 msgstr "rm -r /Library/Torbutton"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:186
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:186
 msgid "rm -r ~/Library/Vidalia"
 msgstr "rm -r ~/Library/Vidalia"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:187
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:187
 msgid "rm -r ~/.tor"
 msgstr "rm -r ~/.tor"
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:190
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:190
 msgid "<hr>"
 msgstr "<hr>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:192
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:192
 msgid ""
 "If you have suggestions for improving this document, please <a href=\"<page "
 "about/contact>\">send them to us</a>. Thanks!"

Modified: translation/trunk/projects/website/po/pl_PL/docs/2-medium.tor-doc-relay.po
===================================================================
--- translation/trunk/projects/website/po/pl_PL/docs/2-medium.tor-doc-relay.po	2011-04-12 16:15:00 UTC (rev 24594)
+++ translation/trunk/projects/website/po/pl_PL/docs/2-medium.tor-doc-relay.po	2011-04-12 16:19:31 UTC (rev 24595)
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-02-12 12:20+0000\n"
-"PO-Revision-Date: 2011-03-22 16:29+0000\n"
+"POT-Creation-Date: 2011-03-28 12:48+0200\n"
+"PO-Revision-Date: 2011-04-03 12:07+0000\n"
 "Last-Translator: bogdrozd <bog.d at gazeta.pl>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
@@ -18,7 +18,7 @@
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:8
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:8
 msgid ""
 "<a href=\"<page index>\">Home &raquo; </a> <a href=\"<page "
 "docs/documentation>\">Documentation &raquo; </a> <a href=\"<page docs/tor-"
@@ -29,17 +29,17 @@
 "doc-relay>\">Configure Tor Relay</a>"
 
 #. type: Content of: <div><div><h1>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:14
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:14
 msgid "Configuring a Tor relay"
 msgstr "Konfiguracja przekaźnika Tora"
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:16 /tmp/eKLg46HT7B.xml:275
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:16 /tmp/ogZUlgnLzH.xml:275
 msgid "<hr>"
 msgstr "<hr>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:19
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:19
 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 "
@@ -59,41 +59,40 @@
 "IP</a>."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:28
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:28
 msgid ""
-"You can run a Tor relay on <a href=\"<wikifaq>#RelayOS\">pretty much any</a>"
-" operating system. Tor relays work best on Linux, OS X Tiger or later, "
-"FreeBSD 5.x+, NetBSD 5.x+, and Windows Server 2003 or later."
+"You can run a Tor relay on pretty much any operating system. Tor relays work"
+" best on Linux, OS X Tiger or later, FreeBSD 5.x+, NetBSD 5.x+, and Windows "
+"Server 2003 or later."
 msgstr ""
-"Możesz uruchomić przekaźnik sieci Tora na <a "
-"href=\"<wikifaq>#RelayOS\">prawie każdym</a> systemie operacyjnym. "
-"Przekaźniki Tora działają najlepiej na systemach Linux, OS X Tiger lub "
-"późniejszym, FreeBSD 5.x+, NetBSD 5.x+ oraz Windows Server 2003 lub "
-"późniejszym."
+"Możesz uruchomić przekaźnik sieci Tora na prawie każdym systemie "
+"operacyjnym. Przekaźniki Tora działają najlepiej na systemach Linux, OS X "
+"Tiger lub późniejszym, FreeBSD 5.x+, NetBSD 5.x+ oraz Windows Server 2003 "
+"lub późniejszym."
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:33
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:33
 msgid "<hr> <a id=\"zero\"></a> <a id=\"install\"></a>"
 msgstr "<hr> <a id=\"zero\"></a> <a id=\"install\"></a>"
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:36
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:36
 msgid "<a class=\"anchor\" href=\"#install\">Step One: Download and Install Tor</a>"
 msgstr "<a class=\"anchor\" href=\"#install\">Krok 1: Pobranie i instalacja Tora</a>"
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:37 /tmp/eKLg46HT7B.xml:52
-#: /tmp/eKLg46HT7B.xml:141 /tmp/eKLg46HT7B.xml:165
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:37 /tmp/ogZUlgnLzH.xml:52
+#: /tmp/ogZUlgnLzH.xml:141 /tmp/ogZUlgnLzH.xml:165
 msgid "<br>"
 msgstr "<br>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:39
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:39
 msgid "Before you start, you need to make sure that Tor is up and running."
 msgstr "Zanim zaczniesz, upewnij się, że Tor jest uruchomiony i działa."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:42
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:42
 msgid ""
 "Visit our <a href=\"<page download/download>\">download page</a> and install"
 " the \"Installation Bundle\" for your OS."
@@ -102,7 +101,7 @@
 "zainstaluj \"Paczkę Instalacyjną\" dla swojego systemu."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:46
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:46
 msgid ""
 "If it's convenient, you might also want to use it as a client for a while to"
 " make sure it's actually working."
@@ -111,19 +110,19 @@
 " jakiś czas, by upewnić się, czy rzeczywiście działa."
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:49
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:49
 msgid "<hr> <a id=\"setup\"></a>"
 msgstr "<hr> <a id=\"setup\"></a>"
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:51
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:51
 msgid "<a class=\"anchor\" href=\"#setup\">Step Two: Set it up as a relay</a>"
 msgstr ""
 "<a class=\"anchor\" href=\"#setup\">Krok 2: Ustawienie Tora jako przekaźnika"
 " sieci</a>"
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:54
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:54
 msgid ""
 "Verify that your clock and timezone are set correctly. If possible, "
 "synchronize your clock with public <a "
@@ -136,12 +135,12 @@
 "czasu</a>."
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:60
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:60
 msgid "<strong>Manual Configuration</strong>:"
 msgstr "<strong>Konfiguracja ręczna</strong>:"
 
 #. type: Content of: <div><div><ol><li><ul><li>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:62
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:62
 msgid ""
 "Edit the bottom part of <a href=\"<page docs/faq>#torrc\">your torrc "
 "file</a>. If you want to be a public relay (recommended), make sure to "
@@ -160,12 +159,12 @@
 "docs/bridges>#RunningABridge\">tych linii</a>."
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:72
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:72
 msgid "<strong>Configuring Tor with the Vidalia Graphical Interface</strong>:"
 msgstr "<strong>Konfiguracja Tora z Interfejsem Graficznym Vidalia</strong>:"
 
 #. type: Content of: <div><div><ol><li><ol><li><dt>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:76
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:76
 msgid ""
 "Right click on the Vidalia icon in your task bar.  Choose <tt>Control "
 "Panel</tt>."
@@ -174,7 +173,7 @@
 "<tt>Control Panel</tt> (Panel sterowania)."
 
 #. type: Content of: <div><div><ol><li><ol><li><dd>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:77
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:77
 msgid ""
 "<img alt=\"vidalia right click menu\" src=\"$(IMGROOT)/screenshot-"
 "win32-vidalia.png\" />"
@@ -183,12 +182,12 @@
 ")/screenshot-win32-vidalia.png\" />"
 
 #. type: Content of: <div><div><ol><li><ol><li>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:80
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:80
 msgid "Click <tt>Setup Relaying</tt>."
 msgstr "Klinkij <tt>Setup Relaying</tt> (Uruchomienie przekazywania)."
 
 #. type: Content of: <div><div><ol><li><ol><li><dt>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:83
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:83
 msgid ""
 "Choose <tt>Relay Traffic for the Tor network</tt> if you want to be a public"
 " relay (recommended), or choose <tt>Help censored users reach the Tor "
@@ -204,7 +203,7 @@
 "cenzurujących swój Internet."
 
 #. type: Content of: <div><div><ol><li><ol><li><dd>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:88
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:88
 msgid ""
 "<img alt=\"vidalia basic settings\" src=\"$(IMGROOT)/screenshot-win32"
 "-configure-relay-1.png\" />"
@@ -213,7 +212,7 @@
 ")/screenshot-win32-configure-relay-1.png\" />"
 
 #. type: Content of: <div><div><ol><li><ol><li>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:91
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:91
 msgid ""
 "Enter a nickname for your relay, and enter contact information in case we "
 "need to contact you about problems."
@@ -222,7 +221,7 @@
 "razie gdybyśmy musieli skontaktować się z Tobą w przypadku problemów."
 
 #. type: Content of: <div><div><ol><li><ol><li>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:94
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:94
 msgid ""
 "Leave <tt>Attempt to automatically configure port forwarding</tt> clicked.  "
 "Push the <tt>Test</tt> button to see if it works.  If it does work, great.  "
@@ -234,7 +233,7 @@
 "nie, spójrz na punkt numer 3 poniżej."
 
 #. type: Content of: <div><div><ol><li><ol><li><dt>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:98
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:98
 msgid ""
 "Choose the <tt>Bandwidth Limits</tt> tab.  Select how much bandwidth you "
 "want to provide for Tor users like yourself."
@@ -243,7 +242,7 @@
 "przepustowości łącza chcesz dać uzytkownikom Tora, takim jak Ty."
 
 #. type: Content of: <div><div><ol><li><ol><li><dd>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:99
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:99
 msgid ""
 "<img alt=\"vidalia bandwidth limits\" src=\"$(IMGROOT)/screenshot-win32"
 "-configure-relay-2.png\" />"
@@ -252,7 +251,7 @@
 ")/screenshot-win32-configure-relay-2.png\" />"
 
 #. type: Content of: <div><div><ol><li><ol><li><dt>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:102
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:102
 msgid ""
 "Choose the <tt>Exit Policies</tt> tab.  If you want to allow others to use "
 "your relay for these services, don't change anything.  Un-check the services"
@@ -267,7 +266,7 @@
 "chcesz być przekaźnikiem nie-wyjściowym, wyłącz wszystkie usługi."
 
 #. type: Content of: <div><div><ol><li><ol><li><dd>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:107
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:107
 msgid ""
 "<img alt=\"vidalia exit policies\" src=\"$(IMGROOT)/screenshot-win32"
 "-configure-relay-3.png\" />"
@@ -276,7 +275,7 @@
 ")/screenshot-win32-configure-relay-3.png\" />"
 
 #. type: Content of: <div><div><ol><li><ol><li>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:110
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:110
 msgid ""
 "Click the <tt>Ok</tt> button.  See Step Three below for confirmation that "
 "the relay is working correctly."
@@ -285,7 +284,7 @@
 " że przekaźnik działa prawidłowo."
 
 #. type: Content of: <div><div><ol><li><li>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:114
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:114
 msgid ""
 "If you are using a firewall, open a hole in your firewall so incoming "
 "connections can reach the ports you configured (ORPort, plus DirPort if you "
@@ -303,7 +302,7 @@
 "przekaźnik mógł dotrzeć do innych przekaźników Tora."
 
 #. type: Content of: <div><div><ol><li><li>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:123
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:123
 msgid ""
 "Restart your relay. If it <a href=\"<page docs/faq>#Logs\">logs any "
 "warnings</a>, address them."
@@ -312,7 +311,7 @@
 "docs/faq>#Logs\">wypisze jakieś ostrzeżenia</a>, zajmij się nimi."
 
 #. type: Content of: <div><div><ol><li><li>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:128
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:128
 msgid ""
 "Subscribe to the <a href=\"http://archives.seul.org/or/announce/\">or-"
 "announce</a> mailing list. It is very low volume, and it will keep you "
@@ -327,19 +326,19 @@
 "docs/documentation>#MailingLists\">listy Tora o większym ruchu</a>. "
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:138
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:138
 msgid "<hr> <a id=\"check\"></a>"
 msgstr "<hr> <a id=\"check\"></a>"
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:140
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:140
 msgid "<a class=\"anchor\" href=\"#check\">Step Three: Make sure it is working</a>"
 msgstr ""
 "<a class=\"anchor\" href=\"#check\">Krok 3: Sprawdzenie, czy wszystko "
 "działa</a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:143
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:143
 msgid ""
 "As soon as your relay manages to connect to the network, it will try to "
 "determine whether the ports you configured are reachable from the outside. "
@@ -360,7 +359,7 @@
 "zobaczyć, czy sprawdza ten IP i port, który powinien sprawdzać etc."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:153
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:153
 msgid ""
 "When it decides that it's reachable, it will upload a \"server descriptor\" "
 "to the directories, to let clients know what address, ports, keys, etc your "
@@ -380,22 +379,22 @@
 "serwerów."
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:162
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:162
 msgid "<hr> <a id=\"after\"></a>"
 msgstr "<hr> <a id=\"after\"></a>"
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:164
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:164
 msgid "<a class=\"anchor\" href=\"#after\">Step Four: Once it is working</a>"
 msgstr "<a class=\"anchor\" href=\"#after\">Krok 4: Gdy już wszystko działa</a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:168
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:168
 msgid "We recommend the following steps as well:"
 msgstr "Zalecamy też następujące kroki:"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:172
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:172
 msgid ""
 "6. Read <a href=\"<wiki>TheOnionRouter/OperationalSecurity\">about "
 "operational security</a> to get ideas how you can increase the security of "
@@ -406,7 +405,7 @@
 "bezpieczeństwo swojego przekaźnika."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:178
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:178
 msgid ""
 "7. If you want to run more than one relay that's great, but please set <a "
 "href=\"<page docs/faq>#MultipleRelays\">the MyFamily option</a> in all your "
@@ -417,7 +416,7 @@
 "MyFamily</a> w plikach konfiguracyjnych wszystkich Twoich przekaźników."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:184
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:184
 msgid ""
 "8. Decide about rate limiting. Cable modem, DSL, and other users who have "
 "asymmetric bandwidth (e.g. more down than up) should rate limit to their "
@@ -431,7 +430,7 @@
 "temat ograniczania przepustowości</a>."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:192
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:192
 msgid ""
 "9. Back up your Tor relay's private key (stored in \"keys/secret_id_key\" in"
 " your DataDirectory). This is your relay's \"identity,\" and you need to "
@@ -449,7 +448,7 @@
 "Tora</a> jeśli coś pójdzie nie tak."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:202
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:202
 msgid ""
 "10. If you control the name servers for your domain, consider setting your "
 "reverse DNS hostname to 'anonymous-relay', 'proxy' or 'tor-proxy', so when "
@@ -468,7 +467,7 @@
 "Ciebie lub Twojego ISP, jeśli prowadzisz węzeł wyjściowy Tora."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:213
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:213
 msgid ""
 "11. If your computer isn't running a webserver, please consider changing "
 "your ORPort to 443 and your DirPort to 80. Many Tor users are stuck behind "
@@ -494,7 +493,7 @@
 "tak chcesz pomóc, to innymi użytecznymi portami są 22, 110 i 143."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:228
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:228
 msgid ""
 "12. If your Tor relay provides other services on the same IP address &mdash;"
 " such as a public webserver &mdash; make sure that connections to the "
@@ -515,7 +514,7 @@
 "jawnie wykluczyć je w swojej polityce wyjścia."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:239
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:239
 msgid ""
 "13. (Unix only). Make a separate user to run the relay. If you installed the"
 " OS X package or the deb or the rpm, this is already done. Otherwise, you "
@@ -536,7 +535,7 @@
 "środowisku</a>.)"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:250
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:250
 msgid ""
 "14. (Unix only.) Your operating system probably limits the number of open "
 "file descriptors per process to 1024 (or even less). If you plan to be "
@@ -557,7 +556,7 @@
 "uruchamiasz go sam)."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:260
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:260
 msgid ""
 "15. If you installed Tor via some package or installer, it probably starts "
 "Tor for you automatically on boot. But if you installed from source, you may"
@@ -569,7 +568,7 @@
 "inicjalizacyjne contrib/tor.sh lub contrib/torctl."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:266
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:266
 msgid ""
 "When you change your Tor configuration, remember to verify that your relay "
 "still works correctly after the change. Be sure to set your \"ContactInfo\" "
@@ -589,7 +588,7 @@
 " pomagasz rosnąć sieci Tora!"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:277
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:277
 msgid ""
 "If you have suggestions for improving this document, please <a href=\"<page "
 "about/contact>\">send them to us</a>. Thanks!"

Modified: translation/trunk/projects/website/po/pl_PL/getinvolved/4-optional.volunteer.po
===================================================================
--- translation/trunk/projects/website/po/pl_PL/getinvolved/4-optional.volunteer.po	2011-04-12 16:15:00 UTC (rev 24594)
+++ translation/trunk/projects/website/po/pl_PL/getinvolved/4-optional.volunteer.po	2011-04-12 16:19:31 UTC (rev 24595)
@@ -7,9 +7,9 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-03-25 16:51+0000\n"
-"PO-Revision-Date: 2011-03-28 13:21+0000\n"
-"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
+"POT-Creation-Date: 2011-03-28 12:49+0200\n"
+"PO-Revision-Date: 2011-04-03 12:46+0000\n"
+"Last-Translator: bogdrozd <bog.d at gazeta.pl>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,7 +18,7 @@
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:8
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:8
 msgid ""
 "<a href=\"<page index>\">Home &raquo; </a> <a href=\"<page "
 "getinvolved/volunteer>\">Volunteer</a>"
@@ -27,12 +27,12 @@
 "getinvolved/volunteer>\">Ochotnicy &raquo; </a>"
 
 #. type: Content of: <div><div><h1>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:13
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:13
 msgid "A few things everyone can do now:"
 msgstr "Kilka rzeczy, które każdy może zrobić już teraz:"
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:15
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:15
 msgid ""
 "Please consider <a href=\"<page docs/tor-doc-relay>\">running a relay</a> to"
 " help the Tor network grow."
@@ -41,7 +41,7 @@
 "przekaźnika sieci Tor</a>, by wspomóc rozwój sieci Tora."
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:17
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:17
 msgid ""
 "Tell your friends! Get them to run relays. Get them to run hidden services. "
 "Get them to tell their friends."
@@ -50,7 +50,7 @@
 "ukryte. Spraw, by mówili o systemie Tor swoim znajomym."
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:19
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:19
 msgid ""
 "If you like Tor's goals, please <a href=\"<page donate/donate>\">take a "
 "moment to donate to support further Tor development</a>. We're also looking "
@@ -65,7 +65,7 @@
 "anonimowością / prywatnością / bezpieczną komunikacją, daj im znać o nas."
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:24
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:24
 msgid ""
 "We're looking for more <a href=\"<page about/torusers>\">good examples of "
 "Tor users and Tor use cases</a>. If you use Tor for a scenario or purpose "
@@ -78,7 +78,7 @@
 "podzieleniu się z nami tym sposobem, z chęcią przyjmiemy taką wiadomość."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:30
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:30
 msgid ""
 "Tor has <a href=\"<page getinvolved/open-positions>\">two open "
 "positions</a>.  Please <a href=\"<page about/contact>\">contact us</a> if "
@@ -89,17 +89,17 @@
 "masz kwalifikacje!"
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:33
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:33
 msgid "<a id=\"Documentation\"></a>"
 msgstr "<a id=\"Documentation\"></a>"
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:34
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:34
 msgid "<a class=\"anchor\" href=\"#Documentation\">Documentation</a>"
 msgstr "<a class=\"anchor\" href=\"#Documentation\">Dokumentacja</a>"
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:36
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:36
 msgid ""
 "Help translate the web page and documentation into other languages. See the "
 "<a href=\"<page getinvolved/translation>\">translation guidelines</a> if you"
@@ -112,7 +112,7 @@
 "wielu użytkowników Tora w cenzorowanych obszarach."
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:40
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:40
 msgid ""
 "Evaluate and document <a "
 "href=\"https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorifyHOWTO\">our"
@@ -123,7 +123,7 @@
 " listę programów</a>, które można skonfigurować do pracy z Torem."
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:43
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:43
 msgid ""
 "We have a huge list of <a "
 "href=\"https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/SupportPrograms\">potentially"
@@ -137,30 +137,18 @@
 " wyniki."
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:49
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:49
 msgid "<a id=\"Advocacy\"></a>"
 msgstr "<a id=\"Advocacy\"></a>"
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:50
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:50
 msgid "<a class=\"anchor\" href=\"#Advocacy\">Advocacy</a>"
 msgstr "<a class=\"anchor\" href=\"#Advocacy\">Pokazanie się jako zwolennik Tora</a>"
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:52
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:52
 msgid ""
-"Create a <a "
-"href=\"https://trac.torproject.org/projects/tor/wiki/CommunityLogos\">community"
-" logo</a> under a Creative Commons license that all can use and modify."
-msgstr ""
-"Stwórz <a "
-"href=\"https://trac.torproject.org/projects/tor/wiki/CommunityLogos\">logo "
-"społeczności</a> pod licencją Creative Commons, którego wszyscy będą mogli "
-"używać i modyfikować."
-
-#. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:55
-msgid ""
 "Create a presentation that can be used for various user group meetings "
 "around the world."
 msgstr ""
@@ -168,7 +156,7 @@
 "na całym świecie."
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:57
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:54
 msgid ""
 "Create a video about the positive uses of Tor, what Tor is, or how to use "
 "it.  Some have already started on <a "
@@ -185,7 +173,7 @@
 "href=\"http://www.youtube.com/thetorproject\">Youtube</a>."
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:63
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:60
 msgid ""
 "Create a poster, or a set of posters, around a theme, such as \"Tor for "
 "Freedom!\"."
@@ -194,7 +182,7 @@
 "to Wolność!\""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:65
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:62
 msgid ""
 "Create a t-shirt design that incorporates \"Congratulations! You are using "
 "Tor!\" in any language."
@@ -203,17 +191,17 @@
 "dowolnym języku."
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:69
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:66
 msgid "<a id=\"Projects\"></a>"
 msgstr "<a id=\"Projects\"></a>"
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:70
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:67
 msgid "<a class=\"anchor\" href=\"#Projects\">Projects</a>"
 msgstr "<a class=\"anchor\" href=\"#Projects\">Projekty</a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:73
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:70
 msgid ""
 "Below are a list of Tor related projects we're developing and/or "
 "maintaining. Most discussions happen on IRC so if you're interested in any "
@@ -230,326 +218,326 @@
 " są akurat aktywni."
 
 #. type: Content of: <div><div><table><tr><th>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:83
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:80
 msgid "Name"
 msgstr "Nazwa"
 
 #. type: Content of: <div><div><table><tr><th>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:84
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:81
 msgid "Category"
 msgstr "Kategoria"
 
 #. type: Content of: <div><div><table><tr><th>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:85
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:82
 msgid "Language"
 msgstr "Język"
 
 #. type: Content of: <div><div><table><tr><th>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:86
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:83
 msgid "Activity"
 msgstr "Aktywność"
 
 #. type: Content of: <div><div><table><tr><th>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:87
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:84
 msgid "Contributors"
 msgstr "Wkład"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:91
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:88
 msgid "<a href=\"#project-tor\">Tor</a>"
 msgstr "<a href=\"#project-tor\">Tor</a>"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:92
-#: /tmp/OzLkyddxSC.xml:100
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:89
+#: /tmp/qxq11tAO2x.xml:97
 msgid "Core"
 msgstr "Główny"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:93
-#: /tmp/OzLkyddxSC.xml:125
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:90
+#: /tmp/qxq11tAO2x.xml:122
 msgid "C"
 msgstr "C"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:94
-#: /tmp/OzLkyddxSC.xml:118 /tmp/OzLkyddxSC.xml:150 /tmp/OzLkyddxSC.xml:190
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:91
+#: /tmp/qxq11tAO2x.xml:115 /tmp/qxq11tAO2x.xml:147 /tmp/qxq11tAO2x.xml:187
 msgid "Heavy"
 msgstr "Dużo"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:95
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:92
 msgid "nickm, arma, Sebastian"
 msgstr "nickm, arma, Sebastian"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:99
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:96
 msgid "*<a href=\"#project-jtor\">JTor</a>"
 msgstr "*<a href=\"#project-jtor\">JTor</a>"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:101
-#: /tmp/OzLkyddxSC.xml:157 /tmp/OzLkyddxSC.xml:189
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:98
+#: /tmp/qxq11tAO2x.xml:154 /tmp/qxq11tAO2x.xml:186
 msgid "Java"
 msgstr "Java"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:102
-#: /tmp/OzLkyddxSC.xml:198 /tmp/OzLkyddxSC.xml:222 /tmp/OzLkyddxSC.xml:246
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:99
+#: /tmp/qxq11tAO2x.xml:195 /tmp/qxq11tAO2x.xml:219 /tmp/qxq11tAO2x.xml:243
 msgid "None"
 msgstr "Brak"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:107
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:104
 msgid "<a href=\"#project-tbb\">TBB</a>"
 msgstr "<a href=\"#project-tbb\">TBB</a>"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:108
-#: /tmp/OzLkyddxSC.xml:116 /tmp/OzLkyddxSC.xml:124 /tmp/OzLkyddxSC.xml:132
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:105
+#: /tmp/qxq11tAO2x.xml:113 /tmp/qxq11tAO2x.xml:121 /tmp/qxq11tAO2x.xml:129
 msgid "Usability"
 msgstr "Uzyteczność"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:109
-#: /tmp/OzLkyddxSC.xml:117 /tmp/OzLkyddxSC.xml:133
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:106
+#: /tmp/qxq11tAO2x.xml:114 /tmp/qxq11tAO2x.xml:130
 msgid "Sys Admin"
 msgstr "Sys Admin"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:110
-#: /tmp/OzLkyddxSC.xml:158 /tmp/OzLkyddxSC.xml:166 /tmp/OzLkyddxSC.xml:230
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:107
+#: /tmp/qxq11tAO2x.xml:155 /tmp/qxq11tAO2x.xml:163 /tmp/qxq11tAO2x.xml:227
 msgid "Moderate"
 msgstr "Średnia"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:111
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:108
 msgid "Erinn"
 msgstr "Erinn"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:115
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:112
 msgid "<a href=\"#project-tails\">Tails</a>"
 msgstr "<a href=\"#project-tails\">Tails</a>"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:119
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:116
 msgid "<a href=\"https://tails.boum.org/chat/\">#tails</a>"
 msgstr "<a href=\"https://tails.boum.org/chat/\">#tails</a>"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:123
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:120
 msgid "<a href=\"#project-torsocks\">Torsocks</a>"
 msgstr "<a href=\"#project-torsocks\">Torsocks</a>"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:126
-#: /tmp/OzLkyddxSC.xml:134 /tmp/OzLkyddxSC.xml:142 /tmp/OzLkyddxSC.xml:174
-#: /tmp/OzLkyddxSC.xml:182 /tmp/OzLkyddxSC.xml:206 /tmp/OzLkyddxSC.xml:214
-#: /tmp/OzLkyddxSC.xml:238
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:123
+#: /tmp/qxq11tAO2x.xml:131 /tmp/qxq11tAO2x.xml:139 /tmp/qxq11tAO2x.xml:171
+#: /tmp/qxq11tAO2x.xml:179 /tmp/qxq11tAO2x.xml:203 /tmp/qxq11tAO2x.xml:211
+#: /tmp/qxq11tAO2x.xml:235
 msgid "Light"
 msgstr "Mało"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:127
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:124
 msgid "mwenge"
 msgstr "mwenge"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:131
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:128
 msgid "*<a href=\"#project-torouter\">Torouter</a>"
 msgstr "*<a href=\"#project-torouter\">Torouter</a>"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:135
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:132
 msgid "ioerror, Runa"
 msgstr "ioerror, Runa"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:139
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:136
 msgid "<a href=\"#project-vidalia\">Vidalia</a>"
 msgstr "<a href=\"#project-vidalia\">Vidalia</a>"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:140
-#: /tmp/OzLkyddxSC.xml:148 /tmp/OzLkyddxSC.xml:156
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:137
+#: /tmp/qxq11tAO2x.xml:145 /tmp/qxq11tAO2x.xml:153
 msgid "User Interface"
 msgstr "Interfejs użytkownika"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:141
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:138
 msgid "C++, Qt"
 msgstr "C++, Qt"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:143
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:140
 msgid "chiiph"
 msgstr "chiiph"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:147
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:144
 msgid "<a href=\"#project-arm\">Arm</a>"
 msgstr "<a href=\"#project-arm\">Arm</a>"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:149
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:146
 msgid "Python, Curses"
 msgstr "Python, Curses"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:151
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:148
 msgid "atagar"
 msgstr "atagar"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:155
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:152
 msgid "<a href=\"#project-orbot\">Orbot</a>"
 msgstr "<a href=\"#project-orbot\">Orbot</a>"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:159
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:156
 msgid "n8fr8"
 msgstr "n8fr8"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:163
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:160
 msgid "<a href=\"#project-torbutton\">Torbutton</a>"
 msgstr "<a href=\"#project-torbutton\">Torbutton</a>"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:164
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:161
 msgid "Browser Add-on"
 msgstr "Dodatek do przeglądarki"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:165
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:162
 msgid "Javascript"
 msgstr "Javascript"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:167
-#: /tmp/OzLkyddxSC.xml:183 /tmp/OzLkyddxSC.xml:239
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:164
+#: /tmp/qxq11tAO2x.xml:180 /tmp/qxq11tAO2x.xml:236
 msgid "mikeperry"
 msgstr "mikeperry"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:171
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:168
 msgid "*<a href=\"#project-thandy\">Thandy</a>"
 msgstr "*<a href=\"#project-thandy\">Thandy</a>"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:172
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:169
 msgid "Updater"
 msgstr "Aktualizator"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:173
-#: /tmp/OzLkyddxSC.xml:181 /tmp/OzLkyddxSC.xml:205 /tmp/OzLkyddxSC.xml:213
-#: /tmp/OzLkyddxSC.xml:229 /tmp/OzLkyddxSC.xml:237 /tmp/OzLkyddxSC.xml:245
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:170
+#: /tmp/qxq11tAO2x.xml:178 /tmp/qxq11tAO2x.xml:202 /tmp/qxq11tAO2x.xml:210
+#: /tmp/qxq11tAO2x.xml:226 /tmp/qxq11tAO2x.xml:234 /tmp/qxq11tAO2x.xml:242
 msgid "Python"
 msgstr "Python"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:175
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:172
 msgid "Sebastian, Erinn, nickm"
 msgstr "Sebastian, Erinn, nickm"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:179
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:176
 msgid "<a href=\"#project-torctl\">TorCtl</a>"
 msgstr "<a href=\"#project-torctl\">TorCtl</a>"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:180
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:177
 msgid "Library"
 msgstr "Biblioteka"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:187
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:184
 msgid "<a href=\"#project-metrics\">Metrics</a>"
 msgstr "<a href=\"#project-metrics\">Mierzenie</a>"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:188
-#: /tmp/OzLkyddxSC.xml:196 /tmp/OzLkyddxSC.xml:204 /tmp/OzLkyddxSC.xml:212
-#: /tmp/OzLkyddxSC.xml:220
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:185
+#: /tmp/qxq11tAO2x.xml:193 /tmp/qxq11tAO2x.xml:201 /tmp/qxq11tAO2x.xml:209
+#: /tmp/qxq11tAO2x.xml:217
 msgid "Client Service"
 msgstr "Usługa kliencka"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:191
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:188
 msgid "karsten"
 msgstr "karsten"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:195
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:192
 msgid "<a href=\"#project-torstatus\">TorStatus</a>"
 msgstr "<a href=\"#project-torstatus\">TorStatus</a>"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:197
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:194
 msgid "PHP"
 msgstr "PHP"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:203
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:200
 msgid "<a href=\"#project-weather\">Weather</a>"
 msgstr "<a href=\"#project-weather\">Pogoda</a>"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:207
-#: /tmp/OzLkyddxSC.xml:215
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:204
+#: /tmp/qxq11tAO2x.xml:212
 msgid "kaner"
 msgstr "kaner"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:211
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:208
 msgid "<a href=\"#project-gettor\">GetTor</a>"
 msgstr "<a href=\"#project-gettor\">GetTor</a>"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:219
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:216
 msgid "<a href=\"#project-torcheck\">TorCheck</a>"
 msgstr "<a href=\"#project-torcheck\">TorCheck</a>"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:221
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:218
 msgid "Python, Perl"
 msgstr "Python, Perl"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:227
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:224
 msgid "<a href=\"#project-bridgedb\">BridgeDB</a>"
 msgstr "<a href=\"#project-bridgedb\">BridgeDB</a>"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:228
-#: /tmp/OzLkyddxSC.xml:236 /tmp/OzLkyddxSC.xml:244
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:225
+#: /tmp/qxq11tAO2x.xml:233 /tmp/qxq11tAO2x.xml:241
 msgid "Backend Service"
 msgstr "Usługa wspierająca"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:231
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:228
 msgid "kaner, nickm"
 msgstr "kaner, nickm"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:235
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:232
 msgid "<a href=\"#project-torflow\">TorFlow</a>"
 msgstr "<a href=\"#project-torflow\">TorFlow</a>"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:243
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:240
 msgid "*<a href=\"#project-torbel\">TorBEL</a>"
 msgstr "*<a href=\"#project-torbel\">TorBEL</a>"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:247
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:244
 msgid "Sebastian"
 msgstr "Sebastian"
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:251
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:248
 msgid ""
 "<sub> * Project is still in an alpha state.  </sub> <br /><br /> <a id"
 "=\"project-tor\"></a>"
@@ -558,7 +546,7 @@
 "=\"project-tor\"></a>"
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:258
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:255
 msgid ""
 "Tor (<a href=\"https://gitweb.torproject.org/tor.git\">code</a>, <a "
 "href=\"https://trac.torproject.org/projects/tor/query?status=accepted&status=assigned&status=needs_review&status=new&status=reopened&component=Tor+Client&component=Tor+Relay&component=vidalia&order=priority\">bug"
@@ -569,7 +557,7 @@
 " błędów</a>)"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:263
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:260
 msgid ""
 "Central project, providing the core software for using and participating in "
 "the Tor network. Numerous people contribute to the project to varying "
@@ -580,7 +568,7 @@
 "projekt, ale główni architekci to Nick Mathewson i Roger Dingledine."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:269
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:266
 msgid ""
 "<b>Project Ideas:</b><br /> <i><a href=\"#resistCensorship\">Improving Tor's"
 " ability to resist censorship</a></i><br /> <i><a "
@@ -596,12 +584,12 @@
 "Internetem</a></i>"
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:276
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:273
 msgid "<a id=\"project-jtor\"></a>"
 msgstr "<a id=\"project-jtor\"></a>"
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:277
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:274
 msgid ""
 "<a href=\"https://github.com/brl/JTor/wiki\">JTor</a> (<a "
 "href=\"https://github.com/brl/JTor\">code</a>, <a "
@@ -612,7 +600,7 @@
 "href=\"https://github.com/brl/JTor/issues\">śledzenie błędów</a>)"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:283
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:280
 msgid ""
 "Java implementation of Tor and successor to <a "
 "href=\"http://onioncoffee.sourceforge.net/\">OnionCoffee</a>. This project "
@@ -623,12 +611,12 @@
 "nie jest jeszcze kompletny i jest nieaktywny od jesieni 2010."
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:288
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:285
 msgid "<a id=\"project-tbb\"></a>"
 msgstr "<a id=\"project-tbb\"></a>"
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:289
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:286
 msgid ""
 "<a href=\"<page projects/torbrowser>\">Tor Browser Bundle</a> (<a "
 "href=\"https://gitweb.torproject.org/torbrowser.git\">code</a>, <a "
@@ -641,7 +629,7 @@
 " błędów</a>)"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:295
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:292
 msgid ""
 "The Tor Browser Bundle is an easy-to-use portable package of Tor, Vidalia, "
 "and Firefox preconfigured to work together out of the box. This is actively "
@@ -652,7 +640,7 @@
 " Aktywnie pracuje nad tym Erinn Clark."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:301
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:298
 msgid ""
 "<b>Project Ideas:</b><br /> <i><a href=\"#auditTBB\">Audit Tor Browser "
 "Bundles for data leaks</a></i><br /> <i><a "
@@ -663,12 +651,12 @@
 "href=\"#usabilityTesting\">Testy użyteczności Tora</a></i>"
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:306
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:303
 msgid "<a id=\"project-tails\"></a>"
 msgstr "<a id=\"project-tails\"></a>"
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:307
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:304
 msgid ""
 "<a href=\"https://tails.boum.org/\">The Amnesic Incognito Live System</a> "
 "(<a href=\"http://git.immerda.ch/?p=amnesia.git;a=summary\">code</a>, <a "
@@ -679,7 +667,7 @@
 "href=\"https://tails.boum.org/bugs/\">śledzenie błędów</a>)"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:313
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:310
 msgid ""
 "The Amnesic Incognito Live System is a live CD/USB distribution "
 "preconfigured so that everything is safely routed through Tor and leaves no "
@@ -694,7 +682,7 @@
 "ciągle jest bardzo aktywnie rozwijane."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:321
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:318
 msgid ""
 "<b>Project Ideas:</b><br /> <i><a href=\"#tailsStartMenu\">Custom GDM3 "
 "startup menu, aka.  tails-greeter</a></i><br /> <i><a "
@@ -710,12 +698,12 @@
 "danych</a></i>"
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:330
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:327
 msgid "<a id=\"project-torsocks\"></a>"
 msgstr "<a id=\"project-torsocks\"></a>"
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:331
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:328
 msgid ""
 "<a href=\"http://code.google.com/p/torsocks/\">Torsocks</a> (<a "
 "href=\"https://gitweb.torproject.org/torsocks.git\">code</a>, <a "
@@ -728,7 +716,7 @@
 " błędów</a>)"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:337
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:334
 msgid ""
 "Utility for adapting other applications to work with Tor. Development has "
 "slowed and compatibility issues remain with some platforms, but it's "
@@ -739,7 +727,7 @@
 "kompletny program."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:343
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:340
 msgid ""
 "<b>Project Ideas:</b><br /> <i><a href=\"#torsocksForOSX\">Make "
 "torsocks/dsocks work on OS X</a></i>"
@@ -748,12 +736,12 @@
 " torsocks/dsocks działało na OS X</a></i>"
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:347
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:344
 msgid "<a id=\"project-torouter\"></a>"
 msgstr "<a id=\"project-torouter\"></a>"
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:348
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:345
 msgid ""
 "<a "
 "href=\"https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/Torouter\">Torouter</a>"
@@ -767,7 +755,7 @@
 " błędów</a>)"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:354
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:351
 msgid ""
 "Project to provide an easy-to-use, embedded Tor instance for routers. This "
 "had high activity in late 2010, but has since been rather quiet."
@@ -777,12 +765,12 @@
 "tamtego czasu raczej zamilkł."
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:358
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:355
 msgid "<a id=\"project-vidalia\"></a>"
 msgstr "<a id=\"project-vidalia\"></a>"
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:359
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:356
 msgid ""
 "<a href=\"<page projects/vidalia>\">Vidalia</a> (<a "
 "href=\"https://svn.torproject.org/vidalia/vidalia/trunk/\">code</a>, <a "
@@ -795,7 +783,7 @@
 " błędów</a>)"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:365
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:362
 msgid ""
 "The most commonly used user interface for Tor. Matt Edman started the "
 "project in 2006 and brought it to its current stable state. Development "
@@ -808,7 +796,7 @@
 "projekt do przodu."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:372
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:369
 msgid ""
 "<b>Project Ideas:</b><br /> <i><a href=\"#vidaliaStatusEventInterface\">Tor "
 "Controller Status Event Interface for Vidalia</a></i><br /> <i><a "
@@ -822,12 +810,12 @@
 "Vidalii</a></i>"
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:377
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:374
 msgid "<a id=\"project-arm\"></a>"
 msgstr "<a id=\"project-arm\"></a>"
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:378
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:375
 msgid ""
 "<a href=\"http://www.atagar.com/arm/\">Arm</a> (<a "
 "href=\"https://svn.torproject.org/svn/arm/trunk/\">code</a>, <a "
@@ -840,7 +828,7 @@
 " błędów</a>)"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:384
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:381
 msgid ""
 "Command-line monitor for Tor. This has been under very active development by"
 " its author, Damian Johnson, since early 2009 to make it a better general-"
@@ -851,7 +839,7 @@
 "kontrolerem dla środowisk *nix."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:390
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:387
 msgid ""
 "<b>Project Ideas:</b><br /> <i><a href=\"#armClientMode\">Client Mode Use "
 "Cases for Arm</a></i><br /> <i><a href=\"#armGui\">GUI for Arm</a></i>"
@@ -861,12 +849,12 @@
 "dla Arma</a></i>"
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:395
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:392
 msgid "<a id=\"project-orbot\"></a>"
 msgstr "<a id=\"project-orbot\"></a>"
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:396
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:393
 msgid ""
 "<a href=\"https://guardianproject.info/apps/orbot/\">Orbot</a> (<a "
 "href=\"https://svn.torproject.org/svn/projects/android/trunk/Orbot/\">code</a>,"
@@ -881,7 +869,7 @@
 " błędów</a>)"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:402
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:399
 msgid ""
 "Provides Tor on the Android platform. This was under very active development"
 " up through Fall 2010, after which things have been quiet."
@@ -890,21 +878,30 @@
 "jesieni 2010, po czym sprawy zamilkły."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:407
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:404
 msgid ""
-"<b>Project Ideas:</b><br /> <i><a href=\"#orbotDevelopment\">More on Orbot "
-"&amp; Android OS-specific development</a></i>"
+"<b>Project Ideas:</b><br /> <i><a href=\"#orbot-torbutton\">TorButton for "
+"Mobile Firefox 4 or Custom Browser on Android</a></i><br /> <i><a href"
+"=\"#orbot-userInterface\">Build a better user interface for Orbot</a></i><br"
+" /> <i><a href=\"#orbot-optimisation\">Core Tor mobile "
+"optimisation</a></i><br /> <i><a href=\"#orbot-orlibAndOutreach\">Orbot "
+"integration library and community outreach</a></i>"
 msgstr ""
-"<b>Pomysły do projektu:</b><br /> <i><a href=\"#orbotDevelopment\">Więcej na"
-" temat rozwoju specyficznego dla Orbota i Systemu Android</a></i>"
+"<b>Pomysły do projektu:</b><br /> <i><a href=\"#orbot-torbutton\">TorButton "
+"dla mobilnego Firefoksa 4 lub własna przeglądarka na Androidzie</a></i><br "
+"/> <i><a href=\"#orbot-userInterface\">Zbudowanie lepszego interfejsu dla "
+"Orbota</a></i><br /> <i><a href=\"#orbot-optimisation\">Optymalizacja "
+"głównej części Tora na urządzenia przenośne</a></i><br /> <i><a href"
+"=\"#orbot-orlibAndOutreach\">Biblioteka integracyjna Orbota i wyjście do "
+"społeczeństwa</a></i>"
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:411
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:411
 msgid "<a id=\"project-torbutton\"></a>"
 msgstr "<a id=\"project-torbutton\"></a>"
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:412
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:412
 msgid ""
 "<a href=\"<page torbutton/index>\">Torbutton</a> (<a "
 "href=\"https://gitweb.torproject.org/torbutton.git\">code</a>, <a "
@@ -917,7 +914,7 @@
 " błędów</a>)"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:418
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:418
 msgid ""
 "Firefox addon that addresses many of the client-side threats to browsing the"
 " Internet anonymously. Mike has since continued to adapt it to new threats, "
@@ -932,7 +929,7 @@
 "and-fingerprinting\">też Chrome</a>."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:426
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:426
 msgid ""
 "<b>Project Ideas:</b><br /> <i><a "
 "href=\"#torbuttonForThunderbird\">Torbutton equivalent for "
@@ -943,17 +940,17 @@
 "Thunderbirda</a></i>"
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:430
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:430
 msgid "<a id=\"project-thandy\"></a>"
 msgstr "<a id=\"project-thandy\"></a>"
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:431
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:431
 msgid "Thandy (<a href=\"https://gitweb.torproject.org/thandy.git\">code</a>)"
 msgstr "Thandy (<a href=\"https://gitweb.torproject.org/thandy.git\">kod</a>)"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:435
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:435
 msgid ""
 "Updater for Tor. The project began in the Summer of 2008 but wasn't "
 "completed. Recently interest in it has been rekindled and many aspects of "
@@ -965,12 +962,12 @@
 "zmienianych."
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:440
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:440
 msgid "<a id=\"project-torctl\"></a>"
 msgstr "<a id=\"project-torctl\"></a>"
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:441
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:441
 msgid ""
 "TorCtl (<a href=\"https://gitweb.torproject.org/pytorctl.git\">code</a>, <a "
 "href=\"https://trac.torproject.org/projects/tor/query?status=accepted&status=assigned&status=needs_review&status=new&status=reopened&component=Torctl&order=priority\">bug"
@@ -981,7 +978,7 @@
 " błędów</a>)"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:447
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:447
 msgid ""
 "Python bindings and utilities for using the Tor control port. It has been "
 "stable for several years, with only minor revisions."
@@ -990,12 +987,12 @@
 "Projekt stabilny od wielu lat, z minimalnymi zmianami."
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:451
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:451
 msgid "<a id=\"project-metrics\"></a>"
 msgstr "<a id=\"project-metrics\"></a>"
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:452
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:452
 msgid ""
 "<a href=\"https://metrics.torproject.org/\">Metrics</a> (code: <a "
 "href=\"https://gitweb.torproject.org/metrics-db.git\">db</a>, <a "
@@ -1012,7 +1009,7 @@
 " błędów</a>)"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:460
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:460
 msgid ""
 "Processing and analytics of consensus data, provided to users via the "
 "metrics portal. This has been under active development for several years by "
@@ -1023,12 +1020,12 @@
 "Karsten Loesing."
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:465
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:465
 msgid "<a id=\"project-torstatus\"></a>"
 msgstr "<a id=\"project-torstatus\"></a>"
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:466
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:466
 msgid ""
 "<a "
 "href=\"https://trac.torproject.org/projects/tor/wiki/projects/TorStatus\">TorStatus</a>"
@@ -1039,7 +1036,7 @@
 " (<a href=\"https://svn.torproject.org/svn/torstatus/trunk/\">kod</a>)"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:470
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:470
 msgid ""
 "Portal providing an overview of the Tor network, and details on any of its "
 "current relays. Though very actively used, this project has been "
@@ -1050,12 +1047,12 @@
 "od dłuższego czasu."
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:475
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:475
 msgid "<a id=\"project-weather\"></a>"
 msgstr "<a id=\"project-weather\"></a>"
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:476
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:476
 msgid ""
 "<a "
 "href=\"https://trac.torproject.org/projects/tor/wiki/projects/Weather\">Weather</a>"
@@ -1070,7 +1067,7 @@
 " błędów</a>)"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:482
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:482
 msgid ""
 "Provides automatic notification to subscribed relay operators when their "
 "relay's unreachable. This underwent a rewrite by the <a "
@@ -1083,12 +1080,12 @@
 "uaktywniła się na początku roku 2011."
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:488
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:488
 msgid "<a id=\"project-gettor\"></a>"
 msgstr "<a id=\"project-gettor\"></a>"
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:489
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:489
 msgid ""
 "<a "
 "href=\"https://trac.torproject.org/projects/tor/wiki/projects/EmailAutoResponder\">GetTor</a>"
@@ -1103,7 +1100,7 @@
 " błędów</a>)"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:495
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:495
 msgid ""
 "E-mail autoresponder providing Tor's packages over SMTP. This has been "
 "relatively unchanged for quite a while."
@@ -1112,12 +1109,12 @@
 "przez SMTP. Projekt nie ulegał zmianom przez długi czas."
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:499
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:499
 msgid "<a id=\"project-torcheck\"></a>"
 msgstr "<a id=\"project-torcheck\"></a>"
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:500
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:500
 msgid ""
 "<a "
 "href=\"https://trac.torproject.org/projects/tor/wiki/projects/TorCheck\">TorCheck</a>"
@@ -1132,7 +1129,7 @@
 " błędów</a>)"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:506
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:506
 msgid ""
 "Provides a simple site for determining if the visitor is using Tor or not.  "
 "This has been relatively unchanged for quite a while."
@@ -1141,12 +1138,12 @@
 "nie. Projekt nie ulegał zmianom przez długi czas."
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:510
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:510
 msgid "<a id=\"project-bridgedb\"></a>"
 msgstr "<a id=\"project-bridgedb\"></a>"
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:511
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:511
 msgid ""
 "<a "
 "href=\"https://trac.torproject.org/projects/tor/wiki/projects/BridgeDB\">BridgeDB</a>"
@@ -1161,7 +1158,7 @@
 " błędów</a>)"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:517
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:517
 msgid ""
 "Backend bridge distributor, handling the various pools they're distributed "
 "in. This was actively developed until Fall of 2010."
@@ -1170,12 +1167,12 @@
 " znajdują. Projekt był aktywnie rozwijany do jesieni 2010."
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:521
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:521
 msgid "<a id=\"project-torflow\"></a>"
 msgstr "<a id=\"project-torflow\"></a>"
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:522
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:522
 msgid ""
 "<a "
 "href=\"https://trac.torproject.org/projects/tor/wiki/projects/TorFlow\">TorFlow</a>"
@@ -1190,7 +1187,7 @@
 " błędów</a>)"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:528
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:528
 msgid ""
 "Library and collection of services for actively monitoring the Tor network."
 "  These include the Bandwidth Scanners (measuring throughput of relays) and "
@@ -1206,12 +1203,12 @@
 "później. Oba są od tamtego zcasu aktywnie używane, ale rozwój się zatrzymał."
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:536
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:536
 msgid "<a id=\"project-torbel\"></a>"
 msgstr "<a id=\"project-torbel\"></a>"
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:537
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:537
 msgid ""
 "<a "
 "href=\"https://trac.torproject.org/projects/tor/wiki/projects/TorBulkExitlist\">TorBEL</a>"
@@ -1226,7 +1223,7 @@
 " błędów</a>)"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:544
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:544
 msgid ""
 "The Tor Bulk Exitlist provides a method of identifying if IPs belong to exit"
 " nodes or not. This is a replacement for TorDNSEL which is a stable (though "
@@ -1241,17 +1238,17 @@
 "pory projekt jest nieaktywny."
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:551
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:551
 msgid "<a id=\"Coding\"></a> <a id=\"Summer\"></a>"
 msgstr "<a id=\"Coding\"></a> <a id=\"Summer\"></a>"
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:553
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:553
 msgid "<a class=\"anchor\" href=\"#Coding\">Project Ideas</a>"
 msgstr "<a class=\"anchor\" href=\"#Coding\">Pomysły na projekty</a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:556
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:556
 msgid ""
 "You may find some of these projects to be good <a href=\"<page "
 "about/gsoc>\">Google Summer of Code 2011</a> ideas. We have labelled each "
@@ -1276,12 +1273,12 @@
 "własny pomysł na projekt &mdash; co często daje najlepsze programy."
 
 #. type: Content of: <div><div><ol>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:570
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:570
 msgid "<a id=\"auditTBB\"></a>"
 msgstr "<a id=\"auditTBB\"></a>"
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:572
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:572
 msgid ""
 "<b>Audit Tor Browser Bundles for data leaks</b> <br> Priority: <i>High</i> "
 "<br> Effort Level: <i>High</i> <br> Skill Level: <i>Medium</i> <br> Likely "
@@ -1293,7 +1290,7 @@
 "Erinn, Jacob, Andrew</i>"
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:581
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:581
 msgid ""
 "The Tor Browser Bundle incorporates Tor, Firefox, Polipo, and the Vidalia "
 "user interface (and optionally the <a href=\"http://pidgin.im/\">Pidgin</a> "
@@ -1311,7 +1308,7 @@
 "Windows."
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:587
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:587
 msgid ""
 "This project is to identify all of the traces left behind by using a Tor "
 "Browser Bundle on Windows, Mac OS X, or Linux.  Developing ways to stop, "
@@ -1323,7 +1320,7 @@
 "śladów jest ostatnim krokiem."
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:590
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:590
 msgid ""
 "Students should be familiar with operating system analysis, application "
 "development on one or preferably all of Windows, Linux, and Mac OS X, and be"
@@ -1334,7 +1331,7 @@
 "czuć się swobodnie w programowaniu w C/C++ i skryptach powłoki."
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:593
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:593
 msgid ""
 "If you would like to help extend or do security auditing for TBB, please "
 "contact Erinn."
@@ -1343,12 +1340,12 @@
 "Erinn."
 
 #. type: Content of: <div><div><ol>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:597
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:597
 msgid "<a id=\"firewallProbeTool\"></a>"
 msgstr "<a id=\"firewallProbeTool\"></a>"
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:599
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:599
 msgid ""
 "<b>Develop a fully automatic firewall-probing system</b> <br> Priority: "
 "<i>High</i> <br> Effort Level: <i>Medium to High</i> <br> Skill Level: "
@@ -1360,7 +1357,7 @@
 "<i>Robert Ransom, Nick, Jacob</i>"
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:608
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:608
 msgid ""
 "We would like to have a fully automatic firewall-probing system for blocking"
 " systems with no long-term state (i.e. firewalls that can examine each "
@@ -1373,7 +1370,7 @@
 "połaczeń w oparciu o ruch, które widziały)."
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:612
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:612
 msgid ""
 "Ideally, volunteers would only need to set up one or more test servers, and "
 "run the probe client program on a publicly accessible computer behind the "
@@ -1384,12 +1381,12 @@
 "komputerze za zaporą."
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:615
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:615
 msgid "The test tool should:"
 msgstr "Narzędzie do testów powinno:"
 
 #. type: Content of: <div><div><ol><li><ul><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:617
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:617
 msgid ""
 "generate packet captures on both ends (and send them out to the extent "
 "possible),"
@@ -1398,7 +1395,7 @@
 "największym stopniu),"
 
 #. type: Content of: <div><div><ol><li><ul><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:619
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:619
 msgid ""
 "cycle through all the SSL configurations we might want to test through a "
 "censorship device, and"
@@ -1407,7 +1404,7 @@
 "przez urządzenie cenzurujące i"
 
 #. type: Content of: <div><div><ol><li><ul><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:621
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:621
 msgid ""
 "also test some other protocols to see whether they are allowed through the "
 "firewall (IMAP and other mail protocols, BitTorrent, DTLS, etc.)."
@@ -1417,12 +1414,12 @@
 "DTLS, etc.)."
 
 #. type: Content of: <div><div><ol>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:627
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:627
 msgid "<a id=\"tailsStartMenu\"></a>"
 msgstr "<a id=\"tailsStartMenu\"></a>"
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:629
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:629
 msgid ""
 "<b>Custom GDM3 startup menu, aka. tails-greeter</b> <br> Priority: "
 "<i>High</i> <br> Effort Level: <i>Medium</i> <br> Skill Level: <i>Medium to "
@@ -1434,7 +1431,7 @@
 "anonym</i>"
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:638
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:638
 msgid ""
 "Several major upcoming Tails features need to gather user input at startup "
 "time: bridges support, persistence, MAC address anonymization, etc."
@@ -1444,7 +1441,7 @@
 "anonimizacja adresu MAC, etc."
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:641
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:641
 msgid ""
 "Existing boot menus lack the graphical widgets and generally user-"
 "friendliness needed. Hence it was decided to implement Tails startup menu in"
@@ -1459,7 +1456,7 @@
 "która pozwoli użytkownikowi podać wszelkie niezbędne dane."
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:646
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:646
 msgid ""
 "Anyone undertaking this project should be familiar with GNU/Linux and "
 "application development; no other skill is required, apart of the ability to"
@@ -1478,7 +1475,7 @@
 "Python/GTK+ to prawdopodobnie najlepiej pasujący język do tego zadania."
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:653
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:653
 msgid ""
 "For more information see <a "
 "href=\"https://tails.boum.org/todo/boot_menu/\">https://tails.boum.org/todo/boot_menu/</a>"
@@ -1487,12 +1484,97 @@
 "href=\"https://tails.boum.org/todo/boot_menu/\">https://tails.boum.org/todo/boot_menu/</a>"
 
 #. type: Content of: <div><div><ol>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:656
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:656
+msgid "<a id=\"orbot-torbutton\"></a>"
+msgstr "<a id=\"orbot-torbutton\"></a>"
+
+#. type: Content of: <div><div><ol><li>
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:658
+msgid ""
+"<b>TorButton for Mobile Firefox 4 or Custom Browser on Android</b> <br> "
+"Priority: <i>High</i> <br> Effort Level: <i>High</i> <br> Skill Level: "
+"<i>High</i> <br> Likely Mentors: <i>Nathan (n8fr8), Jake, Mike Perry</i>"
+msgstr ""
+"<b>TorButton dla Mobilnego Firefoksa 4 lub własna przegladarka na "
+"Androidzie</b> <br> Priorytet: <i>Wysoki</i> <br> Poziom wysiłku: "
+"<i>Wysoki</i> <br> Poziom umiejętności: <i>Wysoki</i> <br> Prawdopodobni "
+"opiekunowie: <i>Nathan (n8fr8), Jake, Mike Perry</i>"
+
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:667
+msgid ""
+"Initial work has been done on implementing a proxy-setting add-on for "
+"Firefox on Android (see <a "
+"href=\"https://github.com/guardianproject/ProxyMob\">ProxyMob</a>), but a "
+"full port of TorButton needs to be done (dependent upon Firefox 4 port of "
+"TorButton). The other approach is to implement a custom &quot;Tor "
+"Browser&quot; based on Firefox or Webkit browser. See <a "
+"href=\"http://code.google.com/p/torora/wiki/Android\">Torora</a> for "
+"progress on this so far."
+msgstr ""
+"Wykonano pracę wstępną nad implementacją dodatku ustawiającego proxy dla "
+"Firefoksa na Androidzie (zobacz <a "
+"href=\"https://github.com/guardianproject/ProxyMob\">ProxyMob</a>), ale "
+"wymagane jest pełne przeniesienie TorButton (zależne od wersji TorButtona na"
+" Firefoksa 4). Innym podejściem jest zaimplementowanie własnej "
+"&quot;Przeglądarki Tora&quot; opartej na przeglądarkach Firefox lub Webkit. "
+"Zobacz <a href=\"http://code.google.com/p/torora/wiki/Android\">Torora</a>, "
+"aby zobaczyć postępy w tej sprawie."
+
+#. type: Content of: <div><div><ol>
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:677
+msgid "<a id=\"orbot-userInterface\"></a>"
+msgstr "<a id=\"orbot-userInterface\"></a>"
+
+#. type: Content of: <div><div><ol><li>
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:679
+msgid ""
+"<b>Build a better user interface for Orbot</b> <br> Priority: <i>High</i> "
+"<br> Effort Level: <i>Medium</i> <br> Skill Level: <i>Medium</i> <br> Likely"
+" Mentors: <i>Nathan (n8fr8), Jake</i>"
+msgstr ""
+"<b>Zbudować lepszy interfejs użytkownika dla Orbota</b> <br> Priorytet: "
+"<i>Wysoki</i> <br> Poziom wysiłku: <i>Średni</i> <br> Poziom umiejętności: "
+"<i>Średni</i> <br> Prawdopodobni opiekunowie: <i>Nathan (n8fr8), Jake</i>"
+
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:688
+msgid ""
+"Improved home screen to show confirmation of connection (via a TorCheck API "
+"call), better statistics about data transferred (up/down), number of "
+"circuits connected, quality of connection and so on. The &quot;Tether "
+"Wifi&quot; Android application is a good model to follow in how it shows a "
+"realtime count of bytes transferred as well as notifications when wifi "
+"clients connect. In addition, better handling of Tor system and error "
+"messages would also be very helpful, include use of standard Android "
+"operating systems notifications. The addition of a wizard or tutorial "
+"walkthrough for novice users to explain to them exactly what is and what is "
+"not anonymized or protected would greatly improve the likelihood they will "
+"use Orbot correctly. All of this should work on the range of screens and "
+"device types now offered for Android, from 2&quot; phone to 10&quot; Tablet."
+msgstr ""
+"Lepszy ekran główny pokazujący potwierdzenie połączenia (poprzez wywołanie "
+"API TorCheck), lepsze statystyki przesłanych danych (wysłanych/odebranych), "
+"liczba podłączonych obwodów, jakość połączenia i tak dalej. Aplikacja "
+"&quot;Tether Wifi&quot; na Androida jest dobrym modelem do naśladowania w "
+"tym, jak pokazuje w czasie rzeczywistym liczbę przesłanych bajtów jak "
+"również w powiadomieniach o połączeniu się klientów wifi. Ponadto, lepsza "
+"obsługa wiadomości systemowych i błędów Tora też byłaby bardzo przydatna, "
+"zawierająca standardowe powiadomienia systemu operacyjnego Android. Dodanie "
+"kreatora lub przewodnika dla początkujących użytkowników, aby wyjąsnić im "
+"dokładnie, co jest, a co nie jest anonimizowane, znacznie powiększyłoby "
+"prawdopodobieństwo, że będą oni prawidłowo używać Orbota. To wszystko "
+"powinno działać na różnych rodzajach ekranów i typach urządzeń oferowanych "
+"teraz dla Androida, od dwucalowych telefonów, do dziesięciocalowych "
+"tabletów."
+
+#. type: Content of: <div><div><ol>
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:703
 msgid "<a id=\"resistCensorship\"></a>"
 msgstr "<a id=\"resistCensorship\"></a>"
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:658
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:705
 msgid ""
 "<b>Improving Tor's ability to resist censorship</b> <br> Priority: <i>Medium"
 " to High</i> <br> Effort Level: <i>Medium to High</i> <br> Skill Level: "
@@ -1504,7 +1586,7 @@
 "<i>Roger, Nick, Steven, Jake</i>"
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:667
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:714
 msgid ""
 "The Tor 0.2.1.x series makes <a href=\"<svnprojects>design-"
 "paper/blocking.html\">significant improvements</a> in resisting national and"
@@ -1517,7 +1599,7 @@
 "niektórych częściach projektu anty-cenzurowania."
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:672
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:719
 msgid ""
 "One huge category of work is adding features to our <a "
 "href=\"https://gitweb.torproject.org/bridgedb.git?a=tree\">BridgeDB</a> "
@@ -1544,7 +1626,7 @@
 "zrobienia wiele pracy projektowej."
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:683
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:730
 msgid ""
 "If you want to get more into the guts of Tor itself (C), a more minor "
 "problem we should address is that current Tors can only listen on a single "
@@ -1561,7 +1643,7 @@
 "wielu adresach i portach, ale wymaga to więcej pracy."
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:690
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:737
 msgid ""
 "This project could involve a lot of research and design. One of the big "
 "challenges will be identifying and crafting approaches that can still resist"
@@ -1574,12 +1656,12 @@
 "odporności na cenzurę z użytecznością i siłą."
 
 #. type: Content of: <div><div><ol>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:697
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:744
 msgid "<a id=\"geoIPUpgrade\"></a>"
 msgstr "<a id=\"geoIPUpgrade\"></a>"
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:699
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:746
 msgid ""
 "<b>Improve our GeoIP file format</b> <br> Priority: <i>Medium</i> <br> "
 "Effort Level: <i>Medium</i> <br> Skill Level: <i>Medium to High</i> <br> "
@@ -1590,7 +1672,7 @@
 "Wysokiego</i> <br> Prawdopodobni opiekunowie: <i>Robert Ransom</i>"
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:708
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:755
 msgid ""
 "Currently, Tor bridges and relays read an entire IP->country database into "
 "memory from a text file during startup.  We would like to distribute this "
@@ -1603,7 +1685,7 @@
 "dokonywać zapytań IP->kraj na jej formacie dyskowym, jesli to możliwe."
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:713
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:760
 msgid ""
 "We have <a href='https://trac.torproject.org/projects/tor/ticket/2506'>a "
 "sketch of a design</a> for a moderately optimized format for IPv4 GeoIP "
@@ -1616,23 +1698,23 @@
 "zaprojektowanie i zaimplementowanie formatu danych GeoIP dla IPv6."
 
 #. type: Content of: <div><div><ol>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:722
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:769
 msgid "<a id=\"armClientMode\"></a>"
 msgstr "<a id=\"armClientMode\"></a>"
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:724
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:771
 msgid ""
 "<b>Client Mode Use Cases for Arm</b> <br> Priority: <i>Medium</i> <br> "
 "Effort Level: <i>High</i> <br> Skill Level: <i>Medium</i> <br> Likely "
-"Mentors: <i>Damian</i>"
+"Mentors: <i>Damian (atagar)</i>"
 msgstr ""
 "<b>Przypadki użycia klienta dla Arma</b> <br> Priorytet: <i>Średni</i> <br> "
 "Poziom wysiłku: <i>Wysoki</i> <br> Poziom umiejętności: <i>Średni</i> <br> "
-"Prawdopodobni opiekunowie:<i>Damian</i>"
+"Prawdopodobni opiekunowie:<i>Damian (atagar)</i>"
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:733
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:780
 msgid ""
 "<a href=\"<page projects/arm>\">Arm</a> is a Tor command line status monitor"
 " on *nix environments (Linux, Mac, and BSD). It functions much like top "
@@ -1650,7 +1732,7 @@
 "klientów Tora."
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:741
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:788
 msgid ""
 "This would include UI design, experimenting, and a lot of python hacking. "
 "Here's some ideas for client functionality arm could provide:"
@@ -1660,7 +1742,7 @@
 "funkcjonalności klienta, które arm mógłby dostarczać:"
 
 #. type: Content of: <div><div><ol><li><ul><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:745
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:792
 msgid ""
 "A panel for client connections, showing each hop of the user's circuits with"
 " the ISP, country, and jurisdiction where those relays reside. Other "
@@ -1682,7 +1764,7 @@
 "rozwiązywania nazw)."
 
 #. type: Content of: <div><div><ol><li><ul><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:754
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:801
 msgid ""
 "Options to let the user request new circuits (the &quot;New Identity&quot; "
 "feature in Vidalia), select the exit country, etc."
@@ -1692,7 +1774,7 @@
 "wyjścia etc."
 
 #. type: Content of: <div><div><ol><li><ul><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:757
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:804
 msgid ""
 "A panel showing Internet application and if their connections are being "
 "routed through Tor or not (giving a warning if there's leaks)."
@@ -1701,7 +1783,7 @@
 " przez Tora, czy nie (dając ostrzeżenie, gdy są przecieki)."
 
 #. type: Content of: <div><div><ol><li><ul><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:760
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:807
 msgid ""
 "The status of the bridges we're configured to use (ie, are they up?).  This "
 "would include adding control port functionality to Tor for <a "
@@ -1715,7 +1797,7 @@
 "2068</a>."
 
 #. type: Content of: <div><div><ol><li><ul><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:765
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:812
 msgid ""
 "A one click option to set Tor to be a client, relay, or bridge. The goal "
 "would be to make it trivial for users to voluntarily contribute to the Tor "
@@ -1726,7 +1808,7 @@
 "dla użytkowników na wkład do sieci Tora."
 
 #. type: Content of: <div><div><ol><li><ul><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:769
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:816
 msgid ""
 "Menus as an alternative to hotkeys to make the interface more intuitive and "
 "usable for beginners (<a "
@@ -1737,14 +1819,14 @@
 "href=\"http://gnosis.cx/publish/programming/charming_python_6.html\">przykład</a>)."
 
 #. type: Content of: <div><div><ol><li><ul><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:773
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:820
 msgid ""
 "Look at Vidalia and TorK for ideas and solicit input from the Tor community."
 msgstr ""
 "Spójrz na Vidalię i TorK po pomysły i informacje od społeczności Tora."
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:777
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:824
 msgid ""
 "More information is available in the following sections of arm's dev notes: "
 "<a "
@@ -1765,12 +1847,12 @@
 " Mode Use Cases</a>"
 
 #. type: Content of: <div><div><ol>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:781
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:828
 msgid "<a id=\"unitTesting\"></a>"
 msgstr "<a id=\"unitTesting\"></a>"
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:783
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:830
 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> Likely "
@@ -1781,7 +1863,7 @@
 "<i>Średni</i> <br /> Prawdopodobni opiekunowie: <i>Nick, Erinn</i>"
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:792
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:839
 msgid ""
 "Tor needs to be tested far more thoroughly. This is a multi-part effort. To "
 "start with, our unit test coverage should rise substantially, especially in "
@@ -1796,7 +1878,7 @@
 " programu od zmiennych globalnych."
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:798
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:845
 msgid ""
 "Additionally, we need to automate our performance testing. We've got "
 "buildbot to automate our regular integration and compile testing already "
@@ -1818,117 +1900,12 @@
 "zmiany wydajności na maszynach pełniących różne zadania."
 
 #. type: Content of: <div><div><ol>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:808
-msgid "<a id=\"orbotDevelopment\"></a>"
-msgstr "<a id=\"orbotDevelopment\"></a>"
-
-#. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:810
-msgid ""
-"<b>More on Orbot &amp; Android OS-specific development</b> <br> Priority: "
-"<i>Medium</i> <br> Effort Level: <i>High</i> <br> Skill Level: <i>Medium to "
-"High</i> <br> Likely Mentors: <i>Nathan, Jake</i>"
-msgstr ""
-"<b>Więcej o Orbocie i rozwoju specyficznym dla systemu Android</b> <br> <br "
-"/> Priorytet: <i>Średni</i> <br> Poziom wysiłku: <i>Wysoki</i> <br> Poziom "
-"umiejętności: <i>Średni do Wysokiego</i> <br> Prawdopodobni opiekunowie: "
-"<i>Nathan, Jake</i>"
-
-#. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:819
-msgid ""
-"<b>Android Java UI work:</b> Improved home screen to show better statistics "
-"about data transferred (up/down), number of circuits connected, quality of "
-"connection and so on. The \"Tether Wifi\" Android application is a good "
-"model to follow in how it shows a realtime count of bytes transferred as "
-"well as notifications when wifi clients connect. In addition, better "
-"display/handling of Tor system/error messages would also be very helpful. "
-"Finally, the addition of a wizard or tutorial walkthrough for novice users "
-"to explain to them exactly what is and what is not anonymized or protected "
-"would greatly improve the likelihood they will use Orbot correctly."
-msgstr ""
-"<b>Praca z interfejsem użytkownika w Javie na Androidzie:</b> Lepszy ekran "
-"powitalny, by pokazywać lepsze statystyki o transferze danych "
-"(wysyłanie/odbieranie), liczbie podłączonych obwodów, jakości połączenia i "
-"tak dalej. Aplikacja \"Tether Wifi\" na Androida jest dobrym modelem do "
-"naśladowania w tym, jak pokazuje w czasie rzeczywistym ilość wysłanych i "
-"odebranych bajtów oraz powiadomienia o połączeniu klienta wifi. Ponadto, "
-"lepsze wyświetlanie/załatwianie wiadomości systemowych lub o błędach Tora "
-"też byłoby bardzo pomocne. W końcu dodanie kreatora lub przewodnika dla "
-"początkujących użytkowników, by wyjaśnić im, co jest, a co nie jest "
-"anonimizowane lub chronione, bardzo zwiększyłoby prawdopodobieństwo, że będą"
-" używać Orbota prawidłowo."
-
-#. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:831
-msgid ""
-"<b>Android Java OS/Core app work:</b> Better system-wide indication, either "
-"via the notification bar, \"Toast\" pop-up dialogs or some other indicator, "
-"that an application's traffic is indeed moving through Orbot/Tor. For "
-"instance, right now you need to first go to a torcheck web service to ensure"
-" your browser is routing via Tor. Orbot should be able to notify you that "
-"circuits are being opened, used, etc. The aforementioned data transfer "
-"tracker might provide this type of awareness as well."
-msgstr ""
-"<b>Praca z systemem w Javie/wnętrzem aplikacji:</b> Lepszy wskaźnik "
-"systemowy, poprzez pasek powiadomień, okna dialogowe \"Toast\" lub inny "
-"mechanizm, że dane aplikacji są rzeczywiście przekazywane przez Orbota/Tora."
-" Na przykład, teraz musisz najpierw wejść na usługę torcheck, by upewnić "
-"się, że Twoja przeglądarka przechodzi przez Tora. Orbot powinien móc "
-"powiadamiać Cię, że obwody są otwierane, używane itd. Wspomniane wcześniej "
-"śledzenie transferu danych też mogłoby dostarczać tego typu uświadamiania."
-
-#. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:840
-msgid ""
-"<b>Android Java Library/Community Outreach work:</b> We need to package a "
-"simple library for use with third-party application to easily enable them to"
-" support \"Torification\" on non-rooted devices (i.e. w/o transparent "
-"proxying). This library should include a wrapper for the Apache HTTPClient "
-"library, a utility class for detecting the state of Orbot connectivity, and "
-"other relevant/useful things an Android app might need to anonymize itself. "
-"This work would include the creation of the library, documentation, and "
-"sample code. Outreach or effort to implement the library within other open-"
-"source apps would follow."
-msgstr ""
-"<b>Praca z biblioteką Javy w Androidzie/Zasięgiem w społeczeństwie</b> "
-"Potrzebujemy mieć paczkę z prostą biblioteką do wykorzystania z aplikacjami "
-"innych producentów, by łatwo umożliwić im \"Toryfikację\" na nie-głównych "
-"urządzeniach (bez przezroczystego proxy) Ta biblioteka powinan zwierać "
-"owijkę na bibliotekę Apache HTTPClient, klasę narzędziową do sprawdzenia "
-"stanu połączenia Orbota i inne istotne/przydatne rzeczy, których aplikacja "
-"na Androida może potrzebować do zanonimizowania się. Ta praca powinna "
-"składać się ze stworzenia biblioteki, dokumentacji i przykładowego kodu. "
-"Wychodzenie z tym projektem lub podjęcie wysiłku implementacji biblioteki w "
-"innych otwartych aplikacjach byłoby następnym krokiem."
-
-#. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:851
-msgid ""
-"<b>Android OS/C/Linux work:</b> The port of Tor to Android is basically a "
-"straight cross-compile to Linux ARM. There has been no work done in looking "
-"the optimization of Tor within a mobile hardware environment, on the ARM "
-"processor or other Android hardware, or on mobile networks. It should be "
-"noted, that even without optimization, Tor is handling the mobile network "
-"environment very well, automatically detecting change in IP addresses, "
-"reconnecting circuits, etc. across switching from 2G to 3G to Wifi, and so "
-"forth."
-msgstr ""
-"<b>Praca Android OS/C/Linux</b> przeniesienie Tora na Androida jest w "
-"zasadzie prostą kompilacją na Linux ARM. Nie została wykonana żadna praca "
-"odnośnie optymalizacji Tora w środowisku sprzętu przenośnego na prcesorze "
-"ARM lub innym sprzęcie z Androidem lub w sieciach mobilnych. Należy "
-"zauważyć, że nawet bez optymalizacji, Tor bardzo dobrze radzi sobie ze "
-"środowiskiem sieci mobilnych, automatycznie wykrywając zmiany adresu IP, "
-"ponownie łącząc obwody itd, przełączając się z 2G na 3G i Wifi i tak dalej."
-
-#. type: Content of: <div><div><ol>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:862
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:855
 msgid "<a id=\"simulateSlowConnections\"></a>"
 msgstr "<a id=\"simulateSlowConnections\"></a>"
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:864
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:857
 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> Likely"
@@ -1939,7 +1916,7 @@
 "<i>Średni</i> <br> Prawdopodobni opiekunowie: <i>Steven</i>"
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:874
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:867
 msgid ""
 "Many users of Tor have poor-quality Internet connections, giving low "
 "bandwidth, high latency, and high packet loss/re-ordering. User experience "
@@ -1953,7 +1930,7 @@
 "powtórzenia tych problemów w laboratorium."
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:882
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:875
 msgid ""
 "This project would be to build a simulation environment which replicates the"
 " poor connectivity so that the effect on Tor performance can be measured. "
@@ -1968,7 +1945,7 @@
 "polepszających wydajność Tora."
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:890
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:883
 msgid ""
 "The tools used would be up to the student, but dummynet (for FreeBSD)  and "
 "nistnet (for Linux) are two potential components on which this project could"
@@ -1982,12 +1959,12 @@
 " skryptowy."
 
 #. type: Content of: <div><div><ol>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:898
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:891
 msgid "<a id=\"torbuttonForThunderbird\"></a>"
 msgstr "<a id=\"torbuttonForThunderbird\"></a>"
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:900
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:893
 msgid ""
 "<b>Torbutton equivalent for Thunderbird</b> <br> Priority: <i>Medium</i> "
 "<br> Effort Level: <i>High</i> <br> Skill Level: <i>High</i> <br> Likely "
@@ -1998,7 +1975,7 @@
 "<br> Prawdopodobni opiekunowie: <i>Mike</i>"
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:910
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:903
 msgid ""
 "We're hearing from an increasing number of users that they want to use "
 "Thunderbird with Tor. However, there are plenty of application-level "
@@ -2014,12 +1991,12 @@
 " do Torbuttona."
 
 #. type: Content of: <div><div><ol>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:918
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:911
 msgid "<a id=\"usabilityTesting\"></a>"
 msgstr "<a id=\"usabilityTesting\"></a>"
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:920
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:913
 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 "
@@ -2030,7 +2007,7 @@
 "<br> Prawdopodobni opiekunowie:<i>Andrew</i>"
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:930
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:923
 msgid ""
 "Especially the browser bundle, ideally amongst our target demographic.  That"
 " would help a lot in knowing what needs to be done in terms of bug fixes or "
@@ -2043,7 +2020,7 @@
 "lepszy byłby proces z lepszą strukturą."
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:937
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:930
 msgid ""
 "Please note that since this isn't a coding project, it isn't suitable for "
 "Google Summer of Code."
@@ -2052,12 +2029,12 @@
 " of Code."
 
 #. type: Content of: <div><div><ol>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:942
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:935
 msgid "<a id=\"tailsMetadataAnonymizing\"></a>"
 msgstr "<a id=\"tailsMetadataAnonymizing\"></a>"
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:944
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:937
 msgid ""
 "<b>Meta-data anonymizing toolkit for file publication</b> <br> Priority: "
 "<i>Medium</i> <br> Effort Level: <i>Low to Medium</i> <br> Skill Level: "
@@ -2069,7 +2046,7 @@
 "opiekunowie: <i>intrigeri, anonym</i>"
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:953
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:946
 msgid ""
 "Tor helps greatly in publishing files anonymously. However, much personal "
 "information can be enclosed *inside* such published files' meta-data: GPS "
@@ -2082,7 +2059,7 @@
 "opublikować plik może więc łatwo się odkryć."
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:957
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:950
 msgid ""
 "A set of tools allowing users to easily inspect and clean up meta-data in "
 "files would benefit Tor users, and would e.g. be shipped in Tails."
@@ -2091,7 +2068,7 @@
 "dane byłby przydatny użytkownikom Tora i byłby np. dystrybuowany w Tails."
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:959
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:952
 msgid ""
 "A graphical user interface is a must, but library and command-line "
 "interfaces are most welcome so that future work can add support for cleaning"
@@ -2105,7 +2082,7 @@
 "Sieci."
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:963
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:956
 msgid ""
 "This project mostly consists of writing glue between the many existing tools"
 " and libraries that provide read/write access to files' meta-data. An "
@@ -2119,7 +2096,7 @@
 "dodana później."
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:967
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:960
 msgid ""
 "The meta-data cleaning toolkit would run at least on GNU/Linux; additional "
 "Windows and/or Mac OS X support would be welcome. The tools used would be up"
@@ -2132,12 +2109,12 @@
 "jest gotowa i będzie opublikowana wkrótce."
 
 #. type: Content of: <div><div><ol>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:973
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:966
 msgid "<a id=\"tailsDebianLive\"></a>"
 msgstr "<a id=\"tailsDebianLive\"></a>"
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:975
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:968
 msgid ""
 "<b>Improve Debian Live support for persistence</b> <br> Priority: "
 "<i>Medium</i> <br> Effort Level: <i>Medium</i> <br> Skill Level: <i>Low to "
@@ -2149,7 +2126,7 @@
 "<i>intrigeri, anonym</i>"
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:984
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:977
 msgid ""
 "Data persistence is a somewhat tricky topic in a Live system context, "
 "especially one such as Tails, which is explicitly designed to avoid leaving "
@@ -2160,7 +2137,7 @@
 "zostawiania jakiegokolwiek śladu jego użytkowania."
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:987
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:980
 msgid ""
 "Some real-life use cases, however, require some kind of data persistence. To"
 " start with, Tails should (carefully) support persistence of application-"
@@ -2175,7 +2152,7 @@
 "Tails zawsze będzie opcjonalne i będzie wymagać zaszyfrowanego miejsca."
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:992
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:985
 msgid ""
 "The backend work consists of improving Debian Live's existing persistence "
 "features to make them suit the specific context of Tails. A trust "
@@ -2192,7 +2169,7 @@
 "powłoki typu napisz-i-zapomnij."
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:998
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:991
 msgid ""
 "Anyone undertaking this project must be familiar with GNU/Linux, and "
 "preferably with Debian. Being able to (quickly learn to) write clean and "
@@ -2203,7 +2180,7 @@
 "programów w powłoce też jest wymagana."
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1001
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:994
 msgid ""
 "For more information, see <a "
 "href=\"https://tails.boum.org/todo/persistence/\">https://tails.boum.org/todo/persistence/</a>."
@@ -2212,12 +2189,12 @@
 "href=\"https://tails.boum.org/todo/persistence/\">https://tails.boum.org/todo/persistence/</a>."
 
 #. type: Content of: <div><div><ol>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1004
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:997
 msgid "<a id=\"torsocksForOSX\"></a>"
 msgstr "<a id=\"torsocksForOSX\"></a>"
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1006
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:999
 msgid ""
 "<b>Make torsocks/dsocks work on OS X</b> <br> Priority: <i>Medium</i> <br> "
 "Effort Level: <i>Medium</i> <br> Skill Level: <i>Medium</i> <br> Likely "
@@ -2228,7 +2205,7 @@
 "<i>Średni</i> <br> Prawdopodobni opiekunowie: <i>Robert Hogan</i>"
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1016
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1009
 msgid ""
 "<a href=\"https://code.google.com/p/torsocks/\">Torsocks</a> and <a "
 "href=\"https://code.google.com/p/dsocks/\">dsocks</a> are wrappers that will"
@@ -2265,12 +2242,12 @@
 "lub całkowite odrzucenie jednego."
 
 #. type: Content of: <div><div><ol>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1035
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1028
 msgid "<a id=\"vidaliaStatusEventInterface\"></a>"
 msgstr "<a id=\"vidaliaStatusEventInterface\"></a>"
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1037
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1030
 msgid ""
 "<b>Tor Controller Status Event Interface for Vidalia</b> <br> Priority: "
 "<i>Medium</i> <br> Effort Level: <i>Medium</i> <br> Skill Level: <i>Low to "
@@ -2282,7 +2259,7 @@
 "<i>Tomás</i>"
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1046
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1039
 msgid ""
 "There are a number of status changes inside Tor of which the user may need "
 "to be informed. For example, if the user is trying to set up his Tor as a "
@@ -2303,7 +2280,7 @@
 "miała mały sens dla początkującego."
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1054
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1047
 msgid ""
 "Tor has the ability to inform Vidalia of many such status changes, and we "
 "recently implemented support for a couple of these events. Still, there are "
@@ -2317,7 +2294,7 @@
 "wiadomości."
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1059
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1052
 msgid ""
 "The goal of this project then is to design and implement a UI for displaying"
 " Tor status events to the user. For example, we might put a little badge on "
@@ -2338,7 +2315,7 @@
 "podejście."
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1067
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1060
 msgid ""
 "A person undertaking this project should have good UI design and layout "
 "skills and some C++ development experience. Previous experience with Qt and "
@@ -2358,12 +2335,128 @@
 "gdyż moglibyśmy chcieć/potrzebować nowych ikonek."
 
 #. type: Content of: <div><div><ol>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1076
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1069
+msgid "<a id=\"orbot-optimisation\"></a>"
+msgstr "<a id=\"orbot-optimisation\"></a>"
+
+#. type: Content of: <div><div><ol><li>
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1071
+msgid ""
+"<b>Core Tor mobile optimisation</b> <br> Priority: <i>Medium</i> <br> Effort"
+" Level: <i>Medium</i> <br> Skill Level: <i>High</i> <br> Likely Mentors: "
+"<i>Nathan (n8fr8), Jake</i>"
+msgstr ""
+"<b>Optymalizacja głównej części Tora na urządzenia przenośne</b> <br> "
+"Priorytet: <i>Średni</i> <br> Poziom wysiłku: <i>Średni</i> <br> Poziom "
+"umiejętności: <i>Wysoki</i> <br> Prawdopodobni opiekunowie: <i>Nathan "
+"(n8fr8), Jake</i>"
+
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1081
+msgid ""
+"The existing port of Tor to Android is basically a straight cross-compile to"
+" Linux ARM. There has been no work done in looking at possible optimizations"
+" of Tor within a mobile hardware environment or on mobile networks. In "
+"addition, a number of additional Android OS APIs are available (such as "
+"wireless network status) that could be taken advantage of."
+msgstr ""
+"Istniejąca wersja Tora na Androdzie to z grubsza prosta kompilacja skrośna "
+"na Linuksa na ARMie. Nic nie zrobiono, aby poszukać możliwych optymalizacji "
+"Tora w środowisku urządzenia przenośnego lub w sieciach komórkowych. "
+"Ponadto, dostępne są dodatkowe API systemu Android (jak status sieci "
+"bezprzewodowej), z których można byłoby skorzystać."
+
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1090
+msgid ""
+"It should be noted, that even without optimisation, Tor is handling the "
+"mobile network environment very well, automatically detecting change in IP "
+"addresses, opening circuits, etc, as the device switches from no coverage to"
+" 2G, 3G or Wifi constantly as it changes position. However, this observation"
+" of &quot;very well&quot;, is just based on user experience, and not any "
+"detailed study of what exactly is happening, and what threats might exist "
+"because of this constantly changing network state."
+msgstr ""
+"Należy zauważyć, że nawet bez optymalizacji Tor bardzo dobrze radzi sobie ze"
+" środowiskiem sieci komórkowych, automatycznie wykrywając zmiany adresu IP, "
+"otwierając obwody itd, jak urządzenie ciągle przełącza się z braku łączności"
+" na 2G, 3G lub Wifi gdy zmienia pozycję. Jednak obserwacja &quot;bardzo "
+"dobrze&quot; opiera się na odczuciach użytkowników, a nie na jakimś "
+"szczegółowym badaniu co dokładnie się dzieje i jakie zagrożenia mogą istnieć"
+" z przyczyny ciągłej zmiany stanu sieci."
+
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1100
+msgid ""
+"Finally, the build process needs to be moved to the Android NDK from the "
+"custom GCC toolchain we are now using, and compatibility with Android 2.3 "
+"and 3.x Honeycomb OS need to be verified."
+msgstr ""
+"Ostatecznie trzeba przenieść proces budowania na Android NDK z własnych "
+"narzędzi GCC, których teraz używamy i trzeba sprawdzić zgodność z Androidem "
+"2.3 i 3.x Honeycomb."
+
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1106
+msgid ""
+"For more information see the <a "
+"href=\"https://svn.torproject.org/svn/projects/android/trunk/Orbot/BUILD\">Orbot"
+" build documentation</a>."
+msgstr ""
+"Po więcej informacji zajrzyj do <a "
+"href=\"https://svn.torproject.org/svn/projects/android/trunk/Orbot/BUILD\">dokumentacji"
+" budowania Orbota</a>."
+
+#. type: Content of: <div><div><ol>
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1112
+msgid "<a id=\"orbot-orlibAndOutreach\"></a>"
+msgstr "<a id=\"orbot-orlibAndOutreach\"></a>"
+
+#. type: Content of: <div><div><ol><li>
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1114
+msgid ""
+"<b>Orbot integration library and community outreach</b> <br> Priority: "
+"<i>Medium</i> <br> Effort Level: <i>Low</i> <br> Skill Level: <i>Medium</i> "
+"<br> Likely Mentors: <i>Nathan (n8fr8)</i>"
+msgstr ""
+"<b>Biblioteka integracyjna Orbota i wyjście do społeczeństwa</b> <br> "
+"Priorytet: <i>Średni</i> <br> Poziom wysiłku: <i>Niski</i> <br> Poziom "
+"umiejętności: <i>Średni</i> <br> Prawdopodobni opiekunowie: <i>Nathan "
+"(n8fr8)</i>"
+
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1124
+msgid ""
+"We need additional work on <a "
+"href=\"https://github.com/guardianproject/orlib\">ORLib</a>, our library for"
+" use with third-party application to easily enable them to support "
+"&quot;Torification&quot; on non-rooted devices (i.e. w/o transparent "
+"proxying). This library includes a SOCKS client, a wrapper for the Apache "
+"HTTPClient library, a utility class for detecting the state of Orbot "
+"connectivity, and other relevant/useful things an Android app might need to "
+"anonymize itself. This work would includes direct development of the "
+"library, documentation, and sample code. Outreach or effort to implement the"
+" library within other open-source apps is also needed."
+msgstr ""
+"Potrzeba dodatkowej pracy nad <a "
+"href=\"https://github.com/guardianproject/orlib\">ORLib</a>, naszą "
+"biblioteką do innych aplikacji, by łatwo można było dodać im obsługę "
+"&quot;Toryfikacji &quot; na urządzeniach nie uruchomionych w trybie "
+"administratora (czyli bez przezroczystego przekierowania ruchu). Ta "
+"biblioteka zawiera klienta SOCKS, owijkę na bibliotekę Apache HTTPClient, "
+"klasę narzędziową do wykrywania stanu połączenia Orbota i inne "
+"istotne/przydatne rzeczy, których aplikacja na Androida może potrzebować na "
+"zanonimizowanie się. Praca ta zawierałaby bezpośredni rozwój biblioteki, "
+"dokumentacji i przykładowego kodu. Wyjście do sopłeczeństwa lub wysiłek nad "
+"implementacją biblioteki w innych otwartych aplikacjach też jest potrzebny."
+
+#. type: Content of: <div><div><ol>
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1137
 msgid "<a id=\"vidaliaNetworkMap\"></a>"
 msgstr "<a id=\"vidaliaNetworkMap\"></a>"
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1078
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1139
 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: "
@@ -2375,7 +2468,7 @@
 "<i>Tomás</i>"
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1088
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1149
 msgid ""
 "One of Vidalia's existing features is a network map that shows the user the "
 "approximate geographic location of relays in the Tor network and plots the "
@@ -2400,7 +2493,7 @@
 "stwierdzenia \"chcę, by moje połączenia wychodziły stąd.\""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1102
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1163
 msgid ""
 "This project will first involve getting familiar with Vidalia and the Marble"
 " widget's API. One will then integrate the widget into Vidalia and customize"
@@ -2414,7 +2507,7 @@
 "własnym katalogu Vidalii i dostosować część okien dialogowych widgetu."
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1110
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1171
 msgid ""
 "A person undertaking this project should have good C++ development "
 "experience. Previous experience with Qt and CMake is helpful, but not "
@@ -2424,22 +2517,22 @@
 "doświadczenie z Qt i CMake będzie przydatne, ale nie jest wymagane."
 
 #. type: Content of: <div><div><ol>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1116
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1177
 msgid "<a id=\"armGui\"></a>"
 msgstr "<a id=\"armGui\"></a>"
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1118
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1179
 msgid ""
 "<b>GUI for Arm</b> <br> Priority: <i>Low</i> <br> Effort Level: <i>High</i> "
-"<br> Skill Level: <i>Medium</i> <br> Likely Mentors: <i>Damian</i>"
+"<br> Skill Level: <i>Medium</i> <br> Likely Mentors: <i>Damian (atagar)</i>"
 msgstr ""
 "<b>GUI dla Arma</b> <br> Priorytet: <i>Niski</i> <br> Poziom wysiłku: "
 "<i>Wysoki</i> <br> Poziom umiejętności: <i>Średni</i> <br> Prawdopodobni "
-"opiekunowie: <i>Damian</i>"
+"opiekunowie: <i>Damian (atagar)</i>"
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1128
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1189
 msgid ""
 "Arm has several unique features, some of the most interesting being its "
 "connection listing (correlating netstat results against the Tor consensus)  "
@@ -2459,7 +2552,7 @@
 "okienkowym."
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1138
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1199
 msgid ""
 "The vast majority of arm's more interesting functionality lies in its "
 "backend <a "
@@ -2478,7 +2571,7 @@
 "które można znaleźć w aktualnej aplikacji terminalowej."
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1148
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1209
 msgid ""
 "<b>Bring up new ideas!</b> <br> Don't like any of these? Look at the <a "
 "href=\"/press/presskit/2008-12-19-roadmap-full.pdf\">Tor development "
@@ -2495,12 +2588,12 @@
 "deweloperów."
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1160
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1221
 msgid "<a id=\"OtherCoding\"></a>"
 msgstr "<a id=\"OtherCoding\"></a>"
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1161
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1222
 msgid ""
 "<a class=\"anchor\" href=\"#OtherCoding\">Other Coding and Design related "
 "ideas</a>"
@@ -2509,7 +2602,7 @@
 "programowaniem i projektowaniem</a>"
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1163
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1224
 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 "
@@ -2537,7 +2630,7 @@
 "krok</a> latem roku 2007."
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1176
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1237
 msgid ""
 "We need to actually start building our <a href=\"<page "
 "docs/documentation>#DesignDoc\">blocking-resistance design</a>. This "
@@ -2552,7 +2645,7 @@
 "obsługiwała nowe cechy i planowanie rozpowszechniania."
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1182
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1243
 msgid ""
 "We need a flexible simulator framework for studying end-to-end traffic "
 "confirmation attacks. Many researchers have whipped up ad hoc simulators to "
@@ -2575,7 +2668,7 @@
 "może gdy będzie skończone, pomożesz nam też napisać dokumentację."
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1192
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1253
 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 "
@@ -2589,7 +2682,7 @@
 " trzeba."
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1198
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1259
 msgid ""
 "Perform a security analysis of Tor with <a "
 "href=\"https://secure.wikimedia.org/wikipedia/en/wiki/Fuzz_testing\">\"fuzz\"</a>."
@@ -2602,7 +2695,7 @@
 " sławę gdy wydamy nową wersję dzięki Tobie!"
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1203
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1264
 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 "
@@ -2623,7 +2716,7 @@
 "UDP</a> &mdash; proszę dać znać, co z nią jest nie tak."
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1214
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1275
 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 "
@@ -2634,7 +2727,7 @@
 "punkt startu."
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1218
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1279
 msgid ""
 "We need a way to generate the website diagrams (for example, the \"How Tor "
 "Works\" pictures on the <a href=\"<page about/overview>\">overview page</a> "
@@ -2651,7 +2744,7 @@
 "językach w czasie publikacji strony."
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1225
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1286
 msgid ""
 "How can we make the various LiveCD/USB systems easier to maintain, improve, "
 "and document? One example is <a href=\"https://tails.boum.org/\">The Amnesic"
@@ -2662,7 +2755,7 @@
 "href=\"https://tails.boum.org/\">The Amnesic Incognito Live System</a>"
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1232
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1293
 msgid ""
 "Another anti-censorship project is to try to make Tor more scanning-"
 "resistant.  Right now, an adversary can identify <a "
@@ -2686,17 +2779,17 @@
 "href=\"http://dl.dropbox.com/u/37735/index.html\">pracę i prototyp</a>."
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1246
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1307
 msgid "<a id=\"Research\"></a>"
 msgstr "<a id=\"Research\"></a>"
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1247
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1308
 msgid "<a class=\"anchor\" href=\"#Research\">Research</a>"
 msgstr "<a class=\"anchor\" href=\"#Research\">Badania</a>"
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1249
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1310
 msgid ""
 "The \"end-to-end traffic confirmation attack\": by watching traffic at Alice"
 " and at Bob, we can <a "
@@ -2721,7 +2814,7 @@
 " sposoby kształtowania działają lepiej od innych?"
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1259
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1320
 msgid ""
 "A related question is: Does running a relay/bridge provide additional "
 "protection against these timing attacks? Can an external adversary that "
@@ -2758,7 +2851,7 @@
 "symetrycznych z innych przyczyn?"
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1274
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1335
 msgid ""
 "Repeat Murdoch and Danezis's <a "
 "href=\"http://www.cl.cam.ac.uk/~sjm217/projects/anon/#torta\">attack from "
@@ -2794,7 +2887,7 @@
 "kolejki</a>."
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1289
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1350
 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"
@@ -2819,7 +2912,7 @@
 "praktyczne aproksymacje, jak np. unikanie adresów IP z tej samej sieci /8?"
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1299
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1360
 msgid ""
 "Other research questions regarding geographic diversity consider the "
 "tradeoff between choosing an efficient circuit and choosing a random "
@@ -2837,7 +2930,7 @@
 "wymaga więcej pracy i myślenia, ale wygląda bardzo obiecująco."
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1306
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1367
 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 "
@@ -2866,7 +2959,7 @@
 "użyć tego argumentu jako motywacji do ponownego rozpatrzenia transportu UDP."
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1318
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1379
 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 "
@@ -2885,7 +2978,7 @@
 "dobre."
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1325
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1386
 msgid ""
 "Our censorship-resistance goals include preventing an attacker who's looking"
 " at Tor traffic on the wire from <a href=\"<svnprojects>design-"
@@ -2913,7 +3006,7 @@
 "bardzo pomóc, czy jest o atak, z którym musimy żyć?"
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1336
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1397
 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 "
@@ -2931,7 +3024,7 @@
 "dłuższe. Musimy zbadać ten kompromis wydajność/bezpieczeństwo."
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1343
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1404
 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 "
@@ -2943,7 +3036,7 @@
 "zgodne wstecz z bieżącym protokołem Tora."
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1346
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1407
 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 "
@@ -2980,7 +3073,7 @@
 "odpowiedź."
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1363
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1424
 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 "
@@ -2991,7 +3084,7 @@
 " na zwiększenie szans użytkowników mostków na pozostanie połączonymi?"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1371
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1432
 msgid ""
 "<a href=\"<page about/contact>\">Let us know</a> if you've made progress on "
 "any of these!"

Modified: translation/trunk/projects/website/po/pl_PL/press/3-low.inthemedia.po
===================================================================
--- translation/trunk/projects/website/po/pl_PL/press/3-low.inthemedia.po	2011-04-12 16:15:00 UTC (rev 24594)
+++ translation/trunk/projects/website/po/pl_PL/press/3-low.inthemedia.po	2011-04-12 16:19:31 UTC (rev 24595)
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-03-25 16:51+0000\n"
-"PO-Revision-Date: 2011-03-26 00:32+0000\n"
+"POT-Creation-Date: 2011-03-28 12:48+0200\n"
+"PO-Revision-Date: 2011-03-29 09:47+0000\n"
 "Last-Translator: bogdrozd <bog.d at gazeta.pl>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
@@ -18,7 +18,7 @@
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/press/en/inthemedia.wml:8
+#: /home/runa/dev/website/press/en/inthemedia.wml:8
 msgid ""
 "<a href=\"<page index>\">Home &raquo; </a> <a href=\"<page "
 "press/press>\">Press &raquo; </a> <a href=\"<page press/inthemedia>\">Tor in"
@@ -29,21 +29,25 @@
 "Mediach</a>"
 
 #. type: Content of: <div><div><h1>
-#: /home/runa/tor/website/press/en/inthemedia.wml:15
+#: /home/runa/dev/website/press/en/inthemedia.wml:15
 msgid "Media Appearances"
 msgstr "Pojawienia się w mediach"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/press/en/inthemedia.wml:17
+#: /home/runa/dev/website/press/en/inthemedia.wml:17
 msgid ""
 "Major news organizations including the New York Times, Forbes, Al Jazeera, "
 "Washington Post, Le Monde, NPR, BBC, and more have sought out or quoted Tor "
 "Project members due to their expertise on anonymity, privacy, and Internet "
 "censorship issues."
 msgstr ""
+"Poważne organizacje medialne, łącznie z New York Times, Forbes, Al Jazeera, "
+"Washington Post, Le Monde, NPR, BBC, i innymi, dostrzegły lub cytowały "
+"członków Projektu Tor ze względu na ich specjalizację w dziedzinach "
+"anonimowości, prywatności i cenzury w Internecie. Oto przykłady:"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/press/en/inthemedia.wml:21
+#: /home/runa/dev/website/press/en/inthemedia.wml:21
 msgid ""
 "Since Tor is widely used throughout the world, it is mentioned regularly in "
 "the press.  This list is not comprehensive, but illustrates some of the "
@@ -54,111 +58,130 @@
 "artykułów o Torze."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/press/en/inthemedia.wml:24
+#: /home/runa/dev/website/press/en/inthemedia.wml:24
 msgid ""
 "A sample of such media appearances and mentions is below in order of newest "
 "to oldest:"
 msgstr ""
+"Jako że Tor jest szeroko używany na całym świecie, jest często wymieniany w "
+"prasie. Ta lista nie jest wyczerpująca, ale pokazuje część znaczących "
+"artykułów o Torze."
 
 #. type: Content of: <div><div><table><thead><tr><th>
-#: /home/runa/tor/website/press/en/inthemedia.wml:30
+#: /home/runa/dev/website/press/en/inthemedia.wml:30
 msgid "Date"
 msgstr "Data"
 
 #. type: Content of: <div><div><table><thead><tr><th>
-#: /home/runa/tor/website/press/en/inthemedia.wml:31
+#: /home/runa/dev/website/press/en/inthemedia.wml:31
 msgid "Publication"
 msgstr "Publikacja"
 
 #. type: Content of: <div><div><table><thead><tr><th>
-#: /home/runa/tor/website/press/en/inthemedia.wml:32
+#: /home/runa/dev/website/press/en/inthemedia.wml:32
 msgid "Topic"
 msgstr "Temat"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:36
+#: /home/runa/dev/website/press/en/inthemedia.wml:36
 msgid "2011 March 18"
-msgstr ""
+msgstr "18 Marca 2011"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:37
+#: /home/runa/dev/website/press/en/inthemedia.wml:37
 msgid "Telegraph"
-msgstr ""
+msgstr "Telegraph"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:38
+#: /home/runa/dev/website/press/en/inthemedia.wml:38
 msgid ""
 "<a href=\"http://www.telegraph.co.uk/news/worldnews/middleeast/iran/8388484"
 "/Iran-cracks-down-on-web-dissident-technology.html\">Iran cracks down on web"
 " dissident technology</a>"
 msgstr ""
+"<a href=\"http://www.telegraph.co.uk/news/worldnews/middleeast/iran/8388484"
+"/Iran-cracks-down-on-web-dissident-technology.html\">Iran cracks down on web"
+" dissident technology</a> (Iran dociska śrubę technologii dla dysydentów w "
+"sieci)"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:43
+#: /home/runa/dev/website/press/en/inthemedia.wml:43
 msgid "2011 March 17"
-msgstr ""
+msgstr "17 Marca 2011"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:44 /tmp/u3kTkswOVo.xml:241
+#: /home/runa/dev/website/press/en/inthemedia.wml:44 /tmp/Q2ndl8ZYsF.xml:228
 msgid "BusinessWeek"
 msgstr "BusinessWeek"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:45
+#: /home/runa/dev/website/press/en/inthemedia.wml:45
 msgid ""
 "<a "
 "href=\"http://www.businessweek.com/magazine/content/11_13/b4221043353206.htm\">Social"
 " Networking: Fighting to Remain Anonymous</a>"
 msgstr ""
+"<a "
+"href=\"http://www.businessweek.com/magazine/content/11_13/b4221043353206.htm\">Social"
+" Networking: Fighting to Remain Anonymous</a> (Społeczności w sieci: walka o"
+" pozostanie anonimowym)"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:50
+#: /home/runa/dev/website/press/en/inthemedia.wml:50
 msgid "2011 March 10"
-msgstr ""
+msgstr "10 Marca 2011"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:51
+#: /home/runa/dev/website/press/en/inthemedia.wml:51
 msgid "NyTeknik"
-msgstr ""
+msgstr "NyTeknik"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:52
+#: /home/runa/dev/website/press/en/inthemedia.wml:52
 msgid ""
 "<a "
 "href=\"http://www.nyteknik.se/nyheter/it_telekom/internet/article3123594.ece\">Svenska"
 " biståndspengar till Facebookrevolutionen</a>"
 msgstr ""
+"<a "
+"href=\"http://www.nyteknik.se/nyheter/it_telekom/internet/article3123594.ece\">Svenska"
+" biståndspengar till Facebookrevolutionen</a>"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:57
+#: /home/runa/dev/website/press/en/inthemedia.wml:57
 msgid "2011 March 09"
-msgstr ""
+msgstr "09 Marca 2011"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:58
+#: /home/runa/dev/website/press/en/inthemedia.wml:58
 msgid "Washington Post"
-msgstr ""
+msgstr "Washington Post"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:59
+#: /home/runa/dev/website/press/en/inthemedia.wml:59
 msgid ""
 "<a href=\"http://www.washingtonpost.com/wp-"
 "dyn/content/article/2011/03/09/AR2011030905157_pf.html\">U.S.  funding tech "
 "firms that help Mideast dissidents evade government censors</a>"
 msgstr ""
+"<a href=\"http://www.washingtonpost.com/wp-"
+"dyn/content/article/2011/03/09/AR2011030905157_pf.html\">U.S.  funding tech "
+"firms that help Mideast dissidents evade government censors</a> (USA "
+"sponsorują firmy technologiczne pomagające dysydentom ze Środkowego Wschodu "
+"unikać cenzorów rządowych)"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:65
+#: /home/runa/dev/website/press/en/inthemedia.wml:65
 msgid "2011 February 17"
 msgstr "17 Lutego 2011"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:66
+#: /home/runa/dev/website/press/en/inthemedia.wml:66
 msgid "Walpole Times"
 msgstr "Walpole Times"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:67
+#: /home/runa/dev/website/press/en/inthemedia.wml:67
 msgid ""
 "<a href=\"http://www.wickedlocal.com/walpole/news/x95296113/Tor-Project-a"
 "-Walpole-based-company-helps-Egyptians-avoid-Internet-censorship-during-"
@@ -172,18 +195,18 @@
 "Walpole, pomaga Egipcjanom unikać cenzury w czasie protestów)"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:72 /tmp/u3kTkswOVo.xml:88
-#: /tmp/u3kTkswOVo.xml:96 /tmp/u3kTkswOVo.xml:104
+#: /home/runa/dev/website/press/en/inthemedia.wml:72 /tmp/Q2ndl8ZYsF.xml:86
+#: /tmp/Q2ndl8ZYsF.xml:93 /tmp/Q2ndl8ZYsF.xml:100
 msgid "2011 January 31"
 msgstr "31 Stycznia 2011"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:73
+#: /home/runa/dev/website/press/en/inthemedia.wml:73
 msgid "NPR: WBUR"
 msgstr "NPR: WBUR"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:74
+#: /home/runa/dev/website/press/en/inthemedia.wml:74
 msgid ""
 "<a href=\"http://hereandnow.wbur.org/2011/01/31/egypt-internet-"
 "government\">Here &amp; Now: U.S. Activists Help Egyptian Protesters Elude "
@@ -195,74 +218,85 @@
 " egipskim protestującym unikać cenzury w sieci)"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:80
+#: /home/runa/dev/website/press/en/inthemedia.wml:80
 msgid "2011 February 01"
 msgstr "01 Lutego 2011"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:81
+#: /home/runa/dev/website/press/en/inthemedia.wml:81
 msgid "Discovery News"
 msgstr "Discovery News"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:82
+#: /home/runa/dev/website/press/en/inthemedia.wml:82
 msgid ""
 "<a href=\"http://news.discovery.com/tech/egypt-internet-online-"
-"protesters-110201.  html\">Egypt's Internet Block Incomplete But "
-"Damaging</a>"
+"protesters-110201.html\">Egypt's Internet Block Incomplete But Damaging</a>"
 msgstr ""
+"<a href=\"http://news.discovery.com/tech/egypt-internet-online-"
+"protesters-110201.html\">Egypt's Internet Block Incomplete But Damaging</a> "
+"(Egipska blokada Internetu niekompletna, ale psująca)"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:89
+#: /home/runa/dev/website/press/en/inthemedia.wml:87
 msgid "IDG Poland"
 msgstr "IDG Poland"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:90
+#: /home/runa/dev/website/press/en/inthemedia.wml:88
 msgid ""
 "<a "
-"href=\"http://www.idg.pl/news/366773/Egipt.blokuje.Internet.aktywisci.szukaja."
-"  alternatyw.html\">Egipt blokuje Internet, aktywiści szukają alternatyw</a>"
+"href=\"http://www.idg.pl/news/366773/Egipt.blokuje.Internet.aktywisci.szukaja.alternatyw.html\">Egipt"
+" blokuje Internet, aktywiści szukają alternatyw</a>"
 msgstr ""
+"<a "
+"href=\"http://www.idg.pl/news/366773/Egipt.blokuje.Internet.aktywisci.szukaja.alternatyw.html\">Egipt"
+" blokuje Internet, aktywiści szukają alternatyw</a>"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:97 /tmp/u3kTkswOVo.xml:713
+#: /home/runa/dev/website/press/en/inthemedia.wml:94 /tmp/Q2ndl8ZYsF.xml:677
 msgid "New Scientist"
 msgstr "New Scientist"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:98
+#: /home/runa/dev/website/press/en/inthemedia.wml:95
 msgid ""
 "<a href=\"http://www.newscientist.com/blogs/onepercent/2011/01/egypt-"
-"remains- officially-offli.html\">How Egypt is getting online</a>"
+"remains-officially-offli.html\">How Egypt is getting online</a>"
 msgstr ""
+"<a href=\"http://www.newscientist.com/blogs/onepercent/2011/01/egypt-"
+"remains-officially-offli.html\">How Egypt is getting online</a> (Jak Egipt "
+"dostaje się do sieci)"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:105
+#: /home/runa/dev/website/press/en/inthemedia.wml:101
 msgid "El Pais"
 msgstr "El Pais"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:106
+#: /home/runa/dev/website/press/en/inthemedia.wml:102
 msgid ""
 "<a "
-"href=\"http://www.elpais.com/articulo/internacional/Sortear/censura/golpe/fax/"
-" elpepuint/20110130elpepuint_14/Tes\">Sortear la censura a golpe de fax</a>"
+"href=\"http://www.elpais.com/articulo/internacional/Sortear/censura/golpe/fax/elpepuint/20110130elpepuint_14/Tes\">Sortear"
+" la censura a golpe de fax</a>"
 msgstr ""
+"<a "
+"href=\"http://www.elpais.com/articulo/internacional/Sortear/censura/golpe/fax/elpepuint/20110130elpepuint_14/Tes\">Sortear"
+" la censura a golpe de fax</a>"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:112 /tmp/u3kTkswOVo.xml:119
-#: /tmp/u3kTkswOVo.xml:126
+#: /home/runa/dev/website/press/en/inthemedia.wml:107 /tmp/Q2ndl8ZYsF.xml:114
+#: /tmp/Q2ndl8ZYsF.xml:121
 msgid "2011 January 30"
 msgstr "30 Stycznia 2011"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:113
+#: /home/runa/dev/website/press/en/inthemedia.wml:108
 msgid "Fox 25 News - Boston"
 msgstr "Fox 25 News - Boston"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:114
+#: /home/runa/dev/website/press/en/inthemedia.wml:109
 msgid ""
 "<a href=\"http://www.myfoxboston.com/dpp/news/local/local-company-helps-"
 "give-egyptians-internet-access-20110130\">Local company helps give Egyptians"
@@ -274,12 +308,12 @@
 "Internetu)"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:120
+#: /home/runa/dev/website/press/en/inthemedia.wml:115
 msgid "New England Cable News"
 msgstr "New England Cable News"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:121
+#: /home/runa/dev/website/press/en/inthemedia.wml:116
 msgid ""
 "<a href=\"http://www.necn.com/01/30/11/Mass-company-helps-activists-avoid-"
 "onlin/landing.html?blockID=400628&feedID=4213\">Mass.  company helps "
@@ -290,81 +324,94 @@
 "activists avoid online government censorship</a>"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:127 /tmp/u3kTkswOVo.xml:269
+#: /home/runa/dev/website/press/en/inthemedia.wml:122 /tmp/Q2ndl8ZYsF.xml:253
 msgid "Boston Globe"
 msgstr "Boston Globe"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:128
+#: /home/runa/dev/website/press/en/inthemedia.wml:123
 msgid ""
 "<a "
-"href=\"http://www.boston.com/news/local/massachusetts/articles/2011/01/30/ "
-"mass_groups_software_helps_avoid_censorship/\">Foreign activists stay "
-"covered online</a>"
+"href=\"http://www.boston.com/news/local/massachusetts/articles/2011/01/30/mass_groups_software_helps_avoid_censorship/\">Foreign"
+" activists stay covered online</a>"
 msgstr ""
+"<a "
+"href=\"http://www.boston.com/news/local/massachusetts/articles/2011/01/30/mass_groups_software_helps_avoid_censorship/\">Foreign"
+" activists stay covered online</a> (Zachodni aktywiści pozostają w ukryciu w"
+" sieci)"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:134 /tmp/u3kTkswOVo.xml:142
+#: /home/runa/dev/website/press/en/inthemedia.wml:128 /tmp/Q2ndl8ZYsF.xml:135
 msgid "2011 January 29"
 msgstr "29 Stycznia 2011"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:135
+#: /home/runa/dev/website/press/en/inthemedia.wml:129
 msgid "SvD.se"
 msgstr "SvD.se"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:136
+#: /home/runa/dev/website/press/en/inthemedia.wml:130
 msgid ""
-"<a href=\"http://www.svd.se/nyheter/utrikes/tor-oppnar-dorrar-for- "
+"<a href=\"http://www.svd.se/nyheter/utrikes/tor-oppnar-dorrar-for-"
 "natdissidenter_5902693.svd\">Tor öppnar dörrar för nätdissidenter</a>"
 msgstr ""
+"<a href=\"http://www.svd.se/nyheter/utrikes/tor-oppnar-dorrar-for-"
+"natdissidenter_5902693.svd\">Tor öppnar dörrar för nätdissidenter</a>"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:143 /tmp/u3kTkswOVo.xml:351
+#: /home/runa/dev/website/press/en/inthemedia.wml:136 /tmp/Q2ndl8ZYsF.xml:329
 msgid "ComputerWorld"
 msgstr "ComputerWorld"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:144
+#: /home/runa/dev/website/press/en/inthemedia.wml:137
 msgid ""
-"<a href=\"http://www.computerworld.com/s/article/9207058/ "
-"Without_Internet_Egyptians_find_new_ways_to_get_online?taxonomyId=16\">Without"
+"<a "
+"href=\"http://www.computerworld.com/s/article/9207058/Without_Internet_Egyptians_find_new_ways_to_get_online?taxonomyId=16\">Without"
 " Internet, Egyptians find new ways to get online.</a>"
 msgstr ""
+"<a "
+"href=\"http://www.computerworld.com/s/article/9207058/Without_Internet_Egyptians_find_new_ways_to_get_online?taxonomyId=16\">Without"
+" Internet, Egyptians find new ways to get online.</a> (Bez Internetu "
+"Egipcjanie znajdują nowe sposoby na wejście do sieci)"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:150
+#: /home/runa/dev/website/press/en/inthemedia.wml:142
 msgid "2011 January 28"
 msgstr "28 Stycznia 2011"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:151
+#: /home/runa/dev/website/press/en/inthemedia.wml:143
 msgid "Globe and Mail"
 msgstr "Globe and Mail"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:152
+#: /home/runa/dev/website/press/en/inthemedia.wml:144
 msgid ""
 "<a href=\"https://www.theglobeandmail.com/news/technology/in-a-span-of-"
-"minutes-a- country-goes-offline/article1887207/\">In a span of minutes, a "
+"minutes-a-country-goes-offline/article1887207/\">In a span of minutes, a "
 "country goes offline</a>"
 msgstr ""
+"<a href=\"https://www.theglobeandmail.com/news/technology/in-a-span-of-"
+"minutes-a-country-goes-offline/article1887207/\">In a span of minutes, a "
+"country goes offline</a> (W ciągu kilku minut, cały kraj zostaje odcięty od "
+"sieci)"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:158
+#: /home/runa/dev/website/press/en/inthemedia.wml:149
 msgid "2010 December 22"
 msgstr "22 Grudnia 2010"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:159 /tmp/u3kTkswOVo.xml:235
-#: /tmp/u3kTkswOVo.xml:256 /tmp/u3kTkswOVo.xml:339 /tmp/u3kTkswOVo.xml:380
-#: /tmp/u3kTkswOVo.xml:664
+#: /home/runa/dev/website/press/en/inthemedia.wml:150 /tmp/Q2ndl8ZYsF.xml:222
+#: /tmp/Q2ndl8ZYsF.xml:241 /tmp/Q2ndl8ZYsF.xml:317 /tmp/Q2ndl8ZYsF.xml:355
+#: /tmp/Q2ndl8ZYsF.xml:628
 msgid "Technology Review"
 msgstr "Technology Review"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:160
+#: /home/runa/dev/website/press/en/inthemedia.wml:151
 msgid ""
 "<a href=\"http://www.technologyreview.com/web/26981/\">Home Internet with "
 "Anonymity Built In</a>"
@@ -373,17 +420,17 @@
 "Anonymity Built In</a> (Domowy Internet z wbudowaną anonimowością)"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:164
+#: /home/runa/dev/website/press/en/inthemedia.wml:155
 msgid "2010 December 17"
 msgstr "17 Grudnia 2010"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:165
+#: /home/runa/dev/website/press/en/inthemedia.wml:156
 msgid "New York Times Magazine"
 msgstr "New York Times Magazine"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:166
+#: /home/runa/dev/website/press/en/inthemedia.wml:157
 msgid ""
 "<a href=\"https://www.nytimes.com/2010/12/19/magazine/19FOB-"
 "Medium-t.html\">Granting Anonymity</a>"
@@ -392,34 +439,36 @@
 "Medium-t.html\">Granting Anonymity</a>"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:171
+#: /home/runa/dev/website/press/en/inthemedia.wml:162
 msgid "2010 November 03"
 msgstr "03 Listopada 2010"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:172
+#: /home/runa/dev/website/press/en/inthemedia.wml:163
 msgid "metro sverige"
 msgstr "metro sverige"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:173
+#: /home/runa/dev/website/press/en/inthemedia.wml:164
 msgid ""
 "<a href=\"http://www.metro.se/2010/11/03/73897/sida-hjalper-utsatta-bli-"
-"anonyma-pa-n /\">Sida hjälper utsatta bli anonyma på nätet</a>"
+"anonyma-pa-n/\">Sida hjälper utsatta bli anonyma på nätet</a>"
 msgstr ""
+"<a href=\"http://www.metro.se/2010/11/03/73897/sida-hjalper-utsatta-bli-"
+"anonyma-pa-n/\">Sida hjälper utsatta bli anonyma på nätet</a>"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:178
+#: /home/runa/dev/website/press/en/inthemedia.wml:168
 msgid "2010 Sept 17"
 msgstr "17 Września 2010"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:179
+#: /home/runa/dev/website/press/en/inthemedia.wml:169
 msgid "NPR: On the media"
 msgstr "NPR: On the media"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:180
+#: /home/runa/dev/website/press/en/inthemedia.wml:170
 msgid ""
 "<a href=\"http://www.onthemedia.org/transcripts/2010/09/17/05\">On the "
 "Media: Interview with Jacob Appelbaum</a>."
@@ -429,35 +478,38 @@
 "Appelbaumem)."
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:184
+#: /home/runa/dev/website/press/en/inthemedia.wml:174
 msgid "2010 August 01"
 msgstr "01 Sierpnia 2010"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:185
+#: /home/runa/dev/website/press/en/inthemedia.wml:175
 msgid "PC Format - Poland"
 msgstr "PC Format - Polska"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:186
+#: /home/runa/dev/website/press/en/inthemedia.wml:176
 msgid ""
 "<a href=\"http://www.pcformat.pl/index.php/artykul/aid/1236/t/google-"
-"facebook-nas- szpieguj-jak-chroni-prywatno-w-sieci\">Google and Facebook are"
-" spying on us</a>"
+"facebook-nas-szpieguj-jak-chroni-prywatno-w-sieci\">Google and Facebook are "
+"spying on us</a>"
 msgstr ""
+"<a href=\"http://www.pcformat.pl/index.php/artykul/aid/1236/t/google-"
+"facebook-nas-szpieguj-jak-chroni-prywatno-w-sieci\">Google and Facebook are "
+"spying on us</a> (Google i Facebook nas szpiegują)"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:192
+#: /home/runa/dev/website/press/en/inthemedia.wml:181
 msgid "2010 July 14"
 msgstr "14 Lipca 2010"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:193
+#: /home/runa/dev/website/press/en/inthemedia.wml:182
 msgid "China Rights Forum"
 msgstr "China Rights Forum"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:194
+#: /home/runa/dev/website/press/en/inthemedia.wml:183
 msgid ""
 "<a "
 "href=\"http://www.hrichina.org/public/contents/category?cid=175033\">China "
@@ -468,35 +520,39 @@
 "Rights Forum, No. 2 - “China’s Internet”: Staking Digital Ground</a>"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:200
+#: /home/runa/dev/website/press/en/inthemedia.wml:189
 msgid "2010 May 25"
 msgstr "25 Maja 2010"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:201
+#: /home/runa/dev/website/press/en/inthemedia.wml:190
 msgid "The Australian"
 msgstr "The Australian"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:202
+#: /home/runa/dev/website/press/en/inthemedia.wml:191
 msgid ""
 "<a href=\"http://www.theaustralian.com.au/australian-it/call-to-join-tor-"
-"network-to- fight-censorship/story-e6frgakx-1225870756466\"> Call to join "
-"Tor network to fight censorship</a>"
+"network-to-fight-censorship/story-e6frgakx-1225870756466\"> Call to join Tor"
+" network to fight censorship</a>"
 msgstr ""
+"<a href=\"http://www.theaustralian.com.au/australian-it/call-to-join-tor-"
+"network-to-fight-censorship/story-e6frgakx-1225870756466\"> Call to join Tor"
+" network to fight censorship</a> (Wezwanie do przyłączenia się do sieci "
+"Tora, by zwalczać cenzurę)"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:208
+#: /home/runa/dev/website/press/en/inthemedia.wml:196
 msgid "2010 Mar 17"
 msgstr "17 Marca 2010"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:209
+#: /home/runa/dev/website/press/en/inthemedia.wml:197
 msgid "PC World Poland"
 msgstr "PC World Poland"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:210
+#: /home/runa/dev/website/press/en/inthemedia.wml:198
 msgid ""
 "<a href=\"http://www.idg.pl/news/356993/Anonimowosc.w.Sieci.html\">Anonymity"
 " in the Web</a>"
@@ -506,17 +562,17 @@
 "w Sieci</a>"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:214
+#: /home/runa/dev/website/press/en/inthemedia.wml:202
 msgid "2010 Mar 11"
 msgstr "11 Marca 2010"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:215
+#: /home/runa/dev/website/press/en/inthemedia.wml:203
 msgid "ABC Australia"
 msgstr "ABC Australia"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:216
+#: /home/runa/dev/website/press/en/inthemedia.wml:204
 msgid ""
 "<a "
 "href=\"http://www.abc.net.au/rn/futuretense/stories/2010/2837736.htm\">Future"
@@ -527,17 +583,17 @@
 " Tense: The Deep Web</a>"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:219
+#: /home/runa/dev/website/press/en/inthemedia.wml:207
 msgid "2010 Mar 09"
 msgstr "09 Marca 2010"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:220
+#: /home/runa/dev/website/press/en/inthemedia.wml:208
 msgid "PC Pro UK"
 msgstr "PC Pro UK"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:221
+#: /home/runa/dev/website/press/en/inthemedia.wml:209
 msgid ""
 "<a href=\"http://www.pcpro.co.uk/features/356254/the-dark-side-of-the-"
 "web\">The dark side of the web</a>"
@@ -546,31 +602,34 @@
 "web\">Ciemna strona sieci</a>"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:226
+#: /home/runa/dev/website/press/en/inthemedia.wml:214
 msgid "2009 Dec 29"
 msgstr "29 Grudnia 2009"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:227
+#: /home/runa/dev/website/press/en/inthemedia.wml:215
 msgid "Times Online"
 msgstr "Times Online"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:228
+#: /home/runa/dev/website/press/en/inthemedia.wml:216
 msgid ""
 "<a "
-"href=\"http://www.timesonline.co.uk/tol/news/world/middle_east/article6969958."
-"  ece\">When Iran’s regime falls this will be remembered as the YouTube "
-"revolution </a>"
+"href=\"http://www.timesonline.co.uk/tol/news/world/middle_east/article6969958.ece\">When"
+" Iran’s regime falls this will be remembered as the YouTube revolution </a>"
 msgstr ""
+"<a "
+"href=\"http://www.timesonline.co.uk/tol/news/world/middle_east/article6969958.ece\">When"
+" Iran’s regime falls this will be remembered as the YouTube revolution </a> "
+"(Gdy reżim  irański upadnie, będzie to zapamiętane jako rewolucja YouTube)"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:234
+#: /home/runa/dev/website/press/en/inthemedia.wml:221
 msgid "2009 Oct 15"
 msgstr "15 Października 2009"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:236
+#: /home/runa/dev/website/press/en/inthemedia.wml:223
 msgid ""
 "<a href=\"http://www.technologyreview.com/web/23736/?a=f\">China Cracks Down"
 " on Tor Anonymity Network</a>"
@@ -579,43 +638,51 @@
 " on Tor Anonymity Network</a> (Chiny dokręcają śrubę anonimowej sieci Tora)"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:240
+#: /home/runa/dev/website/press/en/inthemedia.wml:227
 msgid "2009 Sep 30"
 msgstr "30 Września 2009"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:242
+#: /home/runa/dev/website/press/en/inthemedia.wml:229
 msgid ""
 "<a "
-"href=\"http://www.businessweek.com/globalbiz/content/sep2009/gb20090930_620354."
-"  htm\">China's Online Censors Work Overtime</a>"
+"href=\"http://www.businessweek.com/globalbiz/content/sep2009/gb20090930_620354.htm\">China's"
+" Online Censors Work Overtime</a>"
 msgstr ""
+"<a "
+"href=\"http://www.businessweek.com/globalbiz/content/sep2009/gb20090930_620354.htm\">China's"
+" Online Censors Work Overtime</a> (Chińscy cenzorzy sieci pracują w "
+"nadgodzinach)"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:247
+#: /home/runa/dev/website/press/en/inthemedia.wml:233
 msgid "2009 Aug 19"
 msgstr "19 Sierpnia 2009"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:248
+#: /home/runa/dev/website/press/en/inthemedia.wml:234
 msgid "Reuters"
 msgstr "Reuters"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:249
+#: /home/runa/dev/website/press/en/inthemedia.wml:235
 msgid ""
-"<a href=\"http://www.reuters.com/article/internetNews/idUSTRE57I4IE20090819?"
-" pageNumber=1&amp;virtualBrandChannel=0&amp;sp=true\">Web tools help protect"
-" human rights activists</a>"
+"<a "
+"href=\"http://www.reuters.com/article/internetNews/idUSTRE57I4IE20090819?pageNumber=1&amp;virtualBrandChannel=0&amp;sp=true\">Web"
+" tools help protect human rights activists</a>"
 msgstr ""
+"<a "
+"href=\"http://www.reuters.com/article/internetNews/idUSTRE57I4IE20090819?pageNumber=1&amp;virtualBrandChannel=0&amp;sp=true\">Web"
+" tools help protect human rights activists</a> (Narzędzia sieciowe "
+"pomagające chronić aktywistów na rzecz praw człowieka)"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:255
+#: /home/runa/dev/website/press/en/inthemedia.wml:240
 msgid "2009 Aug 10"
 msgstr "10 Sierpnia 2009"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:257
+#: /home/runa/dev/website/press/en/inthemedia.wml:242
 msgid ""
 "<a "
 "href=\"http://www.technologyreview.com/blog/editors/23958/?nlid=2255\">How "
@@ -626,61 +693,70 @@
 "Internet)"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:261 /tmp/u3kTkswOVo.xml:268
+#: /home/runa/dev/website/press/en/inthemedia.wml:246 /tmp/Q2ndl8ZYsF.xml:252
 msgid "2009 Jul 26"
 msgstr "26 Lipca 2009"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:262 /tmp/u3kTkswOVo.xml:296
+#: /home/runa/dev/website/press/en/inthemedia.wml:247 /tmp/Q2ndl8ZYsF.xml:278
 msgid "Washington Times"
 msgstr "Washington Times"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:263
+#: /home/runa/dev/website/press/en/inthemedia.wml:248
 msgid ""
 "<a href=\"http://www.washingtontimes.com/news/2009/jul/26/senate-help-iran-"
-"dodge- internet-censorship/\">Senate OKs funds to thwart Iran Web "
-"censors</a>"
+"dodge-internet-censorship/\">Senate OKs funds to thwart Iran Web censors</a>"
 msgstr ""
+"<a href=\"http://www.washingtontimes.com/news/2009/jul/26/senate-help-iran-"
+"dodge-internet-censorship/\">Senate OKs funds to thwart Iran Web censors</a>"
+" (Senat popiera fundusze na unicestwienie irańskich cenzorów Sieci)"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:270
+#: /home/runa/dev/website/press/en/inthemedia.wml:254
 msgid ""
-"<a href=\"http://www.boston.com/news/nation/washington/articles/2009/07/26/ "
-"us_to_increase_funding_for_hackivists_aiding_iranians/\">US set to hike aid "
-"aimed at Iranians</a>"
+"<a "
+"href=\"http://www.boston.com/news/nation/washington/articles/2009/07/26/us_to_increase_funding_for_hackivists_aiding_iranians/\">US"
+" set to hike aid aimed at Iranians</a>"
 msgstr ""
+"<a "
+"href=\"http://www.boston.com/news/nation/washington/articles/2009/07/26/us_to_increase_funding_for_hackivists_aiding_iranians/\">US"
+" set to hike aid aimed at Iranians</a>"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:276
+#: /home/runa/dev/website/press/en/inthemedia.wml:259
 msgid "2009 Jul 24"
 msgstr "24 Lipca 2009"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:277
+#: /home/runa/dev/website/press/en/inthemedia.wml:260
 msgid "Associated Press"
 msgstr "Associated Press"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:278
+#: /home/runa/dev/website/press/en/inthemedia.wml:261
 msgid ""
-"<a href=\"http://www.google.com/hostednews/ap/article/ALeqM5hTf- "
+"<a href=\"http://www.google.com/hostednews/ap/article/ALeqM5hTf-"
 "p6Iy3sWHK8BRR58npGosLC3AD99L01QO0\">Iran activists work to elude crackdown "
 "on Internet</a>"
 msgstr ""
+"<a href=\"http://www.google.com/hostednews/ap/article/ALeqM5hTf-"
+"p6Iy3sWHK8BRR58npGosLC3AD99L01QO0\">Iran activists work to elude crackdown "
+"on Internet</a> (Irańscy aktywiści pracują nad unikaniem rozprawy z "
+"Internetem)"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:284
+#: /home/runa/dev/website/press/en/inthemedia.wml:266
 msgid "2009 Jul 08"
 msgstr "08 Lipca 2009"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:285
+#: /home/runa/dev/website/press/en/inthemedia.wml:267
 msgid "Tehran Bureau"
 msgstr "Tehran Bureau"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:286
+#: /home/runa/dev/website/press/en/inthemedia.wml:268
 msgid ""
 "<a href=\"http://tehranbureau.com/geeks-globe-rally-iranians-online/\">Geeks"
 " Around the Globe Rally to Help Iranians Online</a>"
@@ -690,128 +766,146 @@
 "Całym Świecie Zbierają Się, by Pomóc Irańczykom On-line)"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:290
+#: /home/runa/dev/website/press/en/inthemedia.wml:272
 msgid "2009 Jul 02"
 msgstr "02 Lipca 2009"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:291
+#: /home/runa/dev/website/press/en/inthemedia.wml:273
 msgid "NED/CIMA"
 msgstr "NED/CIMA"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:292
+#: /home/runa/dev/website/press/en/inthemedia.wml:274
 msgid ""
 "<a href=\"http://cima.ned.org/events/new-media-in-iran.html\">The Role of "
 "New Media in the Iranian Elections</a>"
 msgstr ""
-"<a href=\"http://cima.ned.org/events/new-media-in-iran.html\" >The Role of "
+"<a href=\"http://cima.ned.org/events/new-media-in-iran.html\">The Role of "
 "New Media in the Iranian Elections</a> (Rola Nowych Mediów w Wyborach "
 "Irańskich)"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:295
+#: /home/runa/dev/website/press/en/inthemedia.wml:277
 msgid "2009 Jun 26"
 msgstr "26 Czerwca 2009"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:297
+#: /home/runa/dev/website/press/en/inthemedia.wml:279
 msgid ""
 "<a href=\"http://www.washingtontimes.com/news/2009/jun/26/protesters-use-"
-"navy- technology-to-avoid-censorship/?feat=home_headlines\">Iranian "
+"navy-technology-to-avoid-censorship/?feat=home_headlines\">Iranian "
 "protesters avoid censorship with Navy technology</a>"
 msgstr ""
+"<a href=\"http://www.washingtontimes.com/news/2009/jun/26/protesters-use-"
+"navy-technology-to-avoid-censorship/?feat=home_headlines\">Iranian "
+"protesters avoid censorship with Navy technology</a> (Irańscy protestujący "
+"unikają cenzury z technologią Marynarki Wojennej)"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:303
+#: /home/runa/dev/website/press/en/inthemedia.wml:284
 msgid "2009 Jun 29"
 msgstr "29 Czerwca 2009"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:304
+#: /home/runa/dev/website/press/en/inthemedia.wml:285
 msgid "EFF"
 msgstr "EFF"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:305
+#: /home/runa/dev/website/press/en/inthemedia.wml:286
 msgid ""
 "<a href=\"http://www.eff.org/deeplinks/2009/06/help-protesters-iran-run-tor-"
-"relays- bridges\">Help Protesters in Iran: Run a Tor Bridge or a Tor "
+"relays-bridges\">Help Protesters in Iran: Run a Tor Bridge or a Tor "
 "Relay</a>"
 msgstr ""
+"<a href=\"http://www.eff.org/deeplinks/2009/06/help-protesters-iran-run-tor-"
+"relays-bridges\">Help Protesters in Iran: Run a Tor Bridge or a Tor "
+"Relay</a> (Pomóż protestującym w Iranie: prowadź mostek Tora lub przekaźnik "
+"Tora)"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:310
+#: /home/runa/dev/website/press/en/inthemedia.wml:290
 msgid "2009 Jun 24"
 msgstr "24 Czerwca 2009"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:311
+#: /home/runa/dev/website/press/en/inthemedia.wml:291
 msgid "Daily Finance"
 msgstr "Daily Finance"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:312
+#: /home/runa/dev/website/press/en/inthemedia.wml:292
 msgid ""
-"<a href=\"http://www.dailyfinance.com/2009/06/24/nokia-and-siemens-in-iran- "
+"<a href=\"http://www.dailyfinance.com/2009/06/24/nokia-and-siemens-in-iran-"
 "controversy/\">Nokia and Siemens in Iran controversy</a>"
 msgstr ""
+"<a href=\"http://www.dailyfinance.com/2009/06/24/nokia-and-siemens-in-iran-"
+"controversy/\">Nokia and Siemens in Iran controversy</a> (Nokia i Siemens w "
+"irańskiej kontrowersji)"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:317 /tmp/u3kTkswOVo.xml:332
-#: /tmp/u3kTkswOVo.xml:338
+#: /home/runa/dev/website/press/en/inthemedia.wml:296 /tmp/Q2ndl8ZYsF.xml:310
+#: /tmp/Q2ndl8ZYsF.xml:316
 msgid "2009 Jun 18"
 msgstr "18 Czerwca 2009"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:318 /tmp/u3kTkswOVo.xml:414
-#: /tmp/u3kTkswOVo.xml:658
+#: /home/runa/dev/website/press/en/inthemedia.wml:297 /tmp/Q2ndl8ZYsF.xml:386
+#: /tmp/Q2ndl8ZYsF.xml:622
 msgid "Wall Street Journal"
 msgstr "Wall Street Journal"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:319
+#: /home/runa/dev/website/press/en/inthemedia.wml:298
 msgid ""
 "<a href=\"http://blogs.wsj.com/digits/2009/06/18/iranians-using-tor-to-"
-"anonymize-web -use/\">Iranians Using Tor to Anonymize Web Use</a>"
+"anonymize-web-use/\">Iranians Using Tor to Anonymize Web Use</a>"
 msgstr ""
+"<a href=\"http://blogs.wsj.com/digits/2009/06/18/iranians-using-tor-to-"
+"anonymize-web-use/\">Iranians Using Tor to Anonymize Web Use</a> (Irańczycy "
+"używający Tora w celu anonimizacji korzystania z sieci)"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:324
+#: /home/runa/dev/website/press/en/inthemedia.wml:302
 msgid "2009 Jun 19"
 msgstr "19 Czerwca 2009"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:325
+#: /home/runa/dev/website/press/en/inthemedia.wml:303
 msgid "O'Reilly Radar"
 msgstr "O'Reilly Radar"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:326
+#: /home/runa/dev/website/press/en/inthemedia.wml:304
 msgid ""
 "<a href=\"http://radar.oreilly.com/2009/06/tor-and-the-legality-of-"
 "runnin.html\"> Dramatic Increase in Number of Tor Clients from Iran: "
 "Interview with Tor Project and the EFF</a>"
 msgstr ""
+"<a href=\"http://radar.oreilly.com/2009/06/tor-and-the-legality-of-"
+"runnin.html\"> Dramatic Increase in Number of Tor Clients from Iran: "
+"Interview with Tor Project and the EFF</a> (Dramatyczny wzrost liczby "
+"klientów Tora z Iranu: Wywiad z Projektem Tor i EFF)"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:333
+#: /home/runa/dev/website/press/en/inthemedia.wml:311
 msgid "Deutsche Welle"
 msgstr "Deutsche Welle"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:334
+#: /home/runa/dev/website/press/en/inthemedia.wml:312
 msgid ""
 "<a href=\"http://www.dw-world.de/dw/article/0,,4400882,00.html\">Internet "
 "proxies let Iranians and others connect to blocked Web sites</a>"
 msgstr ""
-"<a href=\"http://www.dw-world.de/dw/article/0,,4400882,00.html\" >Internet "
+"<a href=\"http://www.dw-world.de/dw/article/0,,4400882,00.html\">Internet "
 "proxies let Iranians and others connect to blocked Web sites</a> (Serwery "
 "pośredniczące w sieci pozwalają Irańczykom i innym łączyć się z blokowanymi "
 "stronami WWW)"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:340
+#: /home/runa/dev/website/press/en/inthemedia.wml:318
 msgid ""
 "<a href=\"http://www.technologyreview.com/web/22893/\">The Web vs. the "
 "Republic of Iran</a>"
@@ -820,17 +914,17 @@
 "Republic of Iran</a> (Sieć vs. Republika Iranu)"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:344 /tmp/u3kTkswOVo.xml:350
+#: /home/runa/dev/website/press/en/inthemedia.wml:322 /tmp/Q2ndl8ZYsF.xml:328
 msgid "2009 Jun 17"
 msgstr "17 Czerwca 2009"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:345
+#: /home/runa/dev/website/press/en/inthemedia.wml:323
 msgid "CNet News"
 msgstr "CNet News"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:346
+#: /home/runa/dev/website/press/en/inthemedia.wml:324
 msgid ""
 "<a href=\"http://news.cnet.com/8301-13578_3-10267287-38.html\">Iranians find"
 " ways to bypass Net censors</a>"
@@ -840,62 +934,70 @@
 "cenzorów Sieci)"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:352
+#: /home/runa/dev/website/press/en/inthemedia.wml:330
 msgid ""
 "<a "
-"href=\"http://www.computerworld.com/action/article.do?command=viewArticleBasic&"
-" amp;articleId=9134471&amp;intsrc=news_ts_head\">Iran's leaders fight "
-"Internet; Internet wins (so far)</a>"
+"href=\"http://www.computerworld.com/action/article.do?command=viewArticleBasic&amp;articleId=9134471&amp;intsrc=news_ts_head\">Iran's"
+" leaders fight Internet; Internet wins (so far)</a>"
 msgstr ""
+"<a "
+"href=\"http://www.computerworld.com/action/article.do?command=viewArticleBasic&amp;articleId=9134471&amp;intsrc=news_ts_head\">Iran's"
+" leaders fight Internet; Internet wins (so far)</a> (Irańscy przywódcy "
+"walczą z Internetem; Internet wygrywa [na razie])"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:358
+#: /home/runa/dev/website/press/en/inthemedia.wml:335
 msgid "2009 May 29"
 msgstr "29 Maja 2009"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:359 /tmp/u3kTkswOVo.xml:387
+#: /home/runa/dev/website/press/en/inthemedia.wml:336 /tmp/Q2ndl8ZYsF.xml:362
 msgid "Le Monde"
 msgstr "Le Monde"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:360
+#: /home/runa/dev/website/press/en/inthemedia.wml:337
 msgid ""
 "<a href=\"http://www.lemonde.fr/actualite-medias/article/2009/05/29/les-"
-"censeurs-du- net_1199993_3236.html\">Les censeurs du Net</a>"
+"censeurs-du-net_1199993_3236.html\">Les censeurs du Net</a>"
 msgstr ""
+"<a href=\"http://www.lemonde.fr/actualite-medias/article/2009/05/29/les-"
+"censeurs-du-net_1199993_3236.html\">Les censeurs du Net</a>"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:365
+#: /home/runa/dev/website/press/en/inthemedia.wml:341
 msgid "2009 May 15"
 msgstr "15 Maja 2009"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:366
+#: /home/runa/dev/website/press/en/inthemedia.wml:342
 msgid "Mass High Tech"
 msgstr "Mass High Tech"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:367
+#: /home/runa/dev/website/press/en/inthemedia.wml:343
 msgid ""
 "<a href=\"http://www.masshightech.com/stories/2009/05/11/newscolumn2-Tor-"
-"tackles-Net -privacy-game-makers-flock-to-Hub.html\">Tor tackles Net "
+"tackles-Net-privacy-game-makers-flock-to-Hub.html\">Tor tackles Net "
 "privacy</a>"
 msgstr ""
+"<a href=\"http://www.masshightech.com/stories/2009/05/11/newscolumn2-Tor-"
+"tackles-Net-privacy-game-makers-flock-to-Hub.html\">Tor tackles Net "
+"privacy</a>"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:372
+#: /home/runa/dev/website/press/en/inthemedia.wml:347
 msgid "2009 May 01"
 msgstr "01 Maja 2009"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:373 /tmp/u3kTkswOVo.xml:669
-#: /tmp/u3kTkswOVo.xml:679
+#: /home/runa/dev/website/press/en/inthemedia.wml:348 /tmp/Q2ndl8ZYsF.xml:633
+#: /tmp/Q2ndl8ZYsF.xml:643
 msgid "New York Times"
 msgstr "New York Times"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:374
+#: /home/runa/dev/website/press/en/inthemedia.wml:349
 msgid ""
 "<a "
 "href=\"http://www.nytimes.com/2009/05/01/technology/01filter.html\">Iranians"
@@ -905,58 +1007,63 @@
 ">Iranians and Others Outwit Net Censors</a>"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:379
+#: /home/runa/dev/website/press/en/inthemedia.wml:354
 msgid "2009 Apr 23"
 msgstr "23 Kwietnia 2009"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:381
+#: /home/runa/dev/website/press/en/inthemedia.wml:356
 msgid ""
 "<a href=\"http://www.technologyreview.com/computing/22427/?a=f\">Dissent "
 "Made Safer: How anonymity technology could save free speech on the "
 "Internet.</a>"
 msgstr ""
-"<a href=\"http://www.technologyreview.com/computing/22427/?a=f\" >Dissent "
+"<a href=\"http://www.technologyreview.com/computing/22427/?a=f\">Dissent "
 "Made Safer: How anonymity technology could save free speech on the "
 "Internet.</a> (Dysydenci bezpieczniejsi: Jak technologia anonimowości może "
 "uchronić wolność słowa w Internecie)"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:386
+#: /home/runa/dev/website/press/en/inthemedia.wml:361
 msgid "2009 Apr 22"
 msgstr "22 Kwietnia 2009"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:388
+#: /home/runa/dev/website/press/en/inthemedia.wml:363
 msgid ""
 "<a href=\"http://bugbrother.blog.lemonde.fr/2009/04/22/comment-contourner-"
-"la- cybersurveillance/\">How to circumvent cybersurveillance</a>"
+"la-cybersurveillance/\">How to circumvent cybersurveillance</a>"
 msgstr ""
+"<a href=\"http://bugbrother.blog.lemonde.fr/2009/04/22/comment-contourner-"
+"la-cybersurveillance/\">How to circumvent cybersurveillance</a> (Jak "
+"przeciwdziałać cyberpodsłuchowi)"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:393 /tmp/u3kTkswOVo.xml:400
+#: /home/runa/dev/website/press/en/inthemedia.wml:367 /tmp/Q2ndl8ZYsF.xml:373
 msgid "2009 Apr 06"
 msgstr "06 Kwietnia 2009"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:394
+#: /home/runa/dev/website/press/en/inthemedia.wml:368
 msgid "Reader's Digest"
 msgstr "Reader's Digest"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:395
+#: /home/runa/dev/website/press/en/inthemedia.wml:369
 msgid ""
 "<a href=\"http://www.rd.com/advice-and-know-how/how-to-hide-"
-"anything/article122219.  html\">How to Hide Anything</a>"
+"anything/article122219.html\">How to Hide Anything</a>"
 msgstr ""
+"<a href=\"http://www.rd.com/advice-and-know-how/how-to-hide-"
+"anything/article122219.html\">How to Hide Anything</a>"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:401
+#: /home/runa/dev/website/press/en/inthemedia.wml:374
 msgid "Al Jazeera"
 msgstr "Al Jazeera"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:402
+#: /home/runa/dev/website/press/en/inthemedia.wml:375
 msgid ""
 "<a href=\"http://www.youtube.com/watch?v=vuatxUN2cUQ\">Global Village Voices"
 " showcases Tor</a>"
@@ -965,29 +1072,32 @@
 " pokazuje Tora</a>"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:406
+#: /home/runa/dev/website/press/en/inthemedia.wml:379
 msgid "2009 Mar 18"
 msgstr "18 Marca 2009"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:407
+#: /home/runa/dev/website/press/en/inthemedia.wml:380
 msgid "Marie Claire"
 msgstr "Marie Claire"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:408
+#: /home/runa/dev/website/press/en/inthemedia.wml:381
 msgid ""
 "<a href=\"http://www.marieclaire.com/career-money/career-coach/manage-online"
-"--web- image\">How to Manage Your Web Footprint</a>"
+"--web-image\">How to Manage Your Web Footprint</a>"
 msgstr ""
+"<a href=\"http://www.marieclaire.com/career-money/career-coach/manage-online"
+"--web-image\">How to Manage Your Web Footprint</a> (Jak zarządzać swoimi "
+"śladami w sieci)"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:413
+#: /home/runa/dev/website/press/en/inthemedia.wml:385
 msgid "2009 Mar 13"
 msgstr "13 Marca 2009"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:415
+#: /home/runa/dev/website/press/en/inthemedia.wml:387
 msgid ""
 "<a href=\"http://online.wsj.com/article/SB123567809587886053.html\">The "
 "Kindness of Strangers</a>"
@@ -996,17 +1106,17 @@
 "Kindness of Strangers</a> (Życzliwość nieznajomych)"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:420
+#: /home/runa/dev/website/press/en/inthemedia.wml:392
 msgid "2009 Mar 12"
 msgstr "12 Marca 2009"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:421
+#: /home/runa/dev/website/press/en/inthemedia.wml:393
 msgid "BBC World Service"
 msgstr "BBC World Service"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:422
+#: /home/runa/dev/website/press/en/inthemedia.wml:394
 msgid ""
 "<a href=\"http://bbcworldservicetrust.wordpress.com/2009/03/12/12-march-"
 "world-day-against-cyber-censorship/\">Steven J Murdoch interviewed about Tor"
@@ -1017,17 +1127,17 @@
 "Torze i Cenzurze</a>"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:425
+#: /home/runa/dev/website/press/en/inthemedia.wml:397
 msgid "2009 Mar 03"
 msgstr "03 Marca 2009"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:426
+#: /home/runa/dev/website/press/en/inthemedia.wml:398
 msgid "Orf Austria"
 msgstr "Orf Austria"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:427
+#: /home/runa/dev/website/press/en/inthemedia.wml:399
 msgid ""
 "<a href=\"http://futurezone.orf.at/stories/1503028/\">WIRTSCHAFTSKAMMER "
 "column</a>"
@@ -1036,34 +1146,37 @@
 "WIRTSCHAFTSKAMMER</a>"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:431
+#: /home/runa/dev/website/press/en/inthemedia.wml:403
 msgid "2009 Feb 18"
 msgstr "18 Lutego 2009"
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:432 /tmp/u3kTkswOVo.xml:589
+#: /home/runa/dev/website/press/en/inthemedia.wml:404 /tmp/Q2ndl8ZYsF.xml:553
 msgid "Bangkok Post"
 msgstr "Bangkok Post"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:433
+#: /home/runa/dev/website/press/en/inthemedia.wml:405
 msgid ""
 "<a href=\"http://www.bangkokpost.com/tech/technews/11872/the-old-fake-404"
-"-not-found- routine\">The old fake \"404 not found\" routine</a>"
+"-not-found-routine\">The old fake \"404 not found\" routine</a>"
 msgstr ""
+"<a href=\"http://www.bangkokpost.com/tech/technews/11872/the-old-fake-404"
+"-not-found-routine\">The old fake \"404 not found\" routine</a> (Stara "
+"fałszywa procedura \"404 nie znaleziono\")"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:438
+#: /home/runa/dev/website/press/en/inthemedia.wml:409
 msgid "2009 Feb 13"
 msgstr "13 Lutego 2009"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:439
+#: /home/runa/dev/website/press/en/inthemedia.wml:410
 msgid "Hearsay Culture"
 msgstr "Hearsay Culture"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:440
+#: /home/runa/dev/website/press/en/inthemedia.wml:411
 msgid ""
 "<a href=\"http://www.hearsayculture.com/?p=307\">Hearsay Culture Radio "
 "Interview/Podcast</a>"
@@ -1072,17 +1185,17 @@
 "Interview/Podcast (wywiad/podcast w radio)</a>"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:443
+#: /home/runa/dev/website/press/en/inthemedia.wml:414
 msgid "2008 Dec 29"
 msgstr "29 Grudnia 2008"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:444
+#: /home/runa/dev/website/press/en/inthemedia.wml:415
 msgid "nu.nl"
 msgstr "nu.nl"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:445
+#: /home/runa/dev/website/press/en/inthemedia.wml:416
 msgid ""
 "<a href=\"http://www.nu.nl/internet/1891289/anoniem-browsen-voor-gsm-in-de-"
 "maak.html\">Anoniem browsen voor gsm in de maak</a>"
@@ -1091,17 +1204,17 @@
 "maak.html\" >Anoniem browsen voor gsm in de maak</a>"
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:449
+#: /home/runa/dev/website/press/en/inthemedia.wml:420
 msgid "2008 Dec 14"
 msgstr "14 Grudnia 2008"
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:450
+#: /home/runa/dev/website/press/en/inthemedia.wml:421
 msgid "PC Magazine: Middle &amp; Near East"
 msgstr "PC Magazine: Środkowy i Bliski Wschód"
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:451
+#: /home/runa/dev/website/press/en/inthemedia.wml:422
 msgid ""
 "<a href=\"http://www.pcmag-mideast.com/FeatureDetail.aspx?ID=1039\">How To "
 "Reclaim Your Online Privacy</a>"
@@ -1110,17 +1223,17 @@
 "odzyskać swoją prywatność online</a>"
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:456
+#: /home/runa/dev/website/press/en/inthemedia.wml:427
 msgid "2008 Aug 21"
 msgstr "21 Sierpnia 2008"
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:457
+#: /home/runa/dev/website/press/en/inthemedia.wml:428
 msgid "CNN"
 msgstr "CNN"
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:458
+#: /home/runa/dev/website/press/en/inthemedia.wml:429
 msgid ""
 "<a "
 "href=\"http://www.cnn.com/2008/TECH/08/21/internet.filtering/index.html\">Experts:"
@@ -1131,88 +1244,100 @@
 " Rozpowszechniona cenzura i filtrowanie Internetu</a>"
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:463
+#: /home/runa/dev/website/press/en/inthemedia.wml:434
 msgid "2008 Aug 22"
 msgstr "22 Sierpnia 2008"
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:464
+#: /home/runa/dev/website/press/en/inthemedia.wml:435
 msgid "The Sydney Morning Herald"
 msgstr "The Sydney Morning Herald"
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:465
+#: /home/runa/dev/website/press/en/inthemedia.wml:436
 msgid ""
 "<a href=\"http://www.smh.com.au/news/web/the-china-"
-"syndrome/2008/08/20/1218911800889 .html\">The China Syndrome</a>"
+"syndrome/2008/08/20/1218911800889.html\">The China Syndrome</a>"
 msgstr ""
+"<a href=\"http://www.smh.com.au/news/web/the-china-"
+"syndrome/2008/08/20/1218911800889.html\">The China Syndrome</a> (Syndrom "
+"chiński)"
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:471
+#: /home/runa/dev/website/press/en/inthemedia.wml:441
 msgid "2008 Aug 20"
 msgstr "20 Sierpnia 2008"
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:472
+#: /home/runa/dev/website/press/en/inthemedia.wml:442
 msgid "Scientific American"
 msgstr "Scientific American"
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:473
+#: /home/runa/dev/website/press/en/inthemedia.wml:443
 msgid ""
 "<a href=\"http://www.sciam.com/article.cfm?id=cryptography-how-to-keep-your-"
-"secrets- safe\">Cryptography: How to Keep Your Secrets Safe</a>"
+"secrets-safe\">Cryptography: How to Keep Your Secrets Safe</a>"
 msgstr ""
+"<a href=\"http://www.sciam.com/article.cfm?id=cryptography-how-to-keep-your-"
+"secrets-safe\">Cryptography: How to Keep Your Secrets Safe</a> "
+"(Kryptografia: Jak zabezpieczać swoje tajemnice)"
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:479
+#: /home/runa/dev/website/press/en/inthemedia.wml:448
 msgid "2008 Aug 05"
 msgstr "05 Sierpnia 2008"
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:480
+#: /home/runa/dev/website/press/en/inthemedia.wml:449
 msgid "Guardian UK"
 msgstr "Guardian UK"
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:481
+#: /home/runa/dev/website/press/en/inthemedia.wml:450
 msgid ""
 "<a "
 "href=\"http://www.guardian.co.uk/commentisfree/2008/aug/05/china.censorship\">"
 " Vaulting the great firewall</a>"
 msgstr ""
+"<a "
+"href=\"http://www.guardian.co.uk/commentisfree/2008/aug/05/china.censorship\">"
+" Vaulting the great firewall</a> (Przeskakiwanie wielkiej zapory ogniowej)"
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:487
+#: /home/runa/dev/website/press/en/inthemedia.wml:456
 msgid "2008 Aug 10"
 msgstr "10 Sierpnia 2008"
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:488
+#: /home/runa/dev/website/press/en/inthemedia.wml:457
 msgid "Tech Radar UK"
 msgstr "Tech Radar UK"
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:489
+#: /home/runa/dev/website/press/en/inthemedia.wml:458
 msgid ""
 "<a href=\"http://www.techradar.com/news/internet/web/freedom-stick-"
-"highlights- chinese-net-censorship-449233\">Freedom Stick highlights Chinese"
-" 'net censorship: USB drive promises anonymous surfing for the paranoid</a>"
+"highlights-chinese-net-censorship-449233\">Freedom Stick highlights Chinese "
+"'net censorship: USB drive promises anonymous surfing for the paranoid</a>"
 msgstr ""
+"<a href=\"http://www.techradar.com/news/internet/web/freedom-stick-"
+"highlights-chinese-net-censorship-449233\">Freedom Stick highlights Chinese "
+"'net censorship: USB drive promises anonymous surfing for the paranoid</a>"
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:497 /tmp/u3kTkswOVo.xml:505
-#: /tmp/u3kTkswOVo.xml:514 /tmp/u3kTkswOVo.xml:522
+#: /home/runa/dev/website/press/en/inthemedia.wml:465 /tmp/Q2ndl8ZYsF.xml:473
+#: /tmp/Q2ndl8ZYsF.xml:481 /tmp/Q2ndl8ZYsF.xml:489
 msgid "2008 Aug 07"
 msgstr "07 Sierpnia 2008"
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:498
+#: /home/runa/dev/website/press/en/inthemedia.wml:466
 msgid "Spiegel"
 msgstr "Spiegel"
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:499
+#: /home/runa/dev/website/press/en/inthemedia.wml:467
 msgid ""
 "<a href=\"http://www.spiegel.de/netzwelt/tech/0,1518,570421,00.html\">Tricks"
 " gegen Zensur und Überwachung</a>"
@@ -1221,26 +1346,30 @@
 " gegen Zensur und Überwachung</a>"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:506 /tmp/u3kTkswOVo.xml:560
-#: /tmp/u3kTkswOVo.xml:628 /tmp/u3kTkswOVo.xml:742
+#: /home/runa/dev/website/press/en/inthemedia.wml:474 /tmp/Q2ndl8ZYsF.xml:524
+#: /tmp/Q2ndl8ZYsF.xml:592 /tmp/Q2ndl8ZYsF.xml:706
 msgid "PC World"
 msgstr "PC World"
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:507
+#: /home/runa/dev/website/press/en/inthemedia.wml:475
 msgid ""
 "<a "
-"href=\"http://www.pcworld.com/article/149399-3/15_great_free_privacy_downloads."
-"  html\">15 Great, Free Privacy Downloads</a>.  Tor is Number 1."
+"href=\"http://www.pcworld.com/article/149399-3/15_great_free_privacy_downloads.html\">15"
+" Great, Free Privacy Downloads</a>.  Tor is Number 1."
 msgstr ""
+"<a "
+"href=\"http://www.pcworld.com/article/149399-3/15_great_free_privacy_downloads.html\">15"
+" Great, Free Privacy Downloads</a>. (15 wspaniałych, darmowych programów do "
+"prywatności do pobrania).  Tor jest na pierwszym miejscu."
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:515
+#: /home/runa/dev/website/press/en/inthemedia.wml:482
 msgid "The Guardian UK"
 msgstr "The Guardian UK"
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:516
+#: /home/runa/dev/website/press/en/inthemedia.wml:483
 msgid ""
 "<a "
 "href=\"http://www.guardian.co.uk/technology/2008/aug/07/censorship.hacking\">Chaos"
@@ -1251,12 +1380,12 @@
 " aims to crack China's wall</a> (Chaos próbuje przełamać zaporę Chin)"
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:523
+#: /home/runa/dev/website/press/en/inthemedia.wml:490
 msgid "The Register UK"
 msgstr "The Register UK"
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:524
+#: /home/runa/dev/website/press/en/inthemedia.wml:491
 msgid ""
 "<a "
 "href=\"http://www.theregister.co.uk/2008/08/07/torbrowser_olympics/\">German"
@@ -1268,69 +1397,78 @@
 "wydrążają dziurę w wielkiej chińskiej zaporze)"
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:530
+#: /home/runa/dev/website/press/en/inthemedia.wml:497
 msgid "2008 May 24"
 msgstr "24 Maja 2008"
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:531
+#: /home/runa/dev/website/press/en/inthemedia.wml:498
 msgid "Groupo Estado"
 msgstr "Groupo Estado"
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:532
+#: /home/runa/dev/website/press/en/inthemedia.wml:499
 msgid ""
-"<a href=\"http://blog.estadao.com.br/blog/cruz/?title= "
-"cfp08_navegacao_anonima_na_rede&amp;more=1&amp;c=1&amp;tb=1&amp;pb=1&amp;cat="
-" 525\">Interview at Computers, Freedom, and Privacy 2008 Conference</a>"
+"<a "
+"href=\"http://blog.estadao.com.br/blog/cruz/?title=cfp08_navegacao_anonima_na_rede&amp;more=1&amp;c=1&amp;tb=1&amp;pb=1&amp;cat=525\">Interview"
+" at Computers, Freedom, and Privacy 2008 Conference</a>"
 msgstr ""
+"<a "
+"href=\"http://blog.estadao.com.br/blog/cruz/?title=cfp08_navegacao_anonima_na_rede&amp;more=1&amp;c=1&amp;tb=1&amp;pb=1&amp;cat=525\">Wywiad"
+" z konferencji Komputery, Wolność i Prywatność 2008</a>"
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:540
+#: /home/runa/dev/website/press/en/inthemedia.wml:505
 msgid "2008 Mar 12"
 msgstr "12 Marca 2008"
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:541
+#: /home/runa/dev/website/press/en/inthemedia.wml:506
 msgid "SearchSecurity.com"
 msgstr "SearchSecurity.com"
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:542
+#: /home/runa/dev/website/press/en/inthemedia.wml:507
 msgid ""
-"<a href=\"http://searchsecurity.techtarget.com/news/article/0,289142, "
-"sid14_gci1305120,00.html\"> Tor network 'bridges' help evade blockers</a>.  "
-"Covers new Tor features designed to overcome filtering and blocking that "
-"prevent access to the Tor network."
+"<a "
+"href=\"http://searchsecurity.techtarget.com/news/article/0,289142,sid14_gci1305120,00.html\">"
+" Tor network 'bridges' help evade blockers</a>.  Covers new Tor features "
+"designed to overcome filtering and blocking that prevent access to the Tor "
+"network."
 msgstr ""
+"<a "
+"href=\"http://searchsecurity.techtarget.com/news/article/0,289142,sid14_gci1305120,00.html\">Mostki"
+" w sieci Tora pomagają unikać blokad</a>.  Opisuje nowe cechy Tora "
+"zaprojektowane, by pokonywać filtrowanie i blokowanie, które uniemożliwiają "
+"dostęp do sieci Tora."
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:552
+#: /home/runa/dev/website/press/en/inthemedia.wml:516
 msgid "2008 Feb 14"
 msgstr "14 Lutego 2008"
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:553
+#: /home/runa/dev/website/press/en/inthemedia.wml:517
 msgid "Wired: Compiler Blog"
 msgstr "Wired: Compiler Blog"
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:554
+#: /home/runa/dev/website/press/en/inthemedia.wml:518
 msgid ""
 "<a href=\"http://blog.wired.com/monkeybites/2008/02/how-to-set-up-a.html\"> "
 "How To: Set Up Anonymous Browsing in 30 Seconds or Less</a>."
 msgstr ""
-"<a href=\"http://blog.wired.com/monkeybites/2008/02/how-to-set-up-a.html\" "
-">Jak to zrobić: Uruchomienie anonimowego przeglądania sieci w 30 sekund lub "
+"<a href=\"http://blog.wired.com/monkeybites/2008/02/how-to-set-up-a.html\"> "
+"Jak to zrobić: Uruchomienie anonimowego przeglądania sieci w 30 sekund lub "
 "mniej</a>."
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:559
+#: /home/runa/dev/website/press/en/inthemedia.wml:523
 msgid "2008 Feb 01"
 msgstr "01 Lutego 2008"
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:561
+#: /home/runa/dev/website/press/en/inthemedia.wml:525
 msgid ""
 "<a href=\"http://www.pcworld.com/article/id,142094-pg,1/article.html\"> "
 "Hackers Can Expose Masked Surfers, Study Says</a> A report on <a "
@@ -1340,46 +1478,50 @@
 "channel-vulnerabilities-anonymity-systems%2526quot%3B\"> responds on the Tor"
 " Blog</a>."
 msgstr ""
-"<a href=\"http://www.pcworld.com/article/id,142094-pg,1/article.html\" "
-">Badania twierdzą, że hakerzy mogą odkrywać osoby maskujące się podczas "
+"<a href=\"http://www.pcworld.com/article/id,142094-pg,1/article.html\"> "
+"Badania twierdzą, że hakerzy mogą odkrywać osoby maskujące się podczas "
 "surfowania po sieci</a> Raport na temat <a "
 "href=\"http://www.lightbluetouchpaper.org/2007/12/10/covert-channel-"
-"vulnerabilities-in-anonymity-systems/\" >niedawnej tezy w pracy naukowej "
+"vulnerabilities-in-anonymity-systems/\">niedawnej tezy w pracy naukowej "
 "Stevena Murdocha </a>. Steven <a href=\"<blog>media-coverage-%2526quot"
-"%3Bcovert-channel-vulnerabilities-anonymity-systems%2526quot%3B\">odpowiada "
-"na Blogu Tora</a>."
+"%3Bcovert-channel-vulnerabilities-anonymity-systems%2526quot%3B\"> odpowiada"
+" na Blogu Tora</a>."
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:568
+#: /home/runa/dev/website/press/en/inthemedia.wml:532
 msgid "2007 Sep 21"
 msgstr "21 Września 2007"
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:569
+#: /home/runa/dev/website/press/en/inthemedia.wml:533
 msgid "Wired HowTo Blog"
 msgstr "Wired HowTo Blog"
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:570
+#: /home/runa/dev/website/press/en/inthemedia.wml:534
 msgid ""
 "<a "
 "href=\"http://howto.wired.com/wiredhowtos/index.cgi?page_name=be_a_whistle_blower;action=display;category=Work\">Be"
 " a Whistleblower</a>.  Wired recommends Tor for whistleblowers who wish to "
 "remain anonymous."
 msgstr ""
+"<a "
+"href=\"http://howto.wired.com/wiredhowtos/index.cgi?page_name=be_a_whistle_blower;action=display;category=Work\">Be"
+" a Whistleblower</a>. Wired poleca Tora dla nagłaśniaczy, którzy chcą "
+"pozostać anonimowi."
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:573
+#: /home/runa/dev/website/press/en/inthemedia.wml:537
 msgid "2007 Sep 16"
 msgstr "16 Września 2007"
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:574
+#: /home/runa/dev/website/press/en/inthemedia.wml:538
 msgid "Cnet"
 msgstr "Cnet"
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:575
+#: /home/runa/dev/website/press/en/inthemedia.wml:539
 msgid ""
 "<a href=\"http://news.cnet.com/8301-13739_3-9779225-46.html\">Tor anonymity "
 "server admin arrested</a>.  A Tor exit node operator from Germany was "
@@ -1392,20 +1534,31 @@
 "href=\"<page eff/tor-legal-faq>\"> Legal FAQ for Tor Relay Operators</a> "
 "with advice on how to handle such issues if you are operating a Tor relay."
 msgstr ""
+"<a href=\"http://www.cnet.com/8301-13739_1-9779225-46.html\">Aresztowanie "
+"administratora serwera sieci anonimowej Tor</a>. Operator węzła wyjściowego "
+"sieci Tor w Niemczech został aresztowany, po czym zwolniony, gdy policja "
+"zorientowała się w swoim błędzie. Niestety, całe zamieszanie <a "
+"href=\"http://arstechnica.com/news.ars/post/20070917-tor-node-operator-"
+"after-run-in-with-police-i-cant-do-this-any-more.html\">spowodowało, że ten "
+"operator wyłączył swój węzeł</a>.  Mamy <a href=\"<page docs/faq-abuse>\"> "
+"Najczęściej zadawane pytania o nadużyciach dla operatorów przekaźników</a>, "
+"jak również <a href=\"<page eff/tor-legal-faq>\"> Najczęściej zadawane "
+"prawne pytania dla operatorów przekaźników</a>, które radzą, jak załatwiać "
+"takie sprawy, jeśli prowadzi się przekaźnik sieci."
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:578
+#: /home/runa/dev/website/press/en/inthemedia.wml:542
 msgid "2007 Sep 10"
 msgstr "10 Września 2007"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:579 /tmp/u3kTkswOVo.xml:696
-#: /tmp/u3kTkswOVo.xml:772 /tmp/u3kTkswOVo.xml:881 /tmp/u3kTkswOVo.xml:893
+#: /home/runa/dev/website/press/en/inthemedia.wml:543 /tmp/Q2ndl8ZYsF.xml:660
+#: /tmp/Q2ndl8ZYsF.xml:736 /tmp/Q2ndl8ZYsF.xml:845 /tmp/Q2ndl8ZYsF.xml:857
 msgid "Wired"
 msgstr "Wired"
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:580
+#: /home/runa/dev/website/press/en/inthemedia.wml:544
 msgid ""
 "<a "
 "href=\"http://www.wired.com/politics/security/news/2007/09/embassy_hacks\"> "
@@ -1440,19 +1593,52 @@
 "ZDNet</a>, and <a href=\"http://blog.wired.com/27bstroke6/2007/11/swedish-"
 "researc.html\"> Wired Blog</a>."
 msgstr ""
+"<a "
+"href=\"http://www.wired.com/politics/security/news/2007/09/embassy_hacks\"> "
+"Złe węzły zmieniają anonimizer Tor w raj dla podsłuchiwaczy</a><br /> "
+"Szwedzki konsultant bezpieczeństwa komputerowego, Dan Egerstad, monitorował "
+"ruch przechodzący przez węzeł wyjściowy Tora, który sam prowadził, po czym "
+"opublikował niezaszyfrowane hasła i informacje o kontach. Zauważcie, że "
+"lepsze artykuły o tym wydarzeniu wskazują, że nie jest to błąd "
+"bezpieczeństwa ani projektu systemu Tor - Tor daje anonimowość, ale nie "
+"szyfruje nic przychodzącego do lub wychodzącego z węzła wyjściowego. "
+"<strong>Musisz</strong> używać SSL (HTTPS) w czasie surfowania, by zapewnić "
+"sobie szyfrowanie od początku do końca.  Również opisane w <a "
+"href=\"http://www.theinquirer.net/en/inquirer/news/2007/09/10/tor-network-"
+"exposes-sensitive-information\"> The Inquirer</a>, <a "
+"href=\"http://www.infoworld.com/article/07/09/10/Security-researcher-"
+"intercepts-embassy-passwords_1.html?APPLICATION%20SECURITY\"> InfoWorld</a>,"
+" <a "
+"href=\"http://www.smh.com.au/articles/2007/11/12/1194766589522.html?page=fullpage#contentSwap2\">The"
+" Sydney Morning Herald</a>, <a "
+"href=\"http://www.securityfocus.com/news/11486\">Security Focus</a>, <a "
+"href=\"http://arstechnica.com/news.ars/post/20070910-security-expert-used-"
+"tor-to-collect-government-e-mail-passwords.html\"> ars technica</a> i wielu "
+"innych. Zostało to zgłoszone 31 Sierpnia 2007 na stronie <a "
+"href=\"http://blog.wired.com/27bstroke6/2007/08/embassy-e-mail-.html\" "
+">Wired Blog</a>, zanim pan Egerstad powiedział, że uzyskał te informacje ze "
+"swojego węzła wyjściowego Tora. Ostatecznie, pan Egerstad został "
+"aresztowany, co opisano w <a "
+"href=\"http://www.theregister.co.uk/2007/11/15/tor_hacker_arrest/\"> The "
+"Register</a>, <a href=\"http://www.smh.com.au/news/security/police-swoop-on-"
+"hacker-of-the-"
+"year/2007/11/15/1194766821481.html?page=fullpage#contentSwap1\"> The Sydney "
+"Morning Herald</a>, <a href=\"http://blogs.zdnet.com/Berlind/?p=900\"> "
+"ZDNet</a> i <a href=\"http://blog.wired.com/27bstroke6/2007/11/swedish-"
+"researc.html\"> Wired Blog</a>."
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:583
+#: /home/runa/dev/website/press/en/inthemedia.wml:547
 msgid "2007 Jul 27"
 msgstr "27 Lipca 2007"
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:584
+#: /home/runa/dev/website/press/en/inthemedia.wml:548
 msgid "Wired Blog"
 msgstr "Wired Blog"
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:585
+#: /home/runa/dev/website/press/en/inthemedia.wml:549
 msgid ""
 "<a href=\"http://blog.wired.com/27bstroke6/2007/07/cyber-jihadists.html\"> "
 "Cyber Jihadists Embrace Tor</a><br/> A pointer to a <a "
@@ -1469,12 +1655,12 @@
 " na dole artykułu."
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:588
+#: /home/runa/dev/website/press/en/inthemedia.wml:552
 msgid "2007 Jun 22"
 msgstr "22 Czerwca 2007"
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:590
+#: /home/runa/dev/website/press/en/inthemedia.wml:554
 msgid ""
 "<a href=\"http://www.asiamedia.ucla.edu/article-"
 "southeastasia.asp?parentid=72388\"> The problems with censorship</a>.  "
@@ -1482,21 +1668,21 @@
 "censorship."
 msgstr ""
 "<a href=\"http://www.asiamedia.ucla.edu/article-"
-"southeastasia.asp?parentid=72388\" >Problemy z cenzurą</a>. Opisuje anegdoty"
+"southeastasia.asp?parentid=72388\"> Problemy z cenzurą</a>. Opisuje anegdoty"
 " mówiące, że \"każdy\" w Tajlandii ma Tora, by unikać cenzury."
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:593
+#: /home/runa/dev/website/press/en/inthemedia.wml:557
 msgid "2007 Mar 15"
 msgstr "15 Marca 2007"
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:594
+#: /home/runa/dev/website/press/en/inthemedia.wml:558
 msgid "World Changing"
 msgstr "World Changing"
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:595
+#: /home/runa/dev/website/press/en/inthemedia.wml:559
 msgid ""
 "<a href=\"http://www.worldchanging.com/archives/006309.html\"> Blogging "
 "Where Speech Isn’t Free</a><br/> Coverage of former Tor Executive Director "
@@ -1504,68 +1690,68 @@
 "href=\"http://2007.sxsw.com/interactive/programming/panels/?action=show&amp;id=IAP060124\">"
 " SXSW panel</a>, where she explained how Tor can help bloggers."
 msgstr ""
-"<a href=\"http://www.worldchanging.com/archives/006309.html\" >Blogowanie "
-"tam, gdzie nie ma wolności słowa</a><br /> Opis udziału byłej dyrektor Tora,"
-" Shavy Nerad, w <a "
+"<a href=\"http://www.worldchanging.com/archives/006309.html\"> Blogowanie "
+"tam, gdzie nie ma wolności słowa</a><br/> Opis udziału byłej dyrektor Tora, "
+"Shavy Nerad, w <a "
 "href=\"http://2007.sxsw.com/interactive/programming/panels/?action=show&amp;id=IAP060124\">"
 " SXSW panel</a>, gdzie wyjaśniała, jak Tor może pomóc blogerom."
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:598
+#: /home/runa/dev/website/press/en/inthemedia.wml:562
 msgid "2007 Mar 8"
 msgstr "8 Marca 2007"
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:599
+#: /home/runa/dev/website/press/en/inthemedia.wml:563
 msgid "Security Focus"
 msgstr "Security Focus"
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:600
+#: /home/runa/dev/website/press/en/inthemedia.wml:564
 msgid ""
 "<a href=\"http://www.securityfocus.com/news/11447/1\"> Tor hack proposed to "
 "catch criminals</a>.  Coverage of a toolset called \"Torment\" for "
 "monitoring exit nodes, and responses from the Tor Project illustrating why "
 "this approach may not be a good idea."
 msgstr ""
-"<a href=\"http://www.securityfocus.com/news/11447/1\" >Proponowana dziura w "
+"<a href=\"http://www.securityfocus.com/news/11447/1\"> Proponowana dziura w "
 "Torze do ułatwienia łapania przestępców</a>. Opis narzędzia nazwanego "
 "\"Torment\" do monitorowania węzłów wyjściowych Tora i odpowiedzi od "
 "Projektu Tor ilustrujące, dlaczego to podejście może być złym pomysłem."
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:603
+#: /home/runa/dev/website/press/en/inthemedia.wml:567
 msgid "2007 Feb 1"
 msgstr "01 Lutego 2007"
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:604
+#: /home/runa/dev/website/press/en/inthemedia.wml:568
 msgid "Dr Dobb's"
 msgstr "Dr Dobb's"
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:605
+#: /home/runa/dev/website/press/en/inthemedia.wml:569
 msgid ""
 "<a href=\"http://www.ddj.com/security/197002414\"> Tor Project Protects "
 "Anonymous Sources</a>.  An introduction to Tor, including technical and "
 "historical background."
 msgstr ""
-"<a href=\"http://www.ddj.com/security/197002414\" >Projekt Tor broni "
+"<a href=\"http://www.ddj.com/security/197002414\"> Projekt Tor broni "
 "anonimowe źródła informacji</a>.  Wprowadzenie do Tora, łącznie z notą od "
 "strony technicznej i historycznej."
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:608
+#: /home/runa/dev/website/press/en/inthemedia.wml:572
 msgid "2006 Oct 19"
 msgstr "19 Października 2006"
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:609
+#: /home/runa/dev/website/press/en/inthemedia.wml:573
 msgid "Wired Threat Level"
 msgstr "Wired Threat Level"
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:610
+#: /home/runa/dev/website/press/en/inthemedia.wml:574
 msgid ""
 "<a href=\"http://blog.wired.com/27bstroke6/2006/10/the_onion_route.html\"> "
 "The Onion Router (TOR) is Leaky (Leeky)</a>.  Explains why you need "
@@ -1573,68 +1759,68 @@
 "anonymity. If you use the Vidalia bundle, it installs and configures Privoxy"
 " automatically, but it can't hurt to understand why it is necessary."
 msgstr ""
-"<a href=\"http://blog.wired.com/27bstroke6/2006/10/the_onion_route.html\" "
-">Router cebulowy (TOR) przecieka</a>. Tłumaczy, dlaczego musisz używać "
-"czegoś takiego jak Privoxy jako dodatek do samego Tora, by zapewnić sobie "
+"<a href=\"http://blog.wired.com/27bstroke6/2006/10/the_onion_route.html\"> "
+"Router cebulowy (TOR) przecieka</a>. Tłumaczy, dlaczego musisz używać czegoś"
+" takiego jak Privoxy jako dodatek do samego Tora, by zapewnić sobie "
 "anonimowość. Jeśli używasz paczki z Vidalią, to ona automatycznie instaluje "
 "i konfiguruje Privoxy, ale nie zaszkodzi wiedzieć, czemu to jest potrzebne."
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:613
+#: /home/runa/dev/website/press/en/inthemedia.wml:577
 msgid "2006 Aug 18"
 msgstr "18 Sierpnia 2006"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:614 /tmp/u3kTkswOVo.xml:702
+#: /home/runa/dev/website/press/en/inthemedia.wml:578 /tmp/Q2ndl8ZYsF.xml:666
 msgid "NPR"
 msgstr "NPR"
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:615
+#: /home/runa/dev/website/press/en/inthemedia.wml:579
 msgid ""
 "<a href=\"http://www.npr.org/templates/story/story.php?storyId=5168456\"> "
 "Tips for Protecting Privacy Online</a>.  Kevin Bankston of the EFF "
 "recommends Tor during an NPR interview.  Tor information begins at 8:15 into"
 " the program."
 msgstr ""
-"<a href=\"http://www.npr.org/templates/story/story.php?storyId=5168456\" "
-">Wskazówki jak chronić prywatność on-line</a>. Kevin Bankston z EFF poleca "
+"<a href=\"http://www.npr.org/templates/story/story.php?storyId=5168456\"> "
+"Wskazówki jak chronić prywatność on-line</a>. Kevin Bankston z EFF poleca "
 "Tor podczas wywiadu w NPR. Informacje o Torze zaczynają się o czasie 8:15 w "
 "materiale z programu."
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:618
+#: /home/runa/dev/website/press/en/inthemedia.wml:582
 msgid "2006 Jul 5"
 msgstr "05 Lipca 2006"
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:619
+#: /home/runa/dev/website/press/en/inthemedia.wml:583
 msgid "MSNBC"
 msgstr "MSNBC"
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:620
+#: /home/runa/dev/website/press/en/inthemedia.wml:584
 msgid ""
 "<a href=\"http://www.msnbc.msn.com/id/13718446/page/2/\"> Defending "
 "liberties in high-tech world</a>.  Mentions EFF funding for Tor as one of "
 "its significant nonlitigation projects."
 msgstr ""
-"<a href=\"http://www.msnbc.msn.com/id/13718446/page/2/\" >Obrona wolności w "
+"<a href=\"http://www.msnbc.msn.com/id/13718446/page/2/\"> Obrona wolności w "
 "świecie nowych technologii</a>.  Wspomina, że EFF wspiera funduszami Tora "
 "jako jeden ze swoich głównych projektów niesądowych."
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:622
+#: /home/runa/dev/website/press/en/inthemedia.wml:586
 msgid "2006 Apr 11"
 msgstr "11 Kwietnia 2006"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:623
+#: /home/runa/dev/website/press/en/inthemedia.wml:587
 msgid "PBS Frontline"
 msgstr "PBS Frontline"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:624
+#: /home/runa/dev/website/press/en/inthemedia.wml:588
 msgid ""
 "<a "
 "href=\"http://pbs.gen.in/wgbh/pages/frontline/tankman/internet/tech.html\">Chipping"
@@ -1645,71 +1831,74 @@
 ">Zmniejszanie chińskiej zapory ogniowej</a>"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:627
+#: /home/runa/dev/website/press/en/inthemedia.wml:591
 msgid "2006 Feb 28"
 msgstr "28 Lutego 2006"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:629
+#: /home/runa/dev/website/press/en/inthemedia.wml:593
 msgid ""
 "<a "
 "href=\"http://www.pcworld.com/article/id,124891-page,1/article.html\">Outsmarting"
 " the Online Privacy Snoops</a>"
 msgstr ""
+"<a "
+"href=\"http://www.pcworld.com/article/id,124891-page,1/article.html\">Outsmarting"
+" the Online Privacy Snoops</a> (Przechytrzanie osób podsłuchujących on-line)"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:632
+#: /home/runa/dev/website/press/en/inthemedia.wml:596
 msgid "2006 Feb 27"
 msgstr "27 Lutego 2006"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:633
+#: /home/runa/dev/website/press/en/inthemedia.wml:597
 msgid "Forbes"
 msgstr "Forbes"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:634
+#: /home/runa/dev/website/press/en/inthemedia.wml:598
 msgid ""
 "<a href=\"http://members.forbes.com/global/2006/0227/018A_2.html\"> Cracks "
 "In the Wall</a>.  Discussion of Tor being used for evading censorship by "
 "repressive governments."
 msgstr ""
-"<a href=\"http://members.forbes.com/global/2006/0227/018A_2.html\" "
-">Pęknięcia w Murze</a>. Dyskusja na temat używania Tora do unikania "
+"<a href=\"http://members.forbes.com/global/2006/0227/018A_2.html\"> "
+"Pęknięcia w Murze</a>. Dyskusja na temat używania Tora do unikania "
 "cenzurowania sieci przez represyjne rzędy."
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:637
+#: /home/runa/dev/website/press/en/inthemedia.wml:601
 msgid "2006 Feb 20"
 msgstr "20 Lutego 2006"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:638
+#: /home/runa/dev/website/press/en/inthemedia.wml:602
 msgid "The Boston Globe"
 msgstr "The Boston Globe"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:639
+#: /home/runa/dev/website/press/en/inthemedia.wml:603
 msgid ""
 "<a href=\"http://members.forbes.com/global/2006/0227/018A_2.html\"> Beating "
 "censorship on the Internet</a>"
 msgstr ""
-"<a href=\"http://members.forbes.com/global/2006/0227/018A_2.html\" "
-">Pokonywanie cenzury w Internecie</a>"
+"<a href=\"http://members.forbes.com/global/2006/0227/018A_2.html\"> "
+"Pokonywanie cenzury w Internecie</a>"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:642 /tmp/u3kTkswOVo.xml:647
-#: /tmp/u3kTkswOVo.xml:652 /tmp/u3kTkswOVo.xml:689
+#: /home/runa/dev/website/press/en/inthemedia.wml:606 /tmp/Q2ndl8ZYsF.xml:611
+#: /tmp/Q2ndl8ZYsF.xml:616 /tmp/Q2ndl8ZYsF.xml:653
 msgid "2006 Feb 15"
 msgstr "15 Lutego 2006"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:643
+#: /home/runa/dev/website/press/en/inthemedia.wml:607
 msgid "CBS Evening News"
 msgstr "CBS Evening News"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:644
+#: /home/runa/dev/website/press/en/inthemedia.wml:608
 msgid ""
 "<a "
 "href=\"http://www.cbsnews.com/stories/2006/02/15/eveningnews/main1321785.shtml?source=search_story\">"
@@ -1717,186 +1906,208 @@
 "the show to discuss Tor, starting at 1:04 into the video."
 msgstr ""
 "<a "
-"href=\"http://www.cbsnews.com/stories/2006/02/15/eveningnews/main1321785.shtml?source=search_story\""
-" >Przebijanie się przez \"Wielki Chiński Mur Ogniowy (Firewall)\"</a>. Roger"
-" Dingledine pojawił się w programie, by omówić Tora, zaczyna się to w chwili"
-" 1:04 na wideo."
+"href=\"http://www.cbsnews.com/stories/2006/02/15/eveningnews/main1321785.shtml?source=search_story\">"
+" Przebijanie się przez \"Wielki Chiński Mur Ogniowy (Firewall)\"</a>. Roger "
+"Dingledine pojawił się w programie, by omówić Tora, zaczyna się to w chwili "
+"1:04 na wideo."
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:648
+#: /home/runa/dev/website/press/en/inthemedia.wml:612
 msgid "CNBC - Closing Bell"
 msgstr "CNBC - Closing Bell"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:649
+#: /home/runa/dev/website/press/en/inthemedia.wml:613
 msgid "TV Appearance by Roger Dingledine at 4:25pm. (no link)"
 msgstr "Występ telewizyjny Rogera Dingledine'a o 16:25. (brak linku)"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:653
+#: /home/runa/dev/website/press/en/inthemedia.wml:617
 msgid "Network Secure"
 msgstr "Network Secure"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:654
+#: /home/runa/dev/website/press/en/inthemedia.wml:618
 msgid ""
 "<a href=\"http://www.network-"
 "secure.de/index.php?option=com_content&amp;task=view&amp;id=3909\">Tor: "
 "Anonymisierungswerkzeug entwickelt</a> (German)"
 msgstr ""
+"<a href=\"http://www.network-"
+"secure.de/index.php?option=com_content&amp;task=view&amp;id=3909\">Tor: "
+"Anonymisierungswerkzeug entwickelt</a> (niemiecki)"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:657
+#: /home/runa/dev/website/press/en/inthemedia.wml:621
 msgid "2006 Feb 13"
 msgstr "13 Lutego 2006"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:659
+#: /home/runa/dev/website/press/en/inthemedia.wml:623
 msgid ""
 "<a href=\"http://online.wsj.com/article/SB113979965346572150.html\"> Chinese"
 " Censors Of Internet Face 'Hacktivists' in U.S.</a>Full article text can "
 "also be found <a "
 "href=\"http://yaleglobal.yale.edu/display.article?id=6981\">here</a>."
 msgstr ""
+"<a href=\"http://online.wsj.com/article/SB113979965346572150.html\"> Chińscy"
+" cenzorzy Internetu stają naprzeciw \"haktywistów\" z USA</a> Pełny artykuł "
+"można też znaleźć <a "
+"href=\"http://yaleglobal.yale.edu/display.article?id=6981\">tutaj</a>."
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:663
+#: /home/runa/dev/website/press/en/inthemedia.wml:627
 msgid "2006 Jan 31"
 msgstr "31 Stycznia 2006"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:665
+#: /home/runa/dev/website/press/en/inthemedia.wml:629
 msgid ""
 "<a href=\"http://www.technologyreview.com/Infotech/16216/page2/\">Evading "
 "the Google Eye</a>"
 msgstr ""
+"<a href=\"http://www.technologyreview.com/Infotech/16216/page2/\">Evading "
+"the Google Eye</a> (Unikanie oczu Google)"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:668
+#: /home/runa/dev/website/press/en/inthemedia.wml:632
 msgid "2006 Jan 29"
 msgstr "29 Stycznia 2006"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:670
+#: /home/runa/dev/website/press/en/inthemedia.wml:634
 msgid ""
 "<a href=\"http://www.nytimes.com/2006/01/29/weekinreview/29basic.html\"> How"
 " to Outwit the World's Internet Censors</a>"
 msgstr ""
+"<a href=\"http://www.nytimes.com/2006/01/29/weekinreview/29basic.html\"> How"
+" to Outwit the World's Internet Censors</a> (Jak przechytrzyć światowych "
+"cenzorów Internetu)"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:673
+#: /home/runa/dev/website/press/en/inthemedia.wml:637
 msgid "2006 Jan 27"
 msgstr "27 Stycznia 2006"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:674
+#: /home/runa/dev/website/press/en/inthemedia.wml:638
 msgid "Fox News/eWeek"
 msgstr "Fox News/eWeek"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:675
+#: /home/runa/dev/website/press/en/inthemedia.wml:639
 msgid ""
 "<a href=\"http://www.foxnews.com/story/0,2933,183005,00.html\"> Web "
 "Anonymizers Suddenly Get Very Popular</a>"
 msgstr ""
-"<a href=\"http://www.foxnews.com/story/0,2933,183005,00.html\">Anonimizery "
+"<a href=\"http://www.foxnews.com/story/0,2933,183005,00.html\"> Anonimizery "
 "sieciowe nagle stają się bardzo popularne</a>"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:678
+#: /home/runa/dev/website/press/en/inthemedia.wml:642
 msgid "2006 Jan 25"
 msgstr "25 Stycznia 2006"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:680
+#: /home/runa/dev/website/press/en/inthemedia.wml:644
 msgid ""
 "<a "
 "href=\"http://www.nytimes.com/2006/01/25/technology/techspecial2/25privacy.html?_r=1&amp;oref=slogin\">"
 " Privacy for People Who Don't Show Their Navels</a>"
 msgstr ""
 "<a "
-"href=\"http://www.nytimes.com/2006/01/25/technology/techspecial2/25privacy.html?_r=1&amp;oref=slogin\""
-" >Prywatność dla ludzi nie pokazujących swoich pępków</a> (tłum. dosł.)"
+"href=\"http://www.nytimes.com/2006/01/25/technology/techspecial2/25privacy.html?_r=1&amp;oref=slogin\">"
+" Prywatność dla ludzi nie pokazujących swoich pępków</a> (tłum. dosł.)"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:683
+#: /home/runa/dev/website/press/en/inthemedia.wml:647
 msgid "2006 Jan 23"
 msgstr "23 Stycznia 2006"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:684
+#: /home/runa/dev/website/press/en/inthemedia.wml:648
 msgid "NPR Talk of the Nation"
 msgstr "NPR Talk of the Nation"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:685
+#: /home/runa/dev/website/press/en/inthemedia.wml:649
 msgid ""
 "<a href=\"http://www.npr.org/templates/story/story.php?storyId=5168456\"> "
 "Search Engines and Privacy Rights on the Web</a><br/> <a "
 "href=\"http://xeni.net/\">Xeni Jardin</a> recommends Tor at 33:30 into the "
 "program."
 msgstr ""
-"<a href=\"http://www.npr.org/templates/story/story.php?storyId=5168456\" "
-">Wyszukiwarki a prawo do prywatności w sieci</a><br /> <a "
+"<a href=\"http://www.npr.org/templates/story/story.php?storyId=5168456\"> "
+"Wyszukiwarki a prawo do prywatności w sieci</a><br /> <a "
 "href=\"http://xeni.net/\">Xeni Jardin</a> poleca Tora o czasie 33:30 na "
 "wideo z programu."
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:690
+#: /home/runa/dev/website/press/en/inthemedia.wml:654
 msgid "Punto Informatico"
 msgstr "Punto Informatico"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:691
+#: /home/runa/dev/website/press/en/inthemedia.wml:655
 msgid ""
 "<a href=\"http://punto-informatico.it/p.aspx?i=1430903\"> TOR c'è</a> "
 "(Italian)"
 msgstr ""
+"<a href=\"http://punto-informatico.it/p.aspx?i=1430903\"> TOR c'è</a> "
+"(włoski)"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:695 /tmp/u3kTkswOVo.xml:701
+#: /home/runa/dev/website/press/en/inthemedia.wml:659 /tmp/Q2ndl8ZYsF.xml:665
 msgid "2006 Jan 20"
 msgstr "20 Stycznia 2006"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:697
+#: /home/runa/dev/website/press/en/inthemedia.wml:661
 msgid ""
 "<a "
 "href=\"http://www.wired.com/science/discoveries/news/2006/01/70051?currentPage=2\">"
 " How to Foil Search Engine Snoops</a>"
 msgstr ""
+"<a "
+"href=\"http://www.wired.com/science/discoveries/news/2006/01/70051?currentPage=2\">"
+" How to Foil Search Engine Snoops</a> (Jak oszukać szpiegowanie z "
+"wyszukiwarek)"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:703
+#: /home/runa/dev/website/press/en/inthemedia.wml:667
 msgid ""
 "<a href=\"http://www.npr.org/templates/story/story.php?storyId=5165854\"> "
 "Google Records Subpoena Raises Privacy Fears</a>"
 msgstr ""
+"<a href=\"http://www.npr.org/templates/story/story.php?storyId=5165854\"> "
+"Google Records Subpoena Raises Privacy Fears</a>"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:707
+#: /home/runa/dev/website/press/en/inthemedia.wml:671
 msgid "2005 Sep 30"
 msgstr "30 Września 2005"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:708
+#: /home/runa/dev/website/press/en/inthemedia.wml:672
 msgid "Viva o Linux"
 msgstr "Viva o Linux"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:709
+#: /home/runa/dev/website/press/en/inthemedia.wml:673
 msgid ""
 "<a href=\"http://www.vivaolinux.com.br/artigos/verArtigo.php?codigo=2759\"> "
 "TOR: A Internet sem rastreabilidade</a> (Portuguese)"
 msgstr ""
+"<a href=\"http://www.vivaolinux.com.br/artigos/verArtigo.php?codigo=2759\"> "
+"TOR: A Internet sem rastreabilidade</a> (portugalski)"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:712
+#: /home/runa/dev/website/press/en/inthemedia.wml:676
 msgid "2005 Aug 6"
 msgstr "6 Sierpnia 2005"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:714
+#: /home/runa/dev/website/press/en/inthemedia.wml:678
 msgid ""
 "<a href=\"http://www.eurekalert.org/pub_releases/2005-08/ns-"
 "wwa080305.php\">Why we all need pornography</a>"
@@ -1905,469 +2116,545 @@
 ">Czemu wszyscy potrzebujemy pornografii</a>"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:717
+#: /home/runa/dev/website/press/en/inthemedia.wml:681
 msgid "2005 Jul 12"
 msgstr "12 Lipca 2005"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:718
+#: /home/runa/dev/website/press/en/inthemedia.wml:682
 msgid "IEEE Computer Society's Technical Committee on Security and Privacy"
 msgstr "IEEE Computer Society's Technical Committee on Security and Privacy"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:719
+#: /home/runa/dev/website/press/en/inthemedia.wml:683
 msgid ""
 "<a href=\"http://www.ieee-"
 "security.org/Cipher/Newsbriefs/2005/071805.html#TOR\"> Onion routing "
 "application Tor makes PCWorld's top 100</a>"
 msgstr ""
+"<a href=\"http://www.ieee-"
+"security.org/Cipher/Newsbriefs/2005/071805.html#TOR\"> Onion routing "
+"application Tor makes PCWorld's top 100</a> (Aplikacja Trasowania Cebulowego"
+" Tor wchodzi do pierwszej setki PCWorlda)"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:723
+#: /home/runa/dev/website/press/en/inthemedia.wml:687
 msgid "2005 Jun 22"
 msgstr "22 Czerwca 2005"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:724
+#: /home/runa/dev/website/press/en/inthemedia.wml:688
 msgid "The Unofficial Apple Blog"
 msgstr "The Unofficial Apple Blog"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:725
+#: /home/runa/dev/website/press/en/inthemedia.wml:689
 msgid ""
 "<a href=\"http://www.tuaw.com/2005/06/22/privacy-watch-tor/\"> Privacy "
 "Watch: Tor</a>"
 msgstr ""
+"<a href=\"http://www.tuaw.com/2005/06/22/privacy-watch-tor/\"> Privacy "
+"Watch: Tor</a>"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:729
+#: /home/runa/dev/website/press/en/inthemedia.wml:693
 msgid "2005 Jun 10"
 msgstr "10 Czerwca 2005"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:730
+#: /home/runa/dev/website/press/en/inthemedia.wml:694
 msgid "The New Zealand Herald"
 msgstr "The New Zealand Herald"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:731
+#: /home/runa/dev/website/press/en/inthemedia.wml:695
 msgid ""
 "<a "
 "href=\"http://www.nzherald.co.nz/section/story.cfm?c_id=5&amp;objectid=10329896\">"
 " China's internet censorship stranglehold can't last</a>"
 msgstr ""
+"<a "
+"href=\"http://www.nzherald.co.nz/section/story.cfm?c_id=5&amp;objectid=10329896\">"
+" China's internet censorship stranglehold can't last</a> (Chińskie "
+"cenzurowanie Internetu nie przetrwa)"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:735
+#: /home/runa/dev/website/press/en/inthemedia.wml:699
 msgid "2005 Jun 8"
 msgstr "08 Czerwca 2005"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:736
+#: /home/runa/dev/website/press/en/inthemedia.wml:700
 msgid "American Public Radio"
 msgstr "American Public Radio"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:737
+#: /home/runa/dev/website/press/en/inthemedia.wml:701
 msgid ""
 "<a href=\"http://www.publicradio.org/columns/futuretense/2005/06/08.shtml\">"
 " An Internet privacy tool called \"Tor\"</a>"
 msgstr ""
+"<a href=\"http://www.publicradio.org/columns/futuretense/2005/06/08.shtml\">"
+" An Internet privacy tool called \"Tor\"</a> (Internetowe narzędzie "
+"prywatności o nazwie \"Tor\")"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:741 /tmp/u3kTkswOVo.xml:747
+#: /home/runa/dev/website/press/en/inthemedia.wml:705 /tmp/Q2ndl8ZYsF.xml:711
 msgid "2005 Jun 1"
 msgstr "1 Czerwca 2005"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:743
+#: /home/runa/dev/website/press/en/inthemedia.wml:707
 msgid ""
 "<a href=\"http://www.pcworld.com/article/id,120763-page,4/article.html\"> "
 "The 100 Best Products of 2005</a><br/> Tor is ranked #40 on the list."
 msgstr ""
-"<a href=\"http://www.pcworld.com/article/id,120763-page,4/article.html\" "
-">Najlepsze 100 produktów roku 2005</a><br /> Tor zajmuje miejsce 40."
+"<a href=\"http://www.pcworld.com/article/id,120763-page,4/article.html\"> "
+"Najlepsze 100 produktów roku 2005</a><br /> Tor zajmuje miejsce 40."
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:748
+#: /home/runa/dev/website/press/en/inthemedia.wml:712
 msgid "Linux Weekly News"
 msgstr "Linux Weekly News"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:749
+#: /home/runa/dev/website/press/en/inthemedia.wml:713
 msgid ""
 "<a href=\"http://lwn.net/Articles/138242/\"> A Look at The Onion Router "
 "(Tor)</a>"
 msgstr ""
+"<a href=\"http://lwn.net/Articles/138242/\"> A Look at The Onion Router "
+"(Tor)</a> (Spojrzenie na The Onion Router [Tor])"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:753
+#: /home/runa/dev/website/press/en/inthemedia.wml:717
 msgid "2005 May 22"
 msgstr "22 Maja 2005"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:754 /tmp/u3kTkswOVo.xml:839
+#: /home/runa/dev/website/press/en/inthemedia.wml:718 /tmp/Q2ndl8ZYsF.xml:803
 msgid "Slashdot"
 msgstr "Slashdot"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:755
+#: /home/runa/dev/website/press/en/inthemedia.wml:719
 msgid ""
 "<a href=\"http://yro.slashdot.org/article.pl?sid=05/05/22/0113244\"> Tor "
 "Anonymity Network Reaches 100 Verified Nodes</a>"
 msgstr ""
+"<a href=\"http://yro.slashdot.org/article.pl?sid=05/05/22/0113244\"> Tor "
+"Anonymity Network Reaches 100 Verified Nodes</a> (Sieć anonimowości Tora ma "
+"100 zweryfikowanych węzłów)"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:759
+#: /home/runa/dev/website/press/en/inthemedia.wml:723
 msgid "2005 May 20"
 msgstr "20 Maja 2005"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:760
+#: /home/runa/dev/website/press/en/inthemedia.wml:724
 msgid "Security.uz"
 msgstr "Security.uz"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:761
+#: /home/runa/dev/website/press/en/inthemedia.wml:725
 msgid ""
 "<a href=\"http://security.uz/news/default.asp?id=10541\"> Tor - мощный "
 "анонимайзер для всех ОС</a> (Russian)"
 msgstr ""
+"<a href=\"http://security.uz/news/default.asp?id=10541\"> Tor - мощный "
+"анонимайзер для всех ОС</a> (rosyjski)"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:765
+#: /home/runa/dev/website/press/en/inthemedia.wml:729
 msgid "2005 May 19"
 msgstr "19 Maja 2005"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:766
+#: /home/runa/dev/website/press/en/inthemedia.wml:730
 msgid "WebPlanet"
 msgstr "WebPlanet"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:767
+#: /home/runa/dev/website/press/en/inthemedia.wml:731
 msgid ""
 "<a href=\"http://webplanet.ru/news/security/2005/5/19/tor.html\"> Tor: "
 "распределенная система анонимного серфинга</a> (Russian)"
 msgstr ""
+"<a href=\"http://webplanet.ru/news/security/2005/5/19/tor.html\"> Tor: "
+"распределенная система анонимного серфинга</a> (rosyjski)"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:771 /tmp/u3kTkswOVo.xml:778
+#: /home/runa/dev/website/press/en/inthemedia.wml:735 /tmp/Q2ndl8ZYsF.xml:742
 msgid "2005 May 17"
 msgstr "17 Maja 2005"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:773
+#: /home/runa/dev/website/press/en/inthemedia.wml:737
 msgid ""
 "<a "
 "href=\"http://www.wired.com/politics/security/news/2005/05/67542?currentPage=all\">"
 " Tor Torches Online Tracking</a>. Also available in <a "
 "href=\"http://wiredvision.jp/archives/200505/2005051904.html\">Japanese</a>."
 msgstr ""
+"<a "
+"href=\"http://www.wired.com/politics/security/news/2005/05/67542?currentPage=all\">"
+" Tor niszczy śledzenie w sieci</a>. Dostępne również po <a "
+"href=\"http://wiredvision.jp/archives/200505/2005051904.html\">japońsku</a>."
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:779
+#: /home/runa/dev/website/press/en/inthemedia.wml:743
 msgid "XBiz"
 msgstr "XBiz"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:780
+#: /home/runa/dev/website/press/en/inthemedia.wml:744
 msgid ""
 "<a href=\"http://xbiz.com/news/8761\"> Navy Project Allows Anonymous "
 "Browsing</a>"
 msgstr ""
+"<a href=\"http://xbiz.com/news/8761\"> Navy Project Allows Anonymous "
+"Browsing</a> (Projekt Marynarki Wojennej umożliwia anonimowe przeglądanie "
+"sieci)"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:784
+#: /home/runa/dev/website/press/en/inthemedia.wml:748
 msgid "2005 Apr 13"
 msgstr "13 Kwietnia 2005"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:785
+#: /home/runa/dev/website/press/en/inthemedia.wml:749
 msgid "Heise online"
 msgstr "Heise onlineHeise online"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:786
+#: /home/runa/dev/website/press/en/inthemedia.wml:750
 msgid ""
 "<a href=\"http://www.heise.de/newsticker/meldung/58506\"> CFP: Vom "
 "kafkaesken Schwinden der Anonymität</a> (German)"
 msgstr ""
+"<a href=\"http://www.heise.de/newsticker/meldung/58506\"> CFP: Vom "
+"kafkaesken Schwinden der Anonymität</a> (niemiecki)"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:790
+#: /home/runa/dev/website/press/en/inthemedia.wml:754
 msgid "2005 Apr 5"
 msgstr "5 Kwietnia 2005"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:791
+#: /home/runa/dev/website/press/en/inthemedia.wml:755
 msgid "Libero"
 msgstr "Libero"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:792
+#: /home/runa/dev/website/press/en/inthemedia.wml:756
 msgid ""
 "<a href=\"http://magazine.libero.it/internetlife/scienzaeweb/ne208.phtml\"> "
 "Anonimato on line, ecco Tor</a> (Italian)"
 msgstr ""
+"<a href=\"http://magazine.libero.it/internetlife/scienzaeweb/ne208.phtml\"> "
+"Anonimato on line, ecco Tor</a> (włoski)"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:796
+#: /home/runa/dev/website/press/en/inthemedia.wml:760
 msgid "2005 Jan 4"
 msgstr "4 Stycznia 2005"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:797
+#: /home/runa/dev/website/press/en/inthemedia.wml:761
 msgid "Internetnews"
 msgstr "Internetnews"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:798
+#: /home/runa/dev/website/press/en/inthemedia.wml:762
 msgid ""
 "<a href=\"http://www.internetnews.com/dev-news/article.php/3454521\"> EFF "
 "Throws Support to 'Anonymous' Internet Project</a>"
 msgstr ""
+"<a href=\"http://www.internetnews.com/dev-news/article.php/3454521\"> EFF "
+"Throws Support to 'Anonymous' Internet Project</a> (EFF daje wsparcie "
+"projektowi 'Anonimowego' Internetu)"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:802
+#: /home/runa/dev/website/press/en/inthemedia.wml:766
 msgid "2005 Mar 31"
 msgstr "31 Marca 2005"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:803
+#: /home/runa/dev/website/press/en/inthemedia.wml:767
 msgid "Linux.com"
 msgstr "Linux.com"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:804
+#: /home/runa/dev/website/press/en/inthemedia.wml:768
 msgid ""
 "<a href=\"http://www.linux.com/articles/43713?tid=19&amp;tid=78\"> Securing "
 "your online privacy with Tor</a>"
 msgstr ""
+"<a href=\"http://www.linux.com/articles/43713?tid=19&amp;tid=78\"> Securing "
+"your online privacy with Tor</a> (Zabezpieczanie swojej prywatności on-line "
+"z Torem)"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:808
+#: /home/runa/dev/website/press/en/inthemedia.wml:772
 msgid "2004 Dec 27"
 msgstr "27 Grudnia 2004"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:809
+#: /home/runa/dev/website/press/en/inthemedia.wml:773
 msgid "BoingBoing"
 msgstr "BoingBoing"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:810
+#: /home/runa/dev/website/press/en/inthemedia.wml:774
 msgid ""
 "<a href=\"http://www.boingboing.net/2004/12/27/eff-helping-produce-.html\"> "
 "EFF helping produce anonymizing software</a>"
 msgstr ""
+"<a href=\"http://www.boingboing.net/2004/12/27/eff-helping-produce-.html\"> "
+"EFF helping produce anonymizing software</a> (EFF pomaga stworzyć "
+"oprogramowanie anonimizujące)"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:814
+#: /home/runa/dev/website/press/en/inthemedia.wml:778
 msgid "2004 Dec 25"
 msgstr "25 Grudnia 2004"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:815
+#: /home/runa/dev/website/press/en/inthemedia.wml:779
 msgid "Kansas City infozine"
 msgstr "Kansas City infozine"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:816
+#: /home/runa/dev/website/press/en/inthemedia.wml:780
 msgid ""
 "<a href=\"http://www.infozine.com/news/stories/op/storiesView/sid/4933/\"> "
 "EFF Joins Forces with Tor Software Project</a>"
 msgstr ""
+"<a href=\"http://www.infozine.com/news/stories/op/storiesView/sid/4933/\"> "
+"EFF Joins Forces with Tor Software Project</a> (EFF łączy siły z Projektem "
+"Tor)"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:820 /tmp/u3kTkswOVo.xml:826
+#: /home/runa/dev/website/press/en/inthemedia.wml:784 /tmp/Q2ndl8ZYsF.xml:790
 msgid "2004 Dec 23"
 msgstr "23 Grudnia 2004"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:821
+#: /home/runa/dev/website/press/en/inthemedia.wml:785
 msgid "golem.de"
 msgstr "golem.de"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:822
+#: /home/runa/dev/website/press/en/inthemedia.wml:786
 msgid ""
 "<a href=\"http://www.golem.de/0412/35340.html\"> EFF unterstützt "
 "Anonymisierer Tor</a> (German)"
 msgstr ""
+"<a href=\"http://www.golem.de/0412/35340.html\"> EFF unterstützt "
+"Anonymisierer Tor</a> (niemiecki)"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:827
+#: /home/runa/dev/website/press/en/inthemedia.wml:791
 msgid "SuicideGirls"
 msgstr "SuicideGirls"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:828
+#: /home/runa/dev/website/press/en/inthemedia.wml:792
 msgid ""
 "<a href=\"http://suicidegirls.com/news/technology/6150/\"> New Routing "
 "Software Allows Anonymous Internet Use</a>"
 msgstr ""
+"<a href=\"http://suicidegirls.com/news/technology/6150/\"> New Routing "
+"Software Allows Anonymous Internet Use</a> (Nowe oprogramowanie trasujące "
+"pozwala anonimowo korzystać z Internetu)"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:832
+#: /home/runa/dev/website/press/en/inthemedia.wml:796
 msgid "2004 Dec 18"
 msgstr "18 Grudnia 2004"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:833
+#: /home/runa/dev/website/press/en/inthemedia.wml:797
 msgid "P2Pnet"
 msgstr "P2Pnet"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:834
+#: /home/runa/dev/website/press/en/inthemedia.wml:798
 msgid "<a href=\"http://p2pnet.net/story/3357\"> EFF to sponsor Tor</a>"
 msgstr ""
+"<a href=\"http://p2pnet.net/story/3357\"> EFF to sponsor Tor</a> (EFF ma "
+"sponsorować Tora)"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:838
+#: /home/runa/dev/website/press/en/inthemedia.wml:802
 msgid "2004 Dec 22"
 msgstr "22 Grudnia 2004"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:840
+#: /home/runa/dev/website/press/en/inthemedia.wml:804
 msgid ""
 "<a "
 "href=\"http://yro.slashdot.org/article.pl?sid=04/12/22/2031229&amp;tid=95&amp;tid=158&amp;tid=153&amp;tid=17\">"
 " EFF Promotes Freenet-like System Tor</a>"
 msgstr ""
+"<a "
+"href=\"http://yro.slashdot.org/article.pl?sid=04/12/22/2031229&amp;tid=95&amp;tid=158&amp;tid=153&amp;tid=17\">"
+" EFF Promotes Freenet-like System Tor</a> (EFF promuje system Tor podobny do"
+" Freenetu)"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:844
+#: /home/runa/dev/website/press/en/inthemedia.wml:808
 msgid "2004 Nov 16"
 msgstr "16 Listopada 2004"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:845
+#: /home/runa/dev/website/press/en/inthemedia.wml:809
 msgid "AlterNet"
 msgstr "AlterNet"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:846
+#: /home/runa/dev/website/press/en/inthemedia.wml:810
 msgid ""
 "<a href=\"http://www.alternet.org/columnists/story/20523/\"> Heavy "
 "Traffic</a>"
 msgstr ""
+"<a href=\"http://www.alternet.org/columnists/story/20523/\"> Heavy "
+"Traffic</a>"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:850
+#: /home/runa/dev/website/press/en/inthemedia.wml:814
 msgid "2004 Aug 30"
 msgstr "30 Sierpnia 2004"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:851
+#: /home/runa/dev/website/press/en/inthemedia.wml:815
 msgid "Newsweek"
 msgstr "Newsweek"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:852
+#: /home/runa/dev/website/press/en/inthemedia.wml:816
 msgid "Technology: Instant Security (no link)"
-msgstr ""
+msgstr "Technologia: Natychmiastowe bezpieczeństwo (brak linku)"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:856
+#: /home/runa/dev/website/press/en/inthemedia.wml:820
 msgid "2004 Aug 16"
 msgstr "16 Sierpnia 2004"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:857
+#: /home/runa/dev/website/press/en/inthemedia.wml:821
 msgid "Eweek"
 msgstr "Eweek"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:858
+#: /home/runa/dev/website/press/en/inthemedia.wml:822
 msgid ""
 "<a href=\"http://www.eweek.com/c/a/Security/Dont-Fear-Internet-Anonymity-"
 "Tools/\"> Don't Fear Internet Anonymity Tools</a>"
 msgstr ""
+"<a href=\"http://www.eweek.com/c/a/Security/Dont-Fear-Internet-Anonymity-"
+"Tools/\"> Don't Fear Internet Anonymity Tools</a> (Nie bój się internetowych"
+" narzędzi anonimizujących)"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:862 /tmp/u3kTkswOVo.xml:868
+#: /home/runa/dev/website/press/en/inthemedia.wml:826 /tmp/Q2ndl8ZYsF.xml:832
 msgid "2004 Aug 6"
 msgstr "6 Sierpnia 2004"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:863
+#: /home/runa/dev/website/press/en/inthemedia.wml:827
 msgid "HCC magazine"
 msgstr "HCC magazine"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:864
+#: /home/runa/dev/website/press/en/inthemedia.wml:828
 msgid ""
 "<a href=\"http://www.hcc.nl/eCache/DEF/21/083.html\"> Anoniem surfen met "
 "hulp van marine VS</a> (Dutch)"
 msgstr ""
+"<a href=\"http://www.hcc.nl/eCache/DEF/21/083.html\"> Anoniem surfen met "
+"hulp van marine VS</a> (holenderski)"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:869
+#: /home/runa/dev/website/press/en/inthemedia.wml:833
 msgid "Golem"
 msgstr "Golem"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:870
+#: /home/runa/dev/website/press/en/inthemedia.wml:834
 msgid ""
 "<a href=\"http://www.golem.de/0408/32835.html\"> Tor: Anonymisierer nutzt "
 "Onion-Routing</a>"
 msgstr ""
+"<a href=\"http://www.golem.de/0408/32835.html\"> Tor: Anonymisierer nutzt "
+"Onion-Routing</a>"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:874
+#: /home/runa/dev/website/press/en/inthemedia.wml:838
 msgid "2004 Aug 5"
 msgstr "5 Sierpnia 2004"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:875
+#: /home/runa/dev/website/press/en/inthemedia.wml:839
 msgid "Network World Security"
 msgstr "Network World Security"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:876
+#: /home/runa/dev/website/press/en/inthemedia.wml:840
 msgid ""
 "<a href=\"http://www.networkworld.com/details/7088.html\"> Onion routing</a>"
 msgstr ""
+"<a href=\"http://www.networkworld.com/details/7088.html\"> Onion "
+"routing</a>(Trasowanie cebulowe)"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:880
+#: /home/runa/dev/website/press/en/inthemedia.wml:844
 msgid "2004 May 8"
 msgstr "8 Maja 2004"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:882
+#: /home/runa/dev/website/press/en/inthemedia.wml:846
 msgid ""
 "<a href=\"http://www.wired.com/politics/security/news/2004/08/64464\"> Onion"
 " Routing Averts Prying Eyes</a>. Also in <a "
 "href=\"http://hotwired.goo.ne.jp/news/news/technology/story/20040806301.html\">Japanese</a>."
 msgstr ""
+"<a href=\"http://www.wired.com/politics/security/news/2004/08/64464\"> Onion"
+" Routing Averts Prying Eyes</a> (Trasowanie cebulowe zapobiega wścibskim "
+"oczom). Także po <a "
+"href=\"http://hotwired.goo.ne.jp/news/news/technology/story/20040806301.html\">japońsku</a>."
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:886
+#: /home/runa/dev/website/press/en/inthemedia.wml:850
 msgid "2004 Mar 8"
 msgstr "8 Marca 2004"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:887
+#: /home/runa/dev/website/press/en/inthemedia.wml:851
 msgid "CNET Japan blog"
 msgstr "CNET Japan blog"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:888
+#: /home/runa/dev/website/press/en/inthemedia.wml:852
 msgid ""
 "<a href=\"http://japan.cnet.com/blog/umeda/2004/03/08/entry_post_126/\"> "
 "Yearning of hackers and insecurity</a> (Japanese)"
 msgstr ""
+"<a href=\"http://japan.cnet.com/blog/umeda/2004/03/08/entry_post_126/\"> "
+"Yearning of hackers and insecurity</a> (Tęsknota za hakerami i brakiem "
+"bezpieczeństwa) (japoński)"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:892
+#: /home/runa/dev/website/press/en/inthemedia.wml:856
 msgid "1999 Apr 13"
 msgstr "13 Kwietnia 1999"
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:894
+#: /home/runa/dev/website/press/en/inthemedia.wml:858
 msgid ""
 "<a href=\"http://www.wired.com/science/discoveries/news/1999/04/19091\"> "
 "Anonymous Web Surfing? Uh-Uh</a>"
 msgstr ""
+"<a href=\"http://www.wired.com/science/discoveries/news/1999/04/19091\"> "
+"Anonymous Web Surfing? Uh-Uh</a>"

Modified: translation/trunk/projects/website/po/pl_PL/projects/1-high.torbrowser.po
===================================================================
--- translation/trunk/projects/website/po/pl_PL/projects/1-high.torbrowser.po	2011-04-12 16:15:00 UTC (rev 24594)
+++ translation/trunk/projects/website/po/pl_PL/projects/1-high.torbrowser.po	2011-04-12 16:19:31 UTC (rev 24595)
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-03-25 16:51+0000\n"
-"PO-Revision-Date: 2011-03-26 16:34+0000\n"
+"POT-Creation-Date: 2011-03-28 12:49+0200\n"
+"PO-Revision-Date: 2011-04-03 12:54+0000\n"
 "Last-Translator: bogdrozd <bog.d at gazeta.pl>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
@@ -18,7 +18,7 @@
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:9
+#: /home/runa/dev/website/projects/en/torbrowser.wml:9
 msgid ""
 "<a href=\"<page index>\">Home &raquo; </a> <a href=\"<page "
 "projects/projects>\">Projects &raquo; </a> <a href=\"<page "
@@ -29,17 +29,17 @@
 "projects/torbrowser>\">Przeglądarka Tora</a>"
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:17
+#: /home/runa/dev/website/projects/en/torbrowser.wml:17
 msgid "Tor Browser Bundle"
 msgstr "Paczka Tora z przeglądarką"
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:18
+#: /home/runa/dev/website/projects/en/torbrowser.wml:18
 msgid "<hr/>"
 msgstr "<hr/>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:20
+#: /home/runa/dev/website/projects/en/torbrowser.wml:20
 msgid ""
 "The <strong>Tor</strong> software protects you by bouncing your "
 "communications around a distributed network of relays run by volunteers all "
@@ -55,7 +55,7 @@
 "które odwiedzasz, i umozliwia odwiedzanie zablokowanych stron."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:27
+#: /home/runa/dev/website/projects/en/torbrowser.wml:27
 msgid ""
 "The <strong>Tor Browser Bundle</strong> lets you use Tor on Windows, Mac OS "
 "X, or Linux without needing to install any software.  It can run off a USB "
@@ -76,7 +76,7 @@
 "href=\"<page download/download>\">pobrania Tora</a>."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:39
+#: /home/runa/dev/website/projects/en/torbrowser.wml:39
 msgid ""
 "Freedom House has produced a video on how to find and use the Tor Browser "
 "Bundle.  If you don't see a video below, view it at <a "
@@ -89,12 +89,12 @@
 "film lub taki, który jest przetłumaczony na Twój język? Daj nam znać!"
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:49
+#: /home/runa/dev/website/projects/en/torbrowser.wml:49
 msgid "<a id=\"Download\"></a>"
 msgstr "<a id=\"Download\"></a>"
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:50
+#: /home/runa/dev/website/projects/en/torbrowser.wml:50
 msgid ""
 "<a class=\"anchor\" href=\"#Download\">Download Tor Browser Bundle and Tor "
 "IM Browser Bundle</a>"
@@ -103,7 +103,7 @@
 " oraz paczki Tora z przeglądarką i komunikatorem</a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:52
+#: /home/runa/dev/website/projects/en/torbrowser.wml:52
 msgid ""
 "To start using the Tor Browser Bundle or Tor IM Browser Bundle, download the"
 " file for your preferred language. This file can be saved wherever is "
@@ -114,7 +114,7 @@
 "gdziekolwiek będzie wygodnie, np. na pulpicie czy na dysku USB."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:56
+#: /home/runa/dev/website/projects/en/torbrowser.wml:56
 msgid ""
 "If you have an unreliable Internet connection, it may be easier for you to "
 "download the bundle edition which is <a href=\"<page projects/torbrowser-"
@@ -125,7 +125,7 @@
 "split>\">rozdzielona</a> na mniejsze części."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:58
+#: /home/runa/dev/website/projects/en/torbrowser.wml:58
 msgid ""
 "Tor Browser Bundle for Windows with Firefox (version <version-"
 "torbrowserbundle>, 16 MB)"
@@ -134,7 +134,7 @@
 "torbrowserbundle>, 16 MB)"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:62
+#: /home/runa/dev/website/projects/en/torbrowser.wml:62
 msgid ""
 "<a href=\"../dist/torbrowser/tor-browser-<version-torbrowserbundle>_en-"
 "US.exe\">English (en-US)</a> (<a href=\"../dist/torbrowser/tor-browser"
@@ -147,7 +147,7 @@
 "90%;\">podpis</a>)"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:64
+#: /home/runa/dev/website/projects/en/torbrowser.wml:64
 msgid ""
 "<a href=\"../dist/torbrowser/tor-browser-<version-"
 "torbrowserbundle>_ar.exe\">&#x0627;&#x0644;&#x0639;&#x0631;&#x0628;&#x064a;&#x0629;"
@@ -160,7 +160,7 @@
 "torbrowserbundle>_ar.exe.asc\" style=\"font-size: 90%;\">podpis</a>)"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:66
+#: /home/runa/dev/website/projects/en/torbrowser.wml:66
 msgid ""
 "<a href=\"../dist/torbrowser/tor-browser-<version-"
 "torbrowserbundle>_de.exe\">Deutsch (de)</a> (<a href=\"../dist/torbrowser"
@@ -173,7 +173,7 @@
 "90%;\">podpis</a>)"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:68
+#: /home/runa/dev/website/projects/en/torbrowser.wml:68
 msgid ""
 "<a href=\"../dist/torbrowser/tor-browser-<version-torbrowserbundle>_es-"
 "ES.exe\">&#x0045;&#x0073;&#x0070;&#x0061;&#x00f1;&#x006f;&#x006c; (es-"
@@ -186,7 +186,7 @@
 ">_es-ES.exe.asc\" style=\"font-size: 90%;\">podpis</a>)"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:70
+#: /home/runa/dev/website/projects/en/torbrowser.wml:70
 msgid ""
 "<a href=\"../dist/torbrowser/tor-browser-<version-"
 "torbrowserbundle>_fa.exe\">&#x0641;&#x0627;&#x0631;&#x0633;&#x06cc; (fa)</a>"
@@ -199,7 +199,7 @@
 "torbrowserbundle>_fa.exe.asc\" style=\"font-size: 90%;\">podpis</a>)"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:72
+#: /home/runa/dev/website/projects/en/torbrowser.wml:72
 msgid ""
 "<a href=\"../dist/torbrowser/tor-browser-<version-"
 "torbrowserbundle>_fr.exe\">&#x0046;&#x0072;&#x0061;&#x006e;&#x00e7;&#x0061;&#x0069;&#x0073;"
@@ -212,7 +212,7 @@
 "torbrowserbundle>_fr.exe.asc\" style=\"font-size: 90%;\">podpis</a>)"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:74
+#: /home/runa/dev/website/projects/en/torbrowser.wml:74
 msgid ""
 "<a href=\"../dist/torbrowser/tor-browser-<version-"
 "torbrowserbundle>_it.exe\">Italiano (it)</a> (<a href=\"../dist/torbrowser"
@@ -225,7 +225,7 @@
 "90%;\">podpis</a>)"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:76
+#: /home/runa/dev/website/projects/en/torbrowser.wml:76
 msgid ""
 "<a href=\"../dist/torbrowser/tor-browser-<version-"
 "torbrowserbundle>_nl.exe\">Nederlands (nl)</a> (<a href=\"../dist/torbrowser"
@@ -238,7 +238,7 @@
 "90%;\">podpis</a>)"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:78
+#: /home/runa/dev/website/projects/en/torbrowser.wml:78
 msgid ""
 "<a href=\"../dist/torbrowser/tor-browser-<version-"
 "torbrowserbundle>_pl.exe\">Polish (pl)</a> (<a href=\"../dist/torbrowser"
@@ -251,7 +251,7 @@
 "90%;\">podpis</a>)"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:80
+#: /home/runa/dev/website/projects/en/torbrowser.wml:80
 msgid ""
 "<a href=\"../dist/torbrowser/tor-browser-<version-torbrowserbundle>_pt-"
 "PT.exe\">&#x0050;&#x006f;&#x0072;&#x0074;&#x0075;&#x0067;&#x0075;&#x00ea;&#x0073;"
@@ -264,7 +264,7 @@
 "torbrowserbundle>_pt-PT.exe.asc\" style=\"font-size: 90%;\">podpis</a>)"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:82
+#: /home/runa/dev/website/projects/en/torbrowser.wml:82
 msgid ""
 "<a href=\"../dist/torbrowser/tor-browser-<version-"
 "torbrowserbundle>_ru.exe\">&#x0420;&#x0443;&#x0441;&#x0441;&#x043a;&#x0438;&#x0439;"
@@ -277,7 +277,7 @@
 "torbrowserbundle>_ru.exe.asc\" style=\"font-size: 90%;\">podpis</a>)"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:84
+#: /home/runa/dev/website/projects/en/torbrowser.wml:84
 msgid ""
 "<a href=\"../dist/torbrowser/tor-browser-<version-"
 "torbrowserbundle>_vi.exe\">Vietnamese (vi)</a> (<a href=\"../dist/torbrowser"
@@ -290,7 +290,7 @@
 "90%;\">podpis</a>)"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:86
+#: /home/runa/dev/website/projects/en/torbrowser.wml:86
 msgid ""
 "<a href=\"../dist/torbrowser/tor-browser-<version-torbrowserbundle>_zh-"
 "CN.exe\">&#x7b80;&#x4f53;&#x5b57; (zh-CN)</a> (<a href=\"../dist/torbrowser"
@@ -303,7 +303,7 @@
 "90%;\">podpis</a>)"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:90
+#: /home/runa/dev/website/projects/en/torbrowser.wml:90
 msgid ""
 "Tor IM Browser Bundle for Windows with Firefox and Pidgin (version <version-"
 "torimbrowserbundle>, 25 MB)"
@@ -312,7 +312,7 @@
 "<version-torimbrowserbundle>, 25 MB)"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:94
+#: /home/runa/dev/website/projects/en/torbrowser.wml:94
 msgid ""
 "<a href=\"../dist/torbrowser/tor-im-browser-<version-torimbrowserbundle>_en-"
 "US.exe\">English (en-US)</a> (<a href=\"../dist/torbrowser/tor-im-browser"
@@ -325,7 +325,7 @@
 "90%;\">podpis</a>)"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:96
+#: /home/runa/dev/website/projects/en/torbrowser.wml:96
 msgid ""
 "<a href=\"../dist/torbrowser/tor-im-browser-<version-"
 "torimbrowserbundle>_ar.exe\">&#x0627;&#x0644;&#x0639;&#x0631;&#x0628;&#x064a;&#x0629;"
@@ -338,7 +338,7 @@
 "torimbrowserbundle>_ar.exe.asc\" style=\"font-size: 90%;\">podpis</a>)"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:98
+#: /home/runa/dev/website/projects/en/torbrowser.wml:98
 msgid ""
 "<a href=\"../dist/torbrowser/tor-im-browser-<version-"
 "torimbrowserbundle>_de.exe\">Deutsch (de)</a> (<a href=\"../dist/torbrowser"
@@ -351,7 +351,7 @@
 " 90%;\">podpis</a>)"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:100
+#: /home/runa/dev/website/projects/en/torbrowser.wml:100
 msgid ""
 "<a href=\"../dist/torbrowser/tor-im-browser-<version-torimbrowserbundle>_es-"
 "ES.exe\">&#x0045;&#x0073;&#x0070;&#x0061;&#x00f1;&#x006f;&#x006c; (es-"
@@ -364,7 +364,7 @@
 "torimbrowserbundle>_es-ES.exe.asc\" style=\"font-size: 90%;\">podpis</a>)"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:102
+#: /home/runa/dev/website/projects/en/torbrowser.wml:102
 msgid ""
 "<a href=\"../dist/torbrowser/tor-im-browser-<version-"
 "torimbrowserbundle>_fa.exe\">&#x0641;&#x0627;&#x0631;&#x0633;&#x06cc; "
@@ -377,7 +377,7 @@
 "torimbrowserbundle>_fa.exe.asc\" style=\"font-size: 90%;\">podpis</a>)"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:104
+#: /home/runa/dev/website/projects/en/torbrowser.wml:104
 msgid ""
 "<a href=\"../dist/torbrowser/tor-im-browser-<version-"
 "torimbrowserbundle>_fr.exe\">&#x0046;&#x0072;&#x0061;&#x006e;&#x00e7;&#x0061;&#x0069;&#x0073;"
@@ -390,7 +390,7 @@
 "torimbrowserbundle>_fr.exe.asc\" style=\"font-size: 90%;\">podpis</a>)"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:106
+#: /home/runa/dev/website/projects/en/torbrowser.wml:106
 msgid ""
 "<a href=\"../dist/torbrowser/tor-im-browser-<version-"
 "torimbrowserbundle>_it.exe\">Italiano (it)</a> (<a href=\"../dist/torbrowser"
@@ -403,7 +403,7 @@
 " 90%;\">podpis</a>)"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:108
+#: /home/runa/dev/website/projects/en/torbrowser.wml:108
 msgid ""
 "<a href=\"../dist/torbrowser/tor-im-browser-<version-"
 "torimbrowserbundle>_nl.exe\">Nederlands (nl)</a> (<a "
@@ -416,7 +416,7 @@
 "torimbrowserbundle>_nl.exe.asc\" style=\"font-size: 90%;\">podpis</a>)"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:110
+#: /home/runa/dev/website/projects/en/torbrowser.wml:110
 msgid ""
 "<a href=\"../dist/torbrowser/tor-im-browser-<version-"
 "torimbrowserbundle>_pl.exe\">Polish (pl)</a> (<a href=\"../dist/torbrowser"
@@ -429,7 +429,7 @@
 " 90%;\">podpis</a>)"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:112
+#: /home/runa/dev/website/projects/en/torbrowser.wml:112
 msgid ""
 "<a href=\"../dist/torbrowser/tor-im-browser-<version-torimbrowserbundle>_pt-"
 "PT.exe\">&#x0050;&#x006f;&#x0072;&#x0074;&#x0075;&#x0067;&#x0075;&#x00ea;&#x0073;"
@@ -442,7 +442,7 @@
 "torimbrowserbundle>_pt-PT.exe.asc\" style=\"font-size: 90%;\">podpis</a>)"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:114
+#: /home/runa/dev/website/projects/en/torbrowser.wml:114
 msgid ""
 "<a href=\"../dist/torbrowser/tor-im-browser-<version-"
 "torimbrowserbundle>_ru.exe\">&#x0420;&#x0443;&#x0441;&#x0441;&#x043a;&#x0438;&#x0439;"
@@ -455,7 +455,7 @@
 "torimbrowserbundle>_ru.exe.asc\" style=\"font-size: 90%;\">podpis</a>)"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:116
+#: /home/runa/dev/website/projects/en/torbrowser.wml:116
 msgid ""
 "<a href=\"../dist/torbrowser/tor-im-browser-<version-"
 "torimbrowserbundle>_vi.exe\">Vietnamese (vi)</a> (<a "
@@ -468,7 +468,7 @@
 "torimbrowserbundle>_vi.exe.asc\" style=\"font-size: 90%;\">podpis</a>)"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:118
+#: /home/runa/dev/website/projects/en/torbrowser.wml:118
 msgid ""
 "<a href=\"../dist/torbrowser/tor-im-browser-<version-torimbrowserbundle>_zh-"
 "CN.exe\">&#x7b80;&#x4f53;&#x5b57; (zh-CN)</a> (<a href=\"../dist/torbrowser"
@@ -481,16 +481,16 @@
 "size: 90%;\">podpis</a>)"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:122
+#: /home/runa/dev/website/projects/en/torbrowser.wml:122
 msgid ""
-"BETA: Tor Browser Bundle for Intel Mac OS X with Firefox (version <version-"
-"torbrowserbundleosx>, 28 MB)"
+"BETA: Tor Browser Bundle for Intel Mac OS X 10.5 and higher with Firefox "
+"(version <version-torbrowserbundleosx>, 28 MB)"
 msgstr ""
-"BETA: Paczka Tora z przeglądarką dla Intel Mac OS X z Firefoksem (wersja "
-"<version-torbrowserbundleosx>, 28 MB)"
+"BETA: Paczka Tora z Przeglądarką dla Intel Mac OS X 10.5 i nowszych z "
+"Firefoksem (wersja <version-torbrowserbundleosx>, 28 MB)"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:126
+#: /home/runa/dev/website/projects/en/torbrowser.wml:126
 msgid ""
 "<a href=\"../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx"
 ">-dev-osx-i386-en-US.zip\">English (en-US)</a> (<a "
@@ -503,7 +503,7 @@
 "osx-i386-en-US.zip.asc\" style=\"font-size: 90%;\">podpis</a>)"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:129
+#: /home/runa/dev/website/projects/en/torbrowser.wml:129
 msgid ""
 "<a href=\"../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx"
 ">-dev-"
@@ -520,7 +520,7 @@
 "90%;\">podpis</a>)"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:133
+#: /home/runa/dev/website/projects/en/torbrowser.wml:133
 msgid ""
 "<a href=\"../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx"
 ">-dev-osx-i386-de.zip\">Deutsch (de)</a> (<a "
@@ -533,7 +533,7 @@
 "osx-i386-de.zip.asc\" style=\"font-size: 90%;\">podpis</a>)"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:136
+#: /home/runa/dev/website/projects/en/torbrowser.wml:136
 msgid ""
 "<a href=\"../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx"
 ">-dev-osx-i386-es-"
@@ -550,7 +550,7 @@
 "90%;\">podpis</a>)"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:140
+#: /home/runa/dev/website/projects/en/torbrowser.wml:140
 msgid ""
 "<a href=\"../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx"
 ">-dev-osx-i386-fa.zip\">&#x0641;&#x0627;&#x0631;&#x0633;&#x06cc; (fa) </a> "
@@ -563,7 +563,7 @@
 ">-dev-osx-i386-fa.zip.asc\" style=\"font-size: 90%;\">podpis</a>)"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:143
+#: /home/runa/dev/website/projects/en/torbrowser.wml:143
 msgid ""
 "<a href=\"../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx"
 ">-dev-"
@@ -580,7 +580,7 @@
 "90%;\">podpis</a>)"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:146
+#: /home/runa/dev/website/projects/en/torbrowser.wml:146
 msgid ""
 "<a href=\"../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx"
 ">-dev-osx-i386-it.zip\">Italiano (it)</a> (<a "
@@ -593,7 +593,7 @@
 "osx-i386-it.zip.asc\" style=\"font-size: 90%;\">podpis</a>)"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:149
+#: /home/runa/dev/website/projects/en/torbrowser.wml:149
 msgid ""
 "<a href=\"../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx"
 ">-dev-osx-i386-nl.zip\">Nederlands (nl)</a> (<a "
@@ -606,7 +606,7 @@
 "osx-i386-nl.zip.asc\" style=\"font-size: 90%;\">podpis</a>)"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:152
+#: /home/runa/dev/website/projects/en/torbrowser.wml:152
 msgid ""
 "<a href=\"../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx"
 ">-dev-osx-i386-pl.zip\">Polish (pl)</a> (<a "
@@ -619,7 +619,7 @@
 "osx-i386-pl.zip.asc\" style=\"font-size: 90%;\">podpis</a>)"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:155
+#: /home/runa/dev/website/projects/en/torbrowser.wml:155
 msgid ""
 "<a href=\"../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx"
 ">-dev-osx-i386-pt-"
@@ -636,7 +636,7 @@
 "90%;\">podpis</a>)"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:158
+#: /home/runa/dev/website/projects/en/torbrowser.wml:158
 msgid ""
 "<a href=\"../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx"
 ">-dev-"
@@ -653,7 +653,7 @@
 "90%;\">podpis</a>)"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:162
+#: /home/runa/dev/website/projects/en/torbrowser.wml:162
 msgid ""
 "<a href=\"../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx"
 ">-dev-osx-i386-zh-CN.zip\">&#x7b80;&#x4f53;&#x5b57; (zh-CN)</a> (<a "
@@ -666,7 +666,7 @@
 "osx-i386-zh-CN.zip.asc\" style=\"font-size: 90%;\">podpis</a>)"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:169
+#: /home/runa/dev/website/projects/en/torbrowser.wml:169
 msgid ""
 "BETA: Tor Browser Bundle for Linux with Firefox (version <version-"
 "torbrowserbundlelinux32> (32-bit), <version-torbrowserbundlelinux64> "
@@ -677,7 +677,7 @@
 "(64-bit), 24 MB)"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:172
+#: /home/runa/dev/website/projects/en/torbrowser.wml:172
 msgid ""
 "English (en-US): <a href=\"../dist/torbrowser/linux/tor-browser-gnu-"
 "linux-i686-<version-torbrowserbundlelinux32>-dev-en-US.tar.gz\">32-bit</a> "
@@ -700,7 +700,7 @@
 "90%;\">sig</a>)"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:175
+#: /home/runa/dev/website/projects/en/torbrowser.wml:175
 msgid ""
 "&#x0627;&#x0644;&#x0639;&#x0631;&#x0628;&#x064a;&#x0629; (ar): <a "
 "href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-"
@@ -725,7 +725,7 @@
 "90%;\">sig</a>)"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:177
+#: /home/runa/dev/website/projects/en/torbrowser.wml:177
 msgid ""
 "Deutsch (de): <a href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-i686"
 "-<version-torbrowserbundlelinux32>-dev-de.tar.gz\">32-bit</a> (<a "
@@ -748,7 +748,7 @@
 "90%;\">sig</a>)"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:179
+#: /home/runa/dev/website/projects/en/torbrowser.wml:179
 msgid ""
 "&#x0045;&#x0073;&#x0070;&#x0061;&#x00f1;&#x006f;&#x006c; (es-ES): <a "
 "href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-"
@@ -773,7 +773,7 @@
 "90%;\">sig</a>)"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:181
+#: /home/runa/dev/website/projects/en/torbrowser.wml:181
 msgid ""
 "&#x0641;&#x0627;&#x0631;&#x0633;&#x06cc; (fa): <a "
 "href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-"
@@ -798,7 +798,7 @@
 "90%;\">sig</a>)"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:183
+#: /home/runa/dev/website/projects/en/torbrowser.wml:183
 msgid ""
 "&#x0046;&#x0072;&#x0061;&#x006e;&#x00e7;&#x0061;&#x0069;&#x0073; (fr): <a "
 "href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-"
@@ -823,7 +823,7 @@
 "90%;\">sig</a>)"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:185
+#: /home/runa/dev/website/projects/en/torbrowser.wml:185
 msgid ""
 "Italiano (it): <a href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-i686"
 "-<version-torbrowserbundlelinux32>-dev-it.tar.gz\">32-bit</a> (<a "
@@ -846,7 +846,7 @@
 "90%;\">sig</a>)"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:187
+#: /home/runa/dev/website/projects/en/torbrowser.wml:187
 msgid ""
 "Nederlands (nl): <a href=\"../dist/torbrowser/linux/tor-browser-gnu-"
 "linux-i686-<version-torbrowserbundlelinux32>-dev-nl.tar.gz\">32-bit</a> (<a "
@@ -869,7 +869,7 @@
 "90%;\">sig</a>)"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:189
+#: /home/runa/dev/website/projects/en/torbrowser.wml:189
 msgid ""
 "Polish (pl): <a href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-i686"
 "-<version-torbrowserbundlelinux32>-dev-pl.tar.gz\">32-bit</a> (<a "
@@ -892,7 +892,7 @@
 "90%;\">sig</a>)"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:191
+#: /home/runa/dev/website/projects/en/torbrowser.wml:191
 msgid ""
 "&#x0050;&#x006f;&#x0072;&#x0074;&#x0075;&#x0067;&#x0075;&#x00ea;&#x0073; "
 "(pt-PT): <a href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-i686"
@@ -917,7 +917,7 @@
 "90%;\">sig</a>)"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:193
+#: /home/runa/dev/website/projects/en/torbrowser.wml:193
 msgid ""
 "&#x0420;&#x0443;&#x0441;&#x0441;&#x043a;&#x0438;&#x0439; (ru): <a "
 "href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-"
@@ -942,7 +942,7 @@
 "90%;\">sig</a>)"
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:195
+#: /home/runa/dev/website/projects/en/torbrowser.wml:195
 msgid ""
 "&#x7b80;&#x4f53;&#x5b57; (zh-CN): <a href=\"../dist/torbrowser/linux/tor-"
 "browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-zh-"
@@ -965,7 +965,7 @@
 "=\"font-size: 90%;\">sig</a>)"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:201
+#: /home/runa/dev/website/projects/en/torbrowser.wml:201
 msgid ""
 "See our instructions on <a href=\"<page docs/verifying-signatures>\">how to "
 "verify package signatures</a>, which allows you to make sure you've "
@@ -985,17 +985,17 @@
 "lepiej o tym informowała."
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:211
+#: /home/runa/dev/website/projects/en/torbrowser.wml:211
 msgid "<a id=\"MacOSX\"></a>"
 msgstr "<a id=\"MacOSX\"></a>"
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:212
+#: /home/runa/dev/website/projects/en/torbrowser.wml:212
 msgid "<a class=\"anchor\" href=\"#MacOSX\">Mac OS X instructions</a>"
 msgstr "<a class=\"anchor\" href=\"#MacOSX\">Instrukcje dla Mac OS X</a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:213
+#: /home/runa/dev/website/projects/en/torbrowser.wml:213
 msgid ""
 "Download the file above, save it somewhere, then click on it. Mac OS X will "
 "automatically unarchive it and you will have a TorBrowser application in "
@@ -1009,18 +1009,27 @@
 "aplikację TorBrowser, by uruchomić Vidalię. Gdy Vidalia połączy się z Torem,"
 " uruchomi Firefoksa."
 
+#. type: Content of: <div><div><p>
+#: /home/runa/dev/website/projects/en/torbrowser.wml:219
+msgid ""
+"<img src=\"$(IMGROOT)/screenshot-osx-torbrowser-icon.png\" alt=\"Screenshot "
+"Mac OS X bundle\" />"
+msgstr ""
+"<img src=\"$(IMGROOT)/screenshot-osx-torbrowser-icon.png\" alt=\"Zrzut "
+"ekranu paczki dla Mac OS X\" />"
+
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:219
+#: /home/runa/dev/website/projects/en/torbrowser.wml:221
 msgid "<a id=\"Linux\"></a>"
 msgstr "<a id=\"Linux\"></a>"
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:220
+#: /home/runa/dev/website/projects/en/torbrowser.wml:222
 msgid "<a class=\"anchor\" href=\"#Linux\">Linux instructions</a>"
 msgstr "<a class=\"anchor\" href=\"#Linux\">Instrukcje dla Linuksa</a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:221
+#: /home/runa/dev/website/projects/en/torbrowser.wml:223
 msgid ""
 "Download the architecture-appropriate file above, save it somewhere, then "
 "run:<br> tar -xvzf tor-browser-gnu-linux-i686-<version-"
@@ -1041,17 +1050,17 @@
 "uruchomi Firefoksa."
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:230
+#: /home/runa/dev/website/projects/en/torbrowser.wml:232
 msgid "<a id=\"Extraction\"></a>"
 msgstr "<a id=\"Extraction\"></a>"
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:231
+#: /home/runa/dev/website/projects/en/torbrowser.wml:233
 msgid "<a class=\"anchor\" href=\"#Extraction\">Extraction</a>"
 msgstr "<a class=\"anchor\" href=\"#Extraction\">Rozpakowanie</a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:233
+#: /home/runa/dev/website/projects/en/torbrowser.wml:235
 msgid ""
 "Download the file above, and save it somewhere, then double click on it.  "
 "Click on the button labelled <strong>\"...\"</strong> (1) and select where "
@@ -1070,7 +1079,7 @@
 " ograniczyć pozostawione ślady, zapisz ją na dysku USB."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:241
+#: /home/runa/dev/website/projects/en/torbrowser.wml:243
 msgid ""
 "Click <strong>Extract</strong> (3) to begin extraction. This may take a few "
 "minutes to complete."
@@ -1079,24 +1088,24 @@
 "Może ono potrwać parę minut."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:244
+#: /home/runa/dev/website/projects/en/torbrowser.wml:246
 msgid ""
 "<img src=\"$(IMGROOT)/tbb-screenshot1.png\" alt=\"Screenshot of extraction "
 "process\" />"
 msgstr "<img src=\"$(IMGROOT)/tbb-screenshot1.png\" alt=\"Proces rozpakowywania\" />"
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:247
+#: /home/runa/dev/website/projects/en/torbrowser.wml:249
 msgid "<a id=\"Usage\"></a>"
 msgstr "<a id=\"Usage\"></a>"
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:248
+#: /home/runa/dev/website/projects/en/torbrowser.wml:250
 msgid "<a class=\"anchor\" href=\"#Usage\">Usage</a>"
 msgstr "<a class=\"anchor\" href=\"#Usage\">Sposób użycia</a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:250
+#: /home/runa/dev/website/projects/en/torbrowser.wml:252
 msgid ""
 "Once extraction is complete, open the folder <strong>Tor Browser</strong> "
 "from the location you saved the bundle."
@@ -1105,7 +1114,7 @@
 "zachowałeś/aś paczkę."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:252
+#: /home/runa/dev/website/projects/en/torbrowser.wml:254
 msgid ""
 "Double click on the <strong>Start Tor Browser</strong> (4) application (it "
 "may be called <strong>Start Tor Browser.exe</strong> on some systems.)"
@@ -1115,19 +1124,19 @@
 "systemach.)"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:255
+#: /home/runa/dev/website/projects/en/torbrowser.wml:257
 msgid "The Vidalia window will shortly appear."
 msgstr "Wkrótce pojawi się okno programu Vidalia."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:257
+#: /home/runa/dev/website/projects/en/torbrowser.wml:259
 msgid ""
 "<img src=\"$(IMGROOT)/tbb-screenshot2.png\" alt=\"Screenshot of bundle "
 "startup\" />"
 msgstr "<img src=\"$(IMGROOT)/tbb-screenshot2.png\" alt=\"Uruchomienie paczki\" />"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:260
+#: /home/runa/dev/website/projects/en/torbrowser.wml:262
 msgid ""
 "Once Tor is ready, Firefox will automatically be opened. Only web pages "
 "visited through the included Firefox browser will be sent via Tor. Other web"
@@ -1146,7 +1155,7 @@
 "okna Firefoksa przed uruchomieniem paczki."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:267
+#: /home/runa/dev/website/projects/en/torbrowser.wml:269
 msgid ""
 "If you installed the Tor IM Browser Bundle, the Pidgin instant messaging "
 "client will also be automatically opened."
@@ -1155,7 +1164,7 @@
 "zostanie uruchomiony automatycznie."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:269
+#: /home/runa/dev/website/projects/en/torbrowser.wml:271
 msgid ""
 "Once you are finished browsing, close any open Firefox windows by clicking "
 "on the <img src=\"$(IMGROOT)/tbb-close-button.png\" alt=\"Close button "
@@ -1168,12 +1177,12 @@
 "wszelkie ciasteczka zostaną usunięte."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:275
+#: /home/runa/dev/website/projects/en/torbrowser.wml:277
 msgid "<img src=\"$(IMGROOT)/tbb-screenshot3a.png\" alt=\"Screenshot of Firefox\" />"
 msgstr "<img src=\"$(IMGROOT)/tbb-screenshot3a.png\" alt=\"Ekran Firefoksa\" />"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:278
+#: /home/runa/dev/website/projects/en/torbrowser.wml:280
 msgid ""
 "With the Tor Browser Bundle, Vidalia and Tor will automatically close. With "
 "the Tor IM Browser Bundle you need to also close Pidgin by right-clicking on"
@@ -1185,12 +1194,12 @@
 "\"Zamknij\" (\"Quit\") (8)."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:280
+#: /home/runa/dev/website/projects/en/torbrowser.wml:282
 msgid "<img src=\"$(IMGROOT)/tbb-screenshot3b.png\" alt=\"Screenshot of Pidgin\" />"
 msgstr "<img src=\"$(IMGROOT)/tbb-screenshot3b.png\" alt=\"Ekran Pidgina\" />"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:283
+#: /home/runa/dev/website/projects/en/torbrowser.wml:285
 msgid ""
 "To use the Tor Browser Bundle or Tor IM Browser Bundle again, repeat the "
 "steps in <a href=\"#Usage\">\"Usage\"</a>."
@@ -1199,7 +1208,7 @@
 "href=\"#Usage\">\"Sposób użycia\"</a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:285
+#: /home/runa/dev/website/projects/en/torbrowser.wml:287
 msgid ""
 "Remember that Tor anonymizes the origin of your traffic, and it encrypts "
 "everything inside the Tor network, but <a "
@@ -1218,17 +1227,17 @@
 "uwierzytelniania na całej trasie od nadawcy do odbiorcy."
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:293
+#: /home/runa/dev/website/projects/en/torbrowser.wml:295
 msgid "<a id=\"Feedback\"></a>"
 msgstr "<a id=\"Feedback\"></a>"
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:294
+#: /home/runa/dev/website/projects/en/torbrowser.wml:296
 msgid "<a class=\"anchor\" href=\"#Feedback\">Comments and suggestions</a>"
 msgstr "<a class=\"anchor\" href=\"#Feedback\">Komentarze i sugestie</a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:296
+#: /home/runa/dev/website/projects/en/torbrowser.wml:298
 msgid ""
 "The Tor Browser Bundle is under development and not yet complete.  To "
 "discuss improvements and submit comments, please use the <a "
@@ -1239,17 +1248,17 @@
 "listy wysyłkowej <a href=\"http://archives.seul.org/or/talk/\">or-talk</a>."
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:300
+#: /home/runa/dev/website/projects/en/torbrowser.wml:302
 msgid "<a id=\"More\"></a>"
 msgstr "<a id=\"More\"></a>"
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:301
+#: /home/runa/dev/website/projects/en/torbrowser.wml:303
 msgid "<a class=\"anchor\" href=\"#More\">More information</a>"
 msgstr "<a class=\"anchor\" href=\"#More\">Więcej informacji</a>"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:303
+#: /home/runa/dev/website/projects/en/torbrowser.wml:305
 msgid ""
 "<strong>What is Tor and why do I need it?</strong> To learn more about Tor, "
 "visit the <a href=\"<page index>\">Tor Project website</a>."
@@ -1258,7 +1267,7 @@
 "więcej o Torze, odwiedź <a href=\"<page index>\">stronę Projektu Tor</a>."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:307
+#: /home/runa/dev/website/projects/en/torbrowser.wml:309
 msgid ""
 "<strong>What is in the Tor Browser Bundle?</strong> It contains Tor, "
 "Vidalia, Polipo, Firefox, and Torbutton (<a href=\"<page projects"
@@ -1269,7 +1278,7 @@
 "/torbrowser-details>#contents\">dowiedz się więcej</a>)."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:311
+#: /home/runa/dev/website/projects/en/torbrowser.wml:313
 msgid ""
 "<strong>What is in the Tor IM Browser Bundle?</strong> It contains Tor, "
 "Vidalia, Polipo, Firefox, Torbutton, Pidgin and OTR (<a href=\"<page "
@@ -1281,7 +1290,7 @@
 "więcej</a>)."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:315
+#: /home/runa/dev/website/projects/en/torbrowser.wml:317
 msgid ""
 "<strong>How can I make my own bundle?</strong> To download the source code "
 "and learn how to build the bundle yourself, read the <a href=\"<page "
@@ -1292,7 +1301,7 @@
 "projects/torbrowser-details>#build\">instrukcji tworzenia paczki</a>."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:319
+#: /home/runa/dev/website/projects/en/torbrowser.wml:321
 msgid ""
 "Tor Browser Bundle is partially based on <a "
 "href=\"http://portableapps.com/apps/internet/firefox_portable\">Mozilla "

Modified: translation/trunk/projects/website/po/ru/1-high.index.po
===================================================================
--- translation/trunk/projects/website/po/ru/1-high.index.po	2011-04-12 16:15:00 UTC (rev 24594)
+++ translation/trunk/projects/website/po/ru/1-high.index.po	2011-04-12 16:19:31 UTC (rev 24595)
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-03-17 18:05+0000\n"
-"PO-Revision-Date: 2011-03-22 16:15+0000\n"
+"POT-Creation-Date: 2011-03-28 12:48+0200\n"
+"PO-Revision-Date: 2011-03-29 00:25+0000\n"
 "Last-Translator: arma <arma at mit.edu>\n"
 "Language-Team: Russian <None>\n"
 "MIME-Version: 1.0\n"
@@ -18,14 +18,14 @@
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
 #. type: Content of: <div><div><div><div><ul><li>
-#: /home/runa/tor/website/en/index.wml:12
+#: /home/runa/dev/website/en/index.wml:12
 msgid "Tor prevents anyone from learning your location or browsing habits."
 msgstr ""
 "Tor защищает от попыток любого узнать ваше месторасположение или ваши "
 "привычки работы в сети."
 
 #. type: Content of: <div><div><div><div><ul><li>
-#: /home/runa/tor/website/en/index.wml:13
+#: /home/runa/dev/website/en/index.wml:13
 msgid ""
 "Tor is for web browsers, instant messaging clients, remote logins, and more."
 msgstr ""
@@ -33,19 +33,19 @@
 "логинов, и многого другого."
 
 #. type: Content of: <div><div><div><div><ul><li>
-#: /home/runa/tor/website/en/index.wml:14
+#: /home/runa/dev/website/en/index.wml:14
 msgid "Tor is free and open source for Windows, Mac, Linux/Unix, and Android"
 msgstr ""
 "Тор является программным обеспечением со свободно распространяемым и "
 "открытым исходным кодом для Windows, Mac, Linux/Unix и Android"
 
 #. type: Content of: <div><div><div><div><h1>
-#: /home/runa/tor/website/en/index.wml:16
+#: /home/runa/dev/website/en/index.wml:16
 msgid "Anonymity Online"
 msgstr "Анонимность-онлайн"
 
 #. type: Content of: <div><div><div><div><p>
-#: /home/runa/tor/website/en/index.wml:17
+#: /home/runa/dev/website/en/index.wml:17
 msgid ""
 "Protect your privacy. Defend yourself against network surveillance and "
 "traffic analysis."
@@ -54,7 +54,7 @@
 "работой в сети и анализа вашего трафика."
 
 #. type: Content of: <div><div><div><div><div>
-#: /home/runa/tor/website/en/index.wml:20
+#: /home/runa/dev/website/en/index.wml:20
 msgid ""
 "<a href=\"<page download/download>\"> <span class=\"download-tor\">Download "
 "Tor</span></a>"
@@ -63,12 +63,12 @@
 "Tor</span></a>"
 
 #. type: Content of: <div><div><div><div><div><h2>
-#: /home/runa/tor/website/en/index.wml:26
+#: /home/runa/dev/website/en/index.wml:26
 msgid "What is Tor?"
 msgstr "Что такое Tor?"
 
 #. type: Content of: <div><div><div><div><div><p>
-#: /home/runa/tor/website/en/index.wml:26
+#: /home/runa/dev/website/en/index.wml:26
 msgid ""
 "Tor is free software and an open network that helps you defend against a "
 "form of network surveillance that threatens personal freedom and privacy, "
@@ -85,12 +85,12 @@
 "about/overview>\">Узнайте больше о Tor &raquo;</a></span>"
 
 #. type: Content of: <div><div><div><div><div><h2>
-#: /home/runa/tor/website/en/index.wml:36
+#: /home/runa/dev/website/en/index.wml:36
 msgid "Why Anonymity Matters"
 msgstr "Почему Анонимность Важна"
 
 #. type: Content of: <div><div><div><div><div><p>
-#: /home/runa/tor/website/en/index.wml:37
+#: /home/runa/dev/website/en/index.wml:37
 msgid ""
 "Tor protects you by bouncing your communications around a distributed "
 "network of relays run by volunteers all around the world: it prevents "
@@ -113,22 +113,22 @@
 "Tor &raquo;</a></span>"
 
 #. type: Content of: <div><div><div><div><h2>
-#: /home/runa/tor/website/en/index.wml:50
+#: /home/runa/dev/website/en/index.wml:50
 msgid "Our Projects"
 msgstr "Наши проекты"
 
 #. type: Content of: <div><div><div><div><table><tr><td>
-#: /home/runa/tor/website/en/index.wml:55
+#: /home/runa/dev/website/en/index.wml:55
 msgid "<img src=\"$(IMGROOT)/icon-TorButton.jpg\" alt=\"Torbutton Icon\">"
 msgstr "<img src=\"$(IMGROOT)/icon-TorButton.jpg\" alt=\"иконка Torbutton\">"
 
 #. type: Content of: <div><div><div><div><table><tr><td><h3>
-#: /home/runa/tor/website/en/index.wml:56
+#: /home/runa/dev/website/en/index.wml:56
 msgid "<a href=\"<page torbutton/index>\">Torbutton</a>"
 msgstr "<a href=\"<page torbutton/index>\">Torbutton</a>"
 
 #. type: Content of: <div><div><div><div><table><tr><td><p>
-#: /home/runa/tor/website/en/index.wml:57
+#: /home/runa/dev/website/en/index.wml:57
 msgid ""
 "Torbutton is a 1-click way for Firefox users to enable or disable Tor in "
 "Firefox."
@@ -137,33 +137,33 @@
 "включить или отключить Tor."
 
 #. type: Content of: <div><div><div><div><table><tr><td>
-#: /home/runa/tor/website/en/index.wml:61
+#: /home/runa/dev/website/en/index.wml:61
 msgid "<img src=\"$(IMGROOT)/icon-TorCheck.jpg\" alt=\"Tor Check Icon\">"
 msgstr "<img src=\"$(IMGROOT)/icon-TorCheck.jpg\" alt=\"иконка Проверки Tor\">"
 
 #. type: Content of: <div><div><div><div><table><tr><td><h3>
-#: /home/runa/tor/website/en/index.wml:62
+#: /home/runa/dev/website/en/index.wml:62
 msgid "<a href=\"https://check.torproject.org/\">Check</a>"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><table><tr><td><p>
-#: /home/runa/tor/website/en/index.wml:63
+#: /home/runa/dev/website/en/index.wml:63
 msgid "Check determines if you are successfully browsing with Tor."
 msgstr ""
 "Проверка Анонимности определяет, если вы успешно работаете в сети через Tor."
 
 #. type: Content of: <div><div><div><div><table><tr><td>
-#: /home/runa/tor/website/en/index.wml:69
+#: /home/runa/dev/website/en/index.wml:69
 msgid "<img src=\"$(IMGROOT)/icon-Vidalia.jpg\" alt=\"Vidalia Icon\">"
 msgstr "<img src=\"$(IMGROOT)/icon-Vidalia.jpg\" alt=\"иконка Vidalia\">"
 
 #. type: Content of: <div><div><div><div><table><tr><td><h3>
-#: /home/runa/tor/website/en/index.wml:70
+#: /home/runa/dev/website/en/index.wml:70
 msgid "<a href=\"<page projects/vidalia>\">Vidalia</a>"
 msgstr "<a href=\"<page projects/vidalia>\">Vidalia</a>"
 
 #. type: Content of: <div><div><div><div><table><tr><td><p>
-#: /home/runa/tor/website/en/index.wml:71
+#: /home/runa/dev/website/en/index.wml:71
 msgid ""
 "Vidalia is a graphical way to control and view Tor's connections and "
 "settings."
@@ -172,36 +172,36 @@
 "Tor."
 
 #. type: Content of: <div><div><div><div><table><tr><td>
-#: /home/runa/tor/website/en/index.wml:75
+#: /home/runa/dev/website/en/index.wml:75
 msgid "<img src=\"$(IMGROOT)/icon-TorBrowser.jpg\" alt=\"TorBrowser Icon\">"
 msgstr "<img src=\"$(IMGROOT)/icon-TorBrowser.jpg\" alt=\"иконка TorBrowser\">"
 
 #. type: Content of: <div><div><div><div><table><tr><td><h3>
-#: /home/runa/tor/website/en/index.wml:76
+#: /home/runa/dev/website/en/index.wml:76
 msgid "<a href=\"<page projects/torbrowser>\">Tor Browser</a>"
 msgstr "<a href=\"<page projects/torbrowser>\">Tor Browser</a>"
 
 #. type: Content of: <div><div><div><div><table><tr><td><p>
-#: /home/runa/tor/website/en/index.wml:78
+#: /home/runa/dev/website/en/index.wml:78
 msgid ""
 "Tor Browser contains everything you need to safely browse the Internet."
 msgstr ""
 "Tor Browser содержит все необходимое для безопасной работы в Интернете."
 
 #. type: Content of: <div><div><div><div><h2>
-#: /home/runa/tor/website/en/index.wml:90
+#: /home/runa/dev/website/en/index.wml:90
 msgid "Who Uses Tor?"
 msgstr "Кто Использует Tor?"
 
 #. type: Content of: <div><div><div><div><div><h3>
-#: /home/runa/tor/website/en/index.wml:93
+#: /home/runa/dev/website/en/index.wml:93
 msgid ""
 "<a href=\"<page about/torusers>#normalusers\"><img "
 "src=\"$(IMGROOT)/family.jpg\" alt=\"Normal People\">Family &amp; Friends</a>"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><div><p>
-#: /home/runa/tor/website/en/index.wml:95
+#: /home/runa/dev/website/en/index.wml:95
 msgid ""
 "People like you and your family use Tor to protect themselves, their "
 "children, and their dignity while using the Internet."
@@ -210,14 +210,14 @@
 "детей, и их достоинство при использовании Интернета."
 
 #. type: Content of: <div><div><div><div><div><h3>
-#: /home/runa/tor/website/en/index.wml:99
+#: /home/runa/dev/website/en/index.wml:99
 msgid ""
 "<a href=\"<page about/torusers>#executives\"><img "
 "src=\"$(IMGROOT)/consumers.jpg\" alt=\"Businesses\">Businesses</a>"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><div><p>
-#: /home/runa/tor/website/en/index.wml:101
+#: /home/runa/dev/website/en/index.wml:101
 msgid ""
 "Businesses use Tor to research competition, keep business strategies "
 "confidential, and facilitate internal accountability."
@@ -226,7 +226,7 @@
 "конфиденциальности бизнес-стратегии, содействия внутренней подотчетности."
 
 #. type: Content of: <div><div><div><div><div><h3>
-#: /home/runa/tor/website/en/index.wml:105
+#: /home/runa/dev/website/en/index.wml:105
 msgid ""
 "<a href=\"<page about/torusers>#activists\"><img "
 "src=\"$(IMGROOT)/activists.jpg\" alt=\"Activists &amp; "
@@ -234,7 +234,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><div><div><div><p>
-#: /home/runa/tor/website/en/index.wml:107
+#: /home/runa/dev/website/en/index.wml:107
 msgid ""
 "Activists use Tor to anonymously report abuses from danger zones.  "
 "Whistleblowers use Tor to safely report on corruption."
@@ -244,14 +244,14 @@
 " коррупции."
 
 #. type: Content of: <div><div><div><div><div><h3>
-#: /home/runa/tor/website/en/index.wml:111
+#: /home/runa/dev/website/en/index.wml:111
 msgid ""
 "<a href=\"<page about/torusers>#journalist\"><img "
 "src=\"$(IMGROOT)/media.jpg\" alt=\"Journalists and the Media\">Media</a>"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><div><p>
-#: /home/runa/tor/website/en/index.wml:113
+#: /home/runa/dev/website/en/index.wml:113
 msgid ""
 "Journalists and the media use Tor to protect their research and sources "
 "online."
@@ -260,7 +260,7 @@
 " Интернете."
 
 #. type: Content of: <div><div><div><div><div><h3>
-#: /home/runa/tor/website/en/index.wml:117
+#: /home/runa/dev/website/en/index.wml:117
 msgid ""
 "<a href=\"<page about/torusers>#military\"><img "
 "src=\"$(IMGROOT)/military.jpg\" alt=\"Military and Law "
@@ -268,7 +268,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><div><div><div><p>
-#: /home/runa/tor/website/en/index.wml:119
+#: /home/runa/dev/website/en/index.wml:119
 msgid ""
 "Militaries and law enforcement use Tor to protect their communications, "
 "investigations, and intelligence gathering online."
@@ -277,17 +277,32 @@
 " коммуникаций, исследований, и он-лайн сбора разведывательных данных."
 
 #. type: Content of: <div><div><div><div><h2>
-#: /home/runa/tor/website/en/index.wml:123
+#: /home/runa/dev/website/en/index.wml:123
 msgid "Announcements"
 msgstr "Объявления"
 
 #. type: Content of: <div><div><div><div><table><tr><td><div>
-#: /home/runa/tor/website/en/index.wml:128
+#: /home/runa/dev/website/en/index.wml:128
+msgid "<span class=\"month\">Mar</span><br><span class=\"day\">23</span>"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><table><tr><td><p>
+#: /home/runa/dev/website/en/index.wml:129
+msgid ""
+"The Tor Project wins the \"Project of Social Benefit\" award from the Free "
+"Software Foundation and GNU Project. We are honored to win this award and to"
+" be listed amongst the former winners. <a "
+"href=\"https://blog.torproject.org/blog/tor-project-receives-fsf-"
+"award\">Read more</a> about this award."
+msgstr ""
+
+#. type: Content of: <div><div><div><div><table><tr><td><div>
+#: /home/runa/dev/website/en/index.wml:135
 msgid "<span class=\"month\">Feb</span><br><span class=\"day\">23</span>"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><table><tr><td><p>
-#: /home/runa/tor/website/en/index.wml:129
+#: /home/runa/dev/website/en/index.wml:136
 msgid ""
 "The latest stable Tor version, 0.2.1.30, is <a "
 "href=\"https://lists.torproject.org/pipermail/tor-"
@@ -297,22 +312,3 @@
 "reachable from Iran again.  We don't expect this tweak will win the arms "
 "race long-term, but it buys us time until we roll out a better solution."
 msgstr ""
-
-#. type: Content of: <div><div><div><div><table><tr><td><div>
-#: /home/runa/tor/website/en/index.wml:138
-msgid "<span class=\"month\">Jan</span><br><span class=\"day\">30</span>"
-msgstr "<span class=\"month\">Янв</span><br><span class=\"day\">30</span>"
-
-#. type: Content of: <div><div><div><div><table><tr><td><p>
-#: /home/runa/tor/website/en/index.wml:139
-msgid ""
-"Tor helping with Egypt.  Here's what we've learned <a "
-"href=\"https://blog.torproject.org/blog/recent-events-egypt\">about recent "
-"events in Egypt</a>. And we're keeping our <a href=\"<page "
-"press/inthemedia>\">In the media</a> page up to date with stories about how "
-"we're helping around the world."
-msgstr ""
-"Tor помогает с Египтом. Вот что мы узнали <a "
-"href=\"https://blog.torproject.org/blog/recent-events-egypt\">о последних "
-"событиях в Египте</a> . И мы держим <a href=\"<page press/inthemedia>\">В "
-"СМИ</a> страницы в курсе истории о том, как мы помогаем всему миру."

Modified: translation/trunk/projects/website/po/ru/about/3-low.contact.po
===================================================================
--- translation/trunk/projects/website/po/ru/about/3-low.contact.po	2011-04-12 16:15:00 UTC (rev 24594)
+++ translation/trunk/projects/website/po/ru/about/3-low.contact.po	2011-04-12 16:19:31 UTC (rev 24595)
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-02-12 12:19+0000\n"
-"PO-Revision-Date: 2011-03-22 16:18+0000\n"
+"POT-Creation-Date: 2011-03-28 12:49+0200\n"
+"PO-Revision-Date: 2011-03-29 00:25+0000\n"
 "Last-Translator: runasand <runa.sandvik at gmail.com>\n"
 "Language-Team: Russian <None>\n"
 "MIME-Version: 1.0\n"
@@ -18,7 +18,7 @@
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/about/en/contact.wml:9
+#: /home/runa/dev/website/about/en/contact.wml:9
 msgid ""
 "<a href=\"<page index>\">Home &raquo; </a> <a href=\"<page "
 "about/overview>\">About &raquo; </a> <a href=\"<page "
@@ -29,12 +29,12 @@
 "about/contact>\">Контакты</a>"
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/about/en/contact.wml:14
+#: /home/runa/dev/website/about/en/contact.wml:14
 msgid "Tor: Contact"
 msgstr "Tor: Контакты"
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/about/en/contact.wml:16
+#: /home/runa/dev/website/about/en/contact.wml:16
 msgid ""
 "First, if you have a problem or question about using Tor, go look at the <a "
 "href=\"<page docs/documentation>#Support\">Support section</a> for how to "
@@ -52,30 +52,30 @@
 "помощника</a> ."
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/about/en/contact.wml:18
+#: /home/runa/dev/website/about/en/contact.wml:18
 msgid ""
-"If you really do need to reach us, here are some approaches. All of these "
-"addresses are @torproject.org. Please be patient and <a "
-"href=\"http://www.catb.org/~esr/faqs/smart-questions.html\">helpful</a>, and"
-" please make sure to write your mail in English."
+"If you really do need to reach us, here are some approaches. Please be "
+"patient and <a href=\"http://www.catb.org/~esr/faqs/smart-"
+"questions.html\">helpful</a>, and please make sure to write your mail in "
+"English."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/about/en/contact.wml:23
+#: /home/runa/dev/website/about/en/contact.wml:21
 msgid ""
-"<i>tor-assistants</i> is the catch-all address for everything. It can be "
-"used for:"
+"<i>tor-assistants at lists.torproject.org</i> is the catch-all address for "
+"everything. It can be used for:"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/about/en/contact.wml:27
+#: /home/runa/dev/website/about/en/contact.wml:25
 msgid ""
 "Contacting the people who manage the directory authorities. Use this if you "
 "run a Tor relay and have a question or problem with your relay."
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/about/en/contact.wml:30
+#: /home/runa/dev/website/about/en/contact.wml:28
 msgid ""
 "So we can fix typos on the website, change wrong statements or directions on"
 " the website, and add new sections and paragraphs that you send us. You "
@@ -84,7 +84,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/about/en/contact.wml:34
+#: /home/runa/dev/website/about/en/contact.wml:32
 msgid ""
 "Hearing about your documents, patches, testing, experiences with supporting "
 "applications, and so forth inspired by our <a href=\"<page "
@@ -96,69 +96,59 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/about/en/contact.wml:44
+#: /home/runa/dev/website/about/en/contact.wml:42
 msgid "A few other addresses are more specific:"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/about/en/contact.wml:47
+#: /home/runa/dev/website/about/en/contact.wml:45
 msgid ""
-"<i>tor-translation</i> can put new <a href=\"<page "
+"<i>tor-translation at lists.torproject.org</i> can put new <a href=\"<page "
 "getinvolved/translation>\">website translations</a> into place, and help "
 "answer questions about existing and new translations."
 msgstr ""
-"<i>tor-translation</i> может разместить новый <a href=\"<page "
-"getinvolved/translation>\">вариант перевода на сайте</a>, а также ответить "
-"на вопросы о существующих и новых переводах."
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/about/en/contact.wml:50
+#: /home/runa/dev/website/about/en/contact.wml:48
 msgid ""
-"<i>tordnsel</i> is the alias for the people responsible for the tordns "
-"exitlist."
-msgstr "<i>Tordnsel</i> - для ответственных за tordns exitlist."
+"<i>tordnsel at torproject.org</i> is the alias for the people responsible "
+"for the tordns exitlist."
+msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/about/en/contact.wml:52
+#: /home/runa/dev/website/about/en/contact.wml:50
 msgid ""
-"<i>donations</i> is for questions and comments about <a href=\"<page "
-"donate/donate>\">getting money to the developers</a>. More donations means "
-"<a href=\"<page docs/faq>#Funding\">more Tor</a>. We're happy to help think "
-"about creative ways for you to contribute."
+"<i>donations at torproject.org</i> is for questions and comments about <a "
+"href=\"<page donate/donate>\">getting money to the developers</a>. More "
+"donations means <a href=\"<page docs/faq>#Funding\">more Tor</a>. We're "
+"happy to help think about creative ways for you to contribute."
 msgstr ""
-"<i>donations</i> - для вопросов и комментариев по <a href=\"<page "
-"donate/donate>\">пожертвованию денег для разработчиков</a> . Больше "
-"пожертвований значит <a href=\"<page docs/faq>#Funding\">больше Tor</a> . Мы"
-" рады любой помощи."
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/about/en/contact.wml:57
+#: /home/runa/dev/website/about/en/contact.wml:55
 msgid ""
-"<i>execdir</i> is for press/media, questions and comments about Tor the non-"
-"profit corporation: trademark questions, affiliation and coordination, major"
-" gifts, contract inquiries, licensing and certification, etc."
+"<i>execdir at torproject.org</i> is for press/media, questions and comments "
+"about Tor the non-profit corporation: trademark questions, affiliation and "
+"coordination, major gifts, contract inquiries, licensing and certification, "
+"etc."
 msgstr ""
-"<i>execdir</i> - для прессы / средств массовой информации, вопросов и "
-"комментариев о Tor как о некоммерческой организации: вопросов о торговых "
-"марках, принадлежности и координации, больших пожертвованиях, контрактных "
-"запросах, лицензировании и сертификации и т.д."
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/about/en/contact.wml:63
+#: /home/runa/dev/website/about/en/contact.wml:61
 msgid ""
 "<a id=\"irc\"></a> Tor users and developers can also be found in the "
 "following channels on <a href=\"http://www.oftc.net/oftc/\">oftc</a>:"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/about/en/contact.wml:68
+#: /home/runa/dev/website/about/en/contact.wml:66
 msgid ""
 "<i>#tor</i> - User and relay operation discussions. Having trouble running "
 "Tor or a question for other Tor users? Then this is the spot for you."
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/about/en/contact.wml:71
+#: /home/runa/dev/website/about/en/contact.wml:69
 msgid ""
 "<i>#tor-dev</i> - Channel for people who want to do development.  "
 "Discussions about Tor related coding, protocols, and <a href=\"<page "
@@ -166,7 +156,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/about/en/contact.wml:74
+#: /home/runa/dev/website/about/en/contact.wml:72
 msgid ""
 "<i>#nottor</i> - This is where Tor people hang out to talk about stuff that "
 "is not related to Tor."

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

Modified: translation/trunk/projects/website/po/ru/about/3-low.volunteers.po
===================================================================
--- translation/trunk/projects/website/po/ru/about/3-low.volunteers.po	2011-04-12 16:15:00 UTC (rev 24594)
+++ translation/trunk/projects/website/po/ru/about/3-low.volunteers.po	2011-04-12 16:19:31 UTC (rev 24595)
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-02-12 12:19+0000\n"
-"PO-Revision-Date: 2011-03-22 16:23+0000\n"
+"POT-Creation-Date: 2011-03-28 12:49+0200\n"
+"PO-Revision-Date: 2011-03-29 00:25+0000\n"
 "Last-Translator: runasand <runa.sandvik at gmail.com>\n"
 "Language-Team: Russian <None>\n"
 "MIME-Version: 1.0\n"
@@ -18,7 +18,7 @@
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/about/en/volunteers.wml:8
+#: /home/runa/dev/website/about/en/volunteers.wml:8
 msgid ""
 "<a href=\"<page index>\">Home &raquo; </a> <a href=\"<page "
 "about/overview>\">About &raquo; </a> <a href=\"<page "
@@ -26,27 +26,27 @@
 msgstr ""
 
 #. type: Content of: <div><div><h1>
-#: /home/runa/tor/website/about/en/volunteers.wml:13
+#: /home/runa/dev/website/about/en/volunteers.wml:13
 msgid "Volunteers"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/volunteers.wml:15
+#: /home/runa/dev/website/about/en/volunteers.wml:15
 msgid "Anonym"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/volunteers.wml:15
+#: /home/runa/dev/website/about/en/volunteers.wml:15
 msgid "Maintainer of the Incognito LiveCD."
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/volunteers.wml:16
+#: /home/runa/dev/website/about/en/volunteers.wml:16
 msgid "Kevin Bankston"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/volunteers.wml:16
+#: /home/runa/dev/website/about/en/volunteers.wml:16
 msgid ""
 "EFF lawyer who helped write the <a href=\"<page eff/tor-legal-faq>\">Tor "
 "Legal FAQ</a> and tirelessly answers the phone when somebody in the world "
@@ -54,148 +54,138 @@
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/volunteers.wml:20
+#: /home/runa/dev/website/about/en/volunteers.wml:20
 msgid "Marco Bonetti"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/volunteers.wml:20
+#: /home/runa/dev/website/about/en/volunteers.wml:20
 msgid "Focusing on MobileTor for the iPhone."
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/volunteers.wml:21
+#: /home/runa/dev/website/about/en/volunteers.wml:21
 msgid "Kasimir Gabert"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/volunteers.wml:21
+#: /home/runa/dev/website/about/en/volunteers.wml:21
 msgid ""
 "Maintains the <a href=\"https://torstatus.kgprog.com/\">TorStatus</a> "
 "statistics pages."
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/volunteers.wml:23
+#: /home/runa/dev/website/about/en/volunteers.wml:23
 msgid "Andreas Jonsson"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/volunteers.wml:23
+#: /home/runa/dev/website/about/en/volunteers.wml:23
 msgid "Works on OS X Tor Browser Bundle sandbox technology."
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/volunteers.wml:25
+#: /home/runa/dev/website/about/en/volunteers.wml:25
 msgid "Fabian Keil"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/volunteers.wml:25
+#: /home/runa/dev/website/about/en/volunteers.wml:25
 msgid ""
 "One of the core Privoxy developers, and also a Tor fan. He's the reason Tor "
 "and Privoxy still work well together."
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/volunteers.wml:27
+#: /home/runa/dev/website/about/en/volunteers.wml:27
 msgid "Bruce Leidl"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/volunteers.wml:27
+#: /home/runa/dev/website/about/en/volunteers.wml:27
 msgid "Working on a Tor client in Java."
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/volunteers.wml:28
+#: /home/runa/dev/website/about/en/volunteers.wml:28
 msgid "Julius Mittenzwei"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/volunteers.wml:28
+#: /home/runa/dev/website/about/en/volunteers.wml:28
 msgid ""
 "A lawyer with the CCC in Germany. Coordinates the German Tor community with "
 "respect to legal questions and concerns."
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/volunteers.wml:31
+#: /home/runa/dev/website/about/en/volunteers.wml:31
 msgid "Shava Nerad"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/volunteers.wml:31
+#: /home/runa/dev/website/about/en/volunteers.wml:31
 msgid ""
 "Our former Development Director. She still works on PR and community "
 "relations."
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/volunteers.wml:33
+#: /home/runa/dev/website/about/en/volunteers.wml:33
 msgid "Linus Nordberg"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/volunteers.wml:33
+#: /home/runa/dev/website/about/en/volunteers.wml:33
 msgid ""
 "Enjoys measuring the Tor network and helps with outreach in the Nordic "
 "countries."
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/volunteers.wml:35
+#: /home/runa/dev/website/about/en/volunteers.wml:35
 msgid "Lasse &Oslash;verlier"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/volunteers.wml:35
+#: /home/runa/dev/website/about/en/volunteers.wml:35
 msgid ""
 "Writes research papers on Tor: attacks, defenses, and resource management, "
 "especially for hidden services."
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/volunteers.wml:37
+#: /home/runa/dev/website/about/en/volunteers.wml:37
 msgid "Martin Peck"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/volunteers.wml:37
+#: /home/runa/dev/website/about/en/volunteers.wml:37
 msgid ""
 "Working on a VM-based transparent proxying approach for Tor clients on "
 "Windows."
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/volunteers.wml:39
-msgid "Robert Ransom"
-msgstr ""
-
-#. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/volunteers.wml:39
-msgid "Bug catcher and immensely helpful on irc and the email lists"
-msgstr ""
-
-#. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/volunteers.wml:41
+#: /home/runa/dev/website/about/en/volunteers.wml:39
 msgid "rovv (a pseudonym -- he's managed to stay anonymous even from us!)"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/volunteers.wml:42
+#: /home/runa/dev/website/about/en/volunteers.wml:40
 msgid ""
 "The most dedicated bug reporter we've ever heard from. He must read Tor "
 "source code every day over breakfast."
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/volunteers.wml:44
+#: /home/runa/dev/website/about/en/volunteers.wml:42
 msgid "tup (another pseudonym)"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/volunteers.wml:44
+#: /home/runa/dev/website/about/en/volunteers.wml:42
 msgid ""
 "Periodically adds new features for making Tor easier to use as a <a "
 "href=\"<wiki>TransparentProxy\">transparent proxy</a>. Also maintains the <a"
@@ -203,34 +193,24 @@
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/volunteers.wml:49
-msgid "Tomás Touceda"
-msgstr ""
-
-#. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/volunteers.wml:49
-msgid "Fantastic developer involved with the Vidalia project"
-msgstr ""
-
-#. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/volunteers.wml:51
+#: /home/runa/dev/website/about/en/volunteers.wml:47
 msgid "Kyle Williams"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/volunteers.wml:51
+#: /home/runa/dev/website/about/en/volunteers.wml:47
 msgid ""
 "Developer for JanusVM, a VMWare-based transparent Tor proxy that makes Tor "
 "easier to set up and use."
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/volunteers.wml:54
+#: /home/runa/dev/website/about/en/volunteers.wml:50
 msgid "Ethan Zuckerman"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/about/en/volunteers.wml:54
+#: /home/runa/dev/website/about/en/volunteers.wml:50
 msgid ""
 "A blogger who has written some <a "
 "href=\"http://www.ethanzuckerman.com/blog/?p=1019\">interesting</a> <a "
@@ -240,7 +220,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/about/en/volunteers.wml:59
+#: /home/runa/dev/website/about/en/volunteers.wml:55
 msgid ""
 "All our relay operators, people who write <a "
 "href=\"http://freehaven.net/anonbib/\">research papers</a> about Tor, people"

Modified: translation/trunk/projects/website/po/ru/docs/1-high.proxychain.po
===================================================================
--- translation/trunk/projects/website/po/ru/docs/1-high.proxychain.po	2011-04-12 16:15:00 UTC (rev 24594)
+++ translation/trunk/projects/website/po/ru/docs/1-high.proxychain.po	2011-04-12 16:19:31 UTC (rev 24595)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-01-29 21:06+0000\n"
+"POT-Creation-Date: 2011-03-28 12:48+0200\n"
 "PO-Revision-Date: 2011-03-22 16:45+0000\n"
 "Last-Translator: runasand <runa.sandvik at gmail.com>\n"
 "Language-Team: Russian <None>\n"
@@ -18,7 +18,7 @@
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/proxychain.wml:8
+#: /home/runa/dev/website/docs/en/proxychain.wml:8
 msgid ""
 "<a href=\"<page index>\">Home &raquo; </a> <a href=\"<page "
 "docs/documentation>\">Documentation &raquo; </a> <a href=\"<page "
@@ -26,24 +26,24 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/proxychain.wml:13
+#: /home/runa/dev/website/docs/en/proxychain.wml:13
 msgid "<a id=\"proxychain\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/docs/en/proxychain.wml:14
+#: /home/runa/dev/website/docs/en/proxychain.wml:14
 msgid ""
 "<a class=\"anchor\" href=\"#proxychain\">Tor: Configuring Tor to use a "
 "Proxy</a>"
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/proxychain.wml:15
+#: /home/runa/dev/website/docs/en/proxychain.wml:15
 msgid "<hr>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/proxychain.wml:18
+#: /home/runa/dev/website/docs/en/proxychain.wml:18
 msgid ""
 "The current version of Tor and the Vidalia Graphical Tor Controller support "
 "the ability to use any HTTPS or SOCKS proxy to get access to the Tor "
@@ -55,7 +55,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/proxychain.wml:28
+#: /home/runa/dev/website/docs/en/proxychain.wml:28
 msgid ""
 "These steps assume you have a functional Tor/Vidalia configuration, and you "
 "have found a list of HTTPS, SOCKS4, or SOCKS5 proxies. (To clarify, an HTTPS"
@@ -63,50 +63,50 @@
 msgstr ""
 
 #. type: Content of: <div><div><p><ol><li>
-#: /home/runa/tor/website/docs/en/proxychain.wml:33
+#: /home/runa/dev/website/docs/en/proxychain.wml:33
 msgid "Open the Vidalia Control Panel, click on Settings."
 msgstr ""
 
 #. type: Content of: <div><div><p><ol><li>
-#: /home/runa/tor/website/docs/en/proxychain.wml:34
+#: /home/runa/dev/website/docs/en/proxychain.wml:34
 msgid "Click Network.  Select \"I use a proxy to access the Internet\"."
 msgstr ""
 
 #. type: Content of: <div><div><p><ol><li>
-#: /home/runa/tor/website/docs/en/proxychain.wml:35
+#: /home/runa/dev/website/docs/en/proxychain.wml:35
 msgid ""
 "On the Address line, enter the open proxy address.  This can be a hostname "
 "or IP Address."
 msgstr ""
 
 #. type: Content of: <div><div><p><ol><li>
-#: /home/runa/tor/website/docs/en/proxychain.wml:36
+#: /home/runa/dev/website/docs/en/proxychain.wml:36
 msgid "Enter the port for the proxy."
 msgstr ""
 
 #. type: Content of: <div><div><p><ol><li>
-#: /home/runa/tor/website/docs/en/proxychain.wml:37
+#: /home/runa/dev/website/docs/en/proxychain.wml:37
 msgid ""
 "Generally, you do not need a Username and Password.  If you do, enter the "
 "information in the proper fields."
 msgstr ""
 
 #. type: Content of: <div><div><p><ol><li>
-#: /home/runa/tor/website/docs/en/proxychain.wml:38
+#: /home/runa/dev/website/docs/en/proxychain.wml:38
 msgid ""
 "Choose the Type of proxy you are using, whether HTTP/HTTPS, SOCKS4, or "
 "SOCKS5."
 msgstr ""
 
 #. type: Content of: <div><div><p><ol><li>
-#: /home/runa/tor/website/docs/en/proxychain.wml:39
+#: /home/runa/dev/website/docs/en/proxychain.wml:39
 msgid ""
 "Push the Ok button.  Vidalia and Tor are now configured to use a proxy to "
 "access the rest of the Tor Network."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/proxychain.wml:42
+#: /home/runa/dev/website/docs/en/proxychain.wml:42
 msgid ""
 "<br><br> <img src=\"$(IMGROOT)/vidalia-proxy.png\" alt=\"Vidalia's Network "
 "Proxy settings page\"> <br><br>"

Modified: translation/trunk/projects/website/po/ru/docs/2-medium.faq.po
===================================================================
--- translation/trunk/projects/website/po/ru/docs/2-medium.faq.po	2011-04-12 16:15:00 UTC (rev 24594)
+++ translation/trunk/projects/website/po/ru/docs/2-medium.faq.po	2011-04-12 16:19:31 UTC (rev 24595)
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-03-17 18:04+0000\n"
-"PO-Revision-Date: 2011-03-22 16:26+0000\n"
+"POT-Creation-Date: 2011-03-28 12:48+0200\n"
+"PO-Revision-Date: 2011-03-29 00:25+0000\n"
 "Last-Translator: runasand <runa.sandvik at gmail.com>\n"
 "Language-Team: Russian <None>\n"
 "MIME-Version: 1.0\n"
@@ -18,7 +18,7 @@
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:8
+#: /home/runa/dev/website/docs/en/faq.wml:8
 msgid ""
 "<a href=\"<page index>\">Home &raquo; </a> <a href=\"<page "
 "docs/documentation>\">Documentation &raquo; </a> <a href=\"<page "
@@ -26,288 +26,288 @@
 msgstr ""
 
 #. type: Content of: <div><div><h1>
-#: /home/runa/tor/website/docs/en/faq.wml:14
+#: /home/runa/dev/website/docs/en/faq.wml:14
 msgid "Tor FAQ"
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:15 /tmp/B_aDff_VuJ.xml:1646
+#: /home/runa/dev/website/docs/en/faq.wml:15 /tmp/tNikbgsymy.xml:1646
 msgid "<hr>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:17
+#: /home/runa/dev/website/docs/en/faq.wml:17
 msgid "General questions:"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:19
+#: /home/runa/dev/website/docs/en/faq.wml:19
 msgid "<a href=\"#WhatIsTor\">What is Tor?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:20
+#: /home/runa/dev/website/docs/en/faq.wml:20
 msgid "<a href=\"#Torisdifferent\">How is Tor different from other proxies?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:21
+#: /home/runa/dev/website/docs/en/faq.wml:21
 msgid "<a href=\"#CompatibleApplications\">What programs can I use with Tor?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:23
+#: /home/runa/dev/website/docs/en/faq.wml:23
 msgid "<a href=\"#WhyCalledTor\">Why is it called Tor?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:24
+#: /home/runa/dev/website/docs/en/faq.wml:24
 msgid "<a href=\"#Backdoor\">Is there a backdoor in Tor?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:25
+#: /home/runa/dev/website/docs/en/faq.wml:25
 msgid "<a href=\"#DistributingTor\">Can I distribute Tor on my magazine's CD?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:27
+#: /home/runa/dev/website/docs/en/faq.wml:27
 msgid ""
 "<a href=\"#SupportMail\">How can I get an answer to my Tor support mail?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:29
+#: /home/runa/dev/website/docs/en/faq.wml:29
 msgid "<a href=\"#WhySlow\">Why is Tor so slow?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:30
+#: /home/runa/dev/website/docs/en/faq.wml:30
 msgid "<a href=\"#Funding\">What would The Tor Project do with more funding?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:32
+#: /home/runa/dev/website/docs/en/faq.wml:32
 msgid ""
 "<a href=\"#Metrics\">How many people use Tor? How many relays or exit nodes "
 "are there?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:36
+#: /home/runa/dev/website/docs/en/faq.wml:36
 msgid "Compilation and Installation:"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:38
+#: /home/runa/dev/website/docs/en/faq.wml:38
 msgid "<a href=\"#HowUninstallTor\">How do I uninstall Tor?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:39
+#: /home/runa/dev/website/docs/en/faq.wml:39
 msgid "<a href=\"#PGPSigs\">What are these \"sig\" files on the download page?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:41
+#: /home/runa/dev/website/docs/en/faq.wml:41
 msgid ""
 "<a href=\"#GetTor\">Your website is blocked in my country. How do I download"
 " Tor?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:43
+#: /home/runa/dev/website/docs/en/faq.wml:43
 msgid "<a href=\"#CompileTorWindows\">How do I compile Tor under Windows?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:44
+#: /home/runa/dev/website/docs/en/faq.wml:44
 msgid ""
 "<a href=\"#VirusFalsePositives\">Why does my Tor executable appear to have a"
 " virus or spyware?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:46
+#: /home/runa/dev/website/docs/en/faq.wml:46
 msgid ""
 "<a href=\"#LiveCD\">Is there a LiveCD or other bundle that includes Tor?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:49
+#: /home/runa/dev/website/docs/en/faq.wml:49
 msgid "Running Tor:"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:51
+#: /home/runa/dev/website/docs/en/faq.wml:51
 msgid "<a href=\"#torrc\">I'm supposed to \"edit my torrc\". What does that mean?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:53
+#: /home/runa/dev/website/docs/en/faq.wml:53
 msgid "<a href=\"#Logs\">How do I set up logging, or see Tor's logs?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:57
+#: /home/runa/dev/website/docs/en/faq.wml:57
 msgid "Running a Tor client:"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:59
+#: /home/runa/dev/website/docs/en/faq.wml:59
 msgid ""
 "<a href=\"#DoesntWork\">I installed Tor and Polipo but it's not working.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:61
+#: /home/runa/dev/website/docs/en/faq.wml:61
 msgid ""
 "<a href=\"#VidaliaPassword\">Tor/Vidalia prompts for a password at "
 "start.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:63
+#: /home/runa/dev/website/docs/en/faq.wml:63
 msgid ""
 "<a href=\"#ChooseEntryExit\">Can I control which nodes (or country)  are "
 "used for entry/exit?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:65
+#: /home/runa/dev/website/docs/en/faq.wml:65
 msgid ""
 "<a href=\"#GoogleCaptcha\">Google makes me solve a Captcha or tells me I "
 "have spyware installed.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:67
+#: /home/runa/dev/website/docs/en/faq.wml:67
 msgid ""
 "<a href=\"#GmailWarning\">Gmail warns me that my account may have been "
 "compromised.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:69
+#: /home/runa/dev/website/docs/en/faq.wml:69
 msgid ""
 "<a href=\"#FirewallPorts\">My firewall only allows a few outgoing ports.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:73
+#: /home/runa/dev/website/docs/en/faq.wml:73
 msgid "Running a Tor relay:"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:75
+#: /home/runa/dev/website/docs/en/faq.wml:75
 msgid "<a href=\"#RelayFlexible\">How stable does my relay need to be?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:76
+#: /home/runa/dev/website/docs/en/faq.wml:76
 msgid ""
 "<a href=\"#ExitPolicies\">I'd run a relay, but I don't want to deal with "
 "abuse issues.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:78
+#: /home/runa/dev/website/docs/en/faq.wml:78
 msgid "<a href=\"#RelayOrBridge\">Should I be a normal relay or bridge relay?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:80
+#: /home/runa/dev/website/docs/en/faq.wml:80
 msgid "<a href=\"#MultipleRelays\">I want to run more than one relay.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:81
+#: /home/runa/dev/website/docs/en/faq.wml:81
 msgid "<a href=\"#RelayMemory\">Why is my Tor relay using so much memory?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:82
+#: /home/runa/dev/website/docs/en/faq.wml:82
 msgid "<a href=\"#WhyNotNamed\">Why is my Tor relay not named?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:85
+#: /home/runa/dev/website/docs/en/faq.wml:85
 msgid "Running a Tor hidden service:"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:87
+#: /home/runa/dev/website/docs/en/faq.wml:87
 msgid "Anonymity and Security:"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:89
+#: /home/runa/dev/website/docs/en/faq.wml:89
 msgid "<a href=\"#KeyManagement\">Tell me about all the keys Tor uses.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:90
+#: /home/runa/dev/website/docs/en/faq.wml:90
 msgid "<a href=\"#EntryGuards\">What are Entry Guards?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:93
+#: /home/runa/dev/website/docs/en/faq.wml:93
 msgid "Alternate designs that we don't do (yet):"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:95
+#: /home/runa/dev/website/docs/en/faq.wml:95
 msgid ""
 "<a href=\"#EverybodyARelay\">You should make every Tor user be a relay.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:97
+#: /home/runa/dev/website/docs/en/faq.wml:97
 msgid ""
 "<a href=\"#TransportIPnotTCP\">You should transport all IP packets, not just"
 " TCP packets.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:101
+#: /home/runa/dev/website/docs/en/faq.wml:101
 msgid "Abuse:"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:103
+#: /home/runa/dev/website/docs/en/faq.wml:103
 msgid "<a href=\"#Criminals\">Doesn't Tor enable criminals to do bad things?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:104
+#: /home/runa/dev/website/docs/en/faq.wml:104
 msgid ""
 "<a href=\"#RespondISP\">How do I respond to my ISP about my exit relay?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:108
+#: /home/runa/dev/website/docs/en/faq.wml:108
 msgid ""
 "For other questions not yet on this version of the FAQ, see the <a "
 "href=\"<wikifaq>\">wiki FAQ</a> for now."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:111
+#: /home/runa/dev/website/docs/en/faq.wml:111
 msgid "<hr> <a id=\"General\"></a> <a id=\"WhatIsTor\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:116
+#: /home/runa/dev/website/docs/en/faq.wml:116
 msgid "<a class=\"anchor\" href=\"#WhatIsTor\">What is Tor?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:119
+#: /home/runa/dev/website/docs/en/faq.wml:119
 msgid "The name \"Tor\" can refer to several different components."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:123
+#: /home/runa/dev/website/docs/en/faq.wml:123
 msgid ""
 "The Tor software is a program you can run on your computer that helps keep "
 "you safe on the Internet. Tor protects you by bouncing your communications "
@@ -320,26 +320,26 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:134
+#: /home/runa/dev/website/docs/en/faq.wml:134
 msgid ""
 "The Tor Project is a non-profit (charity) organization that maintains and "
 "develops the Tor software."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:138
+#: /home/runa/dev/website/docs/en/faq.wml:138
 msgid "<hr> <a id=\"Torisdifferent\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:141
+#: /home/runa/dev/website/docs/en/faq.wml:141
 msgid ""
 "<a class=\"anchor\" href=\"#Torisdifferent\">How is Tor different from other"
 " proxies?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:143
+#: /home/runa/dev/website/docs/en/faq.wml:143
 msgid ""
 "A typical proxy provider sets up a server somewhere on the Internet and "
 "allows you to use it to relay your traffic.  This creates a simple, easy to "
@@ -355,7 +355,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:156
+#: /home/runa/dev/website/docs/en/faq.wml:156
 msgid ""
 "Simple proxy providers also create a single point of failure.  The provider "
 "knows who you are and where you browse on the Internet.  They can see your "
@@ -367,7 +367,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:165
+#: /home/runa/dev/website/docs/en/faq.wml:165
 msgid ""
 "Tor passes your traffic through at least 3 different servers before sending "
 "it on to the destination.  Tor does not modify, or even know, what you are "
@@ -380,12 +380,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><p><dl><dt>
-#: /home/runa/tor/website/docs/en/faq.wml:175
+#: /home/runa/dev/website/docs/en/faq.wml:175
 msgid "Doesn't the first server see who I am?"
 msgstr ""
 
 #. type: Content of: <div><div><p><dl><dd>
-#: /home/runa/tor/website/docs/en/faq.wml:175
+#: /home/runa/dev/website/docs/en/faq.wml:175
 msgid ""
 "Possibly. A bad first of three servers can see encrypted Tor traffic coming "
 "from your computer.  It still doesn't know who you are and what you are "
@@ -396,12 +396,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><p><dl><dt>
-#: /home/runa/tor/website/docs/en/faq.wml:181
+#: /home/runa/dev/website/docs/en/faq.wml:181
 msgid "Can't the third server see my traffic?"
 msgstr ""
 
 #. type: Content of: <div><div><p><dl><dd>
-#: /home/runa/tor/website/docs/en/faq.wml:181
+#: /home/runa/dev/website/docs/en/faq.wml:181
 msgid ""
 "Possibly.  A bad third of three servers can see the traffic you sent into "
 "Tor.  It won't know who sent this traffic.  If you're using encryption, such"
@@ -413,19 +413,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:191
+#: /home/runa/dev/website/docs/en/faq.wml:191
 msgid "<hr> <a id=\"CompatibleApplications\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:194
+#: /home/runa/dev/website/docs/en/faq.wml:194
 msgid ""
 "<a class=\"anchor\" href=\"#CompatibleApplications\">What programs can I use"
 " with Tor?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:197
+#: /home/runa/dev/website/docs/en/faq.wml:197
 msgid ""
 "There are two pieces to \"Torifying\" a program: connection-level anonymity "
 "and application-level anonymity. Connection-level anonymity focuses on "
@@ -441,7 +441,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:211
+#: /home/runa/dev/website/docs/en/faq.wml:211
 msgid ""
 "Most of our work so far has focused on the Firefox web browser. The bundles "
 "on the <a href=\"<page download/download>\">download page</a> automatically "
@@ -452,7 +452,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:220
+#: /home/runa/dev/website/docs/en/faq.wml:220
 msgid ""
 "There are plenty of other programs you can use with Tor, but we haven't "
 "researched the application-level anonymity issues on them well enough to be "
@@ -465,17 +465,17 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:231
+#: /home/runa/dev/website/docs/en/faq.wml:231
 msgid "<hr> <a id=\"WhyCalledTor\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:234
+#: /home/runa/dev/website/docs/en/faq.wml:234
 msgid "<a class=\"anchor\" href=\"#WhyCalledTor\">Why is it called Tor?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:237
+#: /home/runa/dev/website/docs/en/faq.wml:237
 msgid ""
 "Because Tor is the onion routing network. When we were starting the new "
 "next-generation design and implementation of onion routing in 2001-2002, we "
@@ -486,12 +486,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:247
+#: /home/runa/dev/website/docs/en/faq.wml:247
 msgid "(It's also got a fine translation from German and Turkish.)"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:251
+#: /home/runa/dev/website/docs/en/faq.wml:251
 msgid ""
 "Note: even though it originally came from an acronym, Tor is not spelled "
 "\"TOR\". Only the first letter is capitalized. In fact, we can usually spot "
@@ -501,17 +501,17 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:258
+#: /home/runa/dev/website/docs/en/faq.wml:258
 msgid "<hr> <a id=\"Backdoor\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:261
+#: /home/runa/dev/website/docs/en/faq.wml:261
 msgid "<a class=\"anchor\" href=\"#Backdoor\">Is there a backdoor in Tor?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:264
+#: /home/runa/dev/website/docs/en/faq.wml:264
 msgid ""
 "There is absolutely no backdoor in Tor. Nobody has asked us to put one in, "
 "and we know some smart lawyers who say that it's unlikely that anybody will "
@@ -520,7 +520,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:271
+#: /home/runa/dev/website/docs/en/faq.wml:271
 msgid ""
 "We think that putting a backdoor in Tor would be tremendously irresponsible "
 "to our users, and a bad precedent for security software in general. If we "
@@ -530,7 +530,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:279
+#: /home/runa/dev/website/docs/en/faq.wml:279
 msgid ""
 "But that said, there are still plenty of subtle attacks people might try. "
 "Somebody might impersonate us, or break into our computers, or something "
@@ -543,7 +543,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:291
+#: /home/runa/dev/website/docs/en/faq.wml:291
 msgid ""
 "Also, there might be accidental bugs in Tor that could affect your "
 "anonymity. We periodically find and fix anonymity-related bugs, so make sure"
@@ -551,24 +551,24 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:296
+#: /home/runa/dev/website/docs/en/faq.wml:296
 msgid "<hr> <a id=\"DistributingTor\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:299
+#: /home/runa/dev/website/docs/en/faq.wml:299
 msgid ""
 "<a class=\"anchor\" href=\"#DistributingTor\">Can I distribute Tor on my "
 "magazine's CD?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:302
+#: /home/runa/dev/website/docs/en/faq.wml:302
 msgid "Yes."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:306
+#: /home/runa/dev/website/docs/en/faq.wml:306
 msgid ""
 "The Tor software is <a href=\"https://www.fsf.org/\">free software</a>. This"
 " means we give you the rights to redistribute the Tor software, either "
@@ -577,7 +577,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:313
+#: /home/runa/dev/website/docs/en/faq.wml:313
 msgid ""
 "However, if you want to redistribute the Tor software you must follow our <a"
 " href=\"<gitblob>LICENSE\">LICENSE</a>.  Essentially this means that you "
@@ -586,7 +586,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:320
+#: /home/runa/dev/website/docs/en/faq.wml:320
 msgid ""
 "Most people who ask us this question don't want to distribute just the Tor "
 "software, though. They want to distribute the Tor bundles, which typically "
@@ -604,7 +604,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:336
+#: /home/runa/dev/website/docs/en/faq.wml:336
 msgid ""
 "Also, you should make sure not to confuse your readers about what Tor is, "
 "who makes it, and what properties it provides (and doesn't provide). See our"
@@ -612,7 +612,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:342
+#: /home/runa/dev/website/docs/en/faq.wml:342
 msgid ""
 "Lastly, you should realize that we release new versions of the Tor software "
 "frequently, and sometimes we make backward incompatible changes. So if you "
@@ -622,78 +622,78 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:349
+#: /home/runa/dev/website/docs/en/faq.wml:349
 msgid "<hr> <a id=\"SupportMail\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:352
+#: /home/runa/dev/website/docs/en/faq.wml:352
 msgid ""
 "<a class=\"anchor\" href=\"#SupportMail\">How can I get an answer to my Tor "
 "support mail?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:354
+#: /home/runa/dev/website/docs/en/faq.wml:354
 msgid ""
 "There is no official support for Tor. Your best bet is to try the following:"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:356
+#: /home/runa/dev/website/docs/en/faq.wml:356
 msgid "Read through this <a href=\"<page docs/faq>\">FAQ</a>."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:357
+#: /home/runa/dev/website/docs/en/faq.wml:357
 msgid "Read through the <a href=\"<page docs/documentation>\">documentation</a>."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:358
+#: /home/runa/dev/website/docs/en/faq.wml:358
 msgid ""
 "Read through the <a href=\"http://archives.seul.org/or/talk\">OR-TALK "
 "Archives</a> and see if your question is already answered."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:361
+#: /home/runa/dev/website/docs/en/faq.wml:361
 msgid ""
 "Join our <a href=\"irc://irc.oftc.net#tor\">irc channel</a> and state the "
 "issue and wait for help."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:363
+#: /home/runa/dev/website/docs/en/faq.wml:363
 msgid ""
 "Send an email to tor-assistants at torproject.org. These are volunteers who "
 "may be able to help you but you may not get a response for days."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:368
+#: /home/runa/dev/website/docs/en/faq.wml:368
 msgid ""
 "If you find your answer, please stick around on the IRC channel or the "
 "mailing list and answer questions from others."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:371
+#: /home/runa/dev/website/docs/en/faq.wml:371
 msgid "<hr> <a id=\"WhySlow\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:374
+#: /home/runa/dev/website/docs/en/faq.wml:374
 msgid "<a class=\"anchor\" href=\"#WhySlow\">Why is Tor so slow?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:377
+#: /home/runa/dev/website/docs/en/faq.wml:377
 msgid "There are many reasons why the Tor network is currently slow."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:381
+#: /home/runa/dev/website/docs/en/faq.wml:381
 msgid ""
 "Before we answer, though, you should realize that Tor is never going to be "
 "blazing fast. Your traffic is bouncing through volunteers' computers in "
@@ -703,7 +703,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:389
+#: /home/runa/dev/website/docs/en/faq.wml:389
 msgid ""
 "But that doesn't mean that it can't be improved. The current Tor network is "
 "quite small compared to the number of people trying to use it, and many of "
@@ -712,7 +712,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:396
+#: /home/runa/dev/website/docs/en/faq.wml:396
 msgid ""
 "For the much more in-depth answer, see <a href=\"<blog>why-tor-is-"
 "slow\">Roger's blog post on the topic</a>, which includes both a detailed "
@@ -720,12 +720,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:403
+#: /home/runa/dev/website/docs/en/faq.wml:403
 msgid "What can you do to help?"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:409
+#: /home/runa/dev/website/docs/en/faq.wml:409
 msgid ""
 "<a href=\"<page docs/tor-doc-relay>\">Configure your Tor to relay traffic "
 "for others</a>. Help make the Tor network large enough that we can handle "
@@ -733,7 +733,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:415
+#: /home/runa/dev/website/docs/en/faq.wml:415
 msgid ""
 "<a href=\"<page projects/vidalia>\">Help us make Tor more usable</a>. We "
 "especially need people to help make it easier to configure your Tor as a "
@@ -742,7 +742,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:422
+#: /home/runa/dev/website/docs/en/faq.wml:422
 msgid ""
 "There are some bottlenecks in the current Tor network. Help us design "
 "experiments to track down and demonstrate where the problems are, and then "
@@ -750,7 +750,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:428
+#: /home/runa/dev/website/docs/en/faq.wml:428
 msgid ""
 "There are some steps that individuals can take to improve their Tor "
 "performance. <a href=\"<wiki>TheOnionRouter/FireFoxTorPerf\">You can "
@@ -763,7 +763,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:439
+#: /home/runa/dev/website/docs/en/faq.wml:439
 msgid ""
 "Tor needs some architectural changes too. One important change is to start "
 "providing <a href=\"#EverybodyARelay\">better service to people who relay "
@@ -772,7 +772,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:446
+#: /home/runa/dev/website/docs/en/faq.wml:446
 msgid ""
 "Help do other things so we can do the hard stuff. Please take a moment to "
 "figure out what your skills and interests are, and then <a href=\"<page "
@@ -780,7 +780,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:452
+#: /home/runa/dev/website/docs/en/faq.wml:452
 msgid ""
 "Help find sponsors for Tor. Do you work at a company or government agency "
 "that uses Tor or has a use for Internet privacy, e.g. to browse the "
@@ -791,7 +791,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:461
+#: /home/runa/dev/website/docs/en/faq.wml:461
 msgid ""
 "If you can't help out with any of the above, you can still help out "
 "individually by <a href=\"<page donate/donate>\">donating a bit of money to "
@@ -799,19 +799,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:468
+#: /home/runa/dev/website/docs/en/faq.wml:468
 msgid "<hr> <a id=\"Funding\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:471
+#: /home/runa/dev/website/docs/en/faq.wml:471
 msgid ""
 "<a class=\"anchor\" href=\"#Funding\">What would The Tor Project do with "
 "more funding?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:474
+#: /home/runa/dev/website/docs/en/faq.wml:474
 msgid ""
 "We have about 1800 relays right now, pushing over 150 MB/s average traffic. "
 "We have several hundred thousand active users. But the Tor network is not "
@@ -819,12 +819,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:480
+#: /home/runa/dev/website/docs/en/faq.wml:480
 msgid "There are six main development/maintenance pushes that need attention:"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:486
+#: /home/runa/dev/website/docs/en/faq.wml:486
 msgid ""
 "Scalability: We need to keep scaling and decentralizing the Tor architecture"
 " so it can handle thousands of relays and millions of users. The upcoming "
@@ -833,7 +833,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:493
+#: /home/runa/dev/website/docs/en/faq.wml:493
 msgid ""
 "User support: With this many users, a lot of people are asking questions all"
 " the time, offering to help out with things, and so on. We need good clean "
@@ -841,18 +841,18 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:499
+#: /home/runa/dev/website/docs/en/faq.wml:499
 msgid ""
 "Relay support: the Tor network is run by volunteers, but they still need "
 "attention with prompt bug fixes, explanations when things go wrong, "
 "reminders to upgrade, and so on. The network itself is a commons, and "
 "somebody needs to spend some energy making sure the relay operators stay "
-"happy. We also need to work on <a href=\"#RelayOS\">stability</a> on some "
-"platforms &mdash; e.g., Tor relays have problems on Win XP currently."
+"happy. We also need to work on stability on some platforms &mdash; e.g., Tor"
+" relays have problems on Win XP currently."
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:508
+#: /home/runa/dev/website/docs/en/faq.wml:508
 msgid ""
 "Usability: Beyond documentation, we also need to work on usability of the "
 "software itself. This includes installers, clean GUIs, easy configuration to"
@@ -863,7 +863,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:517
+#: /home/runa/dev/website/docs/en/faq.wml:517
 msgid ""
 "Incentives: We need to work on ways to encourage people to configure their "
 "Tors as relays and exit nodes rather than just clients.  <a "
@@ -872,7 +872,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:524
+#: /home/runa/dev/website/docs/en/faq.wml:524
 msgid ""
 "Research: The anonymous communications field is full of surprises and "
 "gotchas. In our copious free time, we also help run top anonymity and "
@@ -884,7 +884,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:537
+#: /home/runa/dev/website/docs/en/faq.wml:537
 msgid ""
 "We're continuing to move forward on all of these, but at this rate <a "
 "href=\"#WhySlow\">the Tor network is growing faster than the developers can "
@@ -893,14 +893,14 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:545
+#: /home/runa/dev/website/docs/en/faq.wml:545
 msgid ""
 "We are also excited about tackling related problems, such as censorship-"
 "resistance."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:550
+#: /home/runa/dev/website/docs/en/faq.wml:550
 msgid ""
 "We are proud to have <a href=\"<page about/sponsors>\">sponsorship and "
 "support</a> from the Omidyar Network, the International Broadcasting Bureau,"
@@ -910,7 +910,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:557
+#: /home/runa/dev/website/docs/en/faq.wml:557
 msgid ""
 "However, this support is not enough to keep Tor abreast of changes in the "
 "Internet privacy landscape. Please <a href=\"<page "
@@ -920,36 +920,36 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:563
+#: /home/runa/dev/website/docs/en/faq.wml:563
 msgid "<hr> <a id=\"Metrics\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:566
+#: /home/runa/dev/website/docs/en/faq.wml:566
 msgid ""
 "<a class=\"anchor\" href=\"#Metrics\">How many people use Tor? How many "
 "relays or exit nodes are there?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:568
+#: /home/runa/dev/website/docs/en/faq.wml:568
 msgid ""
 "All this and more about measuring Tor can be found at the <a "
 "href=\"https://metrics.torproject.org/\">Tor Metrics Portal</a>."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:570
+#: /home/runa/dev/website/docs/en/faq.wml:570
 msgid "<hr> <a id=\"HowUninstallTor\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:573
+#: /home/runa/dev/website/docs/en/faq.wml:573
 msgid "<a class=\"anchor\" href=\"#HowUninstallTor\">How do I uninstall Tor?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:576
+#: /home/runa/dev/website/docs/en/faq.wml:576
 msgid ""
 "This depends entirely on how you installed it and which operating system you"
 " have. If you installed a package, then hopefully your package has a way to "
@@ -959,35 +959,35 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:584
+#: /home/runa/dev/website/docs/en/faq.wml:584
 msgid ""
 "In your taskbar, right click on Vidalia (the green onion or the black head)"
 "  and choose exit."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:586
+#: /home/runa/dev/website/docs/en/faq.wml:586
 msgid ""
 "Right click on the taskbar to bring up TaskManager. Look for tor.exe in the "
 "Process List. If it's running, right click and choose End Process."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:588
+#: /home/runa/dev/website/docs/en/faq.wml:588
 msgid ""
 "Click the Start button, go to Programs, go to Vidalia, choose Uninstall.  "
 "This will remove the Vidalia bundle, which includes Tor and Polipo."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:590
+#: /home/runa/dev/website/docs/en/faq.wml:590
 msgid ""
 "Start Firefox. Go to the Tools menu, choose Add-ons. Select Torbutton.  "
 "Click the Uninstall button."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:595
+#: /home/runa/dev/website/docs/en/faq.wml:595
 msgid ""
 "If you do not follow these steps (for example by trying to uninstall "
 "Vidalia, Tor, and Polipo while they are still running), you will need to "
@@ -995,14 +995,14 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:601
+#: /home/runa/dev/website/docs/en/faq.wml:601
 msgid ""
 "For Mac OS X, follow the <a href=\"<page docs/tor-doc-"
 "osx>#uninstall\">uninstall directions</a>."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:606
+#: /home/runa/dev/website/docs/en/faq.wml:606
 msgid ""
 "If you installed by source, I'm afraid there is no easy uninstall method. "
 "But on the bright side, by default it only installs into /usr/local/ and it "
@@ -1010,45 +1010,45 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:611
+#: /home/runa/dev/website/docs/en/faq.wml:611
 msgid "<hr> <a id=\"PGPSigs\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:614
+#: /home/runa/dev/website/docs/en/faq.wml:614
 msgid ""
 "<a class=\"anchor\" href=\"#PGPSigs\">What are these \"sig\" files on the "
 "download page?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:617
+#: /home/runa/dev/website/docs/en/faq.wml:617
 msgid ""
 "These are PGP signatures, so you can verify that the file you've downloaded "
 "is exactly the one that we intended you to get."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:622
+#: /home/runa/dev/website/docs/en/faq.wml:622
 msgid ""
 "Please read the <a href=\"<page docs/verifying-signatures>\">verifying "
 "signatures</a> page for details."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:626
+#: /home/runa/dev/website/docs/en/faq.wml:626
 msgid "<hr> <a id=\"GetTor\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:629
+#: /home/runa/dev/website/docs/en/faq.wml:629
 msgid ""
 "<a class=\"anchor\" href=\"#GetTor\">Your website is blocked in my country. "
 "How do I download Tor?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:633
+#: /home/runa/dev/website/docs/en/faq.wml:633
 msgid ""
 "Some government or corporate firewalls censor connections to Tor's website. "
 "In those cases, you have three options. First, get it from a friend &mdash; "
@@ -1063,7 +1063,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:647
+#: /home/runa/dev/website/docs/en/faq.wml:647
 msgid ""
 "Be sure to <a href=\"<page docs/verifying-signatures>\">verify the "
 "signature</a> of any package you download, especially when you get it from "
@@ -1071,26 +1071,26 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:652
+#: /home/runa/dev/website/docs/en/faq.wml:652
 msgid "<hr> <a id=\"CompileTorWindows\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:655
+#: /home/runa/dev/website/docs/en/faq.wml:655
 msgid ""
 "<a class=\"anchor\" href=\"#CompileTorWindows\">How do I compile Tor under "
 "Windows?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:658
+#: /home/runa/dev/website/docs/en/faq.wml:658
 msgid ""
 "Try following the steps at <a href=\"<gitblob>doc/tor-win32-mingw-"
 "creation.txt\"> tor-win32-mingw-creation.txt</a>."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:663
+#: /home/runa/dev/website/docs/en/faq.wml:663
 msgid ""
 "(Note that you don't need to compile Tor yourself in order to use it. Most "
 "people just use the packages available on the <a href=\"<page "
@@ -1098,19 +1098,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:668
+#: /home/runa/dev/website/docs/en/faq.wml:668
 msgid "<hr> <a id=\"VirusFalsePositives\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:671
+#: /home/runa/dev/website/docs/en/faq.wml:671
 msgid ""
 "<a class=\"anchor\" href=\"#VirusFalsePositives\">Why does my Tor executable"
 " appear to have a virus or spyware?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:674
+#: /home/runa/dev/website/docs/en/faq.wml:674
 msgid ""
 "Sometimes, overzealous Windows virus and spyware detectors trigger on some "
 "parts of the Tor Windows binary. Our best guess is that these are false "
@@ -1121,7 +1121,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:682
+#: /home/runa/dev/website/docs/en/faq.wml:682
 msgid ""
 "In the meantime, we encourage you to not just take our word for it. Our job "
 "is to provide the source; if you're concerned, please do <a "
@@ -1129,19 +1129,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:687
+#: /home/runa/dev/website/docs/en/faq.wml:687
 msgid "<hr> <a id=\"LiveCD\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:690
+#: /home/runa/dev/website/docs/en/faq.wml:690
 msgid ""
 "<a class=\"anchor\" href=\"#LiveCD\">Is there a LiveCD or other bundle that "
 "includes Tor?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:693
+#: /home/runa/dev/website/docs/en/faq.wml:693
 msgid ""
 "Yes.  Use <a href=\"https://tails.boum.org/\">The Amnesic Incognito Live "
 "System</a> or <a href=\"<page projects/torbrowser>\">the Tor Browser "
@@ -1149,19 +1149,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:698
+#: /home/runa/dev/website/docs/en/faq.wml:698
 msgid "<hr> <a id=\"torrc\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:701
+#: /home/runa/dev/website/docs/en/faq.wml:701
 msgid ""
 "<a class=\"anchor\" href=\"#torrc\">I'm supposed to \"edit my torrc\". What "
 "does that mean?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:704
+#: /home/runa/dev/website/docs/en/faq.wml:704
 msgid ""
 "Tor installs a text file called torrc that contains configuration "
 "instructions for how your Tor program should behave. The default "
@@ -1171,12 +1171,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:712
+#: /home/runa/dev/website/docs/en/faq.wml:712
 msgid "The location of your torrc file depends on the way you installed Tor:"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:716
+#: /home/runa/dev/website/docs/en/faq.wml:716
 msgid ""
 "On Windows, if you installed a Tor bundle with Vidalia, you can find your "
 "torrc file in the Start menu under Programs -&gt; Vidalia Bundle -&gt; Tor, "
@@ -1189,14 +1189,14 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:725
+#: /home/runa/dev/website/docs/en/faq.wml:725
 msgid ""
 "On OS X, if you use Vidalia, edit <code>~/.vidalia/torrc</code>. Otherwise, "
 "open your favorite text editor and load <code>/Library/Tor/torrc</code>."
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:729
+#: /home/runa/dev/website/docs/en/faq.wml:729
 msgid ""
 "On Unix, if you installed a pre-built package, look for "
 "<code>/etc/tor/torrc</code> or <code>/etc/torrc</code> or consult your "
@@ -1204,7 +1204,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:733
+#: /home/runa/dev/website/docs/en/faq.wml:733
 msgid ""
 "Finally, if you installed from source, you may not have a torrc installed "
 "yet: look in <code>/usr/local/etc/</code> and note that you may need to "
@@ -1212,14 +1212,14 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:740
+#: /home/runa/dev/website/docs/en/faq.wml:740
 msgid ""
 "If you use Vidalia, be sure to exit both Tor and Vidalia before you edit "
 "your torrc file. Otherwise Vidalia might overwrite your changes."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:745
+#: /home/runa/dev/website/docs/en/faq.wml:745
 msgid ""
 "Once you've changed your torrc, you will need to restart Tor for the changes"
 " to take effect. (For advanced users on OS X and Unix, note that you "
@@ -1227,7 +1227,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:751
+#: /home/runa/dev/website/docs/en/faq.wml:751
 msgid ""
 "For other configuration options you can use, look at the <a href=\"<page "
 "docs/tor-manual>\">Tor manual page</a>. Remember, all lines beginning with #"
@@ -1235,19 +1235,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:757
+#: /home/runa/dev/website/docs/en/faq.wml:757
 msgid "<hr> <a id=\"Logs\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:760
+#: /home/runa/dev/website/docs/en/faq.wml:760
 msgid ""
 "<a class=\"anchor\" href=\"#Logs\">How do I set up logging, or see Tor's "
 "logs?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:763
+#: /home/runa/dev/website/docs/en/faq.wml:763
 msgid ""
 "If you installed a Tor bundle that includes Vidalia, then Vidalia has a "
 "window called \"Message Log\" that will show you Tor's log messages. You can"
@@ -1256,19 +1256,19 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:770
+#: /home/runa/dev/website/docs/en/faq.wml:770
 msgid ""
 "If you're not using Vidalia, you'll have to go find the log files by hand. "
 "Here are some likely places for your logs to be:"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:775
+#: /home/runa/dev/website/docs/en/faq.wml:775
 msgid "On OS X, Debian, Red Hat, etc, the logs are in /var/log/tor/"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:777
+#: /home/runa/dev/website/docs/en/faq.wml:777
 msgid ""
 "On Windows, there are no default log files currently. If you enable logs in "
 "your torrc file, they default to <code>\\username\\Application "
@@ -1276,7 +1276,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:781
+#: /home/runa/dev/website/docs/en/faq.wml:781
 msgid ""
 "If you compiled Tor from source, by default your Tor logs to <a "
 "href=\"http://en.wikipedia.org/wiki/Standard_streams\">\"stdout\"</a> at "
@@ -1285,7 +1285,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:789
+#: /home/runa/dev/website/docs/en/faq.wml:789
 msgid ""
 "To change your logging setup by hand, <a href=\"#torrc\">edit your torrc</a>"
 " and find the section (near the top of the file) which contains the "
@@ -1293,7 +1293,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><pre>
-#: /home/runa/tor/website/docs/en/faq.wml:795
+#: /home/runa/dev/website/docs/en/faq.wml:795
 #, no-wrap
 msgid ""
 "\\## Logs go to stdout at level \"notice\" unless redirected by something\n"
@@ -1301,7 +1301,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:800
+#: /home/runa/dev/website/docs/en/faq.wml:800
 msgid ""
 "For example, if you want Tor to send complete debug, info, notice, warn, and"
 " err level messages to a file, append the following line to the end of the "
@@ -1309,32 +1309,32 @@
 msgstr ""
 
 #. type: Content of: <div><div><pre>
-#: /home/runa/tor/website/docs/en/faq.wml:806
+#: /home/runa/dev/website/docs/en/faq.wml:806
 #, no-wrap
 msgid "Log debug file c:/program files/tor/debug.log\n"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:810
+#: /home/runa/dev/website/docs/en/faq.wml:810
 msgid ""
 "Replace <code>c:/program files/tor/debug.log</code> with a directory and "
 "filename for your Tor log."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:814
+#: /home/runa/dev/website/docs/en/faq.wml:814
 msgid "<hr> <a id=\"DoesntWork\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:817
+#: /home/runa/dev/website/docs/en/faq.wml:817
 msgid ""
 "<a class=\"anchor\" href=\"#DoesntWork\">I installed Tor and Polipo but it's"
 " not working.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:820
+#: /home/runa/dev/website/docs/en/faq.wml:820
 msgid ""
 "Once you've installed the Tor bundle, there are two questions to ask: first,"
 " is your Tor able to establish a circuit? Second, is your Firefox correctly "
@@ -1342,7 +1342,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:825
+#: /home/runa/dev/website/docs/en/faq.wml:825
 msgid ""
 "If Tor can establish a circuit, the onion icon in Vidalia will turn green. "
 "You can also check in the Vidalia Control Panel to make sure it says "
@@ -1352,19 +1352,19 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:835
+#: /home/runa/dev/website/docs/en/faq.wml:835
 msgid "If Tor can't establish a circuit, here are some hints:"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:839
+#: /home/runa/dev/website/docs/en/faq.wml:839
 msgid ""
 "Are you sure Tor is running? If you're using Vidalia, you may have to click "
 "on the onion and select \"Start\" to launch Tor."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:841
+#: /home/runa/dev/website/docs/en/faq.wml:841
 msgid ""
 "Check your system clock. If it's more than a few hours off, Tor will refuse "
 "to build circuits. For XP users, synchronize your clock under the clock "
@@ -1373,7 +1373,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:845
+#: /home/runa/dev/website/docs/en/faq.wml:845
 msgid ""
 "Is your Internet connection <a href=\"#FirewallPorts\">firewalled by "
 "port</a>, or do you normally need to use a <a "
@@ -1381,7 +1381,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:850
+#: /home/runa/dev/website/docs/en/faq.wml:850
 msgid ""
 "Are you running programs like Norton Internet Security or SELinux that block"
 " certain connections, even though you don't realize they do? They could be "
@@ -1389,7 +1389,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:853
+#: /home/runa/dev/website/docs/en/faq.wml:853
 msgid ""
 "Are you in China, or behind a restrictive corporate network firewall that "
 "blocks the public Tor relays? If so, you should learn about <a href=\"<page "
@@ -1397,14 +1397,14 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:856
+#: /home/runa/dev/website/docs/en/faq.wml:856
 msgid ""
 "Check your <a href=\"#Logs\">Tor logs</a>. Do they give you any hints about "
 "what's going wrong?"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:861
+#: /home/runa/dev/website/docs/en/faq.wml:861
 msgid ""
 "Step two is to confirm that Firefox is correctly configured to send its "
 "traffic through Tor. Try the <a href=\"https://check.torproject.org/\">Tor "
@@ -1414,12 +1414,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:869
+#: /home/runa/dev/website/docs/en/faq.wml:869
 msgid "If it thinks you're not using Tor, here are some hints:"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:873
+#: /home/runa/dev/website/docs/en/faq.wml:873
 msgid ""
 "Did you install the Torbutton extension for Firefox? The installation "
 "bundles include it, but sometimes people forget to install it. Make sure it "
@@ -1428,7 +1428,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:878
+#: /home/runa/dev/website/docs/en/faq.wml:878
 msgid ""
 "Do you have incompatible Firefox extensions like FoxyProxy installed? If so,"
 " uninstall them. (Note that using FoxyProxy is NOT a sufficient substitute "
@@ -1440,7 +1440,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:885
+#: /home/runa/dev/website/docs/en/faq.wml:885
 msgid ""
 "If your browser says \"The proxy server is refusing connections.\", check "
 "that Polipo (the http proxy that passes traffic between Firefox and Tor) is "
@@ -1450,7 +1450,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:890
+#: /home/runa/dev/website/docs/en/faq.wml:890
 msgid ""
 "If you're upgrading from OS X, some of the earlier OS X installers were "
 "broken in really unfortunate ways. You may find that <a href=\"<page docs"
@@ -1460,14 +1460,14 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:895
+#: /home/runa/dev/website/docs/en/faq.wml:895
 msgid ""
 "If you're on Linux, make sure Privoxy isn't running, since it will conflict "
 "with the port that our Polipo configuration file picks."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:897
+#: /home/runa/dev/website/docs/en/faq.wml:897
 msgid ""
 "If you installed Polipo yourself (not from a bundle), did you edit the "
 "config file as described? Did you restart Polipo after this change? Are you "
@@ -1475,7 +1475,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:900
+#: /home/runa/dev/website/docs/en/faq.wml:900
 msgid ""
 "For Red Hat Linux and related systems, do you have SELinux enabled? If so, "
 "it might be preventing Polipo from talking to Tor. We also run across BSD "
@@ -1484,19 +1484,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:906
+#: /home/runa/dev/website/docs/en/faq.wml:906
 msgid "<hr /> <a id=\"VidaliaPassword\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:909
+#: /home/runa/dev/website/docs/en/faq.wml:909
 msgid ""
 "<a class=\"anchor\" href=\"#VidaliaPassword\">Tor/Vidalia prompts for a "
 "password at start.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:912
+#: /home/runa/dev/website/docs/en/faq.wml:912
 msgid ""
 "Vidalia interacts with the Tor software via Tor's \"control port\". The "
 "control port lets Vidalia receive status updates from Tor, request a new "
@@ -1507,7 +1507,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:921
+#: /home/runa/dev/website/docs/en/faq.wml:921
 msgid ""
 "Usually this process of generating and setting a random control password "
 "happens in the background. There are three common situations, though, where "
@@ -1515,7 +1515,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:927
+#: /home/runa/dev/website/docs/en/faq.wml:927
 msgid ""
 "You're already running Vidalia and Tor. For example, this situation can "
 "happen if you installed the Vidalia bundle and now you're trying to run the "
@@ -1524,7 +1524,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:932
+#: /home/runa/dev/website/docs/en/faq.wml:932
 msgid ""
 "Vidalia crashed, but left Tor running with the last known random password. "
 "After you restart Vidalia, it generates a new random password, but Vidalia "
@@ -1538,7 +1538,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:945
+#: /home/runa/dev/website/docs/en/faq.wml:945
 msgid ""
 "You had previously set Tor to run as a Windows NT service. When Tor is set "
 "to run as a service, it starts up when the system boots. If you configured "
@@ -1553,19 +1553,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:960
+#: /home/runa/dev/website/docs/en/faq.wml:960
 msgid "<hr> <a id=\"ChooseEntryExit\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:963
+#: /home/runa/dev/website/docs/en/faq.wml:963
 msgid ""
 "<a class=\"anchor\" href=\"#ChooseEntryExit\">Can I control which nodes (or "
 "country) are used for entry/exit?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:966
+#: /home/runa/dev/website/docs/en/faq.wml:966
 msgid ""
 "Yes. You can set preferred entry and exit nodes as well as inform Tor which "
 "nodes you do not want to use.  The following options can be added to your "
@@ -1574,53 +1574,53 @@
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/docs/en/faq.wml:972
+#: /home/runa/dev/website/docs/en/faq.wml:972
 msgid "<tt>EntryNodes $fingerprint,$fingerprint,...</tt>"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/docs/en/faq.wml:973
+#: /home/runa/dev/website/docs/en/faq.wml:973
 msgid ""
 "A list of preferred nodes to use for the first hop in the circuit, if "
 "possible."
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/docs/en/faq.wml:975
+#: /home/runa/dev/website/docs/en/faq.wml:975
 msgid "<tt>ExitNodes $fingerprint,$fingerprint,...</tt>"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/docs/en/faq.wml:976
+#: /home/runa/dev/website/docs/en/faq.wml:976
 msgid ""
 "A list of preferred nodes to use for the last hop in the circuit, if "
 "possible."
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/docs/en/faq.wml:978
+#: /home/runa/dev/website/docs/en/faq.wml:978
 msgid "<tt>ExcludeNodes $fingerprint,$fingerprint,...</tt>"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/docs/en/faq.wml:979
+#: /home/runa/dev/website/docs/en/faq.wml:979
 msgid "A list of nodes to never use when building a circuit."
 msgstr ""
 
 #. type: Content of: <div><div><dl><dt>
-#: /home/runa/tor/website/docs/en/faq.wml:981
+#: /home/runa/dev/website/docs/en/faq.wml:981
 msgid "<tt>ExcludeExitNodes $fingerprint,$fingerprint,...</tt>"
 msgstr ""
 
 #. type: Content of: <div><div><dl><dd>
-#: /home/runa/tor/website/docs/en/faq.wml:982
+#: /home/runa/dev/website/docs/en/faq.wml:982
 msgid ""
 "A list of nodes to never use when picking an exit.  Nodes listed in "
 "<tt>ExcludeNodes</tt> are automatically in this list."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:987
+#: /home/runa/dev/website/docs/en/faq.wml:987
 msgid ""
 "<em>We recommend you do not use these</em> &mdash; they are intended for "
 "testing and may disappear in future versions.  You get the best security "
@@ -1630,7 +1630,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:994
+#: /home/runa/dev/website/docs/en/faq.wml:994
 msgid ""
 "The <tt>EntryNodes</tt> and <tt>ExitNodes</tt> config options are treated as"
 " a request, meaning if the nodes are down or seem slow, Tor will still avoid"
@@ -1642,7 +1642,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1004
+#: /home/runa/dev/website/docs/en/faq.wml:1004
 msgid ""
 "Instead of <tt>$fingerprint</tt> you can also specify a 2 letter ISO3166 "
 "country code in curly braces (for example {de}), or an ip address pattern "
@@ -1651,7 +1651,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1010
+#: /home/runa/dev/website/docs/en/faq.wml:1010
 msgid ""
 "If you want to access a service directly through Tor's SOCKS interface (eg. "
 "using ssh via connect.c), another option is to set up an internal mapping in"
@@ -1660,26 +1660,26 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1016
+#: /home/runa/dev/website/docs/en/faq.wml:1016
 msgid "<hr> <a id=\"GoogleCaptcha\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1019
+#: /home/runa/dev/website/docs/en/faq.wml:1019
 msgid ""
 "<a class=\"anchor\" href=\"#GoogleCaptcha\">Google makes me solve a Captcha "
 "or tells me I have spyware installed.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1022
+#: /home/runa/dev/website/docs/en/faq.wml:1022
 msgid ""
 "This is a known and intermittent problem; it does not mean that Google "
 "considers Tor to be spyware."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1027
+#: /home/runa/dev/website/docs/en/faq.wml:1027
 msgid ""
 "When you use Tor, you are sending queries through exit relays that are also "
 "shared by thousands of other users. Tor users typically see this message "
@@ -1690,7 +1690,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1035
+#: /home/runa/dev/website/docs/en/faq.wml:1035
 msgid ""
 "An alternate explanation is that Google tries to detect certain kinds of "
 "spyware or viruses that send distinctive queries to Google Search. It notes "
@@ -1700,7 +1700,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1044
+#: /home/runa/dev/website/docs/en/faq.wml:1044
 msgid ""
 "To our knowledge, Google is not doing anything intentionally specifically to"
 " deter or block Tor use. The error message about an infected machine should "
@@ -1708,7 +1708,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1050
+#: /home/runa/dev/website/docs/en/faq.wml:1050
 msgid ""
 "Torbutton 1.2.5 (released in mid 2010) detects Google captchas and can "
 "automatically redirect you to a more Tor-friendly search engine such as "
@@ -1716,19 +1716,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1055
+#: /home/runa/dev/website/docs/en/faq.wml:1055
 msgid "<hr /> <a id=\"GmailWarning\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1058
+#: /home/runa/dev/website/docs/en/faq.wml:1058
 msgid ""
 "<a class=\"anchor\" href=\"#GmailWarning\">Gmail warns me that my account "
 "may have been compromised.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1061
+#: /home/runa/dev/website/docs/en/faq.wml:1061
 msgid ""
 "Sometimes, after you've used Gmail over Tor, Google presents a pop-up "
 "notification that your account may have been compromised.  The notification "
@@ -1737,7 +1737,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1068
+#: /home/runa/dev/website/docs/en/faq.wml:1068
 msgid ""
 "In general this is a false alarm: Google saw a bunch of logins from "
 "different places, as a result of running the service via Tor, and decided it"
@@ -1746,7 +1746,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1075
+#: /home/runa/dev/website/docs/en/faq.wml:1075
 msgid ""
 "Even though this may be a biproduct of using the service via tor, that "
 "doesn't mean you can entirely ignore the warning. It is <i>probably</i> a "
@@ -1755,7 +1755,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1082
+#: /home/runa/dev/website/docs/en/faq.wml:1082
 msgid ""
 "Cookie hijacking is possible by either physical access to your computer or "
 "by watching your network traffic.  In theory only physical access should "
@@ -1766,7 +1766,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1091
+#: /home/runa/dev/website/docs/en/faq.wml:1091
 msgid ""
 "And if somebody <i>did</i> steal your google cookie, they might end up "
 "logging in from unusual places (though of course they also might not). So "
@@ -1778,19 +1778,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1100
+#: /home/runa/dev/website/docs/en/faq.wml:1100
 msgid "<hr> <a id=\"FirewallPorts\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1103
+#: /home/runa/dev/website/docs/en/faq.wml:1103
 msgid ""
 "<a class=\"anchor\" href=\"#FirewallPorts\">My firewall only allows a few "
 "outgoing ports.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1106
+#: /home/runa/dev/website/docs/en/faq.wml:1106
 msgid ""
 "If your firewall works by blocking ports, then you can tell Tor to only use "
 "the ports that your firewall permits by adding \"FascistFirewall 1\" to your"
@@ -1800,7 +1800,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1114
+#: /home/runa/dev/website/docs/en/faq.wml:1114
 msgid ""
 "By default, when you set this Tor assumes that your firewall allows only "
 "port 80 and port 443 (HTTP and HTTPS respectively). You can select a "
@@ -1808,14 +1808,14 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1120
+#: /home/runa/dev/website/docs/en/faq.wml:1120
 msgid ""
 "If you want to be more fine-grained with your controls, you can also use the"
 " ReachableAddresses config options, e.g.:"
 msgstr ""
 
 #. type: Content of: <div><div><pre>
-#: /home/runa/tor/website/docs/en/faq.wml:1125
+#: /home/runa/dev/website/docs/en/faq.wml:1125
 #, no-wrap
 msgid ""
 "  ReachableDirAddresses *:80\n"
@@ -1823,24 +1823,24 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1129
+#: /home/runa/dev/website/docs/en/faq.wml:1129
 msgid "<hr> <a id=\"RelayFlexible\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1132
+#: /home/runa/dev/website/docs/en/faq.wml:1132
 msgid ""
 "<a class=\"anchor\" href=\"#RelayFlexible\">How stable does my relay need to"
 " be?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1135
+#: /home/runa/dev/website/docs/en/faq.wml:1135
 msgid "We aim to make setting up a Tor relay easy and convenient:"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1139
+#: /home/runa/dev/website/docs/en/faq.wml:1139
 msgid ""
 "Tor has built-in support for <a "
 "href=\"<wikifaq>#WhatbandwidthshapingoptionsareavailabletoTorrelays\"> rate "
@@ -1851,7 +1851,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1147
+#: /home/runa/dev/website/docs/en/faq.wml:1147
 msgid ""
 "Each Tor relay has an <a href=\"#ExitPolicies\">exit policy</a> that "
 "specifies what sort of outbound connections are allowed or refused from that"
@@ -1860,7 +1860,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1152
+#: /home/runa/dev/website/docs/en/faq.wml:1152
 msgid ""
 "It's fine if the relay goes offline sometimes. The directories notice this "
 "quickly and stop advertising the relay. Just try to make sure it's not too "
@@ -1868,14 +1868,14 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1157
+#: /home/runa/dev/website/docs/en/faq.wml:1157
 msgid ""
 "We can handle relays with dynamic IPs just fine &mdash; simply leave the "
 "Address config option blank, and Tor will try to guess."
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1160
+#: /home/runa/dev/website/docs/en/faq.wml:1160
 msgid ""
 "If your relay is behind a NAT and it doesn't know its public IP (e.g. it has"
 " an IP of 192.168.x.y), you'll need to set up port forwarding. Forwarding "
@@ -1885,7 +1885,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1166
+#: /home/runa/dev/website/docs/en/faq.wml:1166
 msgid ""
 "Your relay will passively estimate and advertise its recent bandwidth "
 "capacity, so high-bandwidth relays will attract more users than low-"
@@ -1893,24 +1893,24 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1172
+#: /home/runa/dev/website/docs/en/faq.wml:1172
 msgid "<hr> <a id=\"RunARelayBut\"></a> <a id=\"ExitPolicies\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1176
+#: /home/runa/dev/website/docs/en/faq.wml:1176
 msgid ""
 "<a class=\"anchor\" href=\"#ExitPolicies\">I'd run a relay, but I don't want"
 " to deal with abuse issues.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1179
+#: /home/runa/dev/website/docs/en/faq.wml:1179
 msgid "Great. That's exactly why we implemented exit policies."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1183
+#: /home/runa/dev/website/docs/en/faq.wml:1183
 msgid ""
 "Each Tor relay has an exit policy that specifies what sort of outbound "
 "connections are allowed or refused from that relay. The exit policies are "
@@ -1926,7 +1926,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1197
+#: /home/runa/dev/website/docs/en/faq.wml:1197
 msgid ""
 "The default exit policy allows access to many popular services (e.g. web "
 "browsing), but <a "
@@ -1942,7 +1942,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1211
+#: /home/runa/dev/website/docs/en/faq.wml:1211
 msgid ""
 "If you do allow any exit connections, make sure name resolution works (that "
 "is, your computer can resolve Internet addresses correctly).  If there are "
@@ -1952,19 +1952,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1219
+#: /home/runa/dev/website/docs/en/faq.wml:1219
 msgid "<hr> <a id=\"RelayOrBridge\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1222
+#: /home/runa/dev/website/docs/en/faq.wml:1222
 msgid ""
 "<a class=\"anchor\" href=\"#RelayOrBridge\">Should I be a normal relay or "
 "bridge relay?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1224
+#: /home/runa/dev/website/docs/en/faq.wml:1224
 msgid ""
 "<a href=\"<page docs/bridges>\">Bridge relays</a> (or \"bridges\" for short)"
 "  are <a href=\"<page docs/tor-doc-relay>\">Tor relays</a> that aren't "
@@ -1974,7 +1974,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1231
+#: /home/runa/dev/website/docs/en/faq.wml:1231
 msgid ""
 "Being a normal relay vs being a bridge relay is almost the same "
 "configuration: it's just a matter of whether your relay is listed publically"
@@ -1982,7 +1982,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1236
+#: /home/runa/dev/website/docs/en/faq.wml:1236
 msgid ""
 "Right now, there are a small number of places in the world that filter "
 "connections to the Tor network. So getting a lot of bridges running right "
@@ -1993,7 +1993,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1244
+#: /home/runa/dev/website/docs/en/faq.wml:1244
 msgid ""
 "So should you run a normal relay or bridge relay? If you have lots of "
 "bandwidth, you should definitely run a normal relay &mdash; bridge relays "
@@ -2004,19 +2004,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1252
+#: /home/runa/dev/website/docs/en/faq.wml:1252
 msgid "<hr> <a id=\"MultipleRelays\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1255
+#: /home/runa/dev/website/docs/en/faq.wml:1255
 msgid ""
 "<a class=\"anchor\" href=\"#MultipleRelays\">I want to run more than one "
 "relay.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1258
+#: /home/runa/dev/website/docs/en/faq.wml:1258
 msgid ""
 "Great. If you want to run several relays to donate more to the network, "
 "we're happy with that. But please don't run more than a few dozen on the "
@@ -2025,7 +2025,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1265
+#: /home/runa/dev/website/docs/en/faq.wml:1265
 msgid ""
 "If you do decide to run more than one relay, please set the \"MyFamily\" "
 "config option in the <a href=\"#torrc\">torrc</a> of each relay, listing all"
@@ -2033,13 +2033,13 @@
 msgstr ""
 
 #. type: Content of: <div><div><pre>
-#: /home/runa/tor/website/docs/en/faq.wml:1271
+#: /home/runa/dev/website/docs/en/faq.wml:1271
 #, no-wrap
 msgid "    MyFamily $fingerprint1,$fingerprint2,$fingerprint3\n"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1275
+#: /home/runa/dev/website/docs/en/faq.wml:1275
 msgid ""
 "where each fingerprint is the 40 character identity fingerprint (without "
 "spaces). You can also list them by nickname, but fingerprint is safer. Be "
@@ -2048,7 +2048,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1282
+#: /home/runa/dev/website/docs/en/faq.wml:1282
 msgid ""
 "That way clients will know to avoid using more than one of your relays in a "
 "single circuit. You should set MyFamily if you have administrative control "
@@ -2057,26 +2057,26 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1288
+#: /home/runa/dev/website/docs/en/faq.wml:1288
 msgid "<hr> <a id=\"RelayMemory\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1291
+#: /home/runa/dev/website/docs/en/faq.wml:1291
 msgid ""
 "<a class=\"anchor\" href=\"#RelayMemory\">Why is my Tor relay using so much "
 "memory?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1293
+#: /home/runa/dev/website/docs/en/faq.wml:1293
 msgid ""
 "If your Tor relay is using more memory than you'd like, here are some tips "
 "for reducing its footprint:"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1298
+#: /home/runa/dev/website/docs/en/faq.wml:1298
 msgid ""
 "If you're on Linux, you may be encountering memory fragmentation bugs in "
 "glibc's malloc implementation. That is, when Tor releases memory back to the"
@@ -2088,7 +2088,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1306
+#: /home/runa/dev/website/docs/en/faq.wml:1306
 msgid ""
 "If you're running a fast relay, meaning you have many TLS connections open, "
 "you are probably losing a lot of memory to OpenSSL's internal buffers (38KB+"
@@ -2100,7 +2100,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1314
+#: /home/runa/dev/website/docs/en/faq.wml:1314
 msgid ""
 "If you're running on Solaris, OpenBSD, NetBSD, or old FreeBSD, Tor is "
 "probably forking separate processes rather than using threads. Consider "
@@ -2110,7 +2110,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1320
+#: /home/runa/dev/website/docs/en/faq.wml:1320
 msgid ""
 "If you still can't handle the memory load, consider reducing the amount of "
 "bandwidth your relay advertises. Advertising less bandwidth means you will "
@@ -2119,60 +2119,60 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1329
+#: /home/runa/dev/website/docs/en/faq.wml:1329
 msgid ""
 "All of this said, fast Tor relays do use a lot of ram. It is not unusual for"
 " a fast exit relay to use 500-1000 MB of memory."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1333
+#: /home/runa/dev/website/docs/en/faq.wml:1333
 msgid "<hr> <a id=\"WhyNotNamed\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1336
+#: /home/runa/dev/website/docs/en/faq.wml:1336
 msgid "<a class=\"anchor\" href=\"#WhyNotNamed\">Why is my Tor relay not named?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1339
+#: /home/runa/dev/website/docs/en/faq.wml:1339
 msgid ""
 "We currently use these metrics to determine if your relay should be "
 "named:<br>"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1342
+#: /home/runa/dev/website/docs/en/faq.wml:1342
 msgid ""
 "The name is not currently mapped to a different key. Existing mappings are "
 "removed after 6 months of inactivity from a relay."
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1344
+#: /home/runa/dev/website/docs/en/faq.wml:1344
 msgid "The relay must have been around for at least two weeks."
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1345
+#: /home/runa/dev/website/docs/en/faq.wml:1345
 msgid "No other router may have wanted the same name in the past month."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1348
+#: /home/runa/dev/website/docs/en/faq.wml:1348
 msgid "<hr> <a id=\"KeyManagement\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1351
+#: /home/runa/dev/website/docs/en/faq.wml:1351
 msgid ""
 "<a class=\"anchor\" href=\"#KeyManagement\">Tell me about all the keys Tor "
 "uses.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1354
+#: /home/runa/dev/website/docs/en/faq.wml:1354
 msgid ""
 "Tor uses a variety of different keys, with three goals in mind: 1)  "
 "encryption to ensure privacy of data within the Tor network, 2)  "
@@ -2182,7 +2182,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1362
+#: /home/runa/dev/website/docs/en/faq.wml:1362
 msgid ""
 "<b>Encryption</b>: first, all connections in Tor use TLS link encryption, so"
 " observers can't look inside to see which circuit a given cell is intended "
@@ -2193,7 +2193,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1372
+#: /home/runa/dev/website/docs/en/faq.wml:1372
 msgid ""
 "<b>Authentication</b>: Every Tor relay has a public decryption key called "
 "the \"onion key\".  When the Tor client establishes circuits, at each step "
@@ -2204,7 +2204,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1382
+#: /home/runa/dev/website/docs/en/faq.wml:1382
 msgid ""
 "<b>Coordination</b>: How do clients know what the relays are, and how do "
 "they know that they have the right keys for them? Each relay has a long-term"
@@ -2219,7 +2219,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1396
+#: /home/runa/dev/website/docs/en/faq.wml:1396
 msgid ""
 "How do clients know what the directory authorities are? The Tor software "
 "comes with a built-in list of location and public key for each directory "
@@ -2228,7 +2228,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1403
+#: /home/runa/dev/website/docs/en/faq.wml:1403
 msgid ""
 "How do users know they've got the right software? When we distribute the "
 "source code or a package, we digitally sign it with <a "
@@ -2238,7 +2238,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1411
+#: /home/runa/dev/website/docs/en/faq.wml:1411
 msgid ""
 "In order to be certain that it's really signed by us, you need to have met "
 "us in person and gotten a copy of our GPG key fingerprint, or you need to "
@@ -2248,17 +2248,17 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1418
+#: /home/runa/dev/website/docs/en/faq.wml:1418
 msgid "<hr> <a id=\"EntryGuards\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1421
+#: /home/runa/dev/website/docs/en/faq.wml:1421
 msgid "<a class=\"anchor\" href=\"#EntryGuards\">What are Entry Guards?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1424
+#: /home/runa/dev/website/docs/en/faq.wml:1424
 msgid ""
 "Tor (like all current practical low-latency anonymity designs) fails when "
 "the attacker can see both ends of the communications channel. For example, "
@@ -2270,7 +2270,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1434
+#: /home/runa/dev/website/docs/en/faq.wml:1434
 msgid ""
 "So, what should we do? Suppose the attacker controls, or can observe, "
 "<i>C</i> relays. Suppose there are <i>N</i> relays total. If you select new "
@@ -2284,7 +2284,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1446
+#: /home/runa/dev/website/docs/en/faq.wml:1446
 msgid ""
 "The solution is \"entry guards\": each user selects a few relays at random "
 "to use as entry points, and uses only those relays for her first hop. If "
@@ -2297,7 +2297,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1457
+#: /home/runa/dev/website/docs/en/faq.wml:1457
 msgid ""
 "You can read more at <a href=\"http://freehaven.net/anonbib/#wright02\">An "
 "Analysis of the Degradation of Anonymous Protocols</a>, <a "
@@ -2308,7 +2308,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1466
+#: /home/runa/dev/website/docs/en/faq.wml:1466
 msgid ""
 "Restricting your entry nodes may also help against attackers who want to run"
 " a few Tor nodes and easily enumerate all of the Tor user IP addresses. "
@@ -2319,19 +2319,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1474
+#: /home/runa/dev/website/docs/en/faq.wml:1474
 msgid "<hr> <a id=\"EverybodyARelay\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1477
+#: /home/runa/dev/website/docs/en/faq.wml:1477
 msgid ""
 "<a class=\"anchor\" href=\"#EverybodyARelay\">You should make every Tor user"
 " be a relay.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1480
+#: /home/runa/dev/website/docs/en/faq.wml:1480
 msgid ""
 "Requiring every Tor user to be a relay would help with scaling the network "
 "to handle all our users, and <a "
@@ -2346,7 +2346,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1493
+#: /home/runa/dev/website/docs/en/faq.wml:1493
 msgid ""
 "That said, we do want to encourage Tor users to run relays, so what we "
 "really want to do is simplify the process of setting up and maintaining a "
@@ -2357,12 +2357,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1502
+#: /home/runa/dev/website/docs/en/faq.wml:1502
 msgid "There are five steps we need to address before we can do this though:"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1506
+#: /home/runa/dev/website/docs/en/faq.wml:1506
 msgid ""
 "First, we need to make Tor stable as a relay on all common operating "
 "systems. The main remaining platform is Windows, and we plan to finally "
@@ -2372,7 +2372,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1514
+#: /home/runa/dev/website/docs/en/faq.wml:1514
 msgid ""
 "Second, we still need to get better at automatically estimating the right "
 "amount of bandwidth to allow. See item #7 on the <a href=\"<page "
@@ -2384,7 +2384,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1525
+#: /home/runa/dev/website/docs/en/faq.wml:1525
 msgid ""
 "Third, we need to work on scalability, both of the network (how to stop "
 "requiring that all Tor relays be able to connect to all Tor relays) and of "
@@ -2396,7 +2396,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1535
+#: /home/runa/dev/website/docs/en/faq.wml:1535
 msgid ""
 "Fourth, we need to better understand the risks from letting the attacker "
 "send traffic through your relay while you're also initiating your own "
@@ -2414,7 +2414,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1551
+#: /home/runa/dev/website/docs/en/faq.wml:1551
 msgid ""
 "Fifth, we might need some sort of incentive scheme to encourage people to "
 "relay traffic for others, and/or to become exit nodes. Here are our <a "
@@ -2423,24 +2423,24 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1558
+#: /home/runa/dev/website/docs/en/faq.wml:1558
 msgid "Please help on all of these!"
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1561
+#: /home/runa/dev/website/docs/en/faq.wml:1561
 msgid "<hr> <a id=\"TransportIPnotTCP\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1564
+#: /home/runa/dev/website/docs/en/faq.wml:1564
 msgid ""
 "<a class=\"anchor\" href=\"#TransportIPnotTCP\">You should transport all IP "
 "packets, not just TCP packets.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1567
+#: /home/runa/dev/website/docs/en/faq.wml:1567
 msgid ""
 "This would be handy, because it would make Tor better able to handle new "
 "protocols like VoIP, it could solve the whole need to socksify applications,"
@@ -2449,7 +2449,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1574
+#: /home/runa/dev/website/docs/en/faq.wml:1574
 msgid ""
 "We're heading in this direction: see <a "
 "href=\"https://trac.torproject.org/projects/tor/ticket/1855\">this trac "
@@ -2458,7 +2458,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1581
+#: /home/runa/dev/website/docs/en/faq.wml:1581
 msgid ""
 "IP packets reveal OS characteristics. We would still need to do IP-level "
 "packet normalization, to stop things like TCP fingerprinting attacks. Given "
@@ -2469,7 +2469,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1588
+#: /home/runa/dev/website/docs/en/faq.wml:1588
 msgid ""
 "Application-level streams still need scrubbing. We will still need user-side"
 " applications like Torbutton. So it won't become just a matter of capturing "
@@ -2477,7 +2477,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1592
+#: /home/runa/dev/website/docs/en/faq.wml:1592
 msgid ""
 "Certain protocols will still leak information. For example, we must rewrite "
 "DNS requests so they are delivered to an unlinkable DNS server rather than "
@@ -2486,7 +2486,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1597
+#: /home/runa/dev/website/docs/en/faq.wml:1597
 msgid ""
 "<a "
 "href=\"http://crypto.stanford.edu/~nagendra/projects/dtls/dtls.html\">DTLS</a>"
@@ -2497,7 +2497,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1604
+#: /home/runa/dev/website/docs/en/faq.wml:1604
 msgid ""
 "Exit policies for arbitrary IP packets mean building a secure IDS. Our node "
 "operators tell us that exit policies are one of the main reasons they're "
@@ -2515,7 +2515,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/faq.wml:1618
+#: /home/runa/dev/website/docs/en/faq.wml:1618
 msgid ""
 "The Tor-internal name spaces would need to be redesigned. We support hidden "
 "service \".onion\" addresses by intercepting the addresses when they are "
@@ -2524,38 +2524,38 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1625
+#: /home/runa/dev/website/docs/en/faq.wml:1625
 msgid "<hr> <a id=\"Criminals\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1628
+#: /home/runa/dev/website/docs/en/faq.wml:1628
 msgid ""
 "<a class=\"anchor\" href=\"#Criminals\">Doesn't Tor enable criminals to do "
 "bad things?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1631
+#: /home/runa/dev/website/docs/en/faq.wml:1631
 msgid ""
 "For the answer to this question and others, please see our <a href=\"<page "
 "docs/faq-abuse>\">Tor Abuse FAQ</a>."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/faq.wml:1635
+#: /home/runa/dev/website/docs/en/faq.wml:1635
 msgid "<hr> <a id=\"RespondISP\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/docs/en/faq.wml:1638
+#: /home/runa/dev/website/docs/en/faq.wml:1638
 msgid ""
 "<a class=\"anchor\" href=\"#RespondISP\">How do I respond to my ISP about my"
 " exit relay?</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/faq.wml:1641
+#: /home/runa/dev/website/docs/en/faq.wml:1641
 msgid ""
 "A collection of templates for successfully responding to ISPs is <a "
 "href=\"<wiki>TheOnionRouter/TorAbuseTemplates\">collected here</a>."

Modified: translation/trunk/projects/website/po/ru/docs/2-medium.tor-doc-osx.po
===================================================================
--- translation/trunk/projects/website/po/ru/docs/2-medium.tor-doc-osx.po	2011-04-12 16:15:00 UTC (rev 24594)
+++ translation/trunk/projects/website/po/ru/docs/2-medium.tor-doc-osx.po	2011-04-12 16:19:31 UTC (rev 24595)
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-02-12 12:20+0000\n"
-"PO-Revision-Date: 2011-03-22 16:29+0000\n"
+"POT-Creation-Date: 2011-03-28 12:48+0200\n"
+"PO-Revision-Date: 2011-03-29 00:26+0000\n"
 "Last-Translator: runasand <runa.sandvik at gmail.com>\n"
 "Language-Team: Russian <None>\n"
 "MIME-Version: 1.0\n"
@@ -18,7 +18,7 @@
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:8
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:8
 msgid ""
 "<a href=\"<page index>\">Home &raquo; </a> <a href=\"<page "
 "docs/documentation>\">Documentation &raquo; </a> <a href=\"<page docs/tor-"
@@ -26,19 +26,19 @@
 msgstr ""
 
 #. type: Content of: <div><div><h1>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:13
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:13
 msgid "Running the <a href=\"<page index>\">Tor</a> client on Mac OS X"
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:14 /tmp/N9PceEMclo.xml:26
-#: /tmp/N9PceEMclo.xml:71 /tmp/N9PceEMclo.xml:104 /tmp/N9PceEMclo.xml:136
-#: /tmp/N9PceEMclo.xml:158
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:14 /tmp/dnqIbbGTnT.xml:26
+#: /tmp/dnqIbbGTnT.xml:71 /tmp/dnqIbbGTnT.xml:104 /tmp/dnqIbbGTnT.xml:136
+#: /tmp/dnqIbbGTnT.xml:158
 msgid "<br>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:17
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:17
 msgid ""
 "<b>Note that these are the installation instructions for running a Tor "
 "client on Mac OS X. If you want to relay traffic for others to help the "
@@ -47,19 +47,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:23
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:23
 msgid "<hr> <a id=\"installing\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:25
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:25
 msgid ""
 "<a class=\"anchor\" href=\"#installing\">Step One: Download and Install "
 "Tor</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:29
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:29
 msgid ""
 "The install for Macintosh OS X bundles <a href=\"<page index>\">Tor</a>, <a "
 "href=\"<page projects/vidalia>\">Vidalia</a> (a graphical interface for "
@@ -67,14 +67,14 @@
 "href=\"http://www.pps.jussieu.fr/~jch/software/polipo/\">Polipo</a> (a web "
 "proxy)  into one package, with the four applications pre-configured to work "
 "together.  Download either the <a href=\"<page "
-"download/download>#tor\">stable</a> or the <a href=\"<page "
-"download/download>#tor\">experimental</a> version of the OS X bundle, or "
+"download/download>#mac\">stable</a> or the <a href=\"<page "
+"download/download>#mac\">experimental</a> version of the OS X bundle, or "
 "look for more options on the <a href=\"<page download/download>\">download "
 "page</a>."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:42
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:42
 msgid ""
 "Once you've downloaded the dmg, double-click and let it mount.  Browse to "
 "the now open Vidalia Bundle in Finder.  It's easy to install the bundle; "
@@ -85,7 +85,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:49
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:49
 msgid ""
 "When you are finished installing, you can start Vidalia by selecting its "
 "icon from your Applications folder. A dark onion with a red X in your dock "
@@ -94,19 +94,19 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:55
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:55
 msgid "When Tor is running, Vidalia's dock icon will look like the following:"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:58
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:58
 msgid ""
 "<img alt=\"vidalia running tor\" src=\"$(IMGROOT)/screenshot-osx-"
 "vidalia.png\" />"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:61
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:61
 msgid ""
 "Polipo is installed as part of the Tor bundle package installer. Once it is "
 "installed, it will start automatically when your computer is restarted.  You"
@@ -115,26 +115,26 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:68
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:68
 msgid "<hr> <a id=\"using\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:70
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:70
 msgid ""
 "<a class=\"anchor\" href=\"#using\">Step Two: Configure your applications to"
 " use Tor</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:73
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:73
 msgid ""
 "After installing, 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-osx.wml:76
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:76
 msgid ""
 "You should use Tor with Firefox and Torbutton, for best safety.  Torbutton "
 "was installed for you.  Click on the red \"Tor Disabled\" toggle button to "
@@ -142,14 +142,14 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:80
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:80
 msgid ""
 "<img alt=\"Torbutton plugin for Firefox\" src=\"$(IMGROOT)/screenshot-"
 "torbutton.png\" />"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:83
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:83
 msgid ""
 "If you plan to run Firefox on a different computer than Tor, see the <a "
 "href=\"<wikifaq>#SocksListenAddress\">FAQ entry for running Tor on a "
@@ -157,7 +157,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:87
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:87
 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 "
@@ -170,24 +170,24 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:97
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:97
 msgid ""
 "For information on how to Torify other applications, check out the <a "
 "href=\"<wiki>/TheOnionRouter/TorifyHOWTO\">Torify HOWTO</a>."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:101
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:101
 msgid "<hr> <a id=\"verify\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:103
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:103
 msgid "<a class=\"anchor\" href=\"#verify\">Step Three: Make sure it's working</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:107
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:107
 msgid ""
 "Next, you should try using your browser with Tor and make sure that your IP "
 "address is being anonymized. Click on <a "
@@ -198,7 +198,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:115
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:115
 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"
@@ -208,31 +208,31 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:124
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:124
 msgid ""
 "If it's still not working, look at <a href=\"<page "
 "docs/faq>#DoesntWork\">this FAQ entry</a> for hints."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:128
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:128
 msgid ""
 "Once it's working, learn more about <a href=\"<page "
 "download/download>#Warning\">what Tor does and does not offer</a>."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:132
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:132
 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-osx.wml:135
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:135
 msgid "<a class=\"anchor\" href=\"#relay\">Step Four: Configure it as a relay</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:138
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:138
 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 "
@@ -243,7 +243,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:146
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:146
 msgid ""
 "Having relays in many different places on the Internet is what makes Tor "
 "users secure. <a href=\"<wikifaq>#RelayAnonymity\">You may also get stronger"
@@ -252,24 +252,24 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:152
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:152
 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-osx.wml:155
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:155
 msgid "<hr> <a id=\"uninstall\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:157
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:157
 msgid "<a class=\"anchor\" href=\"#uninstall\">How To Uninstall Tor and Polipo</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:160
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:160
 msgid ""
 "There are two ways to uninstall the bundle from your computer, using Finder "
 "or a command line or Terminal-based uninstaller.  If you want to remove Tor "
@@ -277,79 +277,79 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:164
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:164
 msgid ""
 "Change your application proxy settings back to their original values.  If "
 "you just want to stop using Tor, you can end at this point."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:168
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:168
 msgid ""
 "If you want to completely remove Tor, and your account has Admin Privileges,"
 " then proceed as follows:"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:172
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:172
 msgid "Open Finder and click on Applications."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:173
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:173
 msgid "Drag /Applications/Vidalia to the Trash."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:174
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:174
 msgid "Remove /Library/Torbutton from your system."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:175
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:175
 msgid ""
 "In your User or home directory, go to Library, remove the Vidalia directory"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:179
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:179
 msgid "Tor, Vidalia, and Polipo are now completely removed from your system."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:181
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:181
 msgid ""
 "If you're familiar with the command line or Terminal, you can manually type "
 "the following:"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:184
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:184
 msgid "rm -r /Applications/Vidalia.app"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:185
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:185
 msgid "rm -r /Library/Torbutton"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:186
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:186
 msgid "rm -r ~/Library/Vidalia"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:187
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:187
 msgid "rm -r ~/.tor"
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:190
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:190
 msgid "<hr>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-osx.wml:192
+#: /home/runa/dev/website/docs/en/tor-doc-osx.wml:192
 msgid ""
 "If you have suggestions for improving this document, please <a href=\"<page "
 "about/contact>\">send them to us</a>. Thanks!"

Modified: translation/trunk/projects/website/po/ru/docs/2-medium.tor-doc-relay.po
===================================================================
--- translation/trunk/projects/website/po/ru/docs/2-medium.tor-doc-relay.po	2011-04-12 16:15:00 UTC (rev 24594)
+++ translation/trunk/projects/website/po/ru/docs/2-medium.tor-doc-relay.po	2011-04-12 16:19:31 UTC (rev 24595)
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-02-12 12:20+0000\n"
-"PO-Revision-Date: 2011-03-22 16:29+0000\n"
+"POT-Creation-Date: 2011-03-28 12:48+0200\n"
+"PO-Revision-Date: 2011-03-29 00:26+0000\n"
 "Last-Translator: runasand <runa.sandvik at gmail.com>\n"
 "Language-Team: Russian <None>\n"
 "MIME-Version: 1.0\n"
@@ -18,7 +18,7 @@
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:8
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:8
 msgid ""
 "<a href=\"<page index>\">Home &raquo; </a> <a href=\"<page "
 "docs/documentation>\">Documentation &raquo; </a> <a href=\"<page docs/tor-"
@@ -26,17 +26,17 @@
 msgstr ""
 
 #. type: Content of: <div><div><h1>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:14
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:14
 msgid "Configuring a Tor relay"
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:16 /tmp/eKLg46HT7B.xml:275
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:16 /tmp/ogZUlgnLzH.xml:275
 msgid "<hr>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:19
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:19
 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 "
@@ -48,60 +48,60 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:28
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:28
 msgid ""
-"You can run a Tor relay on <a href=\"<wikifaq>#RelayOS\">pretty much any</a>"
-" operating system. Tor relays work best on Linux, OS X Tiger or later, "
-"FreeBSD 5.x+, NetBSD 5.x+, and Windows Server 2003 or later."
+"You can run a Tor relay on pretty much any operating system. Tor relays work"
+" best on Linux, OS X Tiger or later, FreeBSD 5.x+, NetBSD 5.x+, and Windows "
+"Server 2003 or later."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:33
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:33
 msgid "<hr> <a id=\"zero\"></a> <a id=\"install\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:36
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:36
 msgid "<a class=\"anchor\" href=\"#install\">Step One: Download and Install Tor</a>"
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:37 /tmp/eKLg46HT7B.xml:52
-#: /tmp/eKLg46HT7B.xml:141 /tmp/eKLg46HT7B.xml:165
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:37 /tmp/ogZUlgnLzH.xml:52
+#: /tmp/ogZUlgnLzH.xml:141 /tmp/ogZUlgnLzH.xml:165
 msgid "<br>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:39
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:39
 msgid "Before you start, you need to make sure that Tor is up and running."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:42
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:42
 msgid ""
 "Visit our <a href=\"<page download/download>\">download page</a> and install"
 " the \"Installation Bundle\" for your OS."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:46
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:46
 msgid ""
 "If it's convenient, you might also want to use it as a client for a while to"
 " make sure it's actually working."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:49
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:49
 msgid "<hr> <a id=\"setup\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:51
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:51
 msgid "<a class=\"anchor\" href=\"#setup\">Step Two: Set it up as a relay</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:54
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:54
 msgid ""
 "Verify that your clock and timezone are set correctly. If possible, "
 "synchronize your clock with public <a "
@@ -110,12 +110,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:60
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:60
 msgid "<strong>Manual Configuration</strong>:"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><ul><li>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:62
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:62
 msgid ""
 "Edit the bottom part of <a href=\"<page docs/faq>#torrc\">your torrc "
 "file</a>. If you want to be a public relay (recommended), make sure to "
@@ -127,31 +127,31 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:72
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:72
 msgid "<strong>Configuring Tor with the Vidalia Graphical Interface</strong>:"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><ol><li><dt>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:76
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:76
 msgid ""
 "Right click on the Vidalia icon in your task bar.  Choose <tt>Control "
 "Panel</tt>."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><ol><li><dd>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:77
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:77
 msgid ""
 "<img alt=\"vidalia right click menu\" src=\"$(IMGROOT)/screenshot-"
 "win32-vidalia.png\" />"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><ol><li>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:80
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:80
 msgid "Click <tt>Setup Relaying</tt>."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><ol><li><dt>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:83
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:83
 msgid ""
 "Choose <tt>Relay Traffic for the Tor network</tt> if you want to be a public"
 " relay (recommended), or choose <tt>Help censored users reach the Tor "
@@ -161,21 +161,21 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><ol><li><dd>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:88
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:88
 msgid ""
 "<img alt=\"vidalia basic settings\" src=\"$(IMGROOT)/screenshot-win32"
 "-configure-relay-1.png\" />"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><ol><li>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:91
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:91
 msgid ""
 "Enter a nickname for your relay, and enter contact information in case we "
 "need to contact you about problems."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><ol><li>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:94
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:94
 msgid ""
 "Leave <tt>Attempt to automatically configure port forwarding</tt> clicked.  "
 "Push the <tt>Test</tt> button to see if it works.  If it does work, great.  "
@@ -183,21 +183,21 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><ol><li><dt>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:98
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:98
 msgid ""
 "Choose the <tt>Bandwidth Limits</tt> tab.  Select how much bandwidth you "
 "want to provide for Tor users like yourself."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><ol><li><dd>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:99
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:99
 msgid ""
 "<img alt=\"vidalia bandwidth limits\" src=\"$(IMGROOT)/screenshot-win32"
 "-configure-relay-2.png\" />"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><ol><li><dt>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:102
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:102
 msgid ""
 "Choose the <tt>Exit Policies</tt> tab.  If you want to allow others to use "
 "your relay for these services, don't change anything.  Un-check the services"
@@ -207,21 +207,21 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><ol><li><dd>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:107
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:107
 msgid ""
 "<img alt=\"vidalia exit policies\" src=\"$(IMGROOT)/screenshot-win32"
 "-configure-relay-3.png\" />"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><ol><li>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:110
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:110
 msgid ""
 "Click the <tt>Ok</tt> button.  See Step Three below for confirmation that "
 "the relay is working correctly."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><li>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:114
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:114
 msgid ""
 "If you are using a firewall, open a hole in your firewall so incoming "
 "connections can reach the ports you configured (ORPort, plus DirPort if you "
@@ -232,14 +232,14 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><li>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:123
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:123
 msgid ""
 "Restart your relay. If it <a href=\"<page docs/faq>#Logs\">logs any "
 "warnings</a>, address them."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><li>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:128
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:128
 msgid ""
 "Subscribe to the <a href=\"http://archives.seul.org/or/announce/\">or-"
 "announce</a> mailing list. It is very low volume, and it will keep you "
@@ -249,17 +249,17 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:138
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:138
 msgid "<hr> <a id=\"check\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:140
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:140
 msgid "<a class=\"anchor\" href=\"#check\">Step Three: Make sure it is working</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:143
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:143
 msgid ""
 "As soon as your relay manages to connect to the network, it will try to "
 "determine whether the ports you configured are reachable from the outside. "
@@ -272,7 +272,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:153
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:153
 msgid ""
 "When it decides that it's reachable, it will upload a \"server descriptor\" "
 "to the directories, to let clients know what address, ports, keys, etc your "
@@ -284,22 +284,22 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:162
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:162
 msgid "<hr> <a id=\"after\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:164
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:164
 msgid "<a class=\"anchor\" href=\"#after\">Step Four: Once it is working</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:168
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:168
 msgid "We recommend the following steps as well:"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:172
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:172
 msgid ""
 "6. Read <a href=\"<wiki>TheOnionRouter/OperationalSecurity\">about "
 "operational security</a> to get ideas how you can increase the security of "
@@ -307,7 +307,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:178
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:178
 msgid ""
 "7. If you want to run more than one relay that's great, but please set <a "
 "href=\"<page docs/faq>#MultipleRelays\">the MyFamily option</a> in all your "
@@ -315,7 +315,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:184
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:184
 msgid ""
 "8. Decide about rate limiting. Cable modem, DSL, and other users who have "
 "asymmetric bandwidth (e.g. more down than up) should rate limit to their "
@@ -324,7 +324,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:192
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:192
 msgid ""
 "9. Back up your Tor relay's private key (stored in \"keys/secret_id_key\" in"
 " your DataDirectory). This is your relay's \"identity,\" and you need to "
@@ -335,7 +335,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:202
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:202
 msgid ""
 "10. If you control the name servers for your domain, consider setting your "
 "reverse DNS hostname to 'anonymous-relay', 'proxy' or 'tor-proxy', so when "
@@ -347,7 +347,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:213
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:213
 msgid ""
 "11. If your computer isn't running a webserver, please consider changing "
 "your ORPort to 443 and your DirPort to 80. Many Tor users are stuck behind "
@@ -362,7 +362,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:228
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:228
 msgid ""
 "12. If your Tor relay provides other services on the same IP address &mdash;"
 " such as a public webserver &mdash; make sure that connections to the "
@@ -374,7 +374,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:239
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:239
 msgid ""
 "13. (Unix only). Make a separate user to run the relay. If you installed the"
 " OS X package or the deb or the rpm, this is already done. Otherwise, you "
@@ -386,7 +386,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:250
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:250
 msgid ""
 "14. (Unix only.) Your operating system probably limits the number of open "
 "file descriptors per process to 1024 (or even less). If you plan to be "
@@ -398,7 +398,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:260
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:260
 msgid ""
 "15. If you installed Tor via some package or installer, it probably starts "
 "Tor for you automatically on boot. But if you installed from source, you may"
@@ -406,7 +406,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:266
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:266
 msgid ""
 "When you change your Tor configuration, remember to verify that your relay "
 "still works correctly after the change. Be sure to set your \"ContactInfo\" "
@@ -418,7 +418,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/docs/en/tor-doc-relay.wml:277
+#: /home/runa/dev/website/docs/en/tor-doc-relay.wml:277
 msgid ""
 "If you have suggestions for improving this document, please <a href=\"<page "
 "about/contact>\">send them to us</a>. Thanks!"

Modified: translation/trunk/projects/website/po/ru/getinvolved/4-optional.volunteer.po
===================================================================
--- translation/trunk/projects/website/po/ru/getinvolved/4-optional.volunteer.po	2011-04-12 16:15:00 UTC (rev 24594)
+++ translation/trunk/projects/website/po/ru/getinvolved/4-optional.volunteer.po	2011-04-12 16:19:31 UTC (rev 24595)
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-03-25 16:51+0000\n"
-"PO-Revision-Date: 2011-03-26 00:29+0000\n"
+"POT-Creation-Date: 2011-03-28 12:49+0200\n"
+"PO-Revision-Date: 2011-03-29 00:27+0000\n"
 "Last-Translator: runasand <runa.sandvik at gmail.com>\n"
 "Language-Team: Russian <None>\n"
 "MIME-Version: 1.0\n"
@@ -18,33 +18,33 @@
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:8
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:8
 msgid ""
 "<a href=\"<page index>\">Home &raquo; </a> <a href=\"<page "
 "getinvolved/volunteer>\">Volunteer</a>"
 msgstr ""
 
 #. type: Content of: <div><div><h1>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:13
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:13
 msgid "A few things everyone can do now:"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:15
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:15
 msgid ""
 "Please consider <a href=\"<page docs/tor-doc-relay>\">running a relay</a> to"
 " help the Tor network grow."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:17
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:17
 msgid ""
 "Tell your friends! Get them to run relays. Get them to run hidden services. "
 "Get them to tell their friends."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:19
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:19
 msgid ""
 "If you like Tor's goals, please <a href=\"<page donate/donate>\">take a "
 "moment to donate to support further Tor development</a>. We're also looking "
@@ -54,7 +54,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:24
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:24
 msgid ""
 "We're looking for more <a href=\"<page about/torusers>\">good examples of "
 "Tor users and Tor use cases</a>. If you use Tor for a scenario or purpose "
@@ -63,7 +63,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:30
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:30
 msgid ""
 "Tor has <a href=\"<page getinvolved/open-positions>\">two open "
 "positions</a>.  Please <a href=\"<page about/contact>\">contact us</a> if "
@@ -71,17 +71,17 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:33
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:33
 msgid "<a id=\"Documentation\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:34
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:34
 msgid "<a class=\"anchor\" href=\"#Documentation\">Documentation</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:36
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:36
 msgid ""
 "Help translate the web page and documentation into other languages. See the "
 "<a href=\"<page getinvolved/translation>\">translation guidelines</a> if you"
@@ -90,7 +90,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:40
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:40
 msgid ""
 "Evaluate and document <a "
 "href=\"https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorifyHOWTO\">our"
@@ -98,7 +98,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:43
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:43
 msgid ""
 "We have a huge list of <a "
 "href=\"https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/SupportPrograms\">potentially"
@@ -107,32 +107,24 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:49
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:49
 msgid "<a id=\"Advocacy\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:50
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:50
 msgid "<a class=\"anchor\" href=\"#Advocacy\">Advocacy</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:52
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:52
 msgid ""
-"Create a <a "
-"href=\"https://trac.torproject.org/projects/tor/wiki/CommunityLogos\">community"
-" logo</a> under a Creative Commons license that all can use and modify."
-msgstr ""
-
-#. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:55
-msgid ""
 "Create a presentation that can be used for various user group meetings "
 "around the world."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:57
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:54
 msgid ""
 "Create a video about the positive uses of Tor, what Tor is, or how to use "
 "it.  Some have already started on <a "
@@ -143,31 +135,31 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:63
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:60
 msgid ""
 "Create a poster, or a set of posters, around a theme, such as \"Tor for "
 "Freedom!\"."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:65
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:62
 msgid ""
 "Create a t-shirt design that incorporates \"Congratulations! You are using "
 "Tor!\" in any language."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:69
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:66
 msgid "<a id=\"Projects\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:70
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:67
 msgid "<a class=\"anchor\" href=\"#Projects\">Projects</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:73
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:70
 msgid ""
 "Below are a list of Tor related projects we're developing and/or "
 "maintaining. Most discussions happen on IRC so if you're interested in any "
@@ -178,333 +170,333 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><th>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:83
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:80
 msgid "Name"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><th>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:84
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:81
 msgid "Category"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><th>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:85
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:82
 msgid "Language"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><th>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:86
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:83
 msgid "Activity"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><th>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:87
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:84
 msgid "Contributors"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:91
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:88
 msgid "<a href=\"#project-tor\">Tor</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:92
-#: /tmp/OzLkyddxSC.xml:100
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:89
+#: /tmp/qxq11tAO2x.xml:97
 msgid "Core"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:93
-#: /tmp/OzLkyddxSC.xml:125
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:90
+#: /tmp/qxq11tAO2x.xml:122
 msgid "C"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:94
-#: /tmp/OzLkyddxSC.xml:118 /tmp/OzLkyddxSC.xml:150 /tmp/OzLkyddxSC.xml:190
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:91
+#: /tmp/qxq11tAO2x.xml:115 /tmp/qxq11tAO2x.xml:147 /tmp/qxq11tAO2x.xml:187
 msgid "Heavy"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:95
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:92
 msgid "nickm, arma, Sebastian"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:99
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:96
 msgid "*<a href=\"#project-jtor\">JTor</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:101
-#: /tmp/OzLkyddxSC.xml:157 /tmp/OzLkyddxSC.xml:189
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:98
+#: /tmp/qxq11tAO2x.xml:154 /tmp/qxq11tAO2x.xml:186
 msgid "Java"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:102
-#: /tmp/OzLkyddxSC.xml:198 /tmp/OzLkyddxSC.xml:222 /tmp/OzLkyddxSC.xml:246
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:99
+#: /tmp/qxq11tAO2x.xml:195 /tmp/qxq11tAO2x.xml:219 /tmp/qxq11tAO2x.xml:243
 msgid "None"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:107
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:104
 msgid "<a href=\"#project-tbb\">TBB</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:108
-#: /tmp/OzLkyddxSC.xml:116 /tmp/OzLkyddxSC.xml:124 /tmp/OzLkyddxSC.xml:132
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:105
+#: /tmp/qxq11tAO2x.xml:113 /tmp/qxq11tAO2x.xml:121 /tmp/qxq11tAO2x.xml:129
 msgid "Usability"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:109
-#: /tmp/OzLkyddxSC.xml:117 /tmp/OzLkyddxSC.xml:133
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:106
+#: /tmp/qxq11tAO2x.xml:114 /tmp/qxq11tAO2x.xml:130
 msgid "Sys Admin"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:110
-#: /tmp/OzLkyddxSC.xml:158 /tmp/OzLkyddxSC.xml:166 /tmp/OzLkyddxSC.xml:230
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:107
+#: /tmp/qxq11tAO2x.xml:155 /tmp/qxq11tAO2x.xml:163 /tmp/qxq11tAO2x.xml:227
 msgid "Moderate"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:111
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:108
 msgid "Erinn"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:115
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:112
 msgid "<a href=\"#project-tails\">Tails</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:119
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:116
 msgid "<a href=\"https://tails.boum.org/chat/\">#tails</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:123
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:120
 msgid "<a href=\"#project-torsocks\">Torsocks</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:126
-#: /tmp/OzLkyddxSC.xml:134 /tmp/OzLkyddxSC.xml:142 /tmp/OzLkyddxSC.xml:174
-#: /tmp/OzLkyddxSC.xml:182 /tmp/OzLkyddxSC.xml:206 /tmp/OzLkyddxSC.xml:214
-#: /tmp/OzLkyddxSC.xml:238
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:123
+#: /tmp/qxq11tAO2x.xml:131 /tmp/qxq11tAO2x.xml:139 /tmp/qxq11tAO2x.xml:171
+#: /tmp/qxq11tAO2x.xml:179 /tmp/qxq11tAO2x.xml:203 /tmp/qxq11tAO2x.xml:211
+#: /tmp/qxq11tAO2x.xml:235
 msgid "Light"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:127
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:124
 msgid "mwenge"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:131
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:128
 msgid "*<a href=\"#project-torouter\">Torouter</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:135
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:132
 msgid "ioerror, Runa"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:139
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:136
 msgid "<a href=\"#project-vidalia\">Vidalia</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:140
-#: /tmp/OzLkyddxSC.xml:148 /tmp/OzLkyddxSC.xml:156
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:137
+#: /tmp/qxq11tAO2x.xml:145 /tmp/qxq11tAO2x.xml:153
 msgid "User Interface"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:141
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:138
 msgid "C++, Qt"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:143
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:140
 msgid "chiiph"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:147
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:144
 msgid "<a href=\"#project-arm\">Arm</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:149
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:146
 msgid "Python, Curses"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:151
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:148
 msgid "atagar"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:155
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:152
 msgid "<a href=\"#project-orbot\">Orbot</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:159
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:156
 msgid "n8fr8"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:163
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:160
 msgid "<a href=\"#project-torbutton\">Torbutton</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:164
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:161
 msgid "Browser Add-on"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:165
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:162
 msgid "Javascript"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:167
-#: /tmp/OzLkyddxSC.xml:183 /tmp/OzLkyddxSC.xml:239
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:164
+#: /tmp/qxq11tAO2x.xml:180 /tmp/qxq11tAO2x.xml:236
 msgid "mikeperry"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:171
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:168
 msgid "*<a href=\"#project-thandy\">Thandy</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:172
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:169
 msgid "Updater"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:173
-#: /tmp/OzLkyddxSC.xml:181 /tmp/OzLkyddxSC.xml:205 /tmp/OzLkyddxSC.xml:213
-#: /tmp/OzLkyddxSC.xml:229 /tmp/OzLkyddxSC.xml:237 /tmp/OzLkyddxSC.xml:245
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:170
+#: /tmp/qxq11tAO2x.xml:178 /tmp/qxq11tAO2x.xml:202 /tmp/qxq11tAO2x.xml:210
+#: /tmp/qxq11tAO2x.xml:226 /tmp/qxq11tAO2x.xml:234 /tmp/qxq11tAO2x.xml:242
 msgid "Python"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:175
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:172
 msgid "Sebastian, Erinn, nickm"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:179
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:176
 msgid "<a href=\"#project-torctl\">TorCtl</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:180
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:177
 msgid "Library"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:187
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:184
 msgid "<a href=\"#project-metrics\">Metrics</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:188
-#: /tmp/OzLkyddxSC.xml:196 /tmp/OzLkyddxSC.xml:204 /tmp/OzLkyddxSC.xml:212
-#: /tmp/OzLkyddxSC.xml:220
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:185
+#: /tmp/qxq11tAO2x.xml:193 /tmp/qxq11tAO2x.xml:201 /tmp/qxq11tAO2x.xml:209
+#: /tmp/qxq11tAO2x.xml:217
 msgid "Client Service"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:191
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:188
 msgid "karsten"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:195
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:192
 msgid "<a href=\"#project-torstatus\">TorStatus</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:197
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:194
 msgid "PHP"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:203
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:200
 msgid "<a href=\"#project-weather\">Weather</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:207
-#: /tmp/OzLkyddxSC.xml:215
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:204
+#: /tmp/qxq11tAO2x.xml:212
 msgid "kaner"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:211
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:208
 msgid "<a href=\"#project-gettor\">GetTor</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:219
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:216
 msgid "<a href=\"#project-torcheck\">TorCheck</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:221
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:218
 msgid "Python, Perl"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:227
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:224
 msgid "<a href=\"#project-bridgedb\">BridgeDB</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:228
-#: /tmp/OzLkyddxSC.xml:236 /tmp/OzLkyddxSC.xml:244
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:225
+#: /tmp/qxq11tAO2x.xml:233 /tmp/qxq11tAO2x.xml:241
 msgid "Backend Service"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:231
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:228
 msgid "kaner, nickm"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:235
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:232
 msgid "<a href=\"#project-torflow\">TorFlow</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:243
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:240
 msgid "*<a href=\"#project-torbel\">TorBEL</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:247
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:244
 msgid "Sebastian"
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:251
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:248
 msgid ""
 "<sub> * Project is still in an alpha state.  </sub> <br /><br /> <a id"
 "=\"project-tor\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:258
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:255
 msgid ""
 "Tor (<a href=\"https://gitweb.torproject.org/tor.git\">code</a>, <a "
 "href=\"https://trac.torproject.org/projects/tor/query?status=accepted&status=assigned&status=needs_review&status=new&status=reopened&component=Tor+Client&component=Tor+Relay&component=vidalia&order=priority\">bug"
@@ -512,7 +504,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:263
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:260
 msgid ""
 "Central project, providing the core software for using and participating in "
 "the Tor network. Numerous people contribute to the project to varying "
@@ -520,7 +512,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:269
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:266
 msgid ""
 "<b>Project Ideas:</b><br /> <i><a href=\"#resistCensorship\">Improving Tor's"
 " ability to resist censorship</a></i><br /> <i><a "
@@ -530,12 +522,12 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:276
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:273
 msgid "<a id=\"project-jtor\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:277
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:274
 msgid ""
 "<a href=\"https://github.com/brl/JTor/wiki\">JTor</a> (<a "
 "href=\"https://github.com/brl/JTor\">code</a>, <a "
@@ -543,7 +535,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:283
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:280
 msgid ""
 "Java implementation of Tor and successor to <a "
 "href=\"http://onioncoffee.sourceforge.net/\">OnionCoffee</a>. This project "
@@ -551,12 +543,12 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:288
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:285
 msgid "<a id=\"project-tbb\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:289
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:286
 msgid ""
 "<a href=\"<page projects/torbrowser>\">Tor Browser Bundle</a> (<a "
 "href=\"https://gitweb.torproject.org/torbrowser.git\">code</a>, <a "
@@ -565,7 +557,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:295
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:292
 msgid ""
 "The Tor Browser Bundle is an easy-to-use portable package of Tor, Vidalia, "
 "and Firefox preconfigured to work together out of the box. This is actively "
@@ -573,7 +565,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:301
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:298
 msgid ""
 "<b>Project Ideas:</b><br /> <i><a href=\"#auditTBB\">Audit Tor Browser "
 "Bundles for data leaks</a></i><br /> <i><a "
@@ -581,12 +573,12 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:306
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:303
 msgid "<a id=\"project-tails\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:307
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:304
 msgid ""
 "<a href=\"https://tails.boum.org/\">The Amnesic Incognito Live System</a> "
 "(<a href=\"http://git.immerda.ch/?p=amnesia.git;a=summary\">code</a>, <a "
@@ -594,7 +586,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:313
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:310
 msgid ""
 "The Amnesic Incognito Live System is a live CD/USB distribution "
 "preconfigured so that everything is safely routed through Tor and leaves no "
@@ -604,7 +596,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:321
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:318
 msgid ""
 "<b>Project Ideas:</b><br /> <i><a href=\"#tailsStartMenu\">Custom GDM3 "
 "startup menu, aka.  tails-greeter</a></i><br /> <i><a "
@@ -614,12 +606,12 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:330
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:327
 msgid "<a id=\"project-torsocks\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:331
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:328
 msgid ""
 "<a href=\"http://code.google.com/p/torsocks/\">Torsocks</a> (<a "
 "href=\"https://gitweb.torproject.org/torsocks.git\">code</a>, <a "
@@ -628,7 +620,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:337
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:334
 msgid ""
 "Utility for adapting other applications to work with Tor. Development has "
 "slowed and compatibility issues remain with some platforms, but it's "
@@ -636,19 +628,19 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:343
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:340
 msgid ""
 "<b>Project Ideas:</b><br /> <i><a href=\"#torsocksForOSX\">Make "
 "torsocks/dsocks work on OS X</a></i>"
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:347
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:344
 msgid "<a id=\"project-torouter\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:348
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:345
 msgid ""
 "<a "
 "href=\"https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/Torouter\">Torouter</a>"
@@ -658,19 +650,19 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:354
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:351
 msgid ""
 "Project to provide an easy-to-use, embedded Tor instance for routers. This "
 "had high activity in late 2010, but has since been rather quiet."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:358
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:355
 msgid "<a id=\"project-vidalia\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:359
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:356
 msgid ""
 "<a href=\"<page projects/vidalia>\">Vidalia</a> (<a "
 "href=\"https://svn.torproject.org/vidalia/vidalia/trunk/\">code</a>, <a "
@@ -679,7 +671,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:365
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:362
 msgid ""
 "The most commonly used user interface for Tor. Matt Edman started the "
 "project in 2006 and brought it to its current stable state. Development "
@@ -688,7 +680,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:372
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:369
 msgid ""
 "<b>Project Ideas:</b><br /> <i><a href=\"#vidaliaStatusEventInterface\">Tor "
 "Controller Status Event Interface for Vidalia</a></i><br /> <i><a "
@@ -697,12 +689,12 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:377
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:374
 msgid "<a id=\"project-arm\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:378
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:375
 msgid ""
 "<a href=\"http://www.atagar.com/arm/\">Arm</a> (<a "
 "href=\"https://svn.torproject.org/svn/arm/trunk/\">code</a>, <a "
@@ -711,7 +703,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:384
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:381
 msgid ""
 "Command-line monitor for Tor. This has been under very active development by"
 " its author, Damian Johnson, since early 2009 to make it a better general-"
@@ -719,19 +711,19 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:390
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:387
 msgid ""
 "<b>Project Ideas:</b><br /> <i><a href=\"#armClientMode\">Client Mode Use "
 "Cases for Arm</a></i><br /> <i><a href=\"#armGui\">GUI for Arm</a></i>"
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:395
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:392
 msgid "<a id=\"project-orbot\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:396
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:393
 msgid ""
 "<a href=\"https://guardianproject.info/apps/orbot/\">Orbot</a> (<a "
 "href=\"https://svn.torproject.org/svn/projects/android/trunk/Orbot/\">code</a>,"
@@ -741,26 +733,30 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:402
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:399
 msgid ""
 "Provides Tor on the Android platform. This was under very active development"
 " up through Fall 2010, after which things have been quiet."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:407
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:404
 msgid ""
-"<b>Project Ideas:</b><br /> <i><a href=\"#orbotDevelopment\">More on Orbot "
-"&amp; Android OS-specific development</a></i>"
+"<b>Project Ideas:</b><br /> <i><a href=\"#orbot-torbutton\">TorButton for "
+"Mobile Firefox 4 or Custom Browser on Android</a></i><br /> <i><a href"
+"=\"#orbot-userInterface\">Build a better user interface for Orbot</a></i><br"
+" /> <i><a href=\"#orbot-optimisation\">Core Tor mobile "
+"optimisation</a></i><br /> <i><a href=\"#orbot-orlibAndOutreach\">Orbot "
+"integration library and community outreach</a></i>"
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:411
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:411
 msgid "<a id=\"project-torbutton\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:412
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:412
 msgid ""
 "<a href=\"<page torbutton/index>\">Torbutton</a> (<a "
 "href=\"https://gitweb.torproject.org/torbutton.git\">code</a>, <a "
@@ -769,7 +765,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:418
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:418
 msgid ""
 "Firefox addon that addresses many of the client-side threats to browsing the"
 " Internet anonymously. Mike has since continued to adapt it to new threats, "
@@ -779,7 +775,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:426
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:426
 msgid ""
 "<b>Project Ideas:</b><br /> <i><a "
 "href=\"#torbuttonForThunderbird\">Torbutton equivalent for "
@@ -787,17 +783,17 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:430
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:430
 msgid "<a id=\"project-thandy\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:431
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:431
 msgid "Thandy (<a href=\"https://gitweb.torproject.org/thandy.git\">code</a>)"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:435
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:435
 msgid ""
 "Updater for Tor. The project began in the Summer of 2008 but wasn't "
 "completed. Recently interest in it has been rekindled and many aspects of "
@@ -805,12 +801,12 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:440
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:440
 msgid "<a id=\"project-torctl\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:441
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:441
 msgid ""
 "TorCtl (<a href=\"https://gitweb.torproject.org/pytorctl.git\">code</a>, <a "
 "href=\"https://trac.torproject.org/projects/tor/query?status=accepted&status=assigned&status=needs_review&status=new&status=reopened&component=Torctl&order=priority\">bug"
@@ -818,19 +814,19 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:447
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:447
 msgid ""
 "Python bindings and utilities for using the Tor control port. It has been "
 "stable for several years, with only minor revisions."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:451
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:451
 msgid "<a id=\"project-metrics\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:452
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:452
 msgid ""
 "<a href=\"https://metrics.torproject.org/\">Metrics</a> (code: <a "
 "href=\"https://gitweb.torproject.org/metrics-db.git\">db</a>, <a "
@@ -841,7 +837,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:460
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:460
 msgid ""
 "Processing and analytics of consensus data, provided to users via the "
 "metrics portal. This has been under active development for several years by "
@@ -849,12 +845,12 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:465
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:465
 msgid "<a id=\"project-torstatus\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:466
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:466
 msgid ""
 "<a "
 "href=\"https://trac.torproject.org/projects/tor/wiki/projects/TorStatus\">TorStatus</a>"
@@ -862,7 +858,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:470
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:470
 msgid ""
 "Portal providing an overview of the Tor network, and details on any of its "
 "current relays. Though very actively used, this project has been "
@@ -870,12 +866,12 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:475
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:475
 msgid "<a id=\"project-weather\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:476
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:476
 msgid ""
 "<a "
 "href=\"https://trac.torproject.org/projects/tor/wiki/projects/Weather\">Weather</a>"
@@ -885,7 +881,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:482
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:482
 msgid ""
 "Provides automatic notification to subscribed relay operators when their "
 "relay's unreachable. This underwent a rewrite by the <a "
@@ -894,12 +890,12 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:488
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:488
 msgid "<a id=\"project-gettor\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:489
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:489
 msgid ""
 "<a "
 "href=\"https://trac.torproject.org/projects/tor/wiki/projects/EmailAutoResponder\">GetTor</a>"
@@ -909,19 +905,19 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:495
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:495
 msgid ""
 "E-mail autoresponder providing Tor's packages over SMTP. This has been "
 "relatively unchanged for quite a while."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:499
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:499
 msgid "<a id=\"project-torcheck\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:500
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:500
 msgid ""
 "<a "
 "href=\"https://trac.torproject.org/projects/tor/wiki/projects/TorCheck\">TorCheck</a>"
@@ -931,19 +927,19 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:506
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:506
 msgid ""
 "Provides a simple site for determining if the visitor is using Tor or not.  "
 "This has been relatively unchanged for quite a while."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:510
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:510
 msgid "<a id=\"project-bridgedb\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:511
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:511
 msgid ""
 "<a "
 "href=\"https://trac.torproject.org/projects/tor/wiki/projects/BridgeDB\">BridgeDB</a>"
@@ -953,19 +949,19 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:517
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:517
 msgid ""
 "Backend bridge distributor, handling the various pools they're distributed "
 "in. This was actively developed until Fall of 2010."
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:521
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:521
 msgid "<a id=\"project-torflow\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:522
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:522
 msgid ""
 "<a "
 "href=\"https://trac.torproject.org/projects/tor/wiki/projects/TorFlow\">TorFlow</a>"
@@ -975,7 +971,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:528
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:528
 msgid ""
 "Library and collection of services for actively monitoring the Tor network."
 "  These include the Bandwidth Scanners (measuring throughput of relays) and "
@@ -986,12 +982,12 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:536
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:536
 msgid "<a id=\"project-torbel\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:537
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:537
 msgid ""
 "<a "
 "href=\"https://trac.torproject.org/projects/tor/wiki/projects/TorBulkExitlist\">TorBEL</a>"
@@ -1001,7 +997,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:544
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:544
 msgid ""
 "The Tor Bulk Exitlist provides a method of identifying if IPs belong to exit"
 " nodes or not. This is a replacement for TorDNSEL which is a stable (though "
@@ -1011,17 +1007,17 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:551
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:551
 msgid "<a id=\"Coding\"></a> <a id=\"Summer\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:553
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:553
 msgid "<a class=\"anchor\" href=\"#Coding\">Project Ideas</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:556
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:556
 msgid ""
 "You may find some of these projects to be good <a href=\"<page "
 "about/gsoc>\">Google Summer of Code 2011</a> ideas. We have labelled each "
@@ -1036,12 +1032,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:570
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:570
 msgid "<a id=\"auditTBB\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:572
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:572
 msgid ""
 "<b>Audit Tor Browser Bundles for data leaks</b> <br> Priority: <i>High</i> "
 "<br> Effort Level: <i>High</i> <br> Skill Level: <i>Medium</i> <br> Likely "
@@ -1049,7 +1045,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:581
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:581
 msgid ""
 "The Tor Browser Bundle incorporates Tor, Firefox, Polipo, and the Vidalia "
 "user interface (and optionally the <a href=\"http://pidgin.im/\">Pidgin</a> "
@@ -1060,7 +1056,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:587
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:587
 msgid ""
 "This project is to identify all of the traces left behind by using a Tor "
 "Browser Bundle on Windows, Mac OS X, or Linux.  Developing ways to stop, "
@@ -1068,7 +1064,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:590
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:590
 msgid ""
 "Students should be familiar with operating system analysis, application "
 "development on one or preferably all of Windows, Linux, and Mac OS X, and be"
@@ -1076,19 +1072,19 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:593
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:593
 msgid ""
 "If you would like to help extend or do security auditing for TBB, please "
 "contact Erinn."
 msgstr ""
 
 #. type: Content of: <div><div><ol>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:597
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:597
 msgid "<a id=\"firewallProbeTool\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:599
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:599
 msgid ""
 "<b>Develop a fully automatic firewall-probing system</b> <br> Priority: "
 "<i>High</i> <br> Effort Level: <i>Medium to High</i> <br> Skill Level: "
@@ -1096,7 +1092,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:608
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:608
 msgid ""
 "We would like to have a fully automatic firewall-probing system for blocking"
 " systems with no long-term state (i.e. firewalls that can examine each "
@@ -1105,7 +1101,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:612
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:612
 msgid ""
 "Ideally, volunteers would only need to set up one or more test servers, and "
 "run the probe client program on a publicly accessible computer behind the "
@@ -1113,38 +1109,38 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:615
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:615
 msgid "The test tool should:"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><ul><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:617
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:617
 msgid ""
 "generate packet captures on both ends (and send them out to the extent "
 "possible),"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><ul><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:619
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:619
 msgid ""
 "cycle through all the SSL configurations we might want to test through a "
 "censorship device, and"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><ul><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:621
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:621
 msgid ""
 "also test some other protocols to see whether they are allowed through the "
 "firewall (IMAP and other mail protocols, BitTorrent, DTLS, etc.)."
 msgstr ""
 
 #. type: Content of: <div><div><ol>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:627
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:627
 msgid "<a id=\"tailsStartMenu\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:629
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:629
 msgid ""
 "<b>Custom GDM3 startup menu, aka. tails-greeter</b> <br> Priority: "
 "<i>High</i> <br> Effort Level: <i>Medium</i> <br> Skill Level: <i>Medium to "
@@ -1152,14 +1148,14 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:638
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:638
 msgid ""
 "Several major upcoming Tails features need to gather user input at startup "
 "time: bridges support, persistence, MAC address anonymization, etc."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:641
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:641
 msgid ""
 "Existing boot menus lack the graphical widgets and generally user-"
 "friendliness needed. Hence it was decided to implement Tails startup menu in"
@@ -1169,7 +1165,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:646
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:646
 msgid ""
 "Anyone undertaking this project should be familiar with GNU/Linux and "
 "application development; no other skill is required, apart of the ability to"
@@ -1181,19 +1177,75 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:653
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:653
 msgid ""
 "For more information see <a "
 "href=\"https://tails.boum.org/todo/boot_menu/\">https://tails.boum.org/todo/boot_menu/</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ol>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:656
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:656
+msgid "<a id=\"orbot-torbutton\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><ol><li>
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:658
+msgid ""
+"<b>TorButton for Mobile Firefox 4 or Custom Browser on Android</b> <br> "
+"Priority: <i>High</i> <br> Effort Level: <i>High</i> <br> Skill Level: "
+"<i>High</i> <br> Likely Mentors: <i>Nathan (n8fr8), Jake, Mike Perry</i>"
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:667
+msgid ""
+"Initial work has been done on implementing a proxy-setting add-on for "
+"Firefox on Android (see <a "
+"href=\"https://github.com/guardianproject/ProxyMob\">ProxyMob</a>), but a "
+"full port of TorButton needs to be done (dependent upon Firefox 4 port of "
+"TorButton). The other approach is to implement a custom &quot;Tor "
+"Browser&quot; based on Firefox or Webkit browser. See <a "
+"href=\"http://code.google.com/p/torora/wiki/Android\">Torora</a> for "
+"progress on this so far."
+msgstr ""
+
+#. type: Content of: <div><div><ol>
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:677
+msgid "<a id=\"orbot-userInterface\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><ol><li>
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:679
+msgid ""
+"<b>Build a better user interface for Orbot</b> <br> Priority: <i>High</i> "
+"<br> Effort Level: <i>Medium</i> <br> Skill Level: <i>Medium</i> <br> Likely"
+" Mentors: <i>Nathan (n8fr8), Jake</i>"
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:688
+msgid ""
+"Improved home screen to show confirmation of connection (via a TorCheck API "
+"call), better statistics about data transferred (up/down), number of "
+"circuits connected, quality of connection and so on. The &quot;Tether "
+"Wifi&quot; Android application is a good model to follow in how it shows a "
+"realtime count of bytes transferred as well as notifications when wifi "
+"clients connect. In addition, better handling of Tor system and error "
+"messages would also be very helpful, include use of standard Android "
+"operating systems notifications. The addition of a wizard or tutorial "
+"walkthrough for novice users to explain to them exactly what is and what is "
+"not anonymized or protected would greatly improve the likelihood they will "
+"use Orbot correctly. All of this should work on the range of screens and "
+"device types now offered for Android, from 2&quot; phone to 10&quot; Tablet."
+msgstr ""
+
+#. type: Content of: <div><div><ol>
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:703
 msgid "<a id=\"resistCensorship\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:658
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:705
 msgid ""
 "<b>Improving Tor's ability to resist censorship</b> <br> Priority: <i>Medium"
 " to High</i> <br> Effort Level: <i>Medium to High</i> <br> Skill Level: "
@@ -1201,7 +1253,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:667
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:714
 msgid ""
 "The Tor 0.2.1.x series makes <a href=\"<svnprojects>design-"
 "paper/blocking.html\">significant improvements</a> in resisting national and"
@@ -1210,7 +1262,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:672
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:719
 msgid ""
 "One huge category of work is adding features to our <a "
 "href=\"https://gitweb.torproject.org/bridgedb.git?a=tree\">BridgeDB</a> "
@@ -1226,7 +1278,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:683
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:730
 msgid ""
 "If you want to get more into the guts of Tor itself (C), a more minor "
 "problem we should address is that current Tors can only listen on a single "
@@ -1237,7 +1289,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:690
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:737
 msgid ""
 "This project could involve a lot of research and design. One of the big "
 "challenges will be identifying and crafting approaches that can still resist"
@@ -1246,12 +1298,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:697
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:744
 msgid "<a id=\"geoIPUpgrade\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:699
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:746
 msgid ""
 "<b>Improve our GeoIP file format</b> <br> Priority: <i>Medium</i> <br> "
 "Effort Level: <i>Medium</i> <br> Skill Level: <i>Medium to High</i> <br> "
@@ -1259,7 +1311,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:708
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:755
 msgid ""
 "Currently, Tor bridges and relays read an entire IP->country database into "
 "memory from a text file during startup.  We would like to distribute this "
@@ -1268,7 +1320,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:713
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:760
 msgid ""
 "We have <a href='https://trac.torproject.org/projects/tor/ticket/2506'>a "
 "sketch of a design</a> for a moderately optimized format for IPv4 GeoIP "
@@ -1277,20 +1329,20 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:722
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:769
 msgid "<a id=\"armClientMode\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:724
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:771
 msgid ""
 "<b>Client Mode Use Cases for Arm</b> <br> Priority: <i>Medium</i> <br> "
 "Effort Level: <i>High</i> <br> Skill Level: <i>Medium</i> <br> Likely "
-"Mentors: <i>Damian</i>"
+"Mentors: <i>Damian (atagar)</i>"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:733
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:780
 msgid ""
 "<a href=\"<page projects/arm>\">Arm</a> is a Tor command line status monitor"
 " on *nix environments (Linux, Mac, and BSD). It functions much like top "
@@ -1301,14 +1353,14 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:741
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:788
 msgid ""
 "This would include UI design, experimenting, and a lot of python hacking. "
 "Here's some ideas for client functionality arm could provide:"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><ul><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:745
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:792
 msgid ""
 "A panel for client connections, showing each hop of the user's circuits with"
 " the ISP, country, and jurisdiction where those relays reside. Other "
@@ -1321,21 +1373,21 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><ul><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:754
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:801
 msgid ""
 "Options to let the user request new circuits (the &quot;New Identity&quot; "
 "feature in Vidalia), select the exit country, etc."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><ul><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:757
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:804
 msgid ""
 "A panel showing Internet application and if their connections are being "
 "routed through Tor or not (giving a warning if there's leaks)."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><ul><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:760
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:807
 msgid ""
 "The status of the bridges we're configured to use (ie, are they up?).  This "
 "would include adding control port functionality to Tor for <a "
@@ -1344,7 +1396,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><ul><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:765
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:812
 msgid ""
 "A one click option to set Tor to be a client, relay, or bridge. The goal "
 "would be to make it trivial for users to voluntarily contribute to the Tor "
@@ -1352,7 +1404,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><ul><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:769
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:816
 msgid ""
 "Menus as an alternative to hotkeys to make the interface more intuitive and "
 "usable for beginners (<a "
@@ -1360,13 +1412,13 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><ul><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:773
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:820
 msgid ""
 "Look at Vidalia and TorK for ideas and solicit input from the Tor community."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:777
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:824
 msgid ""
 "More information is available in the following sections of arm's dev notes: "
 "<a "
@@ -1379,12 +1431,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:781
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:828
 msgid "<a id=\"unitTesting\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:783
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:830
 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> Likely "
@@ -1392,7 +1444,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:792
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:839
 msgid ""
 "Tor needs to be tested far more thoroughly. This is a multi-part effort. To "
 "start with, our unit test coverage should rise substantially, especially in "
@@ -1402,7 +1454,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:798
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:845
 msgid ""
 "Additionally, we need to automate our performance testing. We've got "
 "buildbot to automate our regular integration and compile testing already "
@@ -1415,78 +1467,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:808
-msgid "<a id=\"orbotDevelopment\"></a>"
-msgstr ""
-
-#. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:810
-msgid ""
-"<b>More on Orbot &amp; Android OS-specific development</b> <br> Priority: "
-"<i>Medium</i> <br> Effort Level: <i>High</i> <br> Skill Level: <i>Medium to "
-"High</i> <br> Likely Mentors: <i>Nathan, Jake</i>"
-msgstr ""
-
-#. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:819
-msgid ""
-"<b>Android Java UI work:</b> Improved home screen to show better statistics "
-"about data transferred (up/down), number of circuits connected, quality of "
-"connection and so on. The \"Tether Wifi\" Android application is a good "
-"model to follow in how it shows a realtime count of bytes transferred as "
-"well as notifications when wifi clients connect. In addition, better "
-"display/handling of Tor system/error messages would also be very helpful. "
-"Finally, the addition of a wizard or tutorial walkthrough for novice users "
-"to explain to them exactly what is and what is not anonymized or protected "
-"would greatly improve the likelihood they will use Orbot correctly."
-msgstr ""
-
-#. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:831
-msgid ""
-"<b>Android Java OS/Core app work:</b> Better system-wide indication, either "
-"via the notification bar, \"Toast\" pop-up dialogs or some other indicator, "
-"that an application's traffic is indeed moving through Orbot/Tor. For "
-"instance, right now you need to first go to a torcheck web service to ensure"
-" your browser is routing via Tor. Orbot should be able to notify you that "
-"circuits are being opened, used, etc. The aforementioned data transfer "
-"tracker might provide this type of awareness as well."
-msgstr ""
-
-#. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:840
-msgid ""
-"<b>Android Java Library/Community Outreach work:</b> We need to package a "
-"simple library for use with third-party application to easily enable them to"
-" support \"Torification\" on non-rooted devices (i.e. w/o transparent "
-"proxying). This library should include a wrapper for the Apache HTTPClient "
-"library, a utility class for detecting the state of Orbot connectivity, and "
-"other relevant/useful things an Android app might need to anonymize itself. "
-"This work would include the creation of the library, documentation, and "
-"sample code. Outreach or effort to implement the library within other open-"
-"source apps would follow."
-msgstr ""
-
-#. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:851
-msgid ""
-"<b>Android OS/C/Linux work:</b> The port of Tor to Android is basically a "
-"straight cross-compile to Linux ARM. There has been no work done in looking "
-"the optimization of Tor within a mobile hardware environment, on the ARM "
-"processor or other Android hardware, or on mobile networks. It should be "
-"noted, that even without optimization, Tor is handling the mobile network "
-"environment very well, automatically detecting change in IP addresses, "
-"reconnecting circuits, etc. across switching from 2G to 3G to Wifi, and so "
-"forth."
-msgstr ""
-
-#. type: Content of: <div><div><ol>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:862
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:855
 msgid "<a id=\"simulateSlowConnections\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:864
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:857
 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> Likely"
@@ -1494,7 +1480,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:874
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:867
 msgid ""
 "Many users of Tor have poor-quality Internet connections, giving low "
 "bandwidth, high latency, and high packet loss/re-ordering. User experience "
@@ -1503,7 +1489,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:882
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:875
 msgid ""
 "This project would be to build a simulation environment which replicates the"
 " poor connectivity so that the effect on Tor performance can be measured. "
@@ -1513,7 +1499,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:890
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:883
 msgid ""
 "The tools used would be up to the student, but dummynet (for FreeBSD)  and "
 "nistnet (for Linux) are two potential components on which this project could"
@@ -1522,12 +1508,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:898
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:891
 msgid "<a id=\"torbuttonForThunderbird\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:900
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:893
 msgid ""
 "<b>Torbutton equivalent for Thunderbird</b> <br> Priority: <i>Medium</i> "
 "<br> Effort Level: <i>High</i> <br> Skill Level: <i>High</i> <br> Likely "
@@ -1535,7 +1521,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:910
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:903
 msgid ""
 "We're hearing from an increasing number of users that they want to use "
 "Thunderbird with Tor. However, there are plenty of application-level "
@@ -1545,12 +1531,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:918
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:911
 msgid "<a id=\"usabilityTesting\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:920
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:913
 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 "
@@ -1558,7 +1544,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:930
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:923
 msgid ""
 "Especially the browser bundle, ideally amongst our target demographic.  That"
 " would help a lot in knowing what needs to be done in terms of bug fixes or "
@@ -1567,19 +1553,19 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:937
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:930
 msgid ""
 "Please note that since this isn't a coding project, it isn't suitable for "
 "Google Summer of Code."
 msgstr ""
 
 #. type: Content of: <div><div><ol>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:942
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:935
 msgid "<a id=\"tailsMetadataAnonymizing\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:944
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:937
 msgid ""
 "<b>Meta-data anonymizing toolkit for file publication</b> <br> Priority: "
 "<i>Medium</i> <br> Effort Level: <i>Low to Medium</i> <br> Skill Level: "
@@ -1587,7 +1573,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:953
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:946
 msgid ""
 "Tor helps greatly in publishing files anonymously. However, much personal "
 "information can be enclosed *inside* such published files' meta-data: GPS "
@@ -1596,14 +1582,14 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:957
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:950
 msgid ""
 "A set of tools allowing users to easily inspect and clean up meta-data in "
 "files would benefit Tor users, and would e.g. be shipped in Tails."
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:959
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:952
 msgid ""
 "A graphical user interface is a must, but library and command-line "
 "interfaces are most welcome so that future work can add support for cleaning"
@@ -1612,7 +1598,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:963
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:956
 msgid ""
 "This project mostly consists of writing glue between the many existing tools"
 " and libraries that provide read/write access to files' meta-data. An "
@@ -1621,7 +1607,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:967
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:960
 msgid ""
 "The meta-data cleaning toolkit would run at least on GNU/Linux; additional "
 "Windows and/or Mac OS X support would be welcome. The tools used would be up"
@@ -1630,12 +1616,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:973
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:966
 msgid "<a id=\"tailsDebianLive\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:975
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:968
 msgid ""
 "<b>Improve Debian Live support for persistence</b> <br> Priority: "
 "<i>Medium</i> <br> Effort Level: <i>Medium</i> <br> Skill Level: <i>Low to "
@@ -1643,7 +1629,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:984
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:977
 msgid ""
 "Data persistence is a somewhat tricky topic in a Live system context, "
 "especially one such as Tails, which is explicitly designed to avoid leaving "
@@ -1651,7 +1637,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:987
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:980
 msgid ""
 "Some real-life use cases, however, require some kind of data persistence. To"
 " start with, Tails should (carefully) support persistence of application-"
@@ -1661,7 +1647,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:992
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:985
 msgid ""
 "The backend work consists of improving Debian Live's existing persistence "
 "features to make them suit the specific context of Tails. A trust "
@@ -1672,7 +1658,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:998
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:991
 msgid ""
 "Anyone undertaking this project must be familiar with GNU/Linux, and "
 "preferably with Debian. Being able to (quickly learn to) write clean and "
@@ -1680,19 +1666,19 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1001
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:994
 msgid ""
 "For more information, see <a "
 "href=\"https://tails.boum.org/todo/persistence/\">https://tails.boum.org/todo/persistence/</a>."
 msgstr ""
 
 #. type: Content of: <div><div><ol>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1004
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:997
 msgid "<a id=\"torsocksForOSX\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1006
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:999
 msgid ""
 "<b>Make torsocks/dsocks work on OS X</b> <br> Priority: <i>Medium</i> <br> "
 "Effort Level: <i>Medium</i> <br> Skill Level: <i>Medium</i> <br> Likely "
@@ -1700,7 +1686,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1016
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1009
 msgid ""
 "<a href=\"https://code.google.com/p/torsocks/\">Torsocks</a> and <a "
 "href=\"https://code.google.com/p/dsocks/\">dsocks</a> are wrappers that will"
@@ -1720,12 +1706,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1035
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1028
 msgid "<a id=\"vidaliaStatusEventInterface\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1037
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1030
 msgid ""
 "<b>Tor Controller Status Event Interface for Vidalia</b> <br> Priority: "
 "<i>Medium</i> <br> Effort Level: <i>Medium</i> <br> Skill Level: <i>Low to "
@@ -1733,7 +1719,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1046
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1039
 msgid ""
 "There are a number of status changes inside Tor of which the user may need "
 "to be informed. For example, if the user is trying to set up his Tor as a "
@@ -1746,7 +1732,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1054
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1047
 msgid ""
 "Tor has the ability to inform Vidalia of many such status changes, and we "
 "recently implemented support for a couple of these events. Still, there are "
@@ -1755,7 +1741,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1059
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1052
 msgid ""
 "The goal of this project then is to design and implement a UI for displaying"
 " Tor status events to the user. For example, we might put a little badge on "
@@ -1767,7 +1753,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1067
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1060
 msgid ""
 "A person undertaking this project should have good UI design and layout "
 "skills and some C++ development experience. Previous experience with Qt and "
@@ -1779,12 +1765,91 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1076
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1069
+msgid "<a id=\"orbot-optimisation\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><ol><li>
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1071
+msgid ""
+"<b>Core Tor mobile optimisation</b> <br> Priority: <i>Medium</i> <br> Effort"
+" Level: <i>Medium</i> <br> Skill Level: <i>High</i> <br> Likely Mentors: "
+"<i>Nathan (n8fr8), Jake</i>"
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1081
+msgid ""
+"The existing port of Tor to Android is basically a straight cross-compile to"
+" Linux ARM. There has been no work done in looking at possible optimizations"
+" of Tor within a mobile hardware environment or on mobile networks. In "
+"addition, a number of additional Android OS APIs are available (such as "
+"wireless network status) that could be taken advantage of."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1090
+msgid ""
+"It should be noted, that even without optimisation, Tor is handling the "
+"mobile network environment very well, automatically detecting change in IP "
+"addresses, opening circuits, etc, as the device switches from no coverage to"
+" 2G, 3G or Wifi constantly as it changes position. However, this observation"
+" of &quot;very well&quot;, is just based on user experience, and not any "
+"detailed study of what exactly is happening, and what threats might exist "
+"because of this constantly changing network state."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1100
+msgid ""
+"Finally, the build process needs to be moved to the Android NDK from the "
+"custom GCC toolchain we are now using, and compatibility with Android 2.3 "
+"and 3.x Honeycomb OS need to be verified."
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1106
+msgid ""
+"For more information see the <a "
+"href=\"https://svn.torproject.org/svn/projects/android/trunk/Orbot/BUILD\">Orbot"
+" build documentation</a>."
+msgstr ""
+
+#. type: Content of: <div><div><ol>
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1112
+msgid "<a id=\"orbot-orlibAndOutreach\"></a>"
+msgstr ""
+
+#. type: Content of: <div><div><ol><li>
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1114
+msgid ""
+"<b>Orbot integration library and community outreach</b> <br> Priority: "
+"<i>Medium</i> <br> Effort Level: <i>Low</i> <br> Skill Level: <i>Medium</i> "
+"<br> Likely Mentors: <i>Nathan (n8fr8)</i>"
+msgstr ""
+
+#. type: Content of: <div><div><ol><li><p>
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1124
+msgid ""
+"We need additional work on <a "
+"href=\"https://github.com/guardianproject/orlib\">ORLib</a>, our library for"
+" use with third-party application to easily enable them to support "
+"&quot;Torification&quot; on non-rooted devices (i.e. w/o transparent "
+"proxying). This library includes a SOCKS client, a wrapper for the Apache "
+"HTTPClient library, a utility class for detecting the state of Orbot "
+"connectivity, and other relevant/useful things an Android app might need to "
+"anonymize itself. This work would includes direct development of the "
+"library, documentation, and sample code. Outreach or effort to implement the"
+" library within other open-source apps is also needed."
+msgstr ""
+
+#. type: Content of: <div><div><ol>
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1137
 msgid "<a id=\"vidaliaNetworkMap\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1078
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1139
 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: "
@@ -1792,7 +1857,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1088
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1149
 msgid ""
 "One of Vidalia's existing features is a network map that shows the user the "
 "approximate geographic location of relays in the Tor network and plots the "
@@ -1807,7 +1872,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1102
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1163
 msgid ""
 "This project will first involve getting familiar with Vidalia and the Marble"
 " widget's API. One will then integrate the widget into Vidalia and customize"
@@ -1817,7 +1882,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1110
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1171
 msgid ""
 "A person undertaking this project should have good C++ development "
 "experience. Previous experience with Qt and CMake is helpful, but not "
@@ -1825,19 +1890,19 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1116
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1177
 msgid "<a id=\"armGui\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1118
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1179
 msgid ""
 "<b>GUI for Arm</b> <br> Priority: <i>Low</i> <br> Effort Level: <i>High</i> "
-"<br> Skill Level: <i>Medium</i> <br> Likely Mentors: <i>Damian</i>"
+"<br> Skill Level: <i>Medium</i> <br> Likely Mentors: <i>Damian (atagar)</i>"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1128
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1189
 msgid ""
 "Arm has several unique features, some of the most interesting being its "
 "connection listing (correlating netstat results against the Tor consensus)  "
@@ -1849,7 +1914,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1138
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1199
 msgid ""
 "The vast majority of arm's more interesting functionality lies in its "
 "backend <a "
@@ -1861,7 +1926,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1148
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1209
 msgid ""
 "<b>Bring up new ideas!</b> <br> Don't like any of these? Look at the <a "
 "href=\"/press/presskit/2008-12-19-roadmap-full.pdf\">Tor development "
@@ -1872,19 +1937,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1160
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1221
 msgid "<a id=\"OtherCoding\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1161
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1222
 msgid ""
 "<a class=\"anchor\" href=\"#OtherCoding\">Other Coding and Design related "
 "ideas</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1163
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1224
 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 "
@@ -1900,7 +1965,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1176
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1237
 msgid ""
 "We need to actually start building our <a href=\"<page "
 "docs/documentation>#DesignDoc\">blocking-resistance design</a>. This "
@@ -1910,7 +1975,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1182
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1243
 msgid ""
 "We need a flexible simulator framework for studying end-to-end traffic "
 "confirmation attacks. Many researchers have whipped up ad hoc simulators to "
@@ -1924,7 +1989,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1192
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1253
 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 "
@@ -1933,7 +1998,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1198
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1259
 msgid ""
 "Perform a security analysis of Tor with <a "
 "href=\"https://secure.wikimedia.org/wikipedia/en/wiki/Fuzz_testing\">\"fuzz\"</a>."
@@ -1942,7 +2007,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1203
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1264
 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 "
@@ -1955,7 +2020,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1214
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1275
 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 "
@@ -1963,7 +2028,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1218
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1279
 msgid ""
 "We need a way to generate the website diagrams (for example, the \"How Tor "
 "Works\" pictures on the <a href=\"<page about/overview>\">overview page</a> "
@@ -1974,7 +2039,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1225
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1286
 msgid ""
 "How can we make the various LiveCD/USB systems easier to maintain, improve, "
 "and document? One example is <a href=\"https://tails.boum.org/\">The Amnesic"
@@ -1982,7 +2047,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1232
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1293
 msgid ""
 "Another anti-censorship project is to try to make Tor more scanning-"
 "resistant.  Right now, an adversary can identify <a "
@@ -1996,17 +2061,17 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1246
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1307
 msgid "<a id=\"Research\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1247
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1308
 msgid "<a class=\"anchor\" href=\"#Research\">Research</a>"
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1249
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1310
 msgid ""
 "The \"end-to-end traffic confirmation attack\": by watching traffic at Alice"
 " and at Bob, we can <a "
@@ -2021,7 +2086,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1259
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1320
 msgid ""
 "A related question is: Does running a relay/bridge provide additional "
 "protection against these timing attacks? Can an external adversary that "
@@ -2041,7 +2106,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1274
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1335
 msgid ""
 "Repeat Murdoch and Danezis's <a "
 "href=\"http://www.cl.cam.ac.uk/~sjm217/projects/anon/#torta\">attack from "
@@ -2061,7 +2126,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1289
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1350
 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"
@@ -2076,7 +2141,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1299
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1360
 msgid ""
 "Other research questions regarding geographic diversity consider the "
 "tradeoff between choosing an efficient circuit and choosing a random "
@@ -2088,7 +2153,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1306
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1367
 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 "
@@ -2105,7 +2170,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1318
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1379
 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 "
@@ -2116,7 +2181,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1325
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1386
 msgid ""
 "Our censorship-resistance goals include preventing an attacker who's looking"
 " at Tor traffic on the wire from <a href=\"<svnprojects>design-"
@@ -2132,7 +2197,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1336
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1397
 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 "
@@ -2143,7 +2208,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1343
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1404
 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 "
@@ -2151,7 +2216,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1346
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1407
 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 "
@@ -2171,7 +2236,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ol><li>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1363
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1424
 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 "
@@ -2179,7 +2244,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/getinvolved/en/volunteer.wml:1371
+#: /home/runa/dev/website/getinvolved/en/volunteer.wml:1432
 msgid ""
 "<a href=\"<page about/contact>\">Let us know</a> if you've made progress on "
 "any of these!"

Modified: translation/trunk/projects/website/po/ru/press/3-low.inthemedia.po
===================================================================
--- translation/trunk/projects/website/po/ru/press/3-low.inthemedia.po	2011-04-12 16:15:00 UTC (rev 24594)
+++ translation/trunk/projects/website/po/ru/press/3-low.inthemedia.po	2011-04-12 16:19:31 UTC (rev 24595)
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-03-25 16:51+0000\n"
-"PO-Revision-Date: 2011-03-26 00:32+0000\n"
+"POT-Creation-Date: 2011-03-28 12:48+0200\n"
+"PO-Revision-Date: 2011-03-29 00:27+0000\n"
 "Last-Translator: runasand <runa.sandvik at gmail.com>\n"
 "Language-Team: Russian <None>\n"
 "MIME-Version: 1.0\n"
@@ -18,7 +18,7 @@
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/press/en/inthemedia.wml:8
+#: /home/runa/dev/website/press/en/inthemedia.wml:8
 msgid ""
 "<a href=\"<page index>\">Home &raquo; </a> <a href=\"<page "
 "press/press>\">Press &raquo; </a> <a href=\"<page press/inthemedia>\">Tor in"
@@ -26,12 +26,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><h1>
-#: /home/runa/tor/website/press/en/inthemedia.wml:15
+#: /home/runa/dev/website/press/en/inthemedia.wml:15
 msgid "Media Appearances"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/press/en/inthemedia.wml:17
+#: /home/runa/dev/website/press/en/inthemedia.wml:17
 msgid ""
 "Major news organizations including the New York Times, Forbes, Al Jazeera, "
 "Washington Post, Le Monde, NPR, BBC, and more have sought out or quoted Tor "
@@ -40,7 +40,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/press/en/inthemedia.wml:21
+#: /home/runa/dev/website/press/en/inthemedia.wml:21
 msgid ""
 "Since Tor is widely used throughout the world, it is mentioned regularly in "
 "the press.  This list is not comprehensive, but illustrates some of the "
@@ -48,39 +48,39 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/press/en/inthemedia.wml:24
+#: /home/runa/dev/website/press/en/inthemedia.wml:24
 msgid ""
 "A sample of such media appearances and mentions is below in order of newest "
 "to oldest:"
 msgstr ""
 
 #. type: Content of: <div><div><table><thead><tr><th>
-#: /home/runa/tor/website/press/en/inthemedia.wml:30
+#: /home/runa/dev/website/press/en/inthemedia.wml:30
 msgid "Date"
 msgstr ""
 
 #. type: Content of: <div><div><table><thead><tr><th>
-#: /home/runa/tor/website/press/en/inthemedia.wml:31
+#: /home/runa/dev/website/press/en/inthemedia.wml:31
 msgid "Publication"
 msgstr ""
 
 #. type: Content of: <div><div><table><thead><tr><th>
-#: /home/runa/tor/website/press/en/inthemedia.wml:32
+#: /home/runa/dev/website/press/en/inthemedia.wml:32
 msgid "Topic"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:36
+#: /home/runa/dev/website/press/en/inthemedia.wml:36
 msgid "2011 March 18"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:37
+#: /home/runa/dev/website/press/en/inthemedia.wml:37
 msgid "Telegraph"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:38
+#: /home/runa/dev/website/press/en/inthemedia.wml:38
 msgid ""
 "<a href=\"http://www.telegraph.co.uk/news/worldnews/middleeast/iran/8388484"
 "/Iran-cracks-down-on-web-dissident-technology.html\">Iran cracks down on web"
@@ -88,17 +88,17 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:43
+#: /home/runa/dev/website/press/en/inthemedia.wml:43
 msgid "2011 March 17"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:44 /tmp/u3kTkswOVo.xml:241
+#: /home/runa/dev/website/press/en/inthemedia.wml:44 /tmp/Q2ndl8ZYsF.xml:228
 msgid "BusinessWeek"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:45
+#: /home/runa/dev/website/press/en/inthemedia.wml:45
 msgid ""
 "<a "
 "href=\"http://www.businessweek.com/magazine/content/11_13/b4221043353206.htm\">Social"
@@ -106,17 +106,17 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:50
+#: /home/runa/dev/website/press/en/inthemedia.wml:50
 msgid "2011 March 10"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:51
+#: /home/runa/dev/website/press/en/inthemedia.wml:51
 msgid "NyTeknik"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:52
+#: /home/runa/dev/website/press/en/inthemedia.wml:52
 msgid ""
 "<a "
 "href=\"http://www.nyteknik.se/nyheter/it_telekom/internet/article3123594.ece\">Svenska"
@@ -124,17 +124,17 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:57
+#: /home/runa/dev/website/press/en/inthemedia.wml:57
 msgid "2011 March 09"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:58
+#: /home/runa/dev/website/press/en/inthemedia.wml:58
 msgid "Washington Post"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:59
+#: /home/runa/dev/website/press/en/inthemedia.wml:59
 msgid ""
 "<a href=\"http://www.washingtonpost.com/wp-"
 "dyn/content/article/2011/03/09/AR2011030905157_pf.html\">U.S.  funding tech "
@@ -142,17 +142,17 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:65
+#: /home/runa/dev/website/press/en/inthemedia.wml:65
 msgid "2011 February 17"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:66
+#: /home/runa/dev/website/press/en/inthemedia.wml:66
 msgid "Walpole Times"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:67
+#: /home/runa/dev/website/press/en/inthemedia.wml:67
 msgid ""
 "<a href=\"http://www.wickedlocal.com/walpole/news/x95296113/Tor-Project-a"
 "-Walpole-based-company-helps-Egyptians-avoid-Internet-censorship-during-"
@@ -161,18 +161,18 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:72 /tmp/u3kTkswOVo.xml:88
-#: /tmp/u3kTkswOVo.xml:96 /tmp/u3kTkswOVo.xml:104
+#: /home/runa/dev/website/press/en/inthemedia.wml:72 /tmp/Q2ndl8ZYsF.xml:86
+#: /tmp/Q2ndl8ZYsF.xml:93 /tmp/Q2ndl8ZYsF.xml:100
 msgid "2011 January 31"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:73
+#: /home/runa/dev/website/press/en/inthemedia.wml:73
 msgid "NPR: WBUR"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:74
+#: /home/runa/dev/website/press/en/inthemedia.wml:74
 msgid ""
 "<a href=\"http://hereandnow.wbur.org/2011/01/31/egypt-internet-"
 "government\">Here &amp; Now: U.S. Activists Help Egyptian Protesters Elude "
@@ -180,74 +180,73 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:80
+#: /home/runa/dev/website/press/en/inthemedia.wml:80
 msgid "2011 February 01"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:81
+#: /home/runa/dev/website/press/en/inthemedia.wml:81
 msgid "Discovery News"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:82
+#: /home/runa/dev/website/press/en/inthemedia.wml:82
 msgid ""
 "<a href=\"http://news.discovery.com/tech/egypt-internet-online-"
-"protesters-110201.  html\">Egypt's Internet Block Incomplete But "
-"Damaging</a>"
+"protesters-110201.html\">Egypt's Internet Block Incomplete But Damaging</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:89
+#: /home/runa/dev/website/press/en/inthemedia.wml:87
 msgid "IDG Poland"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:90
+#: /home/runa/dev/website/press/en/inthemedia.wml:88
 msgid ""
 "<a "
-"href=\"http://www.idg.pl/news/366773/Egipt.blokuje.Internet.aktywisci.szukaja."
-"  alternatyw.html\">Egipt blokuje Internet, aktywiści szukają alternatyw</a>"
+"href=\"http://www.idg.pl/news/366773/Egipt.blokuje.Internet.aktywisci.szukaja.alternatyw.html\">Egipt"
+" blokuje Internet, aktywiści szukają alternatyw</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:97 /tmp/u3kTkswOVo.xml:713
+#: /home/runa/dev/website/press/en/inthemedia.wml:94 /tmp/Q2ndl8ZYsF.xml:677
 msgid "New Scientist"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:98
+#: /home/runa/dev/website/press/en/inthemedia.wml:95
 msgid ""
 "<a href=\"http://www.newscientist.com/blogs/onepercent/2011/01/egypt-"
-"remains- officially-offli.html\">How Egypt is getting online</a>"
+"remains-officially-offli.html\">How Egypt is getting online</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:105
+#: /home/runa/dev/website/press/en/inthemedia.wml:101
 msgid "El Pais"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:106
+#: /home/runa/dev/website/press/en/inthemedia.wml:102
 msgid ""
 "<a "
-"href=\"http://www.elpais.com/articulo/internacional/Sortear/censura/golpe/fax/"
-" elpepuint/20110130elpepuint_14/Tes\">Sortear la censura a golpe de fax</a>"
+"href=\"http://www.elpais.com/articulo/internacional/Sortear/censura/golpe/fax/elpepuint/20110130elpepuint_14/Tes\">Sortear"
+" la censura a golpe de fax</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:112 /tmp/u3kTkswOVo.xml:119
-#: /tmp/u3kTkswOVo.xml:126
+#: /home/runa/dev/website/press/en/inthemedia.wml:107 /tmp/Q2ndl8ZYsF.xml:114
+#: /tmp/Q2ndl8ZYsF.xml:121
 msgid "2011 January 30"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:113
+#: /home/runa/dev/website/press/en/inthemedia.wml:108
 msgid "Fox 25 News - Boston"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:114
+#: /home/runa/dev/website/press/en/inthemedia.wml:109
 msgid ""
 "<a href=\"http://www.myfoxboston.com/dpp/news/local/local-company-helps-"
 "give-egyptians-internet-access-20110130\">Local company helps give Egyptians"
@@ -255,12 +254,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:120
+#: /home/runa/dev/website/press/en/inthemedia.wml:115
 msgid "New England Cable News"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:121
+#: /home/runa/dev/website/press/en/inthemedia.wml:116
 msgid ""
 "<a href=\"http://www.necn.com/01/30/11/Mass-company-helps-activists-avoid-"
 "onlin/landing.html?blockID=400628&feedID=4213\">Mass.  company helps "
@@ -268,167 +267,166 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:127 /tmp/u3kTkswOVo.xml:269
+#: /home/runa/dev/website/press/en/inthemedia.wml:122 /tmp/Q2ndl8ZYsF.xml:253
 msgid "Boston Globe"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:128
+#: /home/runa/dev/website/press/en/inthemedia.wml:123
 msgid ""
 "<a "
-"href=\"http://www.boston.com/news/local/massachusetts/articles/2011/01/30/ "
-"mass_groups_software_helps_avoid_censorship/\">Foreign activists stay "
-"covered online</a>"
+"href=\"http://www.boston.com/news/local/massachusetts/articles/2011/01/30/mass_groups_software_helps_avoid_censorship/\">Foreign"
+" activists stay covered online</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:134 /tmp/u3kTkswOVo.xml:142
+#: /home/runa/dev/website/press/en/inthemedia.wml:128 /tmp/Q2ndl8ZYsF.xml:135
 msgid "2011 January 29"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:135
+#: /home/runa/dev/website/press/en/inthemedia.wml:129
 msgid "SvD.se"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:136
+#: /home/runa/dev/website/press/en/inthemedia.wml:130
 msgid ""
-"<a href=\"http://www.svd.se/nyheter/utrikes/tor-oppnar-dorrar-for- "
+"<a href=\"http://www.svd.se/nyheter/utrikes/tor-oppnar-dorrar-for-"
 "natdissidenter_5902693.svd\">Tor öppnar dörrar för nätdissidenter</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:143 /tmp/u3kTkswOVo.xml:351
+#: /home/runa/dev/website/press/en/inthemedia.wml:136 /tmp/Q2ndl8ZYsF.xml:329
 msgid "ComputerWorld"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:144
+#: /home/runa/dev/website/press/en/inthemedia.wml:137
 msgid ""
-"<a href=\"http://www.computerworld.com/s/article/9207058/ "
-"Without_Internet_Egyptians_find_new_ways_to_get_online?taxonomyId=16\">Without"
+"<a "
+"href=\"http://www.computerworld.com/s/article/9207058/Without_Internet_Egyptians_find_new_ways_to_get_online?taxonomyId=16\">Without"
 " Internet, Egyptians find new ways to get online.</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:150
+#: /home/runa/dev/website/press/en/inthemedia.wml:142
 msgid "2011 January 28"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:151
+#: /home/runa/dev/website/press/en/inthemedia.wml:143
 msgid "Globe and Mail"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:152
+#: /home/runa/dev/website/press/en/inthemedia.wml:144
 msgid ""
 "<a href=\"https://www.theglobeandmail.com/news/technology/in-a-span-of-"
-"minutes-a- country-goes-offline/article1887207/\">In a span of minutes, a "
+"minutes-a-country-goes-offline/article1887207/\">In a span of minutes, a "
 "country goes offline</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:158
+#: /home/runa/dev/website/press/en/inthemedia.wml:149
 msgid "2010 December 22"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:159 /tmp/u3kTkswOVo.xml:235
-#: /tmp/u3kTkswOVo.xml:256 /tmp/u3kTkswOVo.xml:339 /tmp/u3kTkswOVo.xml:380
-#: /tmp/u3kTkswOVo.xml:664
+#: /home/runa/dev/website/press/en/inthemedia.wml:150 /tmp/Q2ndl8ZYsF.xml:222
+#: /tmp/Q2ndl8ZYsF.xml:241 /tmp/Q2ndl8ZYsF.xml:317 /tmp/Q2ndl8ZYsF.xml:355
+#: /tmp/Q2ndl8ZYsF.xml:628
 msgid "Technology Review"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:160
+#: /home/runa/dev/website/press/en/inthemedia.wml:151
 msgid ""
 "<a href=\"http://www.technologyreview.com/web/26981/\">Home Internet with "
 "Anonymity Built In</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:164
+#: /home/runa/dev/website/press/en/inthemedia.wml:155
 msgid "2010 December 17"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:165
+#: /home/runa/dev/website/press/en/inthemedia.wml:156
 msgid "New York Times Magazine"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:166
+#: /home/runa/dev/website/press/en/inthemedia.wml:157
 msgid ""
 "<a href=\"https://www.nytimes.com/2010/12/19/magazine/19FOB-"
 "Medium-t.html\">Granting Anonymity</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:171
+#: /home/runa/dev/website/press/en/inthemedia.wml:162
 msgid "2010 November 03"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:172
+#: /home/runa/dev/website/press/en/inthemedia.wml:163
 msgid "metro sverige"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:173
+#: /home/runa/dev/website/press/en/inthemedia.wml:164
 msgid ""
 "<a href=\"http://www.metro.se/2010/11/03/73897/sida-hjalper-utsatta-bli-"
-"anonyma-pa-n /\">Sida hjälper utsatta bli anonyma på nätet</a>"
+"anonyma-pa-n/\">Sida hjälper utsatta bli anonyma på nätet</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:178
+#: /home/runa/dev/website/press/en/inthemedia.wml:168
 msgid "2010 Sept 17"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:179
+#: /home/runa/dev/website/press/en/inthemedia.wml:169
 msgid "NPR: On the media"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:180
+#: /home/runa/dev/website/press/en/inthemedia.wml:170
 msgid ""
 "<a href=\"http://www.onthemedia.org/transcripts/2010/09/17/05\">On the "
 "Media: Interview with Jacob Appelbaum</a>."
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:184
+#: /home/runa/dev/website/press/en/inthemedia.wml:174
 msgid "2010 August 01"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:185
+#: /home/runa/dev/website/press/en/inthemedia.wml:175
 msgid "PC Format - Poland"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:186
+#: /home/runa/dev/website/press/en/inthemedia.wml:176
 msgid ""
 "<a href=\"http://www.pcformat.pl/index.php/artykul/aid/1236/t/google-"
-"facebook-nas- szpieguj-jak-chroni-prywatno-w-sieci\">Google and Facebook are"
-" spying on us</a>"
+"facebook-nas-szpieguj-jak-chroni-prywatno-w-sieci\">Google and Facebook are "
+"spying on us</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:192
+#: /home/runa/dev/website/press/en/inthemedia.wml:181
 msgid "2010 July 14"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:193
+#: /home/runa/dev/website/press/en/inthemedia.wml:182
 msgid "China Rights Forum"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:194
+#: /home/runa/dev/website/press/en/inthemedia.wml:183
 msgid ""
 "<a "
 "href=\"http://www.hrichina.org/public/contents/category?cid=175033\">China "
@@ -436,52 +434,52 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:200
+#: /home/runa/dev/website/press/en/inthemedia.wml:189
 msgid "2010 May 25"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:201
+#: /home/runa/dev/website/press/en/inthemedia.wml:190
 msgid "The Australian"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:202
+#: /home/runa/dev/website/press/en/inthemedia.wml:191
 msgid ""
 "<a href=\"http://www.theaustralian.com.au/australian-it/call-to-join-tor-"
-"network-to- fight-censorship/story-e6frgakx-1225870756466\"> Call to join "
-"Tor network to fight censorship</a>"
+"network-to-fight-censorship/story-e6frgakx-1225870756466\"> Call to join Tor"
+" network to fight censorship</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:208
+#: /home/runa/dev/website/press/en/inthemedia.wml:196
 msgid "2010 Mar 17"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:209
+#: /home/runa/dev/website/press/en/inthemedia.wml:197
 msgid "PC World Poland"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:210
+#: /home/runa/dev/website/press/en/inthemedia.wml:198
 msgid ""
 "<a href=\"http://www.idg.pl/news/356993/Anonimowosc.w.Sieci.html\">Anonymity"
 " in the Web</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:214
+#: /home/runa/dev/website/press/en/inthemedia.wml:202
 msgid "2010 Mar 11"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:215
+#: /home/runa/dev/website/press/en/inthemedia.wml:203
 msgid "ABC Australia"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:216
+#: /home/runa/dev/website/press/en/inthemedia.wml:204
 msgid ""
 "<a "
 "href=\"http://www.abc.net.au/rn/futuretense/stories/2010/2837736.htm\">Future"
@@ -489,91 +487,90 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:219
+#: /home/runa/dev/website/press/en/inthemedia.wml:207
 msgid "2010 Mar 09"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:220
+#: /home/runa/dev/website/press/en/inthemedia.wml:208
 msgid "PC Pro UK"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:221
+#: /home/runa/dev/website/press/en/inthemedia.wml:209
 msgid ""
 "<a href=\"http://www.pcpro.co.uk/features/356254/the-dark-side-of-the-"
 "web\">The dark side of the web</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:226
+#: /home/runa/dev/website/press/en/inthemedia.wml:214
 msgid "2009 Dec 29"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:227
+#: /home/runa/dev/website/press/en/inthemedia.wml:215
 msgid "Times Online"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:228
+#: /home/runa/dev/website/press/en/inthemedia.wml:216
 msgid ""
 "<a "
-"href=\"http://www.timesonline.co.uk/tol/news/world/middle_east/article6969958."
-"  ece\">When Iran’s regime falls this will be remembered as the YouTube "
-"revolution </a>"
+"href=\"http://www.timesonline.co.uk/tol/news/world/middle_east/article6969958.ece\">When"
+" Iran’s regime falls this will be remembered as the YouTube revolution </a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:234
+#: /home/runa/dev/website/press/en/inthemedia.wml:221
 msgid "2009 Oct 15"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:236
+#: /home/runa/dev/website/press/en/inthemedia.wml:223
 msgid ""
 "<a href=\"http://www.technologyreview.com/web/23736/?a=f\">China Cracks Down"
 " on Tor Anonymity Network</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:240
+#: /home/runa/dev/website/press/en/inthemedia.wml:227
 msgid "2009 Sep 30"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:242
+#: /home/runa/dev/website/press/en/inthemedia.wml:229
 msgid ""
 "<a "
-"href=\"http://www.businessweek.com/globalbiz/content/sep2009/gb20090930_620354."
-"  htm\">China's Online Censors Work Overtime</a>"
+"href=\"http://www.businessweek.com/globalbiz/content/sep2009/gb20090930_620354.htm\">China's"
+" Online Censors Work Overtime</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:247
+#: /home/runa/dev/website/press/en/inthemedia.wml:233
 msgid "2009 Aug 19"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:248
+#: /home/runa/dev/website/press/en/inthemedia.wml:234
 msgid "Reuters"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:249
+#: /home/runa/dev/website/press/en/inthemedia.wml:235
 msgid ""
-"<a href=\"http://www.reuters.com/article/internetNews/idUSTRE57I4IE20090819?"
-" pageNumber=1&amp;virtualBrandChannel=0&amp;sp=true\">Web tools help protect"
-" human rights activists</a>"
+"<a "
+"href=\"http://www.reuters.com/article/internetNews/idUSTRE57I4IE20090819?pageNumber=1&amp;virtualBrandChannel=0&amp;sp=true\">Web"
+" tools help protect human rights activists</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:255
+#: /home/runa/dev/website/press/en/inthemedia.wml:240
 msgid "2009 Aug 10"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:257
+#: /home/runa/dev/website/press/en/inthemedia.wml:242
 msgid ""
 "<a "
 "href=\"http://www.technologyreview.com/blog/editors/23958/?nlid=2255\">How "
@@ -581,162 +578,161 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:261 /tmp/u3kTkswOVo.xml:268
+#: /home/runa/dev/website/press/en/inthemedia.wml:246 /tmp/Q2ndl8ZYsF.xml:252
 msgid "2009 Jul 26"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:262 /tmp/u3kTkswOVo.xml:296
+#: /home/runa/dev/website/press/en/inthemedia.wml:247 /tmp/Q2ndl8ZYsF.xml:278
 msgid "Washington Times"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:263
+#: /home/runa/dev/website/press/en/inthemedia.wml:248
 msgid ""
 "<a href=\"http://www.washingtontimes.com/news/2009/jul/26/senate-help-iran-"
-"dodge- internet-censorship/\">Senate OKs funds to thwart Iran Web "
-"censors</a>"
+"dodge-internet-censorship/\">Senate OKs funds to thwart Iran Web censors</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:270
+#: /home/runa/dev/website/press/en/inthemedia.wml:254
 msgid ""
-"<a href=\"http://www.boston.com/news/nation/washington/articles/2009/07/26/ "
-"us_to_increase_funding_for_hackivists_aiding_iranians/\">US set to hike aid "
-"aimed at Iranians</a>"
+"<a "
+"href=\"http://www.boston.com/news/nation/washington/articles/2009/07/26/us_to_increase_funding_for_hackivists_aiding_iranians/\">US"
+" set to hike aid aimed at Iranians</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:276
+#: /home/runa/dev/website/press/en/inthemedia.wml:259
 msgid "2009 Jul 24"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:277
+#: /home/runa/dev/website/press/en/inthemedia.wml:260
 msgid "Associated Press"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:278
+#: /home/runa/dev/website/press/en/inthemedia.wml:261
 msgid ""
-"<a href=\"http://www.google.com/hostednews/ap/article/ALeqM5hTf- "
+"<a href=\"http://www.google.com/hostednews/ap/article/ALeqM5hTf-"
 "p6Iy3sWHK8BRR58npGosLC3AD99L01QO0\">Iran activists work to elude crackdown "
 "on Internet</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:284
+#: /home/runa/dev/website/press/en/inthemedia.wml:266
 msgid "2009 Jul 08"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:285
+#: /home/runa/dev/website/press/en/inthemedia.wml:267
 msgid "Tehran Bureau"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:286
+#: /home/runa/dev/website/press/en/inthemedia.wml:268
 msgid ""
 "<a href=\"http://tehranbureau.com/geeks-globe-rally-iranians-online/\">Geeks"
 " Around the Globe Rally to Help Iranians Online</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:290
+#: /home/runa/dev/website/press/en/inthemedia.wml:272
 msgid "2009 Jul 02"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:291
+#: /home/runa/dev/website/press/en/inthemedia.wml:273
 msgid "NED/CIMA"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:292
+#: /home/runa/dev/website/press/en/inthemedia.wml:274
 msgid ""
 "<a href=\"http://cima.ned.org/events/new-media-in-iran.html\">The Role of "
 "New Media in the Iranian Elections</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:295
+#: /home/runa/dev/website/press/en/inthemedia.wml:277
 msgid "2009 Jun 26"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:297
+#: /home/runa/dev/website/press/en/inthemedia.wml:279
 msgid ""
 "<a href=\"http://www.washingtontimes.com/news/2009/jun/26/protesters-use-"
-"navy- technology-to-avoid-censorship/?feat=home_headlines\">Iranian "
+"navy-technology-to-avoid-censorship/?feat=home_headlines\">Iranian "
 "protesters avoid censorship with Navy technology</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:303
+#: /home/runa/dev/website/press/en/inthemedia.wml:284
 msgid "2009 Jun 29"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:304
+#: /home/runa/dev/website/press/en/inthemedia.wml:285
 msgid "EFF"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:305
+#: /home/runa/dev/website/press/en/inthemedia.wml:286
 msgid ""
 "<a href=\"http://www.eff.org/deeplinks/2009/06/help-protesters-iran-run-tor-"
-"relays- bridges\">Help Protesters in Iran: Run a Tor Bridge or a Tor "
+"relays-bridges\">Help Protesters in Iran: Run a Tor Bridge or a Tor "
 "Relay</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:310
+#: /home/runa/dev/website/press/en/inthemedia.wml:290
 msgid "2009 Jun 24"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:311
+#: /home/runa/dev/website/press/en/inthemedia.wml:291
 msgid "Daily Finance"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:312
+#: /home/runa/dev/website/press/en/inthemedia.wml:292
 msgid ""
-"<a href=\"http://www.dailyfinance.com/2009/06/24/nokia-and-siemens-in-iran- "
+"<a href=\"http://www.dailyfinance.com/2009/06/24/nokia-and-siemens-in-iran-"
 "controversy/\">Nokia and Siemens in Iran controversy</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:317 /tmp/u3kTkswOVo.xml:332
-#: /tmp/u3kTkswOVo.xml:338
+#: /home/runa/dev/website/press/en/inthemedia.wml:296 /tmp/Q2ndl8ZYsF.xml:310
+#: /tmp/Q2ndl8ZYsF.xml:316
 msgid "2009 Jun 18"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:318 /tmp/u3kTkswOVo.xml:414
-#: /tmp/u3kTkswOVo.xml:658
+#: /home/runa/dev/website/press/en/inthemedia.wml:297 /tmp/Q2ndl8ZYsF.xml:386
+#: /tmp/Q2ndl8ZYsF.xml:622
 msgid "Wall Street Journal"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:319
+#: /home/runa/dev/website/press/en/inthemedia.wml:298
 msgid ""
 "<a href=\"http://blogs.wsj.com/digits/2009/06/18/iranians-using-tor-to-"
-"anonymize-web -use/\">Iranians Using Tor to Anonymize Web Use</a>"
+"anonymize-web-use/\">Iranians Using Tor to Anonymize Web Use</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:324
+#: /home/runa/dev/website/press/en/inthemedia.wml:302
 msgid "2009 Jun 19"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:325
+#: /home/runa/dev/website/press/en/inthemedia.wml:303
 msgid "O'Reilly Radar"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:326
+#: /home/runa/dev/website/press/en/inthemedia.wml:304
 msgid ""
 "<a href=\"http://radar.oreilly.com/2009/06/tor-and-the-legality-of-"
 "runnin.html\"> Dramatic Increase in Number of Tor Clients from Iran: "
@@ -744,98 +740,97 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:333
+#: /home/runa/dev/website/press/en/inthemedia.wml:311
 msgid "Deutsche Welle"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:334
+#: /home/runa/dev/website/press/en/inthemedia.wml:312
 msgid ""
 "<a href=\"http://www.dw-world.de/dw/article/0,,4400882,00.html\">Internet "
 "proxies let Iranians and others connect to blocked Web sites</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:340
+#: /home/runa/dev/website/press/en/inthemedia.wml:318
 msgid ""
 "<a href=\"http://www.technologyreview.com/web/22893/\">The Web vs. the "
 "Republic of Iran</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:344 /tmp/u3kTkswOVo.xml:350
+#: /home/runa/dev/website/press/en/inthemedia.wml:322 /tmp/Q2ndl8ZYsF.xml:328
 msgid "2009 Jun 17"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:345
+#: /home/runa/dev/website/press/en/inthemedia.wml:323
 msgid "CNet News"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:346
+#: /home/runa/dev/website/press/en/inthemedia.wml:324
 msgid ""
 "<a href=\"http://news.cnet.com/8301-13578_3-10267287-38.html\">Iranians find"
 " ways to bypass Net censors</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:352
+#: /home/runa/dev/website/press/en/inthemedia.wml:330
 msgid ""
 "<a "
-"href=\"http://www.computerworld.com/action/article.do?command=viewArticleBasic&"
-" amp;articleId=9134471&amp;intsrc=news_ts_head\">Iran's leaders fight "
-"Internet; Internet wins (so far)</a>"
+"href=\"http://www.computerworld.com/action/article.do?command=viewArticleBasic&amp;articleId=9134471&amp;intsrc=news_ts_head\">Iran's"
+" leaders fight Internet; Internet wins (so far)</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:358
+#: /home/runa/dev/website/press/en/inthemedia.wml:335
 msgid "2009 May 29"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:359 /tmp/u3kTkswOVo.xml:387
+#: /home/runa/dev/website/press/en/inthemedia.wml:336 /tmp/Q2ndl8ZYsF.xml:362
 msgid "Le Monde"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:360
+#: /home/runa/dev/website/press/en/inthemedia.wml:337
 msgid ""
 "<a href=\"http://www.lemonde.fr/actualite-medias/article/2009/05/29/les-"
-"censeurs-du- net_1199993_3236.html\">Les censeurs du Net</a>"
+"censeurs-du-net_1199993_3236.html\">Les censeurs du Net</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:365
+#: /home/runa/dev/website/press/en/inthemedia.wml:341
 msgid "2009 May 15"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:366
+#: /home/runa/dev/website/press/en/inthemedia.wml:342
 msgid "Mass High Tech"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:367
+#: /home/runa/dev/website/press/en/inthemedia.wml:343
 msgid ""
 "<a href=\"http://www.masshightech.com/stories/2009/05/11/newscolumn2-Tor-"
-"tackles-Net -privacy-game-makers-flock-to-Hub.html\">Tor tackles Net "
+"tackles-Net-privacy-game-makers-flock-to-Hub.html\">Tor tackles Net "
 "privacy</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:372
+#: /home/runa/dev/website/press/en/inthemedia.wml:347
 msgid "2009 May 01"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:373 /tmp/u3kTkswOVo.xml:669
-#: /tmp/u3kTkswOVo.xml:679
+#: /home/runa/dev/website/press/en/inthemedia.wml:348 /tmp/Q2ndl8ZYsF.xml:633
+#: /tmp/Q2ndl8ZYsF.xml:643
 msgid "New York Times"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:374
+#: /home/runa/dev/website/press/en/inthemedia.wml:349
 msgid ""
 "<a "
 "href=\"http://www.nytimes.com/2009/05/01/technology/01filter.html\">Iranians"
@@ -843,12 +838,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:379
+#: /home/runa/dev/website/press/en/inthemedia.wml:354
 msgid "2009 Apr 23"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:381
+#: /home/runa/dev/website/press/en/inthemedia.wml:356
 msgid ""
 "<a href=\"http://www.technologyreview.com/computing/22427/?a=f\">Dissent "
 "Made Safer: How anonymity technology could save free speech on the "
@@ -856,87 +851,87 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:386
+#: /home/runa/dev/website/press/en/inthemedia.wml:361
 msgid "2009 Apr 22"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:388
+#: /home/runa/dev/website/press/en/inthemedia.wml:363
 msgid ""
 "<a href=\"http://bugbrother.blog.lemonde.fr/2009/04/22/comment-contourner-"
-"la- cybersurveillance/\">How to circumvent cybersurveillance</a>"
+"la-cybersurveillance/\">How to circumvent cybersurveillance</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:393 /tmp/u3kTkswOVo.xml:400
+#: /home/runa/dev/website/press/en/inthemedia.wml:367 /tmp/Q2ndl8ZYsF.xml:373
 msgid "2009 Apr 06"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:394
+#: /home/runa/dev/website/press/en/inthemedia.wml:368
 msgid "Reader's Digest"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:395
+#: /home/runa/dev/website/press/en/inthemedia.wml:369
 msgid ""
 "<a href=\"http://www.rd.com/advice-and-know-how/how-to-hide-"
-"anything/article122219.  html\">How to Hide Anything</a>"
+"anything/article122219.html\">How to Hide Anything</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:401
+#: /home/runa/dev/website/press/en/inthemedia.wml:374
 msgid "Al Jazeera"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:402
+#: /home/runa/dev/website/press/en/inthemedia.wml:375
 msgid ""
 "<a href=\"http://www.youtube.com/watch?v=vuatxUN2cUQ\">Global Village Voices"
 " showcases Tor</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:406
+#: /home/runa/dev/website/press/en/inthemedia.wml:379
 msgid "2009 Mar 18"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:407
+#: /home/runa/dev/website/press/en/inthemedia.wml:380
 msgid "Marie Claire"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:408
+#: /home/runa/dev/website/press/en/inthemedia.wml:381
 msgid ""
 "<a href=\"http://www.marieclaire.com/career-money/career-coach/manage-online"
-"--web- image\">How to Manage Your Web Footprint</a>"
+"--web-image\">How to Manage Your Web Footprint</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:413
+#: /home/runa/dev/website/press/en/inthemedia.wml:385
 msgid "2009 Mar 13"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:415
+#: /home/runa/dev/website/press/en/inthemedia.wml:387
 msgid ""
 "<a href=\"http://online.wsj.com/article/SB123567809587886053.html\">The "
 "Kindness of Strangers</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:420
+#: /home/runa/dev/website/press/en/inthemedia.wml:392
 msgid "2009 Mar 12"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:421
+#: /home/runa/dev/website/press/en/inthemedia.wml:393
 msgid "BBC World Service"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:422
+#: /home/runa/dev/website/press/en/inthemedia.wml:394
 msgid ""
 "<a href=\"http://bbcworldservicetrust.wordpress.com/2009/03/12/12-march-"
 "world-day-against-cyber-censorship/\">Steven J Murdoch interviewed about Tor"
@@ -944,102 +939,102 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:425
+#: /home/runa/dev/website/press/en/inthemedia.wml:397
 msgid "2009 Mar 03"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:426
+#: /home/runa/dev/website/press/en/inthemedia.wml:398
 msgid "Orf Austria"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:427
+#: /home/runa/dev/website/press/en/inthemedia.wml:399
 msgid ""
 "<a href=\"http://futurezone.orf.at/stories/1503028/\">WIRTSCHAFTSKAMMER "
 "column</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:431
+#: /home/runa/dev/website/press/en/inthemedia.wml:403
 msgid "2009 Feb 18"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:432 /tmp/u3kTkswOVo.xml:589
+#: /home/runa/dev/website/press/en/inthemedia.wml:404 /tmp/Q2ndl8ZYsF.xml:553
 msgid "Bangkok Post"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:433
+#: /home/runa/dev/website/press/en/inthemedia.wml:405
 msgid ""
 "<a href=\"http://www.bangkokpost.com/tech/technews/11872/the-old-fake-404"
-"-not-found- routine\">The old fake \"404 not found\" routine</a>"
+"-not-found-routine\">The old fake \"404 not found\" routine</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:438
+#: /home/runa/dev/website/press/en/inthemedia.wml:409
 msgid "2009 Feb 13"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:439
+#: /home/runa/dev/website/press/en/inthemedia.wml:410
 msgid "Hearsay Culture"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:440
+#: /home/runa/dev/website/press/en/inthemedia.wml:411
 msgid ""
 "<a href=\"http://www.hearsayculture.com/?p=307\">Hearsay Culture Radio "
 "Interview/Podcast</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:443
+#: /home/runa/dev/website/press/en/inthemedia.wml:414
 msgid "2008 Dec 29"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:444
+#: /home/runa/dev/website/press/en/inthemedia.wml:415
 msgid "nu.nl"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:445
+#: /home/runa/dev/website/press/en/inthemedia.wml:416
 msgid ""
 "<a href=\"http://www.nu.nl/internet/1891289/anoniem-browsen-voor-gsm-in-de-"
 "maak.html\">Anoniem browsen voor gsm in de maak</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:449
+#: /home/runa/dev/website/press/en/inthemedia.wml:420
 msgid "2008 Dec 14"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:450
+#: /home/runa/dev/website/press/en/inthemedia.wml:421
 msgid "PC Magazine: Middle &amp; Near East"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:451
+#: /home/runa/dev/website/press/en/inthemedia.wml:422
 msgid ""
 "<a href=\"http://www.pcmag-mideast.com/FeatureDetail.aspx?ID=1039\">How To "
 "Reclaim Your Online Privacy</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:456
+#: /home/runa/dev/website/press/en/inthemedia.wml:427
 msgid "2008 Aug 21"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:457
+#: /home/runa/dev/website/press/en/inthemedia.wml:428
 msgid "CNN"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:458
+#: /home/runa/dev/website/press/en/inthemedia.wml:429
 msgid ""
 "<a "
 "href=\"http://www.cnn.com/2008/TECH/08/21/internet.filtering/index.html\">Experts:"
@@ -1047,51 +1042,51 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:463
+#: /home/runa/dev/website/press/en/inthemedia.wml:434
 msgid "2008 Aug 22"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:464
+#: /home/runa/dev/website/press/en/inthemedia.wml:435
 msgid "The Sydney Morning Herald"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:465
+#: /home/runa/dev/website/press/en/inthemedia.wml:436
 msgid ""
 "<a href=\"http://www.smh.com.au/news/web/the-china-"
-"syndrome/2008/08/20/1218911800889 .html\">The China Syndrome</a>"
+"syndrome/2008/08/20/1218911800889.html\">The China Syndrome</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:471
+#: /home/runa/dev/website/press/en/inthemedia.wml:441
 msgid "2008 Aug 20"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:472
+#: /home/runa/dev/website/press/en/inthemedia.wml:442
 msgid "Scientific American"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:473
+#: /home/runa/dev/website/press/en/inthemedia.wml:443
 msgid ""
 "<a href=\"http://www.sciam.com/article.cfm?id=cryptography-how-to-keep-your-"
-"secrets- safe\">Cryptography: How to Keep Your Secrets Safe</a>"
+"secrets-safe\">Cryptography: How to Keep Your Secrets Safe</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:479
+#: /home/runa/dev/website/press/en/inthemedia.wml:448
 msgid "2008 Aug 05"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:480
+#: /home/runa/dev/website/press/en/inthemedia.wml:449
 msgid "Guardian UK"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:481
+#: /home/runa/dev/website/press/en/inthemedia.wml:450
 msgid ""
 "<a "
 "href=\"http://www.guardian.co.uk/commentisfree/2008/aug/05/china.censorship\">"
@@ -1099,62 +1094,62 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:487
+#: /home/runa/dev/website/press/en/inthemedia.wml:456
 msgid "2008 Aug 10"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:488
+#: /home/runa/dev/website/press/en/inthemedia.wml:457
 msgid "Tech Radar UK"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:489
+#: /home/runa/dev/website/press/en/inthemedia.wml:458
 msgid ""
 "<a href=\"http://www.techradar.com/news/internet/web/freedom-stick-"
-"highlights- chinese-net-censorship-449233\">Freedom Stick highlights Chinese"
-" 'net censorship: USB drive promises anonymous surfing for the paranoid</a>"
+"highlights-chinese-net-censorship-449233\">Freedom Stick highlights Chinese "
+"'net censorship: USB drive promises anonymous surfing for the paranoid</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:497 /tmp/u3kTkswOVo.xml:505
-#: /tmp/u3kTkswOVo.xml:514 /tmp/u3kTkswOVo.xml:522
+#: /home/runa/dev/website/press/en/inthemedia.wml:465 /tmp/Q2ndl8ZYsF.xml:473
+#: /tmp/Q2ndl8ZYsF.xml:481 /tmp/Q2ndl8ZYsF.xml:489
 msgid "2008 Aug 07"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:498
+#: /home/runa/dev/website/press/en/inthemedia.wml:466
 msgid "Spiegel"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:499
+#: /home/runa/dev/website/press/en/inthemedia.wml:467
 msgid ""
 "<a href=\"http://www.spiegel.de/netzwelt/tech/0,1518,570421,00.html\">Tricks"
 " gegen Zensur und Überwachung</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:506 /tmp/u3kTkswOVo.xml:560
-#: /tmp/u3kTkswOVo.xml:628 /tmp/u3kTkswOVo.xml:742
+#: /home/runa/dev/website/press/en/inthemedia.wml:474 /tmp/Q2ndl8ZYsF.xml:524
+#: /tmp/Q2ndl8ZYsF.xml:592 /tmp/Q2ndl8ZYsF.xml:706
 msgid "PC World"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:507
+#: /home/runa/dev/website/press/en/inthemedia.wml:475
 msgid ""
 "<a "
-"href=\"http://www.pcworld.com/article/149399-3/15_great_free_privacy_downloads."
-"  html\">15 Great, Free Privacy Downloads</a>.  Tor is Number 1."
+"href=\"http://www.pcworld.com/article/149399-3/15_great_free_privacy_downloads.html\">15"
+" Great, Free Privacy Downloads</a>.  Tor is Number 1."
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:515
+#: /home/runa/dev/website/press/en/inthemedia.wml:482
 msgid "The Guardian UK"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:516
+#: /home/runa/dev/website/press/en/inthemedia.wml:483
 msgid ""
 "<a "
 "href=\"http://www.guardian.co.uk/technology/2008/aug/07/censorship.hacking\">Chaos"
@@ -1162,12 +1157,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:523
+#: /home/runa/dev/website/press/en/inthemedia.wml:490
 msgid "The Register UK"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:524
+#: /home/runa/dev/website/press/en/inthemedia.wml:491
 msgid ""
 "<a "
 "href=\"http://www.theregister.co.uk/2008/08/07/torbrowser_olympics/\">German"
@@ -1175,66 +1170,67 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:530
+#: /home/runa/dev/website/press/en/inthemedia.wml:497
 msgid "2008 May 24"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:531
+#: /home/runa/dev/website/press/en/inthemedia.wml:498
 msgid "Groupo Estado"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:532
+#: /home/runa/dev/website/press/en/inthemedia.wml:499
 msgid ""
-"<a href=\"http://blog.estadao.com.br/blog/cruz/?title= "
-"cfp08_navegacao_anonima_na_rede&amp;more=1&amp;c=1&amp;tb=1&amp;pb=1&amp;cat="
-" 525\">Interview at Computers, Freedom, and Privacy 2008 Conference</a>"
+"<a "
+"href=\"http://blog.estadao.com.br/blog/cruz/?title=cfp08_navegacao_anonima_na_rede&amp;more=1&amp;c=1&amp;tb=1&amp;pb=1&amp;cat=525\">Interview"
+" at Computers, Freedom, and Privacy 2008 Conference</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:540
+#: /home/runa/dev/website/press/en/inthemedia.wml:505
 msgid "2008 Mar 12"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:541
+#: /home/runa/dev/website/press/en/inthemedia.wml:506
 msgid "SearchSecurity.com"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:542
+#: /home/runa/dev/website/press/en/inthemedia.wml:507
 msgid ""
-"<a href=\"http://searchsecurity.techtarget.com/news/article/0,289142, "
-"sid14_gci1305120,00.html\"> Tor network 'bridges' help evade blockers</a>.  "
-"Covers new Tor features designed to overcome filtering and blocking that "
-"prevent access to the Tor network."
+"<a "
+"href=\"http://searchsecurity.techtarget.com/news/article/0,289142,sid14_gci1305120,00.html\">"
+" Tor network 'bridges' help evade blockers</a>.  Covers new Tor features "
+"designed to overcome filtering and blocking that prevent access to the Tor "
+"network."
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:552
+#: /home/runa/dev/website/press/en/inthemedia.wml:516
 msgid "2008 Feb 14"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:553
+#: /home/runa/dev/website/press/en/inthemedia.wml:517
 msgid "Wired: Compiler Blog"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:554
+#: /home/runa/dev/website/press/en/inthemedia.wml:518
 msgid ""
 "<a href=\"http://blog.wired.com/monkeybites/2008/02/how-to-set-up-a.html\"> "
 "How To: Set Up Anonymous Browsing in 30 Seconds or Less</a>."
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:559
+#: /home/runa/dev/website/press/en/inthemedia.wml:523
 msgid "2008 Feb 01"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:561
+#: /home/runa/dev/website/press/en/inthemedia.wml:525
 msgid ""
 "<a href=\"http://www.pcworld.com/article/id,142094-pg,1/article.html\"> "
 "Hackers Can Expose Masked Surfers, Study Says</a> A report on <a "
@@ -1246,17 +1242,17 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:568
+#: /home/runa/dev/website/press/en/inthemedia.wml:532
 msgid "2007 Sep 21"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:569
+#: /home/runa/dev/website/press/en/inthemedia.wml:533
 msgid "Wired HowTo Blog"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:570
+#: /home/runa/dev/website/press/en/inthemedia.wml:534
 msgid ""
 "<a "
 "href=\"http://howto.wired.com/wiredhowtos/index.cgi?page_name=be_a_whistle_blower;action=display;category=Work\">Be"
@@ -1265,17 +1261,17 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:573
+#: /home/runa/dev/website/press/en/inthemedia.wml:537
 msgid "2007 Sep 16"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:574
+#: /home/runa/dev/website/press/en/inthemedia.wml:538
 msgid "Cnet"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:575
+#: /home/runa/dev/website/press/en/inthemedia.wml:539
 msgid ""
 "<a href=\"http://news.cnet.com/8301-13739_3-9779225-46.html\">Tor anonymity "
 "server admin arrested</a>.  A Tor exit node operator from Germany was "
@@ -1290,18 +1286,18 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:578
+#: /home/runa/dev/website/press/en/inthemedia.wml:542
 msgid "2007 Sep 10"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:579 /tmp/u3kTkswOVo.xml:696
-#: /tmp/u3kTkswOVo.xml:772 /tmp/u3kTkswOVo.xml:881 /tmp/u3kTkswOVo.xml:893
+#: /home/runa/dev/website/press/en/inthemedia.wml:543 /tmp/Q2ndl8ZYsF.xml:660
+#: /tmp/Q2ndl8ZYsF.xml:736 /tmp/Q2ndl8ZYsF.xml:845 /tmp/Q2ndl8ZYsF.xml:857
 msgid "Wired"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:580
+#: /home/runa/dev/website/press/en/inthemedia.wml:544
 msgid ""
 "<a "
 "href=\"http://www.wired.com/politics/security/news/2007/09/embassy_hacks\"> "
@@ -1338,17 +1334,17 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:583
+#: /home/runa/dev/website/press/en/inthemedia.wml:547
 msgid "2007 Jul 27"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:584
+#: /home/runa/dev/website/press/en/inthemedia.wml:548
 msgid "Wired Blog"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:585
+#: /home/runa/dev/website/press/en/inthemedia.wml:549
 msgid ""
 "<a href=\"http://blog.wired.com/27bstroke6/2007/07/cyber-jihadists.html\"> "
 "Cyber Jihadists Embrace Tor</a><br/> A pointer to a <a "
@@ -1359,12 +1355,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:588
+#: /home/runa/dev/website/press/en/inthemedia.wml:552
 msgid "2007 Jun 22"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:590
+#: /home/runa/dev/website/press/en/inthemedia.wml:554
 msgid ""
 "<a href=\"http://www.asiamedia.ucla.edu/article-"
 "southeastasia.asp?parentid=72388\"> The problems with censorship</a>.  "
@@ -1373,17 +1369,17 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:593
+#: /home/runa/dev/website/press/en/inthemedia.wml:557
 msgid "2007 Mar 15"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:594
+#: /home/runa/dev/website/press/en/inthemedia.wml:558
 msgid "World Changing"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:595
+#: /home/runa/dev/website/press/en/inthemedia.wml:559
 msgid ""
 "<a href=\"http://www.worldchanging.com/archives/006309.html\"> Blogging "
 "Where Speech Isn’t Free</a><br/> Coverage of former Tor Executive Director "
@@ -1393,17 +1389,17 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:598
+#: /home/runa/dev/website/press/en/inthemedia.wml:562
 msgid "2007 Mar 8"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:599
+#: /home/runa/dev/website/press/en/inthemedia.wml:563
 msgid "Security Focus"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:600
+#: /home/runa/dev/website/press/en/inthemedia.wml:564
 msgid ""
 "<a href=\"http://www.securityfocus.com/news/11447/1\"> Tor hack proposed to "
 "catch criminals</a>.  Coverage of a toolset called \"Torment\" for "
@@ -1412,17 +1408,17 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:603
+#: /home/runa/dev/website/press/en/inthemedia.wml:567
 msgid "2007 Feb 1"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:604
+#: /home/runa/dev/website/press/en/inthemedia.wml:568
 msgid "Dr Dobb's"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:605
+#: /home/runa/dev/website/press/en/inthemedia.wml:569
 msgid ""
 "<a href=\"http://www.ddj.com/security/197002414\"> Tor Project Protects "
 "Anonymous Sources</a>.  An introduction to Tor, including technical and "
@@ -1430,17 +1426,17 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:608
+#: /home/runa/dev/website/press/en/inthemedia.wml:572
 msgid "2006 Oct 19"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:609
+#: /home/runa/dev/website/press/en/inthemedia.wml:573
 msgid "Wired Threat Level"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:610
+#: /home/runa/dev/website/press/en/inthemedia.wml:574
 msgid ""
 "<a href=\"http://blog.wired.com/27bstroke6/2006/10/the_onion_route.html\"> "
 "The Onion Router (TOR) is Leaky (Leeky)</a>.  Explains why you need "
@@ -1450,17 +1446,17 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:613
+#: /home/runa/dev/website/press/en/inthemedia.wml:577
 msgid "2006 Aug 18"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:614 /tmp/u3kTkswOVo.xml:702
+#: /home/runa/dev/website/press/en/inthemedia.wml:578 /tmp/Q2ndl8ZYsF.xml:666
 msgid "NPR"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:615
+#: /home/runa/dev/website/press/en/inthemedia.wml:579
 msgid ""
 "<a href=\"http://www.npr.org/templates/story/story.php?storyId=5168456\"> "
 "Tips for Protecting Privacy Online</a>.  Kevin Bankston of the EFF "
@@ -1469,17 +1465,17 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:618
+#: /home/runa/dev/website/press/en/inthemedia.wml:582
 msgid "2006 Jul 5"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:619
+#: /home/runa/dev/website/press/en/inthemedia.wml:583
 msgid "MSNBC"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:620
+#: /home/runa/dev/website/press/en/inthemedia.wml:584
 msgid ""
 "<a href=\"http://www.msnbc.msn.com/id/13718446/page/2/\"> Defending "
 "liberties in high-tech world</a>.  Mentions EFF funding for Tor as one of "
@@ -1487,17 +1483,17 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:622
+#: /home/runa/dev/website/press/en/inthemedia.wml:586
 msgid "2006 Apr 11"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:623
+#: /home/runa/dev/website/press/en/inthemedia.wml:587
 msgid "PBS Frontline"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:624
+#: /home/runa/dev/website/press/en/inthemedia.wml:588
 msgid ""
 "<a "
 "href=\"http://pbs.gen.in/wgbh/pages/frontline/tankman/internet/tech.html\">Chipping"
@@ -1505,12 +1501,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:627
+#: /home/runa/dev/website/press/en/inthemedia.wml:591
 msgid "2006 Feb 28"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:629
+#: /home/runa/dev/website/press/en/inthemedia.wml:593
 msgid ""
 "<a "
 "href=\"http://www.pcworld.com/article/id,124891-page,1/article.html\">Outsmarting"
@@ -1518,17 +1514,17 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:632
+#: /home/runa/dev/website/press/en/inthemedia.wml:596
 msgid "2006 Feb 27"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:633
+#: /home/runa/dev/website/press/en/inthemedia.wml:597
 msgid "Forbes"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:634
+#: /home/runa/dev/website/press/en/inthemedia.wml:598
 msgid ""
 "<a href=\"http://members.forbes.com/global/2006/0227/018A_2.html\"> Cracks "
 "In the Wall</a>.  Discussion of Tor being used for evading censorship by "
@@ -1536,35 +1532,35 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:637
+#: /home/runa/dev/website/press/en/inthemedia.wml:601
 msgid "2006 Feb 20"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:638
+#: /home/runa/dev/website/press/en/inthemedia.wml:602
 msgid "The Boston Globe"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:639
+#: /home/runa/dev/website/press/en/inthemedia.wml:603
 msgid ""
 "<a href=\"http://members.forbes.com/global/2006/0227/018A_2.html\"> Beating "
 "censorship on the Internet</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:642 /tmp/u3kTkswOVo.xml:647
-#: /tmp/u3kTkswOVo.xml:652 /tmp/u3kTkswOVo.xml:689
+#: /home/runa/dev/website/press/en/inthemedia.wml:606 /tmp/Q2ndl8ZYsF.xml:611
+#: /tmp/Q2ndl8ZYsF.xml:616 /tmp/Q2ndl8ZYsF.xml:653
 msgid "2006 Feb 15"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:643
+#: /home/runa/dev/website/press/en/inthemedia.wml:607
 msgid "CBS Evening News"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:644
+#: /home/runa/dev/website/press/en/inthemedia.wml:608
 msgid ""
 "<a "
 "href=\"http://www.cbsnews.com/stories/2006/02/15/eveningnews/main1321785.shtml?source=search_story\">"
@@ -1573,22 +1569,22 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:648
+#: /home/runa/dev/website/press/en/inthemedia.wml:612
 msgid "CNBC - Closing Bell"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:649
+#: /home/runa/dev/website/press/en/inthemedia.wml:613
 msgid "TV Appearance by Roger Dingledine at 4:25pm. (no link)"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:653
+#: /home/runa/dev/website/press/en/inthemedia.wml:617
 msgid "Network Secure"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:654
+#: /home/runa/dev/website/press/en/inthemedia.wml:618
 msgid ""
 "<a href=\"http://www.network-"
 "secure.de/index.php?option=com_content&amp;task=view&amp;id=3909\">Tor: "
@@ -1596,12 +1592,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:657
+#: /home/runa/dev/website/press/en/inthemedia.wml:621
 msgid "2006 Feb 13"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:659
+#: /home/runa/dev/website/press/en/inthemedia.wml:623
 msgid ""
 "<a href=\"http://online.wsj.com/article/SB113979965346572150.html\"> Chinese"
 " Censors Of Internet Face 'Hacktivists' in U.S.</a>Full article text can "
@@ -1610,53 +1606,53 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:663
+#: /home/runa/dev/website/press/en/inthemedia.wml:627
 msgid "2006 Jan 31"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:665
+#: /home/runa/dev/website/press/en/inthemedia.wml:629
 msgid ""
 "<a href=\"http://www.technologyreview.com/Infotech/16216/page2/\">Evading "
 "the Google Eye</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:668
+#: /home/runa/dev/website/press/en/inthemedia.wml:632
 msgid "2006 Jan 29"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:670
+#: /home/runa/dev/website/press/en/inthemedia.wml:634
 msgid ""
 "<a href=\"http://www.nytimes.com/2006/01/29/weekinreview/29basic.html\"> How"
 " to Outwit the World's Internet Censors</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:673
+#: /home/runa/dev/website/press/en/inthemedia.wml:637
 msgid "2006 Jan 27"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:674
+#: /home/runa/dev/website/press/en/inthemedia.wml:638
 msgid "Fox News/eWeek"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:675
+#: /home/runa/dev/website/press/en/inthemedia.wml:639
 msgid ""
 "<a href=\"http://www.foxnews.com/story/0,2933,183005,00.html\"> Web "
 "Anonymizers Suddenly Get Very Popular</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:678
+#: /home/runa/dev/website/press/en/inthemedia.wml:642
 msgid "2006 Jan 25"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:680
+#: /home/runa/dev/website/press/en/inthemedia.wml:644
 msgid ""
 "<a "
 "href=\"http://www.nytimes.com/2006/01/25/technology/techspecial2/25privacy.html?_r=1&amp;oref=slogin\">"
@@ -1664,17 +1660,17 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:683
+#: /home/runa/dev/website/press/en/inthemedia.wml:647
 msgid "2006 Jan 23"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:684
+#: /home/runa/dev/website/press/en/inthemedia.wml:648
 msgid "NPR Talk of the Nation"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:685
+#: /home/runa/dev/website/press/en/inthemedia.wml:649
 msgid ""
 "<a href=\"http://www.npr.org/templates/story/story.php?storyId=5168456\"> "
 "Search Engines and Privacy Rights on the Web</a><br/> <a "
@@ -1683,24 +1679,24 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:690
+#: /home/runa/dev/website/press/en/inthemedia.wml:654
 msgid "Punto Informatico"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:691
+#: /home/runa/dev/website/press/en/inthemedia.wml:655
 msgid ""
 "<a href=\"http://punto-informatico.it/p.aspx?i=1430903\"> TOR c'è</a> "
 "(Italian)"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:695 /tmp/u3kTkswOVo.xml:701
+#: /home/runa/dev/website/press/en/inthemedia.wml:659 /tmp/Q2ndl8ZYsF.xml:665
 msgid "2006 Jan 20"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:697
+#: /home/runa/dev/website/press/en/inthemedia.wml:661
 msgid ""
 "<a "
 "href=\"http://www.wired.com/science/discoveries/news/2006/01/70051?currentPage=2\">"
@@ -1708,53 +1704,53 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:703
+#: /home/runa/dev/website/press/en/inthemedia.wml:667
 msgid ""
 "<a href=\"http://www.npr.org/templates/story/story.php?storyId=5165854\"> "
 "Google Records Subpoena Raises Privacy Fears</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:707
+#: /home/runa/dev/website/press/en/inthemedia.wml:671
 msgid "2005 Sep 30"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:708
+#: /home/runa/dev/website/press/en/inthemedia.wml:672
 msgid "Viva o Linux"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:709
+#: /home/runa/dev/website/press/en/inthemedia.wml:673
 msgid ""
 "<a href=\"http://www.vivaolinux.com.br/artigos/verArtigo.php?codigo=2759\"> "
 "TOR: A Internet sem rastreabilidade</a> (Portuguese)"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:712
+#: /home/runa/dev/website/press/en/inthemedia.wml:676
 msgid "2005 Aug 6"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:714
+#: /home/runa/dev/website/press/en/inthemedia.wml:678
 msgid ""
 "<a href=\"http://www.eurekalert.org/pub_releases/2005-08/ns-"
 "wwa080305.php\">Why we all need pornography</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:717
+#: /home/runa/dev/website/press/en/inthemedia.wml:681
 msgid "2005 Jul 12"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:718
+#: /home/runa/dev/website/press/en/inthemedia.wml:682
 msgid "IEEE Computer Society's Technical Committee on Security and Privacy"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:719
+#: /home/runa/dev/website/press/en/inthemedia.wml:683
 msgid ""
 "<a href=\"http://www.ieee-"
 "security.org/Cipher/Newsbriefs/2005/071805.html#TOR\"> Onion routing "
@@ -1762,34 +1758,34 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:723
+#: /home/runa/dev/website/press/en/inthemedia.wml:687
 msgid "2005 Jun 22"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:724
+#: /home/runa/dev/website/press/en/inthemedia.wml:688
 msgid "The Unofficial Apple Blog"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:725
+#: /home/runa/dev/website/press/en/inthemedia.wml:689
 msgid ""
 "<a href=\"http://www.tuaw.com/2005/06/22/privacy-watch-tor/\"> Privacy "
 "Watch: Tor</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:729
+#: /home/runa/dev/website/press/en/inthemedia.wml:693
 msgid "2005 Jun 10"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:730
+#: /home/runa/dev/website/press/en/inthemedia.wml:694
 msgid "The New Zealand Herald"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:731
+#: /home/runa/dev/website/press/en/inthemedia.wml:695
 msgid ""
 "<a "
 "href=\"http://www.nzherald.co.nz/section/story.cfm?c_id=5&amp;objectid=10329896\">"
@@ -1797,104 +1793,104 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:735
+#: /home/runa/dev/website/press/en/inthemedia.wml:699
 msgid "2005 Jun 8"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:736
+#: /home/runa/dev/website/press/en/inthemedia.wml:700
 msgid "American Public Radio"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:737
+#: /home/runa/dev/website/press/en/inthemedia.wml:701
 msgid ""
 "<a href=\"http://www.publicradio.org/columns/futuretense/2005/06/08.shtml\">"
 " An Internet privacy tool called \"Tor\"</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:741 /tmp/u3kTkswOVo.xml:747
+#: /home/runa/dev/website/press/en/inthemedia.wml:705 /tmp/Q2ndl8ZYsF.xml:711
 msgid "2005 Jun 1"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:743
+#: /home/runa/dev/website/press/en/inthemedia.wml:707
 msgid ""
 "<a href=\"http://www.pcworld.com/article/id,120763-page,4/article.html\"> "
 "The 100 Best Products of 2005</a><br/> Tor is ranked #40 on the list."
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:748
+#: /home/runa/dev/website/press/en/inthemedia.wml:712
 msgid "Linux Weekly News"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:749
+#: /home/runa/dev/website/press/en/inthemedia.wml:713
 msgid ""
 "<a href=\"http://lwn.net/Articles/138242/\"> A Look at The Onion Router "
 "(Tor)</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:753
+#: /home/runa/dev/website/press/en/inthemedia.wml:717
 msgid "2005 May 22"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:754 /tmp/u3kTkswOVo.xml:839
+#: /home/runa/dev/website/press/en/inthemedia.wml:718 /tmp/Q2ndl8ZYsF.xml:803
 msgid "Slashdot"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:755
+#: /home/runa/dev/website/press/en/inthemedia.wml:719
 msgid ""
 "<a href=\"http://yro.slashdot.org/article.pl?sid=05/05/22/0113244\"> Tor "
 "Anonymity Network Reaches 100 Verified Nodes</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:759
+#: /home/runa/dev/website/press/en/inthemedia.wml:723
 msgid "2005 May 20"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:760
+#: /home/runa/dev/website/press/en/inthemedia.wml:724
 msgid "Security.uz"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:761
+#: /home/runa/dev/website/press/en/inthemedia.wml:725
 msgid ""
 "<a href=\"http://security.uz/news/default.asp?id=10541\"> Tor - мощный "
 "анонимайзер для всех ОС</a> (Russian)"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:765
+#: /home/runa/dev/website/press/en/inthemedia.wml:729
 msgid "2005 May 19"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:766
+#: /home/runa/dev/website/press/en/inthemedia.wml:730
 msgid "WebPlanet"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:767
+#: /home/runa/dev/website/press/en/inthemedia.wml:731
 msgid ""
 "<a href=\"http://webplanet.ru/news/security/2005/5/19/tor.html\"> Tor: "
 "распределенная система анонимного серфинга</a> (Russian)"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:771 /tmp/u3kTkswOVo.xml:778
+#: /home/runa/dev/website/press/en/inthemedia.wml:735 /tmp/Q2ndl8ZYsF.xml:742
 msgid "2005 May 17"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:773
+#: /home/runa/dev/website/press/en/inthemedia.wml:737
 msgid ""
 "<a "
 "href=\"http://www.wired.com/politics/security/news/2005/05/67542?currentPage=all\">"
@@ -1903,170 +1899,170 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:779
+#: /home/runa/dev/website/press/en/inthemedia.wml:743
 msgid "XBiz"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:780
+#: /home/runa/dev/website/press/en/inthemedia.wml:744
 msgid ""
 "<a href=\"http://xbiz.com/news/8761\"> Navy Project Allows Anonymous "
 "Browsing</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:784
+#: /home/runa/dev/website/press/en/inthemedia.wml:748
 msgid "2005 Apr 13"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:785
+#: /home/runa/dev/website/press/en/inthemedia.wml:749
 msgid "Heise online"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:786
+#: /home/runa/dev/website/press/en/inthemedia.wml:750
 msgid ""
 "<a href=\"http://www.heise.de/newsticker/meldung/58506\"> CFP: Vom "
 "kafkaesken Schwinden der Anonymität</a> (German)"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:790
+#: /home/runa/dev/website/press/en/inthemedia.wml:754
 msgid "2005 Apr 5"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:791
+#: /home/runa/dev/website/press/en/inthemedia.wml:755
 msgid "Libero"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:792
+#: /home/runa/dev/website/press/en/inthemedia.wml:756
 msgid ""
 "<a href=\"http://magazine.libero.it/internetlife/scienzaeweb/ne208.phtml\"> "
 "Anonimato on line, ecco Tor</a> (Italian)"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:796
+#: /home/runa/dev/website/press/en/inthemedia.wml:760
 msgid "2005 Jan 4"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:797
+#: /home/runa/dev/website/press/en/inthemedia.wml:761
 msgid "Internetnews"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:798
+#: /home/runa/dev/website/press/en/inthemedia.wml:762
 msgid ""
 "<a href=\"http://www.internetnews.com/dev-news/article.php/3454521\"> EFF "
 "Throws Support to 'Anonymous' Internet Project</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:802
+#: /home/runa/dev/website/press/en/inthemedia.wml:766
 msgid "2005 Mar 31"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:803
+#: /home/runa/dev/website/press/en/inthemedia.wml:767
 msgid "Linux.com"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:804
+#: /home/runa/dev/website/press/en/inthemedia.wml:768
 msgid ""
 "<a href=\"http://www.linux.com/articles/43713?tid=19&amp;tid=78\"> Securing "
 "your online privacy with Tor</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:808
+#: /home/runa/dev/website/press/en/inthemedia.wml:772
 msgid "2004 Dec 27"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:809
+#: /home/runa/dev/website/press/en/inthemedia.wml:773
 msgid "BoingBoing"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:810
+#: /home/runa/dev/website/press/en/inthemedia.wml:774
 msgid ""
 "<a href=\"http://www.boingboing.net/2004/12/27/eff-helping-produce-.html\"> "
 "EFF helping produce anonymizing software</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:814
+#: /home/runa/dev/website/press/en/inthemedia.wml:778
 msgid "2004 Dec 25"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:815
+#: /home/runa/dev/website/press/en/inthemedia.wml:779
 msgid "Kansas City infozine"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:816
+#: /home/runa/dev/website/press/en/inthemedia.wml:780
 msgid ""
 "<a href=\"http://www.infozine.com/news/stories/op/storiesView/sid/4933/\"> "
 "EFF Joins Forces with Tor Software Project</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:820 /tmp/u3kTkswOVo.xml:826
+#: /home/runa/dev/website/press/en/inthemedia.wml:784 /tmp/Q2ndl8ZYsF.xml:790
 msgid "2004 Dec 23"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:821
+#: /home/runa/dev/website/press/en/inthemedia.wml:785
 msgid "golem.de"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:822
+#: /home/runa/dev/website/press/en/inthemedia.wml:786
 msgid ""
 "<a href=\"http://www.golem.de/0412/35340.html\"> EFF unterstützt "
 "Anonymisierer Tor</a> (German)"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:827
+#: /home/runa/dev/website/press/en/inthemedia.wml:791
 msgid "SuicideGirls"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:828
+#: /home/runa/dev/website/press/en/inthemedia.wml:792
 msgid ""
 "<a href=\"http://suicidegirls.com/news/technology/6150/\"> New Routing "
 "Software Allows Anonymous Internet Use</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:832
+#: /home/runa/dev/website/press/en/inthemedia.wml:796
 msgid "2004 Dec 18"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:833
+#: /home/runa/dev/website/press/en/inthemedia.wml:797
 msgid "P2Pnet"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:834
+#: /home/runa/dev/website/press/en/inthemedia.wml:798
 msgid "<a href=\"http://p2pnet.net/story/3357\"> EFF to sponsor Tor</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:838
+#: /home/runa/dev/website/press/en/inthemedia.wml:802
 msgid "2004 Dec 22"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:840
+#: /home/runa/dev/website/press/en/inthemedia.wml:804
 msgid ""
 "<a "
 "href=\"http://yro.slashdot.org/article.pl?sid=04/12/22/2031229&amp;tid=95&amp;tid=158&amp;tid=153&amp;tid=17\">"
@@ -2074,106 +2070,106 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:844
+#: /home/runa/dev/website/press/en/inthemedia.wml:808
 msgid "2004 Nov 16"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:845
+#: /home/runa/dev/website/press/en/inthemedia.wml:809
 msgid "AlterNet"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:846
+#: /home/runa/dev/website/press/en/inthemedia.wml:810
 msgid ""
 "<a href=\"http://www.alternet.org/columnists/story/20523/\"> Heavy "
 "Traffic</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:850
+#: /home/runa/dev/website/press/en/inthemedia.wml:814
 msgid "2004 Aug 30"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:851
+#: /home/runa/dev/website/press/en/inthemedia.wml:815
 msgid "Newsweek"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:852
+#: /home/runa/dev/website/press/en/inthemedia.wml:816
 msgid "Technology: Instant Security (no link)"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:856
+#: /home/runa/dev/website/press/en/inthemedia.wml:820
 msgid "2004 Aug 16"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:857
+#: /home/runa/dev/website/press/en/inthemedia.wml:821
 msgid "Eweek"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:858
+#: /home/runa/dev/website/press/en/inthemedia.wml:822
 msgid ""
 "<a href=\"http://www.eweek.com/c/a/Security/Dont-Fear-Internet-Anonymity-"
 "Tools/\"> Don't Fear Internet Anonymity Tools</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:862 /tmp/u3kTkswOVo.xml:868
+#: /home/runa/dev/website/press/en/inthemedia.wml:826 /tmp/Q2ndl8ZYsF.xml:832
 msgid "2004 Aug 6"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:863
+#: /home/runa/dev/website/press/en/inthemedia.wml:827
 msgid "HCC magazine"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:864
+#: /home/runa/dev/website/press/en/inthemedia.wml:828
 msgid ""
 "<a href=\"http://www.hcc.nl/eCache/DEF/21/083.html\"> Anoniem surfen met "
 "hulp van marine VS</a> (Dutch)"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:869
+#: /home/runa/dev/website/press/en/inthemedia.wml:833
 msgid "Golem"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:870
+#: /home/runa/dev/website/press/en/inthemedia.wml:834
 msgid ""
 "<a href=\"http://www.golem.de/0408/32835.html\"> Tor: Anonymisierer nutzt "
 "Onion-Routing</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:874
+#: /home/runa/dev/website/press/en/inthemedia.wml:838
 msgid "2004 Aug 5"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:875
+#: /home/runa/dev/website/press/en/inthemedia.wml:839
 msgid "Network World Security"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:876
+#: /home/runa/dev/website/press/en/inthemedia.wml:840
 msgid ""
 "<a href=\"http://www.networkworld.com/details/7088.html\"> Onion routing</a>"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:880
+#: /home/runa/dev/website/press/en/inthemedia.wml:844
 msgid "2004 May 8"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:882
+#: /home/runa/dev/website/press/en/inthemedia.wml:846
 msgid ""
 "<a href=\"http://www.wired.com/politics/security/news/2004/08/64464\"> Onion"
 " Routing Averts Prying Eyes</a>. Also in <a "
@@ -2181,29 +2177,29 @@
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:886
+#: /home/runa/dev/website/press/en/inthemedia.wml:850
 msgid "2004 Mar 8"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:887
+#: /home/runa/dev/website/press/en/inthemedia.wml:851
 msgid "CNET Japan blog"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:888
+#: /home/runa/dev/website/press/en/inthemedia.wml:852
 msgid ""
 "<a href=\"http://japan.cnet.com/blog/umeda/2004/03/08/entry_post_126/\"> "
 "Yearning of hackers and insecurity</a> (Japanese)"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:892
+#: /home/runa/dev/website/press/en/inthemedia.wml:856
 msgid "1999 Apr 13"
 msgstr ""
 
 #. type: Content of: <div><div><table><tr><td>
-#: /home/runa/tor/website/press/en/inthemedia.wml:894
+#: /home/runa/dev/website/press/en/inthemedia.wml:858
 msgid ""
 "<a href=\"http://www.wired.com/science/discoveries/news/1999/04/19091\"> "
 "Anonymous Web Surfing? Uh-Uh</a>"

Modified: translation/trunk/projects/website/po/ru/press/4-optional.2010-03-25-tor-store-press-release.po
===================================================================
--- translation/trunk/projects/website/po/ru/press/4-optional.2010-03-25-tor-store-press-release.po	2011-04-12 16:15:00 UTC (rev 24594)
+++ translation/trunk/projects/website/po/ru/press/4-optional.2010-03-25-tor-store-press-release.po	2011-04-12 16:19:31 UTC (rev 24595)
@@ -8,7 +8,7 @@
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
 "POT-Creation-Date: 2010-12-26 14:32+0000\n"
-"PO-Revision-Date: 2011-03-27 17:35+0000\n"
+"PO-Revision-Date: 2011-04-12 16:13+0000\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: Russian <None>\n"
 "MIME-Version: 1.0\n"

Modified: translation/trunk/projects/website/po/ru/projects/1-high.torbrowser.po
===================================================================
--- translation/trunk/projects/website/po/ru/projects/1-high.torbrowser.po	2011-04-12 16:15:00 UTC (rev 24594)
+++ translation/trunk/projects/website/po/ru/projects/1-high.torbrowser.po	2011-04-12 16:19:31 UTC (rev 24595)
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-03-25 16:51+0000\n"
-"PO-Revision-Date: 2011-03-26 00:33+0000\n"
+"POT-Creation-Date: 2011-03-28 12:49+0200\n"
+"PO-Revision-Date: 2011-03-29 00:27+0000\n"
 "Last-Translator: runasand <runa.sandvik at gmail.com>\n"
 "Language-Team: Russian <None>\n"
 "MIME-Version: 1.0\n"
@@ -18,7 +18,7 @@
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:9
+#: /home/runa/dev/website/projects/en/torbrowser.wml:9
 msgid ""
 "<a href=\"<page index>\">Home &raquo; </a> <a href=\"<page "
 "projects/projects>\">Projects &raquo; </a> <a href=\"<page "
@@ -26,17 +26,17 @@
 msgstr ""
 
 #. type: Content of: <div><div><h2>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:17
+#: /home/runa/dev/website/projects/en/torbrowser.wml:17
 msgid "Tor Browser Bundle"
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:18
+#: /home/runa/dev/website/projects/en/torbrowser.wml:18
 msgid "<hr/>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:20
+#: /home/runa/dev/website/projects/en/torbrowser.wml:20
 msgid ""
 "The <strong>Tor</strong> software protects you by bouncing your "
 "communications around a distributed network of relays run by volunteers all "
@@ -47,7 +47,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:27
+#: /home/runa/dev/website/projects/en/torbrowser.wml:27
 msgid ""
 "The <strong>Tor Browser Bundle</strong> lets you use Tor on Windows, Mac OS "
 "X, or Linux without needing to install any software.  It can run off a USB "
@@ -59,7 +59,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:39
+#: /home/runa/dev/website/projects/en/torbrowser.wml:39
 msgid ""
 "Freedom House has produced a video on how to find and use the Tor Browser "
 "Bundle.  If you don't see a video below, view it at <a "
@@ -68,19 +68,19 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:49
+#: /home/runa/dev/website/projects/en/torbrowser.wml:49
 msgid "<a id=\"Download\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:50
+#: /home/runa/dev/website/projects/en/torbrowser.wml:50
 msgid ""
 "<a class=\"anchor\" href=\"#Download\">Download Tor Browser Bundle and Tor "
 "IM Browser Bundle</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:52
+#: /home/runa/dev/website/projects/en/torbrowser.wml:52
 msgid ""
 "To start using the Tor Browser Bundle or Tor IM Browser Bundle, download the"
 " file for your preferred language. This file can be saved wherever is "
@@ -88,7 +88,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:56
+#: /home/runa/dev/website/projects/en/torbrowser.wml:56
 msgid ""
 "If you have an unreliable Internet connection, it may be easier for you to "
 "download the bundle edition which is <a href=\"<page projects/torbrowser-"
@@ -96,14 +96,14 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:58
+#: /home/runa/dev/website/projects/en/torbrowser.wml:58
 msgid ""
 "Tor Browser Bundle for Windows with Firefox (version <version-"
 "torbrowserbundle>, 16 MB)"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:62
+#: /home/runa/dev/website/projects/en/torbrowser.wml:62
 msgid ""
 "<a href=\"../dist/torbrowser/tor-browser-<version-torbrowserbundle>_en-"
 "US.exe\">English (en-US)</a> (<a href=\"../dist/torbrowser/tor-browser"
@@ -112,7 +112,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:64
+#: /home/runa/dev/website/projects/en/torbrowser.wml:64
 msgid ""
 "<a href=\"../dist/torbrowser/tor-browser-<version-"
 "torbrowserbundle>_ar.exe\">&#x0627;&#x0644;&#x0639;&#x0631;&#x0628;&#x064a;&#x0629;"
@@ -121,7 +121,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:66
+#: /home/runa/dev/website/projects/en/torbrowser.wml:66
 msgid ""
 "<a href=\"../dist/torbrowser/tor-browser-<version-"
 "torbrowserbundle>_de.exe\">Deutsch (de)</a> (<a href=\"../dist/torbrowser"
@@ -130,7 +130,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:68
+#: /home/runa/dev/website/projects/en/torbrowser.wml:68
 msgid ""
 "<a href=\"../dist/torbrowser/tor-browser-<version-torbrowserbundle>_es-"
 "ES.exe\">&#x0045;&#x0073;&#x0070;&#x0061;&#x00f1;&#x006f;&#x006c; (es-"
@@ -139,7 +139,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:70
+#: /home/runa/dev/website/projects/en/torbrowser.wml:70
 msgid ""
 "<a href=\"../dist/torbrowser/tor-browser-<version-"
 "torbrowserbundle>_fa.exe\">&#x0641;&#x0627;&#x0631;&#x0633;&#x06cc; (fa)</a>"
@@ -148,7 +148,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:72
+#: /home/runa/dev/website/projects/en/torbrowser.wml:72
 msgid ""
 "<a href=\"../dist/torbrowser/tor-browser-<version-"
 "torbrowserbundle>_fr.exe\">&#x0046;&#x0072;&#x0061;&#x006e;&#x00e7;&#x0061;&#x0069;&#x0073;"
@@ -157,7 +157,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:74
+#: /home/runa/dev/website/projects/en/torbrowser.wml:74
 msgid ""
 "<a href=\"../dist/torbrowser/tor-browser-<version-"
 "torbrowserbundle>_it.exe\">Italiano (it)</a> (<a href=\"../dist/torbrowser"
@@ -166,7 +166,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:76
+#: /home/runa/dev/website/projects/en/torbrowser.wml:76
 msgid ""
 "<a href=\"../dist/torbrowser/tor-browser-<version-"
 "torbrowserbundle>_nl.exe\">Nederlands (nl)</a> (<a href=\"../dist/torbrowser"
@@ -175,7 +175,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:78
+#: /home/runa/dev/website/projects/en/torbrowser.wml:78
 msgid ""
 "<a href=\"../dist/torbrowser/tor-browser-<version-"
 "torbrowserbundle>_pl.exe\">Polish (pl)</a> (<a href=\"../dist/torbrowser"
@@ -184,7 +184,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:80
+#: /home/runa/dev/website/projects/en/torbrowser.wml:80
 msgid ""
 "<a href=\"../dist/torbrowser/tor-browser-<version-torbrowserbundle>_pt-"
 "PT.exe\">&#x0050;&#x006f;&#x0072;&#x0074;&#x0075;&#x0067;&#x0075;&#x00ea;&#x0073;"
@@ -193,7 +193,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:82
+#: /home/runa/dev/website/projects/en/torbrowser.wml:82
 msgid ""
 "<a href=\"../dist/torbrowser/tor-browser-<version-"
 "torbrowserbundle>_ru.exe\">&#x0420;&#x0443;&#x0441;&#x0441;&#x043a;&#x0438;&#x0439;"
@@ -202,7 +202,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:84
+#: /home/runa/dev/website/projects/en/torbrowser.wml:84
 msgid ""
 "<a href=\"../dist/torbrowser/tor-browser-<version-"
 "torbrowserbundle>_vi.exe\">Vietnamese (vi)</a> (<a href=\"../dist/torbrowser"
@@ -211,7 +211,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:86
+#: /home/runa/dev/website/projects/en/torbrowser.wml:86
 msgid ""
 "<a href=\"../dist/torbrowser/tor-browser-<version-torbrowserbundle>_zh-"
 "CN.exe\">&#x7b80;&#x4f53;&#x5b57; (zh-CN)</a> (<a href=\"../dist/torbrowser"
@@ -220,14 +220,14 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:90
+#: /home/runa/dev/website/projects/en/torbrowser.wml:90
 msgid ""
 "Tor IM Browser Bundle for Windows with Firefox and Pidgin (version <version-"
 "torimbrowserbundle>, 25 MB)"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:94
+#: /home/runa/dev/website/projects/en/torbrowser.wml:94
 msgid ""
 "<a href=\"../dist/torbrowser/tor-im-browser-<version-torimbrowserbundle>_en-"
 "US.exe\">English (en-US)</a> (<a href=\"../dist/torbrowser/tor-im-browser"
@@ -236,7 +236,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:96
+#: /home/runa/dev/website/projects/en/torbrowser.wml:96
 msgid ""
 "<a href=\"../dist/torbrowser/tor-im-browser-<version-"
 "torimbrowserbundle>_ar.exe\">&#x0627;&#x0644;&#x0639;&#x0631;&#x0628;&#x064a;&#x0629;"
@@ -245,7 +245,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:98
+#: /home/runa/dev/website/projects/en/torbrowser.wml:98
 msgid ""
 "<a href=\"../dist/torbrowser/tor-im-browser-<version-"
 "torimbrowserbundle>_de.exe\">Deutsch (de)</a> (<a href=\"../dist/torbrowser"
@@ -254,7 +254,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:100
+#: /home/runa/dev/website/projects/en/torbrowser.wml:100
 msgid ""
 "<a href=\"../dist/torbrowser/tor-im-browser-<version-torimbrowserbundle>_es-"
 "ES.exe\">&#x0045;&#x0073;&#x0070;&#x0061;&#x00f1;&#x006f;&#x006c; (es-"
@@ -263,7 +263,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:102
+#: /home/runa/dev/website/projects/en/torbrowser.wml:102
 msgid ""
 "<a href=\"../dist/torbrowser/tor-im-browser-<version-"
 "torimbrowserbundle>_fa.exe\">&#x0641;&#x0627;&#x0631;&#x0633;&#x06cc; "
@@ -272,7 +272,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:104
+#: /home/runa/dev/website/projects/en/torbrowser.wml:104
 msgid ""
 "<a href=\"../dist/torbrowser/tor-im-browser-<version-"
 "torimbrowserbundle>_fr.exe\">&#x0046;&#x0072;&#x0061;&#x006e;&#x00e7;&#x0061;&#x0069;&#x0073;"
@@ -281,7 +281,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:106
+#: /home/runa/dev/website/projects/en/torbrowser.wml:106
 msgid ""
 "<a href=\"../dist/torbrowser/tor-im-browser-<version-"
 "torimbrowserbundle>_it.exe\">Italiano (it)</a> (<a href=\"../dist/torbrowser"
@@ -290,7 +290,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:108
+#: /home/runa/dev/website/projects/en/torbrowser.wml:108
 msgid ""
 "<a href=\"../dist/torbrowser/tor-im-browser-<version-"
 "torimbrowserbundle>_nl.exe\">Nederlands (nl)</a> (<a "
@@ -299,7 +299,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:110
+#: /home/runa/dev/website/projects/en/torbrowser.wml:110
 msgid ""
 "<a href=\"../dist/torbrowser/tor-im-browser-<version-"
 "torimbrowserbundle>_pl.exe\">Polish (pl)</a> (<a href=\"../dist/torbrowser"
@@ -308,7 +308,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:112
+#: /home/runa/dev/website/projects/en/torbrowser.wml:112
 msgid ""
 "<a href=\"../dist/torbrowser/tor-im-browser-<version-torimbrowserbundle>_pt-"
 "PT.exe\">&#x0050;&#x006f;&#x0072;&#x0074;&#x0075;&#x0067;&#x0075;&#x00ea;&#x0073;"
@@ -317,7 +317,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:114
+#: /home/runa/dev/website/projects/en/torbrowser.wml:114
 msgid ""
 "<a href=\"../dist/torbrowser/tor-im-browser-<version-"
 "torimbrowserbundle>_ru.exe\">&#x0420;&#x0443;&#x0441;&#x0441;&#x043a;&#x0438;&#x0439;"
@@ -326,7 +326,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:116
+#: /home/runa/dev/website/projects/en/torbrowser.wml:116
 msgid ""
 "<a href=\"../dist/torbrowser/tor-im-browser-<version-"
 "torimbrowserbundle>_vi.exe\">Vietnamese (vi)</a> (<a "
@@ -335,7 +335,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:118
+#: /home/runa/dev/website/projects/en/torbrowser.wml:118
 msgid ""
 "<a href=\"../dist/torbrowser/tor-im-browser-<version-torimbrowserbundle>_zh-"
 "CN.exe\">&#x7b80;&#x4f53;&#x5b57; (zh-CN)</a> (<a href=\"../dist/torbrowser"
@@ -344,14 +344,14 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:122
+#: /home/runa/dev/website/projects/en/torbrowser.wml:122
 msgid ""
-"BETA: Tor Browser Bundle for Intel Mac OS X with Firefox (version <version-"
-"torbrowserbundleosx>, 28 MB)"
+"BETA: Tor Browser Bundle for Intel Mac OS X 10.5 and higher with Firefox "
+"(version <version-torbrowserbundleosx>, 28 MB)"
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:126
+#: /home/runa/dev/website/projects/en/torbrowser.wml:126
 msgid ""
 "<a href=\"../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx"
 ">-dev-osx-i386-en-US.zip\">English (en-US)</a> (<a "
@@ -360,7 +360,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:129
+#: /home/runa/dev/website/projects/en/torbrowser.wml:129
 msgid ""
 "<a href=\"../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx"
 ">-dev-"
@@ -371,7 +371,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:133
+#: /home/runa/dev/website/projects/en/torbrowser.wml:133
 msgid ""
 "<a href=\"../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx"
 ">-dev-osx-i386-de.zip\">Deutsch (de)</a> (<a "
@@ -380,7 +380,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:136
+#: /home/runa/dev/website/projects/en/torbrowser.wml:136
 msgid ""
 "<a href=\"../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx"
 ">-dev-osx-i386-es-"
@@ -391,7 +391,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:140
+#: /home/runa/dev/website/projects/en/torbrowser.wml:140
 msgid ""
 "<a href=\"../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx"
 ">-dev-osx-i386-fa.zip\">&#x0641;&#x0627;&#x0631;&#x0633;&#x06cc; (fa) </a> "
@@ -400,7 +400,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:143
+#: /home/runa/dev/website/projects/en/torbrowser.wml:143
 msgid ""
 "<a href=\"../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx"
 ">-dev-"
@@ -411,7 +411,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:146
+#: /home/runa/dev/website/projects/en/torbrowser.wml:146
 msgid ""
 "<a href=\"../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx"
 ">-dev-osx-i386-it.zip\">Italiano (it)</a> (<a "
@@ -420,7 +420,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:149
+#: /home/runa/dev/website/projects/en/torbrowser.wml:149
 msgid ""
 "<a href=\"../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx"
 ">-dev-osx-i386-nl.zip\">Nederlands (nl)</a> (<a "
@@ -429,7 +429,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:152
+#: /home/runa/dev/website/projects/en/torbrowser.wml:152
 msgid ""
 "<a href=\"../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx"
 ">-dev-osx-i386-pl.zip\">Polish (pl)</a> (<a "
@@ -438,7 +438,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:155
+#: /home/runa/dev/website/projects/en/torbrowser.wml:155
 msgid ""
 "<a href=\"../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx"
 ">-dev-osx-i386-pt-"
@@ -449,7 +449,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:158
+#: /home/runa/dev/website/projects/en/torbrowser.wml:158
 msgid ""
 "<a href=\"../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx"
 ">-dev-"
@@ -460,7 +460,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:162
+#: /home/runa/dev/website/projects/en/torbrowser.wml:162
 msgid ""
 "<a href=\"../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx"
 ">-dev-osx-i386-zh-CN.zip\">&#x7b80;&#x4f53;&#x5b57; (zh-CN)</a> (<a "
@@ -469,7 +469,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:169
+#: /home/runa/dev/website/projects/en/torbrowser.wml:169
 msgid ""
 "BETA: Tor Browser Bundle for Linux with Firefox (version <version-"
 "torbrowserbundlelinux32> (32-bit), <version-torbrowserbundlelinux64> "
@@ -477,7 +477,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:172
+#: /home/runa/dev/website/projects/en/torbrowser.wml:172
 msgid ""
 "English (en-US): <a href=\"../dist/torbrowser/linux/tor-browser-gnu-"
 "linux-i686-<version-torbrowserbundlelinux32>-dev-en-US.tar.gz\">32-bit</a> "
@@ -491,7 +491,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:175
+#: /home/runa/dev/website/projects/en/torbrowser.wml:175
 msgid ""
 "&#x0627;&#x0644;&#x0639;&#x0631;&#x0628;&#x064a;&#x0629; (ar): <a "
 "href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-"
@@ -506,7 +506,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:177
+#: /home/runa/dev/website/projects/en/torbrowser.wml:177
 msgid ""
 "Deutsch (de): <a href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-i686"
 "-<version-torbrowserbundlelinux32>-dev-de.tar.gz\">32-bit</a> (<a "
@@ -520,7 +520,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:179
+#: /home/runa/dev/website/projects/en/torbrowser.wml:179
 msgid ""
 "&#x0045;&#x0073;&#x0070;&#x0061;&#x00f1;&#x006f;&#x006c; (es-ES): <a "
 "href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-"
@@ -535,7 +535,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:181
+#: /home/runa/dev/website/projects/en/torbrowser.wml:181
 msgid ""
 "&#x0641;&#x0627;&#x0631;&#x0633;&#x06cc; (fa): <a "
 "href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-"
@@ -550,7 +550,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:183
+#: /home/runa/dev/website/projects/en/torbrowser.wml:183
 msgid ""
 "&#x0046;&#x0072;&#x0061;&#x006e;&#x00e7;&#x0061;&#x0069;&#x0073; (fr): <a "
 "href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-"
@@ -565,7 +565,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:185
+#: /home/runa/dev/website/projects/en/torbrowser.wml:185
 msgid ""
 "Italiano (it): <a href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-i686"
 "-<version-torbrowserbundlelinux32>-dev-it.tar.gz\">32-bit</a> (<a "
@@ -579,7 +579,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:187
+#: /home/runa/dev/website/projects/en/torbrowser.wml:187
 msgid ""
 "Nederlands (nl): <a href=\"../dist/torbrowser/linux/tor-browser-gnu-"
 "linux-i686-<version-torbrowserbundlelinux32>-dev-nl.tar.gz\">32-bit</a> (<a "
@@ -593,7 +593,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:189
+#: /home/runa/dev/website/projects/en/torbrowser.wml:189
 msgid ""
 "Polish (pl): <a href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-i686"
 "-<version-torbrowserbundlelinux32>-dev-pl.tar.gz\">32-bit</a> (<a "
@@ -607,7 +607,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:191
+#: /home/runa/dev/website/projects/en/torbrowser.wml:191
 msgid ""
 "&#x0050;&#x006f;&#x0072;&#x0074;&#x0075;&#x0067;&#x0075;&#x00ea;&#x0073; "
 "(pt-PT): <a href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-i686"
@@ -622,7 +622,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:193
+#: /home/runa/dev/website/projects/en/torbrowser.wml:193
 msgid ""
 "&#x0420;&#x0443;&#x0441;&#x0441;&#x043a;&#x0438;&#x0439; (ru): <a "
 "href=\"../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-"
@@ -637,7 +637,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:195
+#: /home/runa/dev/website/projects/en/torbrowser.wml:195
 msgid ""
 "&#x7b80;&#x4f53;&#x5b57; (zh-CN): <a href=\"../dist/torbrowser/linux/tor-"
 "browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-zh-"
@@ -651,7 +651,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:201
+#: /home/runa/dev/website/projects/en/torbrowser.wml:201
 msgid ""
 "See our instructions on <a href=\"<page docs/verifying-signatures>\">how to "
 "verify package signatures</a>, which allows you to make sure you've "
@@ -663,17 +663,17 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:211
+#: /home/runa/dev/website/projects/en/torbrowser.wml:211
 msgid "<a id=\"MacOSX\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:212
+#: /home/runa/dev/website/projects/en/torbrowser.wml:212
 msgid "<a class=\"anchor\" href=\"#MacOSX\">Mac OS X instructions</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:213
+#: /home/runa/dev/website/projects/en/torbrowser.wml:213
 msgid ""
 "Download the file above, save it somewhere, then click on it. Mac OS X will "
 "automatically unarchive it and you will have a TorBrowser application in "
@@ -682,18 +682,25 @@
 "will launch Firefox."
 msgstr ""
 
+#. type: Content of: <div><div><p>
+#: /home/runa/dev/website/projects/en/torbrowser.wml:219
+msgid ""
+"<img src=\"$(IMGROOT)/screenshot-osx-torbrowser-icon.png\" alt=\"Screenshot "
+"Mac OS X bundle\" />"
+msgstr ""
+
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:219
+#: /home/runa/dev/website/projects/en/torbrowser.wml:221
 msgid "<a id=\"Linux\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:220
+#: /home/runa/dev/website/projects/en/torbrowser.wml:222
 msgid "<a class=\"anchor\" href=\"#Linux\">Linux instructions</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:221
+#: /home/runa/dev/website/projects/en/torbrowser.wml:223
 msgid ""
 "Download the architecture-appropriate file above, save it somewhere, then "
 "run:<br> tar -xvzf tor-browser-gnu-linux-i686-<version-"
@@ -706,17 +713,17 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:230
+#: /home/runa/dev/website/projects/en/torbrowser.wml:232
 msgid "<a id=\"Extraction\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:231
+#: /home/runa/dev/website/projects/en/torbrowser.wml:233
 msgid "<a class=\"anchor\" href=\"#Extraction\">Extraction</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:233
+#: /home/runa/dev/website/projects/en/torbrowser.wml:235
 msgid ""
 "Download the file above, and save it somewhere, then double click on it.  "
 "Click on the button labelled <strong>\"...\"</strong> (1) and select where "
@@ -728,57 +735,57 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:241
+#: /home/runa/dev/website/projects/en/torbrowser.wml:243
 msgid ""
 "Click <strong>Extract</strong> (3) to begin extraction. This may take a few "
 "minutes to complete."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:244
+#: /home/runa/dev/website/projects/en/torbrowser.wml:246
 msgid ""
 "<img src=\"$(IMGROOT)/tbb-screenshot1.png\" alt=\"Screenshot of extraction "
 "process\" />"
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:247
+#: /home/runa/dev/website/projects/en/torbrowser.wml:249
 msgid "<a id=\"Usage\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:248
+#: /home/runa/dev/website/projects/en/torbrowser.wml:250
 msgid "<a class=\"anchor\" href=\"#Usage\">Usage</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:250
+#: /home/runa/dev/website/projects/en/torbrowser.wml:252
 msgid ""
 "Once extraction is complete, open the folder <strong>Tor Browser</strong> "
 "from the location you saved the bundle."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:252
+#: /home/runa/dev/website/projects/en/torbrowser.wml:254
 msgid ""
 "Double click on the <strong>Start Tor Browser</strong> (4) application (it "
 "may be called <strong>Start Tor Browser.exe</strong> on some systems.)"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:255
+#: /home/runa/dev/website/projects/en/torbrowser.wml:257
 msgid "The Vidalia window will shortly appear."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:257
+#: /home/runa/dev/website/projects/en/torbrowser.wml:259
 msgid ""
 "<img src=\"$(IMGROOT)/tbb-screenshot2.png\" alt=\"Screenshot of bundle "
 "startup\" />"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:260
+#: /home/runa/dev/website/projects/en/torbrowser.wml:262
 msgid ""
 "Once Tor is ready, Firefox will automatically be opened. Only web pages "
 "visited through the included Firefox browser will be sent via Tor. Other web"
@@ -790,14 +797,14 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:267
+#: /home/runa/dev/website/projects/en/torbrowser.wml:269
 msgid ""
 "If you installed the Tor IM Browser Bundle, the Pidgin instant messaging "
 "client will also be automatically opened."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:269
+#: /home/runa/dev/website/projects/en/torbrowser.wml:271
 msgid ""
 "Once you are finished browsing, close any open Firefox windows by clicking "
 "on the <img src=\"$(IMGROOT)/tbb-close-button.png\" alt=\"Close button "
@@ -806,12 +813,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:275
+#: /home/runa/dev/website/projects/en/torbrowser.wml:277
 msgid "<img src=\"$(IMGROOT)/tbb-screenshot3a.png\" alt=\"Screenshot of Firefox\" />"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:278
+#: /home/runa/dev/website/projects/en/torbrowser.wml:280
 msgid ""
 "With the Tor Browser Bundle, Vidalia and Tor will automatically close. With "
 "the Tor IM Browser Bundle you need to also close Pidgin by right-clicking on"
@@ -819,19 +826,19 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:280
+#: /home/runa/dev/website/projects/en/torbrowser.wml:282
 msgid "<img src=\"$(IMGROOT)/tbb-screenshot3b.png\" alt=\"Screenshot of Pidgin\" />"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:283
+#: /home/runa/dev/website/projects/en/torbrowser.wml:285
 msgid ""
 "To use the Tor Browser Bundle or Tor IM Browser Bundle again, repeat the "
 "steps in <a href=\"#Usage\">\"Usage\"</a>."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:285
+#: /home/runa/dev/website/projects/en/torbrowser.wml:287
 msgid ""
 "Remember that Tor anonymizes the origin of your traffic, and it encrypts "
 "everything inside the Tor network, but <a "
@@ -843,17 +850,17 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:293
+#: /home/runa/dev/website/projects/en/torbrowser.wml:295
 msgid "<a id=\"Feedback\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:294
+#: /home/runa/dev/website/projects/en/torbrowser.wml:296
 msgid "<a class=\"anchor\" href=\"#Feedback\">Comments and suggestions</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:296
+#: /home/runa/dev/website/projects/en/torbrowser.wml:298
 msgid ""
 "The Tor Browser Bundle is under development and not yet complete.  To "
 "discuss improvements and submit comments, please use the <a "
@@ -861,24 +868,24 @@
 msgstr ""
 
 #. type: Content of: <div><div>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:300
+#: /home/runa/dev/website/projects/en/torbrowser.wml:302
 msgid "<a id=\"More\"></a>"
 msgstr ""
 
 #. type: Content of: <div><div><h3>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:301
+#: /home/runa/dev/website/projects/en/torbrowser.wml:303
 msgid "<a class=\"anchor\" href=\"#More\">More information</a>"
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:303
+#: /home/runa/dev/website/projects/en/torbrowser.wml:305
 msgid ""
 "<strong>What is Tor and why do I need it?</strong> To learn more about Tor, "
 "visit the <a href=\"<page index>\">Tor Project website</a>."
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:307
+#: /home/runa/dev/website/projects/en/torbrowser.wml:309
 msgid ""
 "<strong>What is in the Tor Browser Bundle?</strong> It contains Tor, "
 "Vidalia, Polipo, Firefox, and Torbutton (<a href=\"<page projects"
@@ -886,7 +893,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:311
+#: /home/runa/dev/website/projects/en/torbrowser.wml:313
 msgid ""
 "<strong>What is in the Tor IM Browser Bundle?</strong> It contains Tor, "
 "Vidalia, Polipo, Firefox, Torbutton, Pidgin and OTR (<a href=\"<page "
@@ -894,7 +901,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:315
+#: /home/runa/dev/website/projects/en/torbrowser.wml:317
 msgid ""
 "<strong>How can I make my own bundle?</strong> To download the source code "
 "and learn how to build the bundle yourself, read the <a href=\"<page "
@@ -902,7 +909,7 @@
 msgstr ""
 
 #. type: Content of: <div><div><p>
-#: /home/runa/tor/website/projects/en/torbrowser.wml:319
+#: /home/runa/dev/website/projects/en/torbrowser.wml:321
 msgid ""
 "Tor Browser Bundle is partially based on <a "
 "href=\"http://portableapps.com/apps/internet/firefox_portable\">Mozilla "

Modified: translation/trunk/projects/website/po/tr/1-high.index.po
===================================================================
--- translation/trunk/projects/website/po/tr/1-high.index.po	2011-04-12 16:15:00 UTC (rev 24594)
+++ translation/trunk/projects/website/po/tr/1-high.index.po	2011-04-12 16:19:31 UTC (rev 24595)
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-03-17 18:05+0000\n"
-"PO-Revision-Date: 2011-03-22 16:15+0000\n"
+"POT-Creation-Date: 2011-03-28 12:48+0200\n"
+"PO-Revision-Date: 2011-03-29 00:25+0000\n"
 "Last-Translator: yuka <yunuskaba at gmail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
@@ -18,47 +18,47 @@
 "Plural-Forms: nplurals=1; plural=0\n"
 
 #. type: Content of: <div><div><div><div><ul><li>
-#: /home/runa/tor/website/en/index.wml:12
+#: /home/runa/dev/website/en/index.wml:12
 msgid "Tor prevents anyone from learning your location or browsing habits."
 msgstr ""
 
 #. type: Content of: <div><div><div><div><ul><li>
-#: /home/runa/tor/website/en/index.wml:13
+#: /home/runa/dev/website/en/index.wml:13
 msgid ""
 "Tor is for web browsers, instant messaging clients, remote logins, and more."
 msgstr ""
 
 #. type: Content of: <div><div><div><div><ul><li>
-#: /home/runa/tor/website/en/index.wml:14
+#: /home/runa/dev/website/en/index.wml:14
 msgid "Tor is free and open source for Windows, Mac, Linux/Unix, and Android"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><h1>
-#: /home/runa/tor/website/en/index.wml:16
+#: /home/runa/dev/website/en/index.wml:16
 msgid "Anonymity Online"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><p>
-#: /home/runa/tor/website/en/index.wml:17
+#: /home/runa/dev/website/en/index.wml:17
 msgid ""
 "Protect your privacy. Defend yourself against network surveillance and "
 "traffic analysis."
 msgstr ""
 
 #. type: Content of: <div><div><div><div><div>
-#: /home/runa/tor/website/en/index.wml:20
+#: /home/runa/dev/website/en/index.wml:20
 msgid ""
 "<a href=\"<page download/download>\"> <span class=\"download-tor\">Download "
 "Tor</span></a>"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><div><h2>
-#: /home/runa/tor/website/en/index.wml:26
+#: /home/runa/dev/website/en/index.wml:26
 msgid "What is Tor?"
 msgstr "Tor nedir?"
 
 #. type: Content of: <div><div><div><div><div><p>
-#: /home/runa/tor/website/en/index.wml:26
+#: /home/runa/dev/website/en/index.wml:26
 msgid ""
 "Tor is free software and an open network that helps you defend against a "
 "form of network surveillance that threatens personal freedom and privacy, "
@@ -69,12 +69,12 @@
 msgstr ""
 
 #. type: Content of: <div><div><div><div><div><h2>
-#: /home/runa/tor/website/en/index.wml:36
+#: /home/runa/dev/website/en/index.wml:36
 msgid "Why Anonymity Matters"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><div><p>
-#: /home/runa/tor/website/en/index.wml:37
+#: /home/runa/dev/website/en/index.wml:37
 msgid ""
 "Tor protects you by bouncing your communications around a distributed "
 "network of relays run by volunteers all around the world: it prevents "
@@ -87,110 +87,110 @@
 msgstr ""
 
 #. type: Content of: <div><div><div><div><h2>
-#: /home/runa/tor/website/en/index.wml:50
+#: /home/runa/dev/website/en/index.wml:50
 msgid "Our Projects"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><table><tr><td>
-#: /home/runa/tor/website/en/index.wml:55
+#: /home/runa/dev/website/en/index.wml:55
 msgid "<img src=\"$(IMGROOT)/icon-TorButton.jpg\" alt=\"Torbutton Icon\">"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><table><tr><td><h3>
-#: /home/runa/tor/website/en/index.wml:56
+#: /home/runa/dev/website/en/index.wml:56
 msgid "<a href=\"<page torbutton/index>\">Torbutton</a>"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><table><tr><td><p>
-#: /home/runa/tor/website/en/index.wml:57
+#: /home/runa/dev/website/en/index.wml:57
 msgid ""
 "Torbutton is a 1-click way for Firefox users to enable or disable Tor in "
 "Firefox."
 msgstr ""
 
 #. type: Content of: <div><div><div><div><table><tr><td>
-#: /home/runa/tor/website/en/index.wml:61
+#: /home/runa/dev/website/en/index.wml:61
 msgid "<img src=\"$(IMGROOT)/icon-TorCheck.jpg\" alt=\"Tor Check Icon\">"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><table><tr><td><h3>
-#: /home/runa/tor/website/en/index.wml:62
+#: /home/runa/dev/website/en/index.wml:62
 msgid "<a href=\"https://check.torproject.org/\">Check</a>"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><table><tr><td><p>
-#: /home/runa/tor/website/en/index.wml:63
+#: /home/runa/dev/website/en/index.wml:63
 msgid "Check determines if you are successfully browsing with Tor."
 msgstr ""
 
 #. type: Content of: <div><div><div><div><table><tr><td>
-#: /home/runa/tor/website/en/index.wml:69
+#: /home/runa/dev/website/en/index.wml:69
 msgid "<img src=\"$(IMGROOT)/icon-Vidalia.jpg\" alt=\"Vidalia Icon\">"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><table><tr><td><h3>
-#: /home/runa/tor/website/en/index.wml:70
+#: /home/runa/dev/website/en/index.wml:70
 msgid "<a href=\"<page projects/vidalia>\">Vidalia</a>"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><table><tr><td><p>
-#: /home/runa/tor/website/en/index.wml:71
+#: /home/runa/dev/website/en/index.wml:71
 msgid ""
 "Vidalia is a graphical way to control and view Tor's connections and "
 "settings."
 msgstr ""
 
 #. type: Content of: <div><div><div><div><table><tr><td>
-#: /home/runa/tor/website/en/index.wml:75
+#: /home/runa/dev/website/en/index.wml:75
 msgid "<img src=\"$(IMGROOT)/icon-TorBrowser.jpg\" alt=\"TorBrowser Icon\">"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><table><tr><td><h3>
-#: /home/runa/tor/website/en/index.wml:76
+#: /home/runa/dev/website/en/index.wml:76
 msgid "<a href=\"<page projects/torbrowser>\">Tor Browser</a>"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><table><tr><td><p>
-#: /home/runa/tor/website/en/index.wml:78
+#: /home/runa/dev/website/en/index.wml:78
 msgid ""
 "Tor Browser contains everything you need to safely browse the Internet."
 msgstr ""
 
 #. type: Content of: <div><div><div><div><h2>
-#: /home/runa/tor/website/en/index.wml:90
+#: /home/runa/dev/website/en/index.wml:90
 msgid "Who Uses Tor?"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><div><h3>
-#: /home/runa/tor/website/en/index.wml:93
+#: /home/runa/dev/website/en/index.wml:93
 msgid ""
 "<a href=\"<page about/torusers>#normalusers\"><img "
 "src=\"$(IMGROOT)/family.jpg\" alt=\"Normal People\">Family &amp; Friends</a>"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><div><p>
-#: /home/runa/tor/website/en/index.wml:95
+#: /home/runa/dev/website/en/index.wml:95
 msgid ""
 "People like you and your family use Tor to protect themselves, their "
 "children, and their dignity while using the Internet."
 msgstr ""
 
 #. type: Content of: <div><div><div><div><div><h3>
-#: /home/runa/tor/website/en/index.wml:99
+#: /home/runa/dev/website/en/index.wml:99
 msgid ""
 "<a href=\"<page about/torusers>#executives\"><img "
 "src=\"$(IMGROOT)/consumers.jpg\" alt=\"Businesses\">Businesses</a>"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><div><p>
-#: /home/runa/tor/website/en/index.wml:101
+#: /home/runa/dev/website/en/index.wml:101
 msgid ""
 "Businesses use Tor to research competition, keep business strategies "
 "confidential, and facilitate internal accountability."
 msgstr ""
 
 #. type: Content of: <div><div><div><div><div><h3>
-#: /home/runa/tor/website/en/index.wml:105
+#: /home/runa/dev/website/en/index.wml:105
 msgid ""
 "<a href=\"<page about/torusers>#activists\"><img "
 "src=\"$(IMGROOT)/activists.jpg\" alt=\"Activists &amp; "
@@ -198,28 +198,28 @@
 msgstr ""
 
 #. type: Content of: <div><div><div><div><div><p>
-#: /home/runa/tor/website/en/index.wml:107
+#: /home/runa/dev/website/en/index.wml:107
 msgid ""
 "Activists use Tor to anonymously report abuses from danger zones.  "
 "Whistleblowers use Tor to safely report on corruption."
 msgstr ""
 
 #. type: Content of: <div><div><div><div><div><h3>
-#: /home/runa/tor/website/en/index.wml:111
+#: /home/runa/dev/website/en/index.wml:111
 msgid ""
 "<a href=\"<page about/torusers>#journalist\"><img "
 "src=\"$(IMGROOT)/media.jpg\" alt=\"Journalists and the Media\">Media</a>"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><div><p>
-#: /home/runa/tor/website/en/index.wml:113
+#: /home/runa/dev/website/en/index.wml:113
 msgid ""
 "Journalists and the media use Tor to protect their research and sources "
 "online."
 msgstr ""
 
 #. type: Content of: <div><div><div><div><div><h3>
-#: /home/runa/tor/website/en/index.wml:117
+#: /home/runa/dev/website/en/index.wml:117
 msgid ""
 "<a href=\"<page about/torusers>#military\"><img "
 "src=\"$(IMGROOT)/military.jpg\" alt=\"Military and Law "
@@ -227,24 +227,39 @@
 msgstr ""
 
 #. type: Content of: <div><div><div><div><div><p>
-#: /home/runa/tor/website/en/index.wml:119
+#: /home/runa/dev/website/en/index.wml:119
 msgid ""
 "Militaries and law enforcement use Tor to protect their communications, "
 "investigations, and intelligence gathering online."
 msgstr ""
 
 #. type: Content of: <div><div><div><div><h2>
-#: /home/runa/tor/website/en/index.wml:123
+#: /home/runa/dev/website/en/index.wml:123
 msgid "Announcements"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><table><tr><td><div>
-#: /home/runa/tor/website/en/index.wml:128
+#: /home/runa/dev/website/en/index.wml:128
+msgid "<span class=\"month\">Mar</span><br><span class=\"day\">23</span>"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><table><tr><td><p>
+#: /home/runa/dev/website/en/index.wml:129
+msgid ""
+"The Tor Project wins the \"Project of Social Benefit\" award from the Free "
+"Software Foundation and GNU Project. We are honored to win this award and to"
+" be listed amongst the former winners. <a "
+"href=\"https://blog.torproject.org/blog/tor-project-receives-fsf-"
+"award\">Read more</a> about this award."
+msgstr ""
+
+#. type: Content of: <div><div><div><div><table><tr><td><div>
+#: /home/runa/dev/website/en/index.wml:135
 msgid "<span class=\"month\">Feb</span><br><span class=\"day\">23</span>"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><table><tr><td><p>
-#: /home/runa/tor/website/en/index.wml:129
+#: /home/runa/dev/website/en/index.wml:136
 msgid ""
 "The latest stable Tor version, 0.2.1.30, is <a "
 "href=\"https://lists.torproject.org/pipermail/tor-"
@@ -254,18 +269,3 @@
 "reachable from Iran again.  We don't expect this tweak will win the arms "
 "race long-term, but it buys us time until we roll out a better solution."
 msgstr ""
-
-#. type: Content of: <div><div><div><div><table><tr><td><div>
-#: /home/runa/tor/website/en/index.wml:138
-msgid "<span class=\"month\">Jan</span><br><span class=\"day\">30</span>"
-msgstr ""
-
-#. type: Content of: <div><div><div><div><table><tr><td><p>
-#: /home/runa/tor/website/en/index.wml:139
-msgid ""
-"Tor helping with Egypt.  Here's what we've learned <a "
-"href=\"https://blog.torproject.org/blog/recent-events-egypt\">about recent "
-"events in Egypt</a>. And we're keeping our <a href=\"<page "
-"press/inthemedia>\">In the media</a> page up to date with stories about how "
-"we're helping around the world."
-msgstr ""

Modified: translation/trunk/projects/website/po/zh_CN/1-high.index.po
===================================================================
--- translation/trunk/projects/website/po/zh_CN/1-high.index.po	2011-04-12 16:15:00 UTC (rev 24594)
+++ translation/trunk/projects/website/po/zh_CN/1-high.index.po	2011-04-12 16:19:31 UTC (rev 24595)
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2011-03-17 18:05+0000\n"
-"PO-Revision-Date: 2011-03-22 16:15+0000\n"
+"POT-Creation-Date: 2011-03-28 12:48+0200\n"
+"PO-Revision-Date: 2011-03-29 00:25+0000\n"
 "Last-Translator: runasand <runa.sandvik at gmail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
@@ -18,35 +18,35 @@
 "Plural-Forms: nplurals=1; plural=0\n"
 
 #. type: Content of: <div><div><div><div><ul><li>
-#: /home/runa/tor/website/en/index.wml:12
+#: /home/runa/dev/website/en/index.wml:12
 msgid "Tor prevents anyone from learning your location or browsing habits."
 msgstr "Tor 能阻止任何人知道你的位置和浏览习惯"
 
 #. type: Content of: <div><div><div><div><ul><li>
-#: /home/runa/tor/website/en/index.wml:13
+#: /home/runa/dev/website/en/index.wml:13
 msgid ""
 "Tor is for web browsers, instant messaging clients, remote logins, and more."
 msgstr "Tor 能用在网页浏览，即时通讯，远程登录等应用上"
 
 #. type: Content of: <div><div><div><div><ul><li>
-#: /home/runa/tor/website/en/index.wml:14
+#: /home/runa/dev/website/en/index.wml:14
 msgid "Tor is free and open source for Windows, Mac, Linux/Unix, and Android"
 msgstr "Tor是免费和开源的，能运行在Windows,Mac,Linux/Unix, 和Android上"
 
 #. type: Content of: <div><div><div><div><h1>
-#: /home/runa/tor/website/en/index.wml:16
+#: /home/runa/dev/website/en/index.wml:16
 msgid "Anonymity Online"
 msgstr "匿名者在线"
 
 #. type: Content of: <div><div><div><div><p>
-#: /home/runa/tor/website/en/index.wml:17
+#: /home/runa/dev/website/en/index.wml:17
 msgid ""
 "Protect your privacy. Defend yourself against network surveillance and "
 "traffic analysis."
 msgstr "保护您的隐私。帮助您抵御网络监视和流量分析"
 
 #. type: Content of: <div><div><div><div><div>
-#: /home/runa/tor/website/en/index.wml:20
+#: /home/runa/dev/website/en/index.wml:20
 msgid ""
 "<a href=\"<page download/download>\"> <span class=\"download-tor\">Download "
 "Tor</span></a>"
@@ -55,12 +55,12 @@
 "Tor</span></a>"
 
 #. type: Content of: <div><div><div><div><div><h2>
-#: /home/runa/tor/website/en/index.wml:26
+#: /home/runa/dev/website/en/index.wml:26
 msgid "What is Tor?"
 msgstr "什么是Tor"
 
 #. type: Content of: <div><div><div><div><div><p>
-#: /home/runa/tor/website/en/index.wml:26
+#: /home/runa/dev/website/en/index.wml:26
 msgid ""
 "Tor is free software and an open network that helps you defend against a "
 "form of network surveillance that threatens personal freedom and privacy, "
@@ -75,12 +75,12 @@
 "about/overview>\">了解»更多关于Tor</a></span>"
 
 #. type: Content of: <div><div><div><div><div><h2>
-#: /home/runa/tor/website/en/index.wml:36
+#: /home/runa/dev/website/en/index.wml:36
 msgid "Why Anonymity Matters"
 msgstr "为什么匿名性很重要"
 
 #. type: Content of: <div><div><div><div><div><p>
-#: /home/runa/tor/website/en/index.wml:37
+#: /home/runa/dev/website/en/index.wml:37
 msgid ""
 "Tor protects you by bouncing your communications around a distributed "
 "network of relays run by volunteers all around the world: it prevents "
@@ -97,110 +97,110 @@
 "&raquo;</a></span>"
 
 #. type: Content of: <div><div><div><div><h2>
-#: /home/runa/tor/website/en/index.wml:50
+#: /home/runa/dev/website/en/index.wml:50
 msgid "Our Projects"
 msgstr "我们的项目"
 
 #. type: Content of: <div><div><div><div><table><tr><td>
-#: /home/runa/tor/website/en/index.wml:55
+#: /home/runa/dev/website/en/index.wml:55
 msgid "<img src=\"$(IMGROOT)/icon-TorButton.jpg\" alt=\"Torbutton Icon\">"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><table><tr><td><h3>
-#: /home/runa/tor/website/en/index.wml:56
+#: /home/runa/dev/website/en/index.wml:56
 msgid "<a href=\"<page torbutton/index>\">Torbutton</a>"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><table><tr><td><p>
-#: /home/runa/tor/website/en/index.wml:57
+#: /home/runa/dev/website/en/index.wml:57
 msgid ""
 "Torbutton is a 1-click way for Firefox users to enable or disable Tor in "
 "Firefox."
 msgstr "TorButton (Tor开关) 是 Firefox 火狐浏览器中的扩展，可以在浏览器中一键开关 Tor。"
 
 #. type: Content of: <div><div><div><div><table><tr><td>
-#: /home/runa/tor/website/en/index.wml:61
+#: /home/runa/dev/website/en/index.wml:61
 msgid "<img src=\"$(IMGROOT)/icon-TorCheck.jpg\" alt=\"Tor Check Icon\">"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><table><tr><td><h3>
-#: /home/runa/tor/website/en/index.wml:62
+#: /home/runa/dev/website/en/index.wml:62
 msgid "<a href=\"https://check.torproject.org/\">Check</a>"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><table><tr><td><p>
-#: /home/runa/tor/website/en/index.wml:63
+#: /home/runa/dev/website/en/index.wml:63
 msgid "Check determines if you are successfully browsing with Tor."
 msgstr "测试您是否正在通过Tor浏览。"
 
 #. type: Content of: <div><div><div><div><table><tr><td>
-#: /home/runa/tor/website/en/index.wml:69
+#: /home/runa/dev/website/en/index.wml:69
 msgid "<img src=\"$(IMGROOT)/icon-Vidalia.jpg\" alt=\"Vidalia Icon\">"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><table><tr><td><h3>
-#: /home/runa/tor/website/en/index.wml:70
+#: /home/runa/dev/website/en/index.wml:70
 msgid "<a href=\"<page projects/vidalia>\">Vidalia</a>"
 msgstr "<a href=\"<page projects/vidalia>\">Vidalia</a>"
 
 #. type: Content of: <div><div><div><div><table><tr><td><p>
-#: /home/runa/tor/website/en/index.wml:71
+#: /home/runa/dev/website/en/index.wml:71
 msgid ""
 "Vidalia is a graphical way to control and view Tor's connections and "
 "settings."
 msgstr "Vidalia 是一个以图形方式管理Tor连接和设置的工具"
 
 #. type: Content of: <div><div><div><div><table><tr><td>
-#: /home/runa/tor/website/en/index.wml:75
+#: /home/runa/dev/website/en/index.wml:75
 msgid "<img src=\"$(IMGROOT)/icon-TorBrowser.jpg\" alt=\"TorBrowser Icon\">"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><table><tr><td><h3>
-#: /home/runa/tor/website/en/index.wml:76
+#: /home/runa/dev/website/en/index.wml:76
 msgid "<a href=\"<page projects/torbrowser>\">Tor Browser</a>"
 msgstr "<a href=\"<page projects/torbrowser>\">Tor 浏览器</a>"
 
 #. type: Content of: <div><div><div><div><table><tr><td><p>
-#: /home/runa/tor/website/en/index.wml:78
+#: /home/runa/dev/website/en/index.wml:78
 msgid ""
 "Tor Browser contains everything you need to safely browse the Internet."
 msgstr "Tor浏览器包含了你浏览互联网所需要的一切"
 
 #. type: Content of: <div><div><div><div><h2>
-#: /home/runa/tor/website/en/index.wml:90
+#: /home/runa/dev/website/en/index.wml:90
 msgid "Who Uses Tor?"
 msgstr "谁在使用Tor"
 
 #. type: Content of: <div><div><div><div><div><h3>
-#: /home/runa/tor/website/en/index.wml:93
+#: /home/runa/dev/website/en/index.wml:93
 msgid ""
 "<a href=\"<page about/torusers>#normalusers\"><img "
 "src=\"$(IMGROOT)/family.jpg\" alt=\"Normal People\">Family &amp; Friends</a>"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><div><p>
-#: /home/runa/tor/website/en/index.wml:95
+#: /home/runa/dev/website/en/index.wml:95
 msgid ""
 "People like you and your family use Tor to protect themselves, their "
 "children, and their dignity while using the Internet."
 msgstr "您和家人、朋友上网时使用Tor可以保护自己和孩子们，守住每个人的尊严。"
 
 #. type: Content of: <div><div><div><div><div><h3>
-#: /home/runa/tor/website/en/index.wml:99
+#: /home/runa/dev/website/en/index.wml:99
 msgid ""
 "<a href=\"<page about/torusers>#executives\"><img "
 "src=\"$(IMGROOT)/consumers.jpg\" alt=\"Businesses\">Businesses</a>"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><div><p>
-#: /home/runa/tor/website/en/index.wml:101
+#: /home/runa/dev/website/en/index.wml:101
 msgid ""
 "Businesses use Tor to research competition, keep business strategies "
 "confidential, and facilitate internal accountability."
 msgstr "商务人士使用 Tor 研究竞争对手，保护商业机密，促进内部问责机制。"
 
 #. type: Content of: <div><div><div><div><div><h3>
-#: /home/runa/tor/website/en/index.wml:105
+#: /home/runa/dev/website/en/index.wml:105
 msgid ""
 "<a href=\"<page about/torusers>#activists\"><img "
 "src=\"$(IMGROOT)/activists.jpg\" alt=\"Activists &amp; "
@@ -208,28 +208,28 @@
 msgstr ""
 
 #. type: Content of: <div><div><div><div><div><p>
-#: /home/runa/tor/website/en/index.wml:107
+#: /home/runa/dev/website/en/index.wml:107
 msgid ""
 "Activists use Tor to anonymously report abuses from danger zones.  "
 "Whistleblowers use Tor to safely report on corruption."
 msgstr "身处险境的活动人士可以使用 Tor 匿名举报权利滥用。举报者使用 Tor 可以安全的曝光腐败行为。"
 
 #. type: Content of: <div><div><div><div><div><h3>
-#: /home/runa/tor/website/en/index.wml:111
+#: /home/runa/dev/website/en/index.wml:111
 msgid ""
 "<a href=\"<page about/torusers>#journalist\"><img "
 "src=\"$(IMGROOT)/media.jpg\" alt=\"Journalists and the Media\">Media</a>"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><div><p>
-#: /home/runa/tor/website/en/index.wml:113
+#: /home/runa/dev/website/en/index.wml:113
 msgid ""
 "Journalists and the media use Tor to protect their research and sources "
 "online."
 msgstr "新闻记者使用 Tor 可以保护他们的线上调查与消息来源。"
 
 #. type: Content of: <div><div><div><div><div><h3>
-#: /home/runa/tor/website/en/index.wml:117
+#: /home/runa/dev/website/en/index.wml:117
 msgid ""
 "<a href=\"<page about/torusers>#military\"><img "
 "src=\"$(IMGROOT)/military.jpg\" alt=\"Military and Law "
@@ -237,24 +237,39 @@
 msgstr ""
 
 #. type: Content of: <div><div><div><div><div><p>
-#: /home/runa/tor/website/en/index.wml:119
+#: /home/runa/dev/website/en/index.wml:119
 msgid ""
 "Militaries and law enforcement use Tor to protect their communications, "
 "investigations, and intelligence gathering online."
 msgstr "军人和执法人员使用 Tor 可以保护他们的在网上的通信、调查和情报搜集。"
 
 #. type: Content of: <div><div><div><div><h2>
-#: /home/runa/tor/website/en/index.wml:123
+#: /home/runa/dev/website/en/index.wml:123
 msgid "Announcements"
 msgstr "消息公告"
 
 #. type: Content of: <div><div><div><div><table><tr><td><div>
-#: /home/runa/tor/website/en/index.wml:128
+#: /home/runa/dev/website/en/index.wml:128
+msgid "<span class=\"month\">Mar</span><br><span class=\"day\">23</span>"
+msgstr ""
+
+#. type: Content of: <div><div><div><div><table><tr><td><p>
+#: /home/runa/dev/website/en/index.wml:129
+msgid ""
+"The Tor Project wins the \"Project of Social Benefit\" award from the Free "
+"Software Foundation and GNU Project. We are honored to win this award and to"
+" be listed amongst the former winners. <a "
+"href=\"https://blog.torproject.org/blog/tor-project-receives-fsf-"
+"award\">Read more</a> about this award."
+msgstr ""
+
+#. type: Content of: <div><div><div><div><table><tr><td><div>
+#: /home/runa/dev/website/en/index.wml:135
 msgid "<span class=\"month\">Feb</span><br><span class=\"day\">23</span>"
 msgstr ""
 
 #. type: Content of: <div><div><div><div><table><tr><td><p>
-#: /home/runa/tor/website/en/index.wml:129
+#: /home/runa/dev/website/en/index.wml:136
 msgid ""
 "The latest stable Tor version, 0.2.1.30, is <a "
 "href=\"https://lists.torproject.org/pipermail/tor-"
@@ -264,18 +279,3 @@
 "reachable from Iran again.  We don't expect this tweak will win the arms "
 "race long-term, but it buys us time until we roll out a better solution."
 msgstr ""
-
-#. type: Content of: <div><div><div><div><table><tr><td><div>
-#: /home/runa/tor/website/en/index.wml:138
-msgid "<span class=\"month\">Jan</span><br><span class=\"day\">30</span>"
-msgstr ""
-
-#. type: Content of: <div><div><div><div><table><tr><td><p>
-#: /home/runa/tor/website/en/index.wml:139
-msgid ""
-"Tor helping with Egypt.  Here's what we've learned <a "
-"href=\"https://blog.torproject.org/blog/recent-events-egypt\">about recent "
-"events in Egypt</a>. And we're keeping our <a href=\"<page "
-"press/inthemedia>\">In the media</a> page up to date with stories about how "
-"we're helping around the world."
-msgstr ""

Modified: translation/trunk/projects/website/po/zh_CN/about/2-medium.overview.po
===================================================================
--- translation/trunk/projects/website/po/zh_CN/about/2-medium.overview.po	2011-04-12 16:15:00 UTC (rev 24594)
+++ translation/trunk/projects/website/po/zh_CN/about/2-medium.overview.po	2011-04-12 16:19:31 UTC (rev 24595)
@@ -8,7 +8,7 @@
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
 "POT-Creation-Date: 2011-03-01 16:37+0000\n"
-"PO-Revision-Date: 2011-03-27 17:27+0000\n"
+"PO-Revision-Date: 2011-04-12 16:14+0000\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"

