tor-commits

Download

tor-commits@lists.torproject.org

July 2011

16 participants
868 discussions

r24894: {website} update the google checkout datafeed for donations to clear u (website/trunk/donate)
by Andrew Lewman 13 Jul '11

13 Jul '11

Author: phobos Date: 2011-07-13 18:38:06 +0000 (Wed, 13 Jul 2011) New Revision: 24894 Modified: website/trunk/donate/google-datafeed.xml Log: update the google checkout datafeed for donations to clear up the errors. Modified: website/trunk/donate/google-datafeed.xml =================================================================== (Binary files differ)

1 0

r24893: {} translation below 80%, removing the wml (website/trunk/download/fr)
by Runa Sandvik 13 Jul '11

13 Jul '11

Author: runa Date: 2011-07-13 18:24:53 +0000 (Wed, 13 Jul 2011) New Revision: 24893 Removed: website/trunk/download/fr/download.wml Log: translation below 80%, removing the wml Deleted: website/trunk/download/fr/download.wml =================================================================== --- website/trunk/download/fr/download.wml 2011-07-13 18:10:49 UTC (rev 24892) +++ website/trunk/download/fr/download.wml 2011-07-13 18:24:53 UTC (rev 24893) @@ -1,494 +0,0 @@ - - - - - -## translation metadata -# Revision: $Revision: 24852 $ -# Translation-Priority: 3-low -#include "head.wmi" TITLE="Download Tor" CHARSET="UTF-8" ANNOUNCE_RSS="yes" -<div id="content" class="clearfix"> -<div id="breadcrumbs"><a href="<page index>">Accueil »</a> <a href="<page -download/download>">Téléchargement</a></div> -<div id="maincol-left"> -<h1>Télécharger Tor</h1> - - -<div class="warning"> -<h2>Voulez-vous vraiment que Tor fonctionne?</h2> -<p>... alors s'il vous plaît ne faites pas que l'installer et utiliser -directement vos applications. Vous devez changer certaines de vos habitudes, -et reconfigurer vos logiciels! Tor en lui même n'est <em>PAS</em> suffisant -pour garantir votre anonymat. Lire la <a href="#warning">liste complète des -mises en garde</a> . -</p> -</div> - - - - -<table class="topforty"> -<tr> -<td class="nopad"><div class="title"><a name="Windows">Microsoft Windows</a></div></td> -</tr> -<tr> -<td> - - -<script type="text/javascript" src="../jquery-1.6.1.min.js"></script> -<script type="text/javascript"> -function displayVals() { var t3 = jQuery("#t3").val(); var amount = -jQuery("#amount").val(); if(t3 != 0){ jQuery('#a3').val(amount); -jQuery('#p3').val(1); jQuery('#cmd').val('_xclick-subscriptions'); -jQuery('#item_name').val('Tor Project Membership'); -jQuery('#ppinfo').replaceWith('<h6 id="ppinfo"><small>(Requires a PayPal Account)</small></h6>'); }else{ jQuery('#a3').val(0); jQuery('#p3').val(0); -jQuery('#cmd').val('_donations'); jQuery('#item_name').val('Donation to the -Tor Project'); jQuery('#ppinfo').replaceWith('<h6 id="ppinfo" style="height:0px;"></h6>'); } if( !t3 ) { jQuery('#cmd').val('_donations'); -jQuery('#item_name').val('Donation to the Tor Project'); -jQuery('#ppinfo').replaceWith('<h6 id="ppinfo" style="height:0px;"></h6>'); } } jQuery(function(){ jQuery("#amount").change(displayVals); -jQuery("#t3").change(displayVals); displayVals(); }); - -</script> - <form class="dbox dl" action="https://www.paypal.com/cgi-bin/webscr" method="post"> - <h2>Donate to Tor</h2> - <p> - <select name="currency_code" class="cur"> - <option value="USD" selected="selected">$</option> - <option value="EUR">€</option> - <option value="GBP">£</option> - <option value="YEN">¥</option> - </select> <input type="text" id="amount" class="amount" name="amount" -value="10" size="10"> - </p> - <p> - <input type="hidden" id="a3" name="a3" value="0"> <select id="t3" name="t3"> - <option value="0">One-time Donation</option> - <option value="M">Monthly Subscription</option> - </select> - </p> - - <p> - - <input type="hidden" id="p3" name="p3" value="1"> <input type="hidden" -name="sra" value="1"> <input type="hidden" name="src" value="1"> <input -type="hidden" name="no_shipping" value="1"> <input type="hidden" -name="no_note" value="1"> <input type="hidden" id="cmd" name="cmd" -value="_donations"> <input type="hidden" name="business" -value="donations(a)torproject.org"> <input type="hidden" id="item_name" -name="item_name" value="Donation to the Tor Project"> <input type="hidden" -name="return" value="https://www.torproject.org/donate"> <input -type="hidden" name="cancel_return" -value="https://www.torproject.org/donate"> - </p> - <h6 id="ppinfo" style="height:0px;"></h6> - <p> - <input class="donate-btn" type="submit" name="donate" value="Donate"> - </p> - <p><a href="<page donate/donate>">Other donation options...</a></p> - </form> - - - - -Tor pour Windows est livré de quatre façons différentes: -<ul> -<li>Le <strong>navigateur Tor Bundle</strong> est un paquetage qui contient tout -ce dont vous avez besoin pour naviguer sur Internet en toute sécurité. Il ne -nécessite aucune installation. Il suffit de l'extraire et de l'exécuter. <a -href="<page projects/torbrowser>">En savoir plus »</a></li> -<li>Le <strong>Paquetage Vidalia</strong> contient Tor, <a href="<page -projects/vidalia>">Vidalia</a> , Polipo, et Torbutton, pour l'installation -sur votre système. Vous aurez besoin de votre propre logiciel Firefox, et -vous aurez besoin de configurer d'autres applications si vous souhaitez les -utiliser avec Tor.</li> -<li>Le <strong>Paquetage Pont-par-Default Vidalia </strong> est un -<strong>Paquetage Vidalia</strong> qui est configuré pour être faire office -de <a href="<page docs/bridges>">pont</a> pour aider les utilisateurs -censurés à accéder au réseau Tor.</li> -<li>Les <strong>Paquetage Expert</strong> ne contient que Tor et rien -d'autre. Vous aurez besoin de configurer Tor et toutes vos applications -manuellement.</li> -</ul> -<p>Il existe deux versions de chaque paquet, une version stable et une version -alpha. Les paquetages Stable sont diffusés lorsque nous pensons que les -caractéristiques et le code n'auront pas besoin d'être modifiés pendant -plusieurs mois. Les paquetages Alpha ou instables sont libérés afin que vous -puissiez nous aider à tester de nouvelles fonctionnalités et à détecter et -corriger des bugs. Même s'ils ont un numéro de version supérieur à celui des -versions stables listés ci-dessus, il y a beaucoup plus de chances que des -failles de fiabilité et de sécurité y soient présentes. Merci d'avance de -nous <a href="https://bugs.torproject.org/">signaler des bugs</a> si vous en -rencontrez.</p> -<p>La version stable actuelle de Tor pour Windows est -<version-win32-stable>. L'alpha / version instable en cours de Tor pour -Windows est <version-win32-alpha>.</p> -</td> -</tr> -<tr class="gray"> -<td><span class="windows">La version (en français) du Paquetage Tor</span> -<version-torbrowserbundle> <span class="windows"> fonctionne avec Windows 7, -Vista et XP. <a -href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_fr.exe">Télécharger</a> -( <a -href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_fr.exe.asc">SIG</a> -)</span> -</td> -</tr> -<tr> -<td><span class="windows">Le développement du Paquetage navigateur Tor de -messagerie instantanée (en anglais) a été <a -href="https://blog.torproject.org/blog/tor-im-browser-bundle-discontinued-tempora…">temporairement -interrompu</a> .</span> - </td> -</tr> - <tr class="gray"> - <td><span class="windows">Télécharger <a href="<page -projects/torbrowser>">d'autres versions linguistiques et le code source</a> -du navigateur Bundle Tor.</span> -</td> -</tr> - <tr><td><span class="windows">Paquetage Vidalia Stable fonctionne avec Windows 7, -Vista, XP, <a href="<package-win32-bundle-stable>">Téléchargement version -stable</a> ( <a href="<package-win32-bundle-stable>.asc">sig</a> )</span></td> - </tr> - <tr class="gray"><td><span class="windows">Le Paquetage Vidalia Instable fonctionne avec Windows -7, Vista, XP, <a href="<package-win32-bundle-alpha>">Télécharger la version -instable</a> ( <a href="<package-win32-bundle-alpha>.asc">sig</a> )</span></td> - </tr> - <tr class="gray"><td><span class="windows">Le Paquetage Pont-par-Défaut de Vidalia fonctionne -avec Windows 7, Vista, XP, <a -href="../dist/vidalia-bundles/vidalia-bridge-bundle-<version-win32-bridge-bundle-alpha>.exe">Télécharger -la version instable</a> ( <a -href="../dist/vidalia-bundles/vidalia-bridge-bundle-<version-win32-bridge-bundle-alpha>.asc">sig</a> -)</span></td> - </tr> - <tr> - <td><span class="windows">Stable experts Bundle fonctionne avec Windows 98SE, -ME, Windows 7, Vista, XP, 2000, 2003 Server, <a -href="../dist/win32/tor-<version-win32-stable>-win32.exe">Téléchargement -version stable</a> ( <a -href="../dist/win32/tor-<version-win32-stable>-win32.exe.asc">SIG</a> -)</span></td> -</tr> - <tr class="gray"> - <td><span class="windows">Le Paquetage Expert Instable fonctionne avec Windows -98SE, ME, Windows 7, Vista, XP, 2000, 2003 Server, <a -href="../dist/win32/tor-<version-win32-alpha>-win32.exe">Télécharger la -version instable</a> ( <a -href="../dist/win32/tor-<version-win32-alpha>-win32.exe.asc">sig</a> -)</span></td> - </tr> - <tr> -<td> -<a href="<page docs/tor-doc-windows>">Documentation pour les clients -Microsoft Windows</a> -</td> -</tr> -</table> - - - - -<table class="topforty"> -<tr> -<td class="nopad"><div class="title"><a name="mac">Apple OS X</a></div></td> -</tr> -<tr> -<td class="intro">Le logiciel Tor pour OS X est livré de deux façons différentes: -<ul> -<li>Le <strong>navigateur Tor Bundle</strong> est un paquetage qui contient tout -ce dont vous avez besoin pour naviguer sur Internet en toute sécurité. Il ne -nécessite aucune installation. Il suffit de l'extraire et de l'exécuter. <a -href="<page projects/torbrowser>">En savoir plus »</a></li> -<li>Le <strong>Paquetage Vidalia</strong> contient Tor, <a href="<page -projects/vidalia>">Vidalia</a> , Polipo, et Torbutton pour installation sur -votre système. Vous aurez besoin de votre propre logiciel Firefox, et vous -aurez besoin de configurer d'autres applications si vous souhaitez les -utiliser avec Tor.</li> -</ul> -<p>Il existe deux versions de chaque paquet, une version stable et une version -alpha. Les paquetages Stable sont diffusés lorsque nous pensons que les -caractéristiques et le code n'auront pas besoin d'être modifiés pendant -plusieurs mois. Les paquetages Alpha ou instables sont libérés afin que vous -puissiez nous aider à tester de nouvelles fonctionnalités et à détecter et -corriger des bugs. Même s'ils ont un numéro de version supérieur à celui des -versions stables listés ci-dessus, il y a beaucoup plus de chances que des -failles de fiabilité et de sécurité y soient présentes. Merci d'avance de -nous <a href="https://bugs.torproject.org/">signaler des bugs</a> si vous en -rencontrez.</p> -<p>La version stable actuelle de Tor pour OS X est <version-osx-x86-stable> -. La version actuelle alpha / instable de Tor pour OS X est -<version-osx-x86-alpha>.</p> -</td> -</tr> -<tr class="gray"> -<td><span class="mac">Navigateur Tor Bundle pour OS X Intel (version bêta), <a -href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-en-US.zip">Télécharger</a> -( <a -href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-en-US.zip.asc">sig</a> -)</span> -</td> -</tr> -<tr> -<td><span class="mac">Bundle Vidalia Stable pour OS X Intel, <a -href="<package-osx-x86-bundle-stable>">Téléchargement de la version -stable</a> ( <a href="<package-osx-x86-bundle-stable>.asc">sig</a> )</span></td> -</tr> -<tr class="gray"> -<td><span class="mac">Bundle Vidalia Instable pour OS X Intel, <a -href="<package-osx-x86-bundle-alpha>">Téléchargement de la version -instable</a> ( <a href="<package-osx-x86-bundle-alpha>.asc">sig</a> )</span></td> -</tr> -<tr> -<td><span class="mac">Bundle Vidalia Stable pour OS X PowerPC, <a -href="<package-osx-ppc-bundle-stable>">Téléchargement de la version -stable</a> ( <a href="<package-osx-ppc-bundle-stable>.asc">sig</a> )</span></td> -</tr> -<tr class="gray"> -<td><span class="mac">Bundle Vidalia Instable pour OS X PowerPC, <a -href="<package-osx-ppc-bundle-alpha>">Téléchargement de la version -instable</a> ( <a href="<package-osx-ppc-bundle-alpha>.asc">sig</a> )</span></td> -</tr> -<tr> -<td><a href="<page docs/tor-doc-osx>">Documentation pour les clients OS X -d'Apple</a>.</td> -</tr> -</table> - - -  - -<table class="topforty"> -<tr> -<td class="nopad"><div class="title"><a name="linux">Linux/Unix</a></div></td></tr> -<tr> -<td class="intro">Le logiciel Tor est livré de deux façons différentes: -<ul> -<li>Le <strong>navigateur Tor Bundle</strong> est un paquetage qui contient tout -ce dont vous avez besoin pour naviguer sur Internet en toute sécurité. Il ne -nécessite aucune installation. Il suffit de l'extraire et de l'exécuter. <a -href="<page projects/torbrowser>">En savoir plus »</a></li> -<li>Lire le mode d'emploi d'utilisation <a href="<page -download/download-unix>">de nos dépots pour Tor</a> .</li> -</ul> -</td> -</tr> -<tr class="gray"> -<td><span class="linux">Le Paquetage du navigateur Tor pour GNU/Linux (version -beta) pour i686, <a -href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-fr.tar.gz">Télécharger</a> -( <a -href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-fr.tar.gz.asc">sig</a> -)</span></td> -</tr> -<tr> -<td><span class="linux">Le Paquetage du navigateur Tor pour GNU/Linux (version -beta) pour x86_64, <a -href="../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64>-dev-fr.tar.gz">Télécharger</a> -( <a -href="../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64>-dev-fr.tar.gz.asc">sig</a> -)</span></td> -</tr> -<tr class="gray"> -<td><span class="linux">Utilisez <a href="<page download/download-unix>">nos -dépots</a> pour tous les autres logiciels faisant appel à Tor.</span></td> -</tr> -</table> -<table class="topforty"> -<tr> -<td class="nopad"><div class="title"><a name="smartphones">Tor pour Smartphones</a></div></td> -</tr> -<tr class="gray"> -<td colspan="2">Smartphones basés sur Android, tablettes, ordinateurs</td> -<td><a -href="../dist/android/<version-androidbundle-tor>-orbot-<version-androidbundle-orbot>.apk">Bundle -Android</a></td> -<td><a href="<page docs/android>">Instructions Android</a></td> -</tr> -<tr> -<td colspan="2">iPhone, iPod Touch, iPad</td> -<td colspan="2"><span class="mac"><a href="http://sid77.slackware.it/iphone/">Test des -packetages par Marco</a></span></td> -</tr> -<tr class="gray"> -<td>Nokia Maemo/N900</td> -<td></td> -<td><span class="nokia"><a href="<page docs/N900>">Instructions -Expérimentales</a></span></td> -<td></td> -</tr> -</table> - - - - -<table class="topforty"> -<tr> -<td class="nopad"><div class="title"><a name="source">Code Source</a></div></td> -</tr> -<tr> -<td colspan="2">La version stable actuelle de Tor est <version-stable> . Ses <a -href="https://gitweb.torproject.org/tor.git/blob/release-0.2.1:/ChangeLog">notes -de version (release notes)</a> sont disponibles.</td> -<td colspan="2">La version actuelle instable/alpha de Tor est <version-alpha>. Son <a -href="https://gitweb.torproject.org/tor.git/blob/refs/heads/release-0.2.2:/Change…">journal -des modifications</a> est disponible.</td> -</tr> -<tr class="gray"> -<td>Tarballs (archives tar) source</td> -<td>./configure && make && src/or/tor</td> -<td><a href="../dist/tor-<version-stable>.tar.gz">Télécharger la version -stable</a> ( <a href="../dist/tor-<version-stable>.tar.gz.asc">sig</a> )</td> -<td><a href="../dist/tor-<version-alpha>.tar.gz">Télécharger la version -instable</a> ( <a href="../dist/tor-<version-alpha>.tar.gz.asc">sig</a> )</td> -</tr> -</table> - - - -<br> - -<div class="warning"> -<a name="warning"></a> <a name="Warning"></a> -<h2><a class="anchor" href="#warning">Voulez-vous vraiment que Tor -fonctionne?</a></h2> -<p>... alors s'il vous plaît ne faites pas que l'installer et utiliser -directement vos applications. Vous devez changer certaines de vos habitudes, -et reconfigurer vos logiciels! Tor en lui même n'est <em>PAS</em> suffisant -pour garantir votre anonymat. Il existe plusieurs pièges auxquels il faut -prendre garde: -</p> - -<ol> -<li> -Tor protège seulement les applications Internet qui sont configurées pour -envoyer leur trafic internet à travers Tor — il ne vient pas -anonymiser de manière magique votre trafic, juste parce que vous l'avez -installé. Nous vous recommandons d'utiliser <a -href="http://www.mozilla.com/en-US/firefox/all-older.html">Firefox</a> avec -l'extension <a href="<page torbutton/index>">Torbutton</a>. -</li> - -<li> -Torbutton bloque les plugins tels que Java, Flash, ActiveX, RealPlayer, -Quicktime, Acrobat Reader, et d'autres: ils peuvent en effet être manipulés -pour révéler votre adresse IP. Par exemple, cela signifie que Youtube est -désactivé. Si vous avez vraiment besoin de votre Youtube, vous pouvez <a -href="<page torbutton/torbutton-faq>#noflash">reconfigurer Torbutton</a> -pour le lui permettre, mais sachez que vous vous exposez à une attaque -potentielle. En outre, des extensions comme la barre d'outils Google -collectent plus d'informations sur les sites web que vous entrez: ils -pourraient évitent Tor et/ou largement diffuser des informations -sensibles. Certaines personnes préfèrent utiliser deux navigateurs -différents (l'un pour Tor, l'autre pour la navigation non-Tor). -</li> - -<li> -Méfiez-vous des cookies: si vous avez déjà utilisé votre navigateur sans Tor -et qu'un site a installé un cookie, celui-ci pourrait révéler votre identité -même si vous utilisez Tor à nouveau. Torbutton tente de gérer vos cookies en -toute sécurité. <a -href="https://addons.mozilla.org/firefox/82/">CookieCuller</a> peut lui vous -aider à protéger les cookies que vous ne souhaitez pas perdre. -</li> - -<li> -Tor anonymise l'origine de votre trafic et chiffre tout entre vous et le -réseau Tor et tout l'intérieur du réseau Tor, mais <a -href="<wikifaq>#SoImtotallyanonymousifIuseTor">il ne peut pas chiffrer votre -trafic entre le réseau Tor et sa destination finale.</a> Si vous envoyez des -informations sensibles, vous devriez prendre autant de précautions que vous -n'utilisiez pas Tor — ou alors utilisez HTTPS ou un autres moyen de -chiffrage et d'authentification d'un bout à l'autre de la connexion. <a -href="https://www.eff.org/https-everywhere">HTTPS Everywhere</a> est une -extension Firefox produit d'une collaboration entre le projet Tor et -l'Electronic Frontier Foundation. Elle chiffre vos communications avec un -certain nombre de sites importants. -</li> - -<li> -Tandis que Tor bloque les attaquants sur votre réseau local en masquant -votre destination, il ouvre de nouveaux risques: des nodes de sortie -mal-intentionnés ou mal configurés de Tor peut vous envoyer la mauvaise page -web, ou même vous envoyer des applets Java déguisées en domaines en qui vous -avez confiance. Soyez prudent en ouvrant des documents ou des applications -que vous téléchargez via Tor, à moins que vous n'ayez vérifié leur intégrité -auparavant. -</li> - -<li> -Tor tente d'empêcher les attaquants d'apprendre quelles sont les -destinations auxquelles vous vous connectez. Il n'empêche pas quelqu'un qui -surveille votre trafic d'apprendre que vous utilisez Tor. Vous pouvez -réduire (mais pas résoudre complètement) ce risque en utilisant un <a -href="<page docs/bridges>">relais-pont Tor</a> plutôt que de vous connecter -directement au réseau Tor public, mais en fin de compte la meilleure -protection est une approche sociétale: plus il y aura des utilisateurs de -Tor près de chez vous et leurs intérêts <a href="<page -about/torusers>">diversifiés,</a> et moins dangereux ça sera d'êtes l'un -d'entre-eux. -</li> - -<li> N'utilisez pas Bittorrent et Tor en même temps <a -href="https://blog.torproject.org/blog/bittorrent-over-tor-isnt-good-idea"> -à moins d'utiliser un système tel que Tails <a -href="http://tails.boum.org/">TAILS</a>. -</li> -</ol> -<br> -<p> -Soyez intelligent et apprenez-en davantage. Comprenez ce que Tor peut et ce -qu'il ne peut pas offrir. Cette liste de pièges n'est pas exhaustive, et -nous avons besoin de votre aide <a href="<page -getinvolved/volunteer>#Documentation">pour identifier et documenter tous les -problèmes</a> . -</p> -</div> - - -</div> - - -<div id="sidecol-right"> -<div class="img-shadow"> -<div class="sidenav-sub"> -<h2>Aller à:</h2> -<ul> -<li class="dropdown"><a href="#Windows">Microsoft Windows</a></li> -<li class="dropdown"><a href="#mac">Apple OS X</a></li> -<li class="dropdown"><a href="#linux">Linux/Unix</a></li> -<li class="dropdown"><a href="#smartphones">Smartphones</a></li> -<li class="dropdown"><a href="#source">Code Source</a></li> -</ul> -</div> -</div> - - -<div class="img-shadow"> -<div class="infoblock"> -<h2>Quel est le lien (sig)?</h2> -<p>Ce sont des signatures GPG pour vous permettre de vérifier que votre fichier -téléchargé est réellement du projet Tor et non un imposteur.</p> -<a href="<page docs/verifying-signatures>">En savoir plus »</a> -</div> -</div> - - -<div class="img-shadow"> -<div class="sidenav-sub"> -<h2>Vous rencontrez des problèmes?</h2> -<ul> -<li class="dropdown"><a href="<page docs/documentation>">Lisez les excellents manuels</a></li> -</ul> -</div> -</div> - - -</div> - - -</div> - - - -#include "foot.wmi"

1 0

r24892: {translation} new and updated translations (as .po) for the website, new l (in translation/trunk/projects/website/po: . ar/about ar/docs ar/donate ar/download ar/getinvolved ar/press ar/projects ar/torbutton de/about de/docs de/download de/getinvolved el/about es/about es/docs es/download es/press fa/about fa/docs fa/donate fa/download fa/projects fi/docs fr/about fr/docs fr/download it/about it/docs it/download it/press my pl_PL/about pl_PL/docs pl_PL/download pt_BR pt_BR/about ru/abo
by Runa Sandvik 13 Jul '11

13 Jul '11

Author: runa Date: 2011-07-13 18:10:49 +0000 (Wed, 13 Jul 2011) New Revision: 24892 Added: translation/trunk/projects/website/po/de/docs/3-low.android.po translation/trunk/projects/website/po/pt_BR/ translation/trunk/projects/website/po/pt_BR/1-high.index.po translation/trunk/projects/website/po/pt_BR/about/ translation/trunk/projects/website/po/pt_BR/about/3-low.board.po translation/trunk/projects/website/po/pt_BR/about/3-low.contact.po Modified: 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.contributors.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/2-medium.documentation.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/download/1-high.download-easy.po translation/trunk/projects/website/po/ar/download/3-low.download-unix.po translation/trunk/projects/website/po/ar/download/3-low.download.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/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/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/de/about/3-low.contact.po translation/trunk/projects/website/po/de/docs/2-medium.faq.po 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/de/getinvolved/3-low.tshirt.po translation/trunk/projects/website/po/el/about/3-low.translators.po translation/trunk/projects/website/po/es/about/3-low.contact.po translation/trunk/projects/website/po/es/about/3-low.contributors.po translation/trunk/projects/website/po/es/about/3-low.volunteers.po translation/trunk/projects/website/po/es/docs/3-low.debian-vidalia.po translation/trunk/projects/website/po/es/docs/3-low.debian.po translation/trunk/projects/website/po/es/docs/3-low.tor-doc-unix.po translation/trunk/projects/website/po/es/download/1-high.download-easy.po translation/trunk/projects/website/po/es/download/3-low.download.po translation/trunk/projects/website/po/es/press/4-optional.2010-03-25-tor-store-press-release.po translation/trunk/projects/website/po/fa/about/2-medium.torusers.po translation/trunk/projects/website/po/fa/about/3-low.board.po translation/trunk/projects/website/po/fa/about/3-low.contact.po translation/trunk/projects/website/po/fa/about/3-low.contributors.po translation/trunk/projects/website/po/fa/about/3-low.corepeople.po translation/trunk/projects/website/po/fa/about/3-low.financials.po translation/trunk/projects/website/po/fa/about/3-low.translators.po translation/trunk/projects/website/po/fa/about/3-low.volunteers.po translation/trunk/projects/website/po/fa/docs/2-medium.installguide.po translation/trunk/projects/website/po/fa/docs/3-low.debian-vidalia.po translation/trunk/projects/website/po/fa/docs/3-low.debian.po translation/trunk/projects/website/po/fa/docs/3-low.tor-doc-unix.po translation/trunk/projects/website/po/fa/donate/3-low.matching-program.po translation/trunk/projects/website/po/fa/download/1-high.download-easy.po translation/trunk/projects/website/po/fa/download/3-low.download.po translation/trunk/projects/website/po/fa/projects/3-low.puppettor.po translation/trunk/projects/website/po/fa/projects/3-low.torweather.po translation/trunk/projects/website/po/fi/docs/3-low.debian-vidalia.po translation/trunk/projects/website/po/fi/docs/3-low.debian.po translation/trunk/projects/website/po/fi/docs/3-low.tor-doc-unix.po translation/trunk/projects/website/po/fr/about/3-low.contact.po translation/trunk/projects/website/po/fr/about/3-low.contributors.po translation/trunk/projects/website/po/fr/docs/3-low.tor-doc-unix.po translation/trunk/projects/website/po/fr/download/1-high.download-easy.po translation/trunk/projects/website/po/fr/download/3-low.download.po translation/trunk/projects/website/po/it/about/3-low.contact.po translation/trunk/projects/website/po/it/about/3-low.contributors.po translation/trunk/projects/website/po/it/about/3-low.volunteers.po translation/trunk/projects/website/po/it/docs/3-low.debian-vidalia.po translation/trunk/projects/website/po/it/docs/3-low.debian.po translation/trunk/projects/website/po/it/docs/3-low.tor-doc-unix.po translation/trunk/projects/website/po/it/download/1-high.download-easy.po translation/trunk/projects/website/po/it/download/3-low.download.po translation/trunk/projects/website/po/it/press/4-optional.2010-03-25-tor-store-press-release.po translation/trunk/projects/website/po/my/1-high.index.po translation/trunk/projects/website/po/pl_PL/about/3-low.contact.po translation/trunk/projects/website/po/pl_PL/about/3-low.contributors.po translation/trunk/projects/website/po/pl_PL/about/3-low.sponsors.po translation/trunk/projects/website/po/pl_PL/about/3-low.volunteers.po translation/trunk/projects/website/po/pl_PL/docs/3-low.debian-vidalia.po translation/trunk/projects/website/po/pl_PL/docs/3-low.debian.po translation/trunk/projects/website/po/pl_PL/docs/3-low.tor-doc-unix.po translation/trunk/projects/website/po/pl_PL/download/1-high.download-easy.po translation/trunk/projects/website/po/pl_PL/download/3-low.download.po translation/trunk/projects/website/po/ru/about/3-low.contact.po translation/trunk/projects/website/po/ru/about/3-low.contributors.po translation/trunk/projects/website/po/ru/about/3-low.volunteers.po translation/trunk/projects/website/po/ru/docs/3-low.debian-vidalia.po translation/trunk/projects/website/po/ru/docs/3-low.debian.po translation/trunk/projects/website/po/ru/docs/3-low.tor-doc-unix.po translation/trunk/projects/website/po/ru/download/1-high.download-easy.po translation/trunk/projects/website/po/ru/download/3-low.download.po translation/trunk/projects/website/po/ru/press/4-optional.2010-03-25-tor-store-press-release.po translation/trunk/projects/website/po/vi/download/3-low.download.po translation/trunk/projects/website/po/zh_CN/about/2-medium.overview.po translation/trunk/projects/website/po/zh_CN/download/3-low.download.po Log: new and updated translations (as .po) for the website, new language pt_BR Modified: translation/trunk/projects/website/po/ar/about/3-low.board.po =================================================================== --- translation/trunk/projects/website/po/ar/about/3-low.board.po 2011-07-13 13:55:34 UTC (rev 24891) +++ translation/trunk/projects/website/po/ar/about/3-low.board.po 2011-07-13 18:10:49 UTC (rev 24892) @@ -7,7 +7,7 @@ "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-06-21 08:19+0200\n" -"PO-Revision-Date: 2011-07-08 07:49+0000\n" +"PO-Revision-Date: 2011-07-13 17:04+0000\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)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-07-13 13:55:34 UTC (rev 24891) +++ translation/trunk/projects/website/po/ar/about/3-low.contact.po 2011-07-13 18:10:49 UTC (rev 24892) @@ -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-04-13 16:28+0200\n" -"PO-Revision-Date: 2011-04-14 00:46+0000\n" +"POT-Creation-Date: 2011-07-08 08:44+0200\n" +"PO-Revision-Date: 2011-07-09 01:09+0000\n" "Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -33,88 +33,36 @@ msgid "Tor: Contact" msgstr "Tor: اتصل بنا" -#. type: Content of: <div><div><p> +#. type: Content of: <div><div><h3> #: /home/runa/tor/website/about/en/contact.wml:16 -msgid "" -"First, if you have a problem or question about using Tor, go look at the <a " -"href=\"<page docs/documentation>#Support\">Support section</a> for how to " -"proceed. The Tor developers spend most of their time developing Tor, and " -"there are no people devoted to user support, so try to help yourself before " -"<a href=\"<page docs/faq>#SupportMail\">politely trying to find a " -"volunteer</a>." +msgid "Email" msgstr "" -"إذا كنت تواجه صعوبات أو لديك أسئلة حول استعمال Tor انتقل إلى <a href=\"<page" -" docs/documentation>#Support\">صفحة المساعدة</a> . يقضي مطورو برنامج Tor " -"معظم وقتهم في برمجة Tor, وليس هناك العدد الكافي من الأشخاص لدعم المستخدمين، " -"لذلك حاول البحث عن الحلول بنفسك, قبل أن تتفضل <a href=\"<page " -"docs/faq>#SupportMail\">بالبحث عن متطوعين للدعم</a>." -#. type: Content of: <div><div><p> -#: /home/runa/tor/website/about/en/contact.wml:18 -msgid "" -"If you really do need to reach us, here are some approaches. Please be " -"patient and <a href=\"http://www.catb.org/~esr/faqs/smart-" -"questions.html\">helpful</a>, and please make sure to write your mail in " -"English." -msgstr "" - #. type: Content of: <div><div> -#: /home/runa/tor/website/about/en/contact.wml:21 +#: /home/runa/tor/website/about/en/contact.wml:17 msgid "" -"<i>tor-assistants at torproject.org</i> is the catch-all address for " -"everything. It can be used for:" +"<a id=\"email\"></a> <i>tor-assistants at torproject.org</i> is the catch-" +"all address for everything. It can be used for reaching people working on " +"Tor. A few other addresses are more specific:" msgstr "" #. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/about/en/contact.wml:25 +#: /home/runa/tor/website/about/en/contact.wml:24 msgid "" -"Contacting the people who manage the directory authorities. Use this if you " -"run a Tor relay and have a question or problem with your relay." -msgstr "" - -#. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/about/en/contact.wml:28 -msgid "" -"So we can fix typos on the website, change wrong statements or directions on" -" the website, and add new sections and paragraphs that you send us. You " -"might want to make a draft of your new sections on <a href=\"<wiki>\">the " -"Tor wiki</a> first." -msgstr "" - -#. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/about/en/contact.wml:32 -msgid "" -"Hearing about your documents, patches, testing, experiences with supporting " -"applications, and so forth inspired by our <a href=\"<page " -"getinvolved/volunteer>\">volunteer page</a> (or other problems you've fixed " -"or documented about using Tor). There's no need to mail us before you start " -"working on something -- like all volunteer Internet projects, we hear from a" -" lot of excited people who vanish soon after, so we are most interested in " -"hearing about actual progress." -msgstr "" - -#. type: Content of: <div><div> -#: /home/runa/tor/website/about/en/contact.wml:42 -msgid "A few other addresses are more specific:" -msgstr "" - -#. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/about/en/contact.wml:45 -msgid "" "<i>tor-translation at lists.torproject.org</i> can put new <a href=\"<page " "getinvolved/translation>\">website translations</a> into place, and help " "answer questions about existing and new translations." msgstr "" #. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/about/en/contact.wml:48 +#: /home/runa/tor/website/about/en/contact.wml:27 msgid "" "<i>tordnsel at torproject.org</i> is the alias for the people responsible " "for the tordns exitlist." msgstr "" #. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/about/en/contact.wml:50 +#: /home/runa/tor/website/about/en/contact.wml:29 msgid "" "<i>donations at torproject.org</i> is for questions and comments about <a " "href=\"<page donate/donate>\">getting money to the developers</a>. More " @@ -123,7 +71,7 @@ msgstr "" #. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/about/en/contact.wml:55 +#: /home/runa/tor/website/about/en/contact.wml:34 msgid "" "<i>execdir at torproject.org</i> is for press/media, questions and comments " "about Tor the non-profit corporation: trademark questions, affiliation and " @@ -131,33 +79,72 @@ "etc." msgstr "" +#. type: Content of: <div><div><h3> +#: /home/runa/tor/website/about/en/contact.wml:40 +msgid "Identi.ca" +msgstr "" + +#. type: Content of: <div><div><p> +#: /home/runa/tor/website/about/en/contact.wml:41 +msgid "" +"<a id=\"identica\"></a> Contact us via our microblogging Identi.ca account " +"at <a href=\"https://identi.ca/torproject\">torproject</a>." +msgstr "" + +#. type: Content of: <div><div><h3> +#: /home/runa/tor/website/about/en/contact.wml:45 +msgid "IRC" +msgstr "" + #. type: Content of: <div><div> -#: /home/runa/tor/website/about/en/contact.wml:61 +#: /home/runa/tor/website/about/en/contact.wml:46 +msgid "<a id=\"irc\"></a>" +msgstr "" + +#. type: Content of: <div><div><p> +#: /home/runa/tor/website/about/en/contact.wml:47 msgid "" -"<a id=\"irc\"></a> Tor users and developers can also be found in the " -"following channels on <a href=\"http://www.oftc.net/oftc/\">oftc</a>:" +"Tor users and developers can also be found in the following channels on <a " +"href=\"http://www.oftc.net/oftc/\">OFTC</a>:" msgstr "" #. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/about/en/contact.wml:66 +#: /home/runa/tor/website/about/en/contact.wml:51 msgid "" "<i>#tor</i> - User and relay operation discussions. Having trouble running " "Tor or a question for other Tor users? Then this is the spot for you." msgstr "" #. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/about/en/contact.wml:69 +#: /home/runa/tor/website/about/en/contact.wml:54 msgid "" "<i>#tor-dev</i> - Channel for people who want to do development. " -"Discussions about Tor related coding, protocols, and <a href=\"<page " +"Discussions about Tor-related coding, protocols, and <a href=\"<page " "getinvolved/volunteer>\">project ideas</a> are all welcome." msgstr "" #. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/about/en/contact.wml:72 +#: /home/runa/tor/website/about/en/contact.wml:57 msgid "" "<i>#nottor</i> - This is where Tor people hang out to talk about stuff that " "is not related to Tor." msgstr "" +#. type: Content of: <div><div><h3> +#: /home/runa/tor/website/about/en/contact.wml:61 +msgid "Telephone" +msgstr "" +#. type: Content of: <div><div> +#: /home/runa/tor/website/about/en/contact.wml:62 +msgid "<a id=\"phone\"></a>" +msgstr "" + +#. type: Content of: <div><div><p> +#: /home/runa/tor/website/about/en/contact.wml:63 +msgid "" +"If none of the above appeal to you, calling +1-781-352-0568 will reach the " +"Tor office. Should there be no answer, please leave a message." +msgstr "" + + Modified: translation/trunk/projects/website/po/ar/about/3-low.contributors.po =================================================================== --- translation/trunk/projects/website/po/ar/about/3-low.contributors.po 2011-07-13 13:55:34 UTC (rev 24891) +++ translation/trunk/projects/website/po/ar/about/3-low.contributors.po 2011-07-13 18:10:49 UTC (rev 24892) @@ -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:18+0000\n" +"POT-Creation-Date: 2011-07-08 08:44+0200\n" +"PO-Revision-Date: 2011-07-09 01:09+0000\n" "Last-Translator: allamiro <allamiro(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -194,47 +194,69 @@ #. type: Content of: <div><div><dl><dt> #: /home/runa/tor/website/about/en/contributors.wml:48 +msgid "Bruce Leidl" +msgstr "" + +#. type: Content of: <div><div><dl><dd> +#: /home/runa/tor/website/about/en/contributors.wml:48 +msgid "Worked on a Tor client in Java." +msgstr "" + +#. type: Content of: <div><div><dl><dt> +#: /home/runa/tor/website/about/en/contributors.wml:49 msgid "Rebecca MacKinnon" msgstr "ريبيكا ماكينون" #. type: Content of: <div><div><dl><dd> -#: /home/runa/tor/website/about/en/contributors.wml:48 +#: /home/runa/tor/website/about/en/contributors.wml:49 msgid "" "Former Director of Tor. Co-Founder of <a " "href=\"http://www.globalvoicesonline.org/\">Global Voices Online</a>." msgstr "" #. type: Content of: <div><div><dl><dt> -#: /home/runa/tor/website/about/en/contributors.wml:50 +#: /home/runa/tor/website/about/en/contributors.wml:51 msgid "Chris Palmer" msgstr "كريس بالمر" #. type: Content of: <div><div><dl><dd> -#: /home/runa/tor/website/about/en/contributors.wml:50 +#: /home/runa/tor/website/about/en/contributors.wml:51 msgid "" "Our liaison and tech guy with EFF while EFF was funding us. Also helped " "advocate and write end-user docs." msgstr "" #. type: Content of: <div><div><dl><dt> -#: /home/runa/tor/website/about/en/contributors.wml:52 +#: /home/runa/tor/website/about/en/contributors.wml:53 +msgid "Martin Peck" +msgstr "" + +#. type: Content of: <div><div><dl><dd> +#: /home/runa/tor/website/about/en/contributors.wml:53 +msgid "" +"Worked on a VM-based transparent proxying approach for Tor clients on " +"Windows." +msgstr "" + +#. type: Content of: <div><div><dl><dt> +#: /home/runa/tor/website/about/en/contributors.wml:55 msgid "Matej Pfajfar" msgstr "ماتيج بفاجفار" #. type: Content of: <div><div><dl><dd> -#: /home/runa/tor/website/about/en/contributors.wml:52 +#: /home/runa/tor/website/about/en/contributors.wml:55 msgid "" "Author of the original onion routing code that Tor is based on, so we didn't" " have to start from scratch." msgstr "" #. type: Content of: <div><div><dl><dt> -#: /home/runa/tor/website/about/en/contributors.wml:54 +#: /home/runa/tor/website/about/en/contributors.wml:57 msgid "Johannes Renner" msgstr "يوهانس رينر" #. type: Content of: <div><div><dl><dd> -#: /home/runa/tor/website/about/en/contributors.wml:54 +#: /home/runa/tor/website/about/en/contributors.wml:57 msgid "" "Worked during the 2007 Google Summer of Code on modifying <a " "href=\"https://svn.torproject.org/svn/torflow/trunk/README\">TorFlow</a> to " @@ -242,23 +264,36 @@ msgstr "" #. type: Content of: <div><div><dl><dt> -#: /home/runa/tor/website/about/en/contributors.wml:59 +#: /home/runa/tor/website/about/en/contributors.wml:62 msgid "Scott Squires" msgstr "سكوت سكويرس" #. type: Content of: <div><div><dl><dd> -#: /home/runa/tor/website/about/en/contributors.wml:59 +#: /home/runa/tor/website/about/en/contributors.wml:62 msgid "" "The original developer of <a href=\"<page torbutton/index>\">Torbutton</a>." msgstr "" #. type: Content of: <div><div><dl><dt> -#: /home/runa/tor/website/about/en/contributors.wml:61 +#: /home/runa/tor/website/about/en/contributors.wml:64 +msgid "tup (a pseudonym)" +msgstr "" + +#. type: Content of: <div><div><dl><dd> +#: /home/runa/tor/website/about/en/contributors.wml:64 +msgid "" +"Added new features for making Tor easier to use as a <a " +"href=\"<wiki>TransparentProxy\">transparent proxy</a>. Also wrote the <a " +"href=\"http://p56soo2ibjkx23xo.onion/\">TorDNSEL code</a>." +msgstr "" + +#. type: Content of: <div><div><dl><dt> +#: /home/runa/tor/website/about/en/contributors.wml:69 msgid "Stephen Tyree" msgstr "ستيفن تيري" #. type: Content of: <div><div><dl><dd> -#: /home/runa/tor/website/about/en/contributors.wml:61 +#: /home/runa/tor/website/about/en/contributors.wml:69 msgid "" "Worked during Google Summer of Code 2009 to develop a plugin API for <a " "href=\"<page projects/vidalia>\">Vidalia</a> and create a plugin to allow " @@ -267,12 +302,12 @@ msgstr "" #. type: Content of: <div><div><dl><dt> -#: /home/runa/tor/website/about/en/contributors.wml:65 +#: /home/runa/tor/website/about/en/contributors.wml:73 msgid "Camilo Viecco" msgstr "كاميلو فييكو" #. type: Content of: <div><div><dl><dd> -#: /home/runa/tor/website/about/en/contributors.wml:65 +#: /home/runa/tor/website/about/en/contributors.wml:73 msgid "" "Worked on Providing Blossom functionality to Vidalia (<a href=\"http://trac" ".vidalia-project.net/browser/vidalia/branches/exit-country\">svn</a>) as " @@ -280,12 +315,12 @@ msgstr "" #. type: Content of: <div><div><dl><dt> -#: /home/runa/tor/website/about/en/contributors.wml:68 +#: /home/runa/tor/website/about/en/contributors.wml:76 msgid "Fred von Lohmann" msgstr "فريد فون لوهمان" #. type: Content of: <div><div><dl><dd> -#: /home/runa/tor/website/about/en/contributors.wml:68 +#: /home/runa/tor/website/about/en/contributors.wml:76 msgid "" "Fred served on our Board of Directors from 2006 through 2009. His complete " "bio can be found at the <a href=\"http://www.eff.org/about/staff/fred-von-" @@ -293,12 +328,24 @@ msgstr "" #. type: Content of: <div><div><dl><dt> -#: /home/runa/tor/website/about/en/contributors.wml:72 +#: /home/runa/tor/website/about/en/contributors.wml:80 +msgid "Kyle Williams" +msgstr "" + +#. type: Content of: <div><div><dl><dd> +#: /home/runa/tor/website/about/en/contributors.wml:80 +msgid "" +"Developer for JanusVM, a VMWare-based transparent Tor proxy that makes Tor " +"easier to set up and use." +msgstr "" + +#. type: Content of: <div><div><dl><dt> +#: /home/runa/tor/website/about/en/contributors.wml:82 msgid "Christian Wilms" msgstr "" #. type: Content of: <div><div><dl><dd> -#: /home/runa/tor/website/about/en/contributors.wml:72 +#: /home/runa/tor/website/about/en/contributors.wml:82 msgid "" "Worked on Performance Enhancing Measures for Tor Hidden Services (<a " "href=\"https://svn.torproject.org/cgi-bin/viewvs.cgi/tor/branches/hidserv-" @@ -306,12 +353,12 @@ msgstr "" #. type: Content of: <div><div><dl><dt> -#: /home/runa/tor/website/about/en/contributors.wml:75 +#: /home/runa/tor/website/about/en/contributors.wml:85 msgid "Jillian C. York" msgstr "جيليان سي يورك" #. type: Content of: <div><div><dl><dd> -#: /home/runa/tor/website/about/en/contributors.wml:75 +#: /home/runa/tor/website/about/en/contributors.wml:85 msgid "" "<a href=\"http://jilliancyork.com/\">Jillian C. York</a> is a writer, " "blogger, and activist based in Boston." Modified: translation/trunk/projects/website/po/ar/about/3-low.corepeople.po =================================================================== --- translation/trunk/projects/website/po/ar/about/3-low.corepeople.po 2011-07-13 13:55:34 UTC (rev 24891) +++ translation/trunk/projects/website/po/ar/about/3-low.corepeople.po 2011-07-13 18:10:49 UTC (rev 24892) @@ -7,7 +7,7 @@ "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-06-21 08:19+0200\n" -"PO-Revision-Date: 2011-07-08 07:47+0000\n" +"PO-Revision-Date: 2011-07-13 17:02+0000\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" Modified: translation/trunk/projects/website/po/ar/about/3-low.financials.po =================================================================== --- translation/trunk/projects/website/po/ar/about/3-low.financials.po 2011-07-13 13:55:34 UTC (rev 24891) +++ translation/trunk/projects/website/po/ar/about/3-low.financials.po 2011-07-13 18:10:49 UTC (rev 24892) @@ -7,7 +7,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-07-08 07:47+0000\n" +"PO-Revision-Date: 2011-07-13 17:01+0000\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)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-07-13 13:55:34 UTC (rev 24891) +++ translation/trunk/projects/website/po/ar/about/3-low.sponsors.po 2011-07-13 18:10:49 UTC (rev 24892) @@ -7,7 +7,7 @@ "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-06-29 20:42+0200\n" -"PO-Revision-Date: 2011-07-08 07:51+0000\n" +"PO-Revision-Date: 2011-07-13 17:06+0000\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)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-07-13 13:55:34 UTC (rev 24891) +++ translation/trunk/projects/website/po/ar/about/3-low.translators.po 2011-07-13 18:10:49 UTC (rev 24892) @@ -7,7 +7,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-07-08 07:52+0000\n" +"PO-Revision-Date: 2011-07-13 17:06+0000\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)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-07-13 13:55:34 UTC (rev 24891) +++ translation/trunk/projects/website/po/ar/about/3-low.volunteers.po 2011-07-13 18:10:49 UTC (rev 24892) @@ -6,8 +6,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" -"POT-Creation-Date: 2011-06-29 20:42+0200\n" -"PO-Revision-Date: 2011-07-08 07:49+0000\n" +"POT-Creation-Date: 2011-07-08 08:44+0200\n" +"PO-Revision-Date: 2011-07-13 17:03+0000\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -31,80 +31,72 @@ #. type: Content of: <div><div><dl><dt> #: /home/runa/tor/website/about/en/volunteers.wml:15 -msgid "Anonym" +msgid "Anonym, bertagaz, and intrigeri" msgstr "" #. type: Content of: <div><div><dl><dd> #: /home/runa/tor/website/about/en/volunteers.wml:15 -msgid "Maintainer of the Incognito LiveCD." +msgid "" +"Maintainers of <a href=\"https://tails.boum.org/\">The Amnesic Incognito " +"Live System</a>." msgstr "" #. type: Content of: <div><div><dl><dt> -#: /home/runa/tor/website/about/en/volunteers.wml:16 -msgid "Kevin Bankston" +#: /home/runa/tor/website/about/en/volunteers.wml:17 +msgid "Marco Bonetti" msgstr "" #. type: Content of: <div><div><dl><dd> -#: /home/runa/tor/website/about/en/volunteers.wml:16 -msgid "" -"EFF lawyer who helped write the <a href=\"<page eff/tor-legal-faq>\">Tor " -"Legal FAQ</a> and tirelessly answers the phone when somebody in the world " -"has a legal question about Tor." +#: /home/runa/tor/website/about/en/volunteers.wml:17 +msgid "Focusing on MobileTor for the iPhone." msgstr "" #. type: Content of: <div><div><dl><dt> -#: /home/runa/tor/website/about/en/volunteers.wml:20 -msgid "Marco Bonetti" +#: /home/runa/tor/website/about/en/volunteers.wml:18 +msgid "Kasimir Gabert" msgstr "" #. type: Content of: <div><div><dl><dd> -#: /home/runa/tor/website/about/en/volunteers.wml:20 -msgid "Focusing on MobileTor for the iPhone." +#: /home/runa/tor/website/about/en/volunteers.wml:18 +msgid "Maintains TorStatus." msgstr "" #. type: Content of: <div><div><dl><dt> -#: /home/runa/tor/website/about/en/volunteers.wml:21 -msgid "Kasimir Gabert" +#: /home/runa/tor/website/about/en/volunteers.wml:19 +msgid "Marcia Hofmann and Kevin Bankston" msgstr "" #. type: Content of: <div><div><dl><dd> -#: /home/runa/tor/website/about/en/volunteers.wml:21 -msgid "Maintains TorStatus." +#: /home/runa/tor/website/about/en/volunteers.wml:19 +msgid "" +"EFF lawyers who helped write the <a href=\"<page eff/tor-legal-faq>\">Tor " +"Legal FAQ</a> and tirelessly answers the phone when somebody in the world " +"has a legal question about Tor." msgstr "" #. type: Content of: <div><div><dl><dt> -#: /home/runa/tor/website/about/en/volunteers.wml:22 +#: /home/runa/tor/website/about/en/volunteers.wml:23 msgid "Andreas Jonsson" msgstr "" #. type: Content of: <div><div><dl><dd> -#: /home/runa/tor/website/about/en/volunteers.wml:22 +#: /home/runa/tor/website/about/en/volunteers.wml:23 msgid "Works on OS X Tor Browser Bundle sandbox technology." msgstr "" #. type: Content of: <div><div><dl><dt> -#: /home/runa/tor/website/about/en/volunteers.wml:24 +#: /home/runa/tor/website/about/en/volunteers.wml:25 msgid "Fabian Keil" msgstr "" #. type: Content of: <div><div><dl><dd> -#: /home/runa/tor/website/about/en/volunteers.wml:24 +#: /home/runa/tor/website/about/en/volunteers.wml:25 msgid "" "One of the core Privoxy developers, and also a Tor fan. He's the reason Tor " "and Privoxy still work well together." msgstr "" #. type: Content of: <div><div><dl><dt> -#: /home/runa/tor/website/about/en/volunteers.wml:26 -msgid "Bruce Leidl" -msgstr "" - -#. type: Content of: <div><div><dl><dd> -#: /home/runa/tor/website/about/en/volunteers.wml:26 -msgid "Working on a Tor client in Java." -msgstr "" - -#. type: Content of: <div><div><dl><dt> #: /home/runa/tor/website/about/en/volunteers.wml:27 msgid "Julius Mittenzwei" msgstr "" @@ -142,60 +134,34 @@ #. type: Content of: <div><div><dl><dt> #: /home/runa/tor/website/about/en/volunteers.wml:34 -msgid "Martin Peck" -msgstr "" - -#. type: Content of: <div><div><dl><dd> -#: /home/runa/tor/website/about/en/volunteers.wml:34 -msgid "" -"Working on a VM-based transparent proxying approach for Tor clients on " -"Windows." -msgstr "" - -#. type: Content of: <div><div><dl><dt> -#: /home/runa/tor/website/about/en/volunteers.wml:36 msgid "rovv (a pseudonym -- he's managed to stay anonymous even from us!)" msgstr "" #. type: Content of: <div><div><dl><dd> -#: /home/runa/tor/website/about/en/volunteers.wml:37 +#: /home/runa/tor/website/about/en/volunteers.wml:35 msgid "" "The most dedicated bug reporter we've ever heard from. He must read Tor " "source code every day over breakfast." msgstr "" #. type: Content of: <div><div><dl><dt> -#: /home/runa/tor/website/about/en/volunteers.wml:39 -msgid "tup (another pseudonym)" +#: /home/runa/tor/website/about/en/volunteers.wml:37 +msgid "Nart Villeneuve" msgstr "" #. type: Content of: <div><div><dl><dd> -#: /home/runa/tor/website/about/en/volunteers.wml:39 +#: /home/runa/tor/website/about/en/volunteers.wml:37 msgid "" -"Periodically adds new features for making Tor easier to use as a <a " -"href=\"<wiki>TransparentProxy\">transparent proxy</a>. Also maintains the <a" -" href=\"http://p56soo2ibjkx23xo.onion/\">TorDNSEL code</a>." +"Security researcher who works with Jacob on Internet Censorship research." msgstr "" #. type: Content of: <div><div><dl><dt> -#: /home/runa/tor/website/about/en/volunteers.wml:44 -msgid "Kyle Williams" -msgstr "" - -#. type: Content of: <div><div><dl><dd> -#: /home/runa/tor/website/about/en/volunteers.wml:44 -msgid "" -"Developer for JanusVM, a VMWare-based transparent Tor proxy that makes Tor " -"easier to set up and use." -msgstr "" - -#. type: Content of: <div><div><dl><dt> -#: /home/runa/tor/website/about/en/volunteers.wml:47 +#: /home/runa/tor/website/about/en/volunteers.wml:39 msgid "Ethan Zuckerman" msgstr "" #. type: Content of: <div><div><dl><dd> -#: /home/runa/tor/website/about/en/volunteers.wml:47 +#: /home/runa/tor/website/about/en/volunteers.wml:39 msgid "" "A blogger who has written some <a " "href=\"http://www.ethanzuckerman.com/blog/?p=1019\">interesting</a> <a " @@ -205,7 +171,7 @@ msgstr "" #. type: Content of: <div><div><dl><dt> -#: /home/runa/tor/website/about/en/volunteers.wml:52 +#: /home/runa/tor/website/about/en/volunteers.wml:44 msgid "" "All our relay operators, people who write <a " "href=\"http://freehaven.net/anonbib/\">research papers</a> about Tor, people" Modified: translation/trunk/projects/website/po/ar/about/4-optional.gsoc.po =================================================================== --- translation/trunk/projects/website/po/ar/about/4-optional.gsoc.po 2011-07-13 13:55:34 UTC (rev 24891) +++ translation/trunk/projects/website/po/ar/about/4-optional.gsoc.po 2011-07-13 18:10:49 UTC (rev 24892) @@ -7,7 +7,7 @@ "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-05-23 17:02+0200\n" -"PO-Revision-Date: 2011-07-08 07:43+0000\n" +"PO-Revision-Date: 2011-07-13 16:42+0000\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" Modified: translation/trunk/projects/website/po/ar/docs/2-medium.documentation.po =================================================================== --- translation/trunk/projects/website/po/ar/docs/2-medium.documentation.po 2011-07-13 13:55:34 UTC (rev 24891) +++ translation/trunk/projects/website/po/ar/docs/2-medium.documentation.po 2011-07-13 18:10:49 UTC (rev 24892) @@ -7,7 +7,7 @@ "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-06-29 20:41+0200\n" -"PO-Revision-Date: 2011-07-08 07:43+0000\n" +"PO-Revision-Date: 2011-07-13 16:38+0000\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" Modified: translation/trunk/projects/website/po/ar/docs/2-medium.installguide.po =================================================================== --- translation/trunk/projects/website/po/ar/docs/2-medium.installguide.po 2011-07-13 13:55:34 UTC (rev 24891) +++ translation/trunk/projects/website/po/ar/docs/2-medium.installguide.po 2011-07-13 18:10:49 UTC (rev 24892) @@ -7,7 +7,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-07-08 07:45+0000\n" +"PO-Revision-Date: 2011-07-13 16:51+0000\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)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-07-13 13:55:34 UTC (rev 24891) +++ translation/trunk/projects/website/po/ar/docs/2-medium.tor-doc-osx.po 2011-07-13 18:10:49 UTC (rev 24892) @@ -7,7 +7,7 @@ "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-06-21 08:18+0200\n" -"PO-Revision-Date: 2011-07-08 07:46+0000\n" +"PO-Revision-Date: 2011-07-13 16:57+0000\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" 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-07-13 13:55:34 UTC (rev 24891) +++ translation/trunk/projects/website/po/ar/docs/2-medium.tor-doc-relay.po 2011-07-13 18:10:49 UTC (rev 24892) @@ -7,7 +7,7 @@ "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-06-21 08:19+0200\n" -"PO-Revision-Date: 2011-07-08 07:50+0000\n" +"PO-Revision-Date: 2011-07-13 17:04+0000\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" 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-07-13 13:55:34 UTC (rev 24891) +++ translation/trunk/projects/website/po/ar/docs/2-medium.verifying-signatures.po 2011-07-13 18:10:49 UTC (rev 24892) @@ -7,7 +7,7 @@ "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-06-21 08:19+0200\n" -"PO-Revision-Date: 2011-07-08 07:51+0000\n" +"PO-Revision-Date: 2011-07-13 17:06+0000\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)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-07-13 13:55:34 UTC (rev 24891) +++ translation/trunk/projects/website/po/ar/docs/3-low.N900.po 2011-07-13 18:10:49 UTC (rev 24892) @@ -7,7 +7,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-07-08 07:45+0000\n" +"PO-Revision-Date: 2011-07-13 16:51+0000\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)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-07-13 13:55:34 UTC (rev 24891) +++ translation/trunk/projects/website/po/ar/docs/3-low.android.po 2011-07-13 18:10:49 UTC (rev 24892) @@ -7,7 +7,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-07-08 07:47+0000\n" +"PO-Revision-Date: 2011-07-13 17:01+0000\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)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-07-13 13:55:34 UTC (rev 24891) +++ translation/trunk/projects/website/po/ar/docs/3-low.debian-vidalia.po 2011-07-13 18:10:49 UTC (rev 24892) @@ -6,8 +6,8 @@ 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-07-08 07:50+0000\n" +"POT-Creation-Date: 2011-07-08 08:43+0200\n" +"PO-Revision-Date: 2011-07-13 17:04+0000\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -35,7 +35,7 @@ msgstr "" #. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:16 /tmp/M9Wxp74W_E.xml:83 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:16 /tmp/LnaSOLeTA9.xml:84 msgid "<br />" msgstr "" @@ -56,72 +56,77 @@ #. type: Content of: <div><div><p><ul><li> #: /home/runa/tor/website/docs/en/debian-vidalia.wml:29 -msgid "Ubuntu 10.10 is \"maverick\" but use the \"lucid\" packages" +msgid "Ubuntu 11.04 is \"natty\"" msgstr "" #. type: Content of: <div><div><p><ul><li> #: /home/runa/tor/website/docs/en/debian-vidalia.wml:30 +msgid "Ubuntu 10.10 or Trisquel 4.5 is \"maverick\"" +msgstr "" + +#. type: Content of: <div><div><p><ul><li> +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:31 msgid "Ubuntu 10.04 or Trisquel 4.0 is \"lucid\"" msgstr "" #. type: Content of: <div><div><p><ul><li> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:31 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:32 msgid "Ubuntu 9.10 or Trisquel 3.5 is \"karmic\"" msgstr "" #. type: Content of: <div><div><p><ul><li> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:32 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:33 msgid "Ubuntu 9.04 is \"jaunty\"" msgstr "" #. type: Content of: <div><div><p><ul><li> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:33 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:34 msgid "Ubuntu 8.10 is \"intrepid\"" msgstr "" #. type: Content of: <div><div><p><ul><li> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:34 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:35 msgid "Ubuntu 8.04 is \"hardy\"" msgstr "" #. type: Content of: <div><div><p><ul><li> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:35 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:36 msgid "Debian Etch is \"etch\"" msgstr "" #. type: Content of: <div><div><p><ul><li> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:36 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:37 msgid "Debian Lenny is \"lenny\"" msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:39 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:40 msgid "Then add this line to your <tt>/etc/apt/sources.list</tt> file:<br />" msgstr "" #. type: Content of: <div><div><p><pre> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:43 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:44 #, no-wrap msgid "" "deb http://deb.torproject.org/torproject.org <DISTRIBUTION> main\n" msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:45 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:46 msgid "" "where you substitute the above word (etch, lenny, sid, karmic, jaunty, " "intrepid, hardy) in place of <DISTRIBUTION>." msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:50 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:51 msgid "" "Then add the gpg key used to sign the packages by running the following " "commands at your command prompt:" msgstr "" #. type: Content of: <div><div><p><pre> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:53 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:54 #, no-wrap msgid "" "gpg --keyserver keys.gnupg.net --recv 886DDD89\n" @@ -129,14 +134,14 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:56 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:57 msgid "" "Now refresh your sources and install Vidalia by running the following " "commands at your command prompt:" msgstr "" #. type: Content of: <div><div><p><pre> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:59 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:60 #, no-wrap msgid "" "apt-get update\n" @@ -144,8 +149,8 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:65 -#: /tmp/M9Wxp74W_E.xml:112 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:66 +#: /tmp/LnaSOLeTA9.xml:113 msgid "" "Now Vidalia is installed and running. Move on to <a href=\"<page docs/tor-" "doc-unix>#polipo\">step two</a> of the \"Vidalia on Linux/Unix\" " @@ -153,7 +158,7 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:71 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:72 msgid "" "The DNS name <code>deb.torproject.org</code> is actually a set of " "independent servers in a DNS round robin configuration. If you for some " @@ -163,38 +168,38 @@ msgstr "" #. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:79 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:80 msgid "<hr /> <a id=\"source\"></a>" msgstr "" #. type: Content of: <div><div><h2> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:82 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:83 msgid "<a class=\"anchor\" href=\"#source\">Building from source</a>" msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:86 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:87 msgid "" "If you want to build your own debs from source you must first add an " "appropriate <tt>deb-src</tt> line to <tt>sources.list</tt>." msgstr "" #. type: Content of: <div><div><p><pre> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:89 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:90 #, no-wrap msgid "" "deb-src http://deb.torproject.org/torproject.org <DISTRIBUTION> main\n" msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:91 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:92 msgid "" "You also need to install the necessary packages to build your own debs and " "the packages needed to build Vidalia:" msgstr "" #. type: Content of: <div><div><p><pre> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:94 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:95 #, no-wrap msgid "" "apt-get install build-essential fakeroot devscripts qt4-dev-tools qt4-designer libqt4-dev g++ cmake\n" @@ -202,12 +207,12 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:97 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:98 msgid "Then you can build Vidalia in ~/debian-packages:" msgstr "" #. type: Content of: <div><div><p><pre> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:99 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:100 #, no-wrap msgid "" "mkdir ~/debian-packages; cd ~/debian-packages\n" @@ -218,23 +223,23 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:105 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:106 msgid "Now you can install the new package:" msgstr "" #. type: Content of: <div><div><p><pre> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:107 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:108 #, no-wrap msgid "sudo dpkg -i vidalia_*.deb\n" msgstr "" #. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:117 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:118 msgid "<hr />" msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:119 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:120 msgid "" "If you have suggestions for improving this document, please <a href=\"<page " "about/contact>\">send them to us</a>. Thanks!" Modified: translation/trunk/projects/website/po/ar/docs/3-low.debian.po =================================================================== --- translation/trunk/projects/website/po/ar/docs/3-low.debian.po 2011-07-13 13:55:34 UTC (rev 24891) +++ translation/trunk/projects/website/po/ar/docs/3-low.debian.po 2011-07-13 18:10:49 UTC (rev 24892) @@ -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-04-05 14:33+0000\n" +"POT-Creation-Date: 2011-07-08 08:43+0200\n" +"PO-Revision-Date: 2011-07-09 01:14+0000\n" "Last-Translator: Mohamed <>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -43,8 +43,8 @@ "دِبيان غيرالمستقرة أو دِبيان الإختبارية</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 +#: /home/runa/tor/website/docs/en/debian.wml:16 /tmp/hXZfq9nNmb.xml:43 +#: /tmp/hXZfq9nNmb.xml:114 /tmp/hXZfq9nNmb.xml:149 msgid "<br />" msgstr "<br />" @@ -67,8 +67,8 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian.wml:32 /tmp/__TMvx4TV6.xml:94 -#: /tmp/__TMvx4TV6.xml:139 /tmp/__TMvx4TV6.xml:182 +#: /home/runa/tor/website/docs/en/debian.wml:32 /tmp/hXZfq9nNmb.xml:95 +#: /tmp/hXZfq9nNmb.xml:140 /tmp/hXZfq9nNmb.xml:183 msgid "" "Now Tor is installed and running. Move on to <a href=\"<page docs/tor-doc-" "unix>#polipo\">step two</a> of the \"Tor on Linux/Unix\" instructions." @@ -123,36 +123,41 @@ #. type: Content of: <div><div><p><ul><li> #: /home/runa/tor/website/docs/en/debian.wml:60 -msgid "Ubuntu 10.10 is \"maverick\"" -msgstr "أوبنتو 10.10 هي \"maverick\"" +msgid "Ubuntu 11.04 is \"natty\"" +msgstr "" #. type: Content of: <div><div><p><ul><li> #: /home/runa/tor/website/docs/en/debian.wml:61 +msgid "Ubuntu 10.10 or Trisquel 4.5 is \"maverick\"" +msgstr "" + +#. type: Content of: <div><div><p><ul><li> +#: /home/runa/tor/website/docs/en/debian.wml:62 msgid "Ubuntu 10.04 or Trisquel 4.0 is \"lucid\"" msgstr "أو 10.04 أو ترِسكال 4.0 هما \"lucid\"" #. type: Content of: <div><div><p><ul><li> -#: /home/runa/tor/website/docs/en/debian.wml:62 +#: /home/runa/tor/website/docs/en/debian.wml:63 msgid "Ubuntu 9.10 or Trisquel 3.5 is \"karmic\"" msgstr "أوبنتو 9.10 أو ترِسكال 3.5 هما \"karmic\"" #. type: Content of: <div><div><p><ul><li> -#: /home/runa/tor/website/docs/en/debian.wml:63 +#: /home/runa/tor/website/docs/en/debian.wml:64 msgid "Ubuntu 8.04 is \"hardy\"" msgstr "أوبنتو 8.04 هي \"hardy\"" #. type: Content of: <div><div><p><ul><li> -#: /home/runa/tor/website/docs/en/debian.wml:64 +#: /home/runa/tor/website/docs/en/debian.wml:65 msgid "Ubuntu 6.06 is \"dapper\"" msgstr "أوبنتو 6.06 هي \"dapper\"" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian.wml:67 +#: /home/runa/tor/website/docs/en/debian.wml:68 msgid "Then add this line to your <tt>/etc/apt/sources.list</tt> file:<br />" msgstr "ثم أضف هذا السطر إلى <tt>/etc/apt/sources.list</tt> الملف:<br /> " #. type: Content of: <div><div><p><pre> -#: /home/runa/tor/website/docs/en/debian.wml:71 +#: /home/runa/tor/website/docs/en/debian.wml:72 #, no-wrap msgid "" "deb http://deb.torproject.org/torproject.org <DISTRIBUTION> main\n" @@ -160,7 +165,7 @@ "deb http://deb.torproject.org/torproject.org <DISTRIBUTION> main\n" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian.wml:73 +#: /home/runa/tor/website/docs/en/debian.wml:74 msgid "" "where you put the codename of your distribution (i.e. lenny, sid, maverick " "or whatever it is) in place of <DISTRIBUTION>." @@ -169,7 +174,7 @@ "مكان <DISTRIBUTION>." #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian.wml:79 +#: /home/runa/tor/website/docs/en/debian.wml:80 msgid "" "Then add the gpg key used to sign the packages by running the following " "commands at your command prompt:" @@ -178,7 +183,7 @@ "الأوامر :" #. type: Content of: <div><div><p><pre> -#: /home/runa/tor/website/docs/en/debian.wml:82 +#: /home/runa/tor/website/docs/en/debian.wml:83 #, no-wrap msgid "" "gpg --keyserver keys.gnupg.net --recv 886DDD89\n" @@ -188,7 +193,7 @@ "gpg --export A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89 | sudo apt-key add -\n" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian.wml:85 +#: /home/runa/tor/website/docs/en/debian.wml:86 msgid "" "Now refresh your sources and install Tor by running the following commands " "(as root) at your command prompt:" @@ -197,7 +202,7 @@ " محث الأوامر:" #. type: Content of: <div><div><p><pre> -#: /home/runa/tor/website/docs/en/debian.wml:88 +#: /home/runa/tor/website/docs/en/debian.wml:89 #, no-wrap msgid "" "apt-get update\n" @@ -207,7 +212,7 @@ "apt-get install tor tor-geoipdb\n" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian.wml:100 +#: /home/runa/tor/website/docs/en/debian.wml:101 msgid "" "The DNS name <code>deb.torproject.org</code> is actually a set of " "independent servers in a DNS round robin configuration. If you for some " @@ -217,12 +222,12 @@ msgstr "" #. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/debian.wml:108 +#: /home/runa/tor/website/docs/en/debian.wml:109 msgid "<hr /> <a id=\"development\"></a>" msgstr "<hr /> <a id=\"development\"></a>" #. type: Content of: <div><div><h2> -#: /home/runa/tor/website/docs/en/debian.wml:111 +#: /home/runa/tor/website/docs/en/debian.wml:112 msgid "" "<a class=\"anchor\" href=\"#development\">Option three: Using the " "development branch of Tor on Debian or Ubuntu</a>" @@ -231,7 +236,7 @@ " من تور على دِبيان أو أوبنتو.</a>" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian.wml:115 +#: /home/runa/tor/website/docs/en/debian.wml:116 msgid "" "If you want to use the <a href=\"<page " "download/download>#packagediff\">development branch</a> of Tor instead (more" @@ -243,7 +248,7 @@ "مجموعة مختلفة من السطور إلى <tt>/etc/apt/sources.list</tt> الملف:<br />" #. type: Content of: <div><div><p><pre> -#: /home/runa/tor/website/docs/en/debian.wml:120 +#: /home/runa/tor/website/docs/en/debian.wml:121 #, no-wrap msgid "" "deb http://deb.torproject.org/torproject.org <DISTRIBUTION> main\n" @@ -253,7 +258,7 @@ "deb http://deb.torproject.org/torproject.org experimental-<DISTRIBUTION> main\n" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian.wml:123 +#: /home/runa/tor/website/docs/en/debian.wml:124 msgid "" "where you again substitute the name of your distro (lenny, sid, maverick, " "...) in place of <DISTRIBUTION>." @@ -262,12 +267,12 @@ "maverick, ...)" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian.wml:129 +#: /home/runa/tor/website/docs/en/debian.wml:130 msgid "Then run the following commands at your command prompt:" msgstr "ثم شغّل الأوامر التالية في محث الأوامر الخاص بك :" #. type: Content of: <div><div><p><pre> -#: /home/runa/tor/website/docs/en/debian.wml:131 +#: /home/runa/tor/website/docs/en/debian.wml:132 #, no-wrap msgid "" "gpg --keyserver keys.gnupg.net --recv 886DDD89\n" @@ -281,17 +286,17 @@ "apt-get install tor tor-geoipdb\n" #. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/debian.wml:144 +#: /home/runa/tor/website/docs/en/debian.wml:145 msgid "<hr /> <a id=\"source\"></a>" msgstr "<hr /> <a id=\"source\"></a>" #. type: Content of: <div><div><h2> -#: /home/runa/tor/website/docs/en/debian.wml:147 +#: /home/runa/tor/website/docs/en/debian.wml:148 msgid "<a class=\"anchor\" href=\"#source\">Building from source</a>" msgstr "<a class=\"anchor\" href=\"#source\">البناء من المصدر</a>" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian.wml:151 +#: /home/runa/tor/website/docs/en/debian.wml:152 msgid "" "If you want to build your own debs from source you must first add an " "appropriate <tt>deb-src</tt> line to <tt>sources.list</tt>." @@ -302,7 +307,7 @@ #. PO4ASHARPBEGIN For the stable version.PO4ASHARPEND #. PO4ASHARPBEGIN For the unstable version.PO4ASHARPEND #. type: Content of: <div><div><p><pre> -#: /home/runa/tor/website/docs/en/debian.wml:154 +#: /home/runa/tor/website/docs/en/debian.wml:155 #, no-wrap msgid "" "\n" @@ -320,7 +325,7 @@ "deb-src http://deb.torproject.org/torproject.org experimental-<DISTRIBUTION> main\n" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian.wml:161 +#: /home/runa/tor/website/docs/en/debian.wml:162 msgid "" "You also need to install the necessary packages to build your own debs and " "the packages needed to build Tor:" @@ -329,7 +334,7 @@ "المطلوبة لبناء تور:" #. type: Content of: <div><div><p><pre> -#: /home/runa/tor/website/docs/en/debian.wml:164 +#: /home/runa/tor/website/docs/en/debian.wml:165 #, no-wrap msgid "" "apt-get install build-essential fakeroot devscripts\n" @@ -339,12 +344,12 @@ "apt-get build-dep tor\n" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian.wml:167 +#: /home/runa/tor/website/docs/en/debian.wml:168 msgid "Then you can build Tor in ~/debian-packages:" msgstr "ثم يمكنك بناء تور في ~/debian-packages:" #. type: Content of: <div><div><p><pre> -#: /home/runa/tor/website/docs/en/debian.wml:169 +#: /home/runa/tor/website/docs/en/debian.wml:170 #, no-wrap msgid "" "mkdir ~/debian-packages; cd ~/debian-packages\n" @@ -360,23 +365,23 @@ "cd ..\n" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian.wml:175 +#: /home/runa/tor/website/docs/en/debian.wml:176 msgid "Now you can install the new package:" msgstr "الأن يمكنك تثبيت الحزمة الجديدة:" #. type: Content of: <div><div><p><pre> -#: /home/runa/tor/website/docs/en/debian.wml:177 +#: /home/runa/tor/website/docs/en/debian.wml:178 #, no-wrap msgid "sudo dpkg -i tor_*.deb\n" msgstr "sudo dpkg -i tor_*.deb\n" #. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/debian.wml:187 +#: /home/runa/tor/website/docs/en/debian.wml:188 msgid "<hr />" msgstr "<hr />" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian.wml:189 +#: /home/runa/tor/website/docs/en/debian.wml:190 msgid "" "If you have suggestions for improving this document, please <a href=\"<page " "about/contact>\">send them to us</a>. Thanks!" Modified: translation/trunk/projects/website/po/ar/docs/3-low.rpms.po =================================================================== --- translation/trunk/projects/website/po/ar/docs/3-low.rpms.po 2011-07-13 13:55:34 UTC (rev 24891) +++ translation/trunk/projects/website/po/ar/docs/3-low.rpms.po 2011-07-13 18:10:49 UTC (rev 24892) @@ -7,7 +7,7 @@ "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-04-13 16:27+0200\n" -"PO-Revision-Date: 2011-07-08 07:43+0000\n" +"PO-Revision-Date: 2011-07-13 16:39+0000\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)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-07-13 13:55:34 UTC (rev 24891) +++ translation/trunk/projects/website/po/ar/docs/3-low.tor-doc-unix.po 2011-07-13 18:10:49 UTC (rev 24892) @@ -6,8 +6,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" -"POT-Creation-Date: 2011-06-21 08:18+0200\n" -"PO-Revision-Date: 2011-07-08 07:48+0000\n" +"POT-Creation-Date: 2011-07-08 08:43+0200\n" +"PO-Revision-Date: 2011-07-13 17:02+0000\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -30,9 +30,8 @@ msgstr "" #. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:14 /tmp/4vVJb7zECD.xml:26 -#: /tmp/4vVJb7zECD.xml:58 /tmp/4vVJb7zECD.xml:92 /tmp/4vVJb7zECD.xml:135 -#: /tmp/4vVJb7zECD.xml:173 +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:14 /tmp/KCUf13Jh9J.xml:26 +#: /tmp/KCUf13Jh9J.xml:57 /tmp/KCUf13Jh9J.xml:96 /tmp/KCUf13Jh9J.xml:130 msgid "<br>" msgstr "" @@ -40,9 +39,8 @@ #: /home/runa/tor/website/docs/en/tor-doc-unix.wml:17 msgid "" "<b>Note that these are the installation instructions for running a Tor " -"client. If you want to relay traffic for others to help the network grow " -"(please do), read the <a href=\"<page docs/tor-doc-relay>\">Configuring a " -"relay</a> guide.</b>" +"client. The easiest way to do this is to simply download the <a href=\"<page" +" projects/torbrowser>\">Tor Browser Bundle</a> and you are done. </b>" msgstr "" #. type: Content of: <div><div> @@ -91,75 +89,25 @@ #. type: Content of: <div><div> #: /home/runa/tor/website/docs/en/tor-doc-unix.wml:54 -msgid "<hr> <a id=\"privoxy\"></a> <a id=\"polipo\"></a>" -msgstr "" - -#. type: Content of: <div><div><h2> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:57 -msgid "" -"<a class=\"anchor\" href=\"#polipo\">Step Two: Install Polipo for Web " -"Browsing</a>" -msgstr "" - -#. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:60 -msgid "" -"After installing Tor, you need to configure your applications to use it." -msgstr "" - -#. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:64 -msgid "" -"The first step is to set up web browsing. Start by installing <a " -"href=\"http://www.pps.jussieu.fr/~jch/software/polipo/\">Polipo</a> from " -"your favorite repository. Polipo is a caching web proxy that does http " -"pipelining well, so it's well-suited for Tor's latencies. Make sure to get " -"at least Polipo 1.0.4, since earlier versions lack the SOCKS support " -"required to use Polipo with Tor. You should uninstall privoxy at this point " -"(e.g. apt-get remove privoxy or yum remove privoxy), so they don't conflict." -msgstr "" - -#. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:74 -msgid "" -"Once you've installed Polipo (either from package or from source), <b>you " -"will need to configure Polipo to use Tor</b>. Grab our <a href=\"<tbbrepo" -">/build-scripts/config/polipo.conf\">Polipo configuration for Tor</a> and " -"put it in place of your current polipo config file (e.g. /etc/polipo/config " -"or ~/.polipo). You'll need to restart Polipo for the changes to take " -"effect. For example:<br> <tt>/etc/init.d/polipo restart</tt>" -msgstr "" - -#. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:84 -msgid "" -"If you prefer, you can instead use Privoxy with <a " -"href=\"<wiki>doc/PrivoxyConfig\">this sample Privoxy configuration</a>. But " -"since the config files both use port 8118, you shouldn't run both Polipo and" -" Privoxy at the same time." -msgstr "" - -#. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:89 msgid "<hr> <a id=\"using\"></a>" msgstr "" #. type: Content of: <div><div><h2> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:91 +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:56 msgid "" -"<a class=\"anchor\" href=\"#using\">Step Three: Configure your applications " -"to use Tor</a>" +"<a class=\"anchor\" href=\"#using\">Step Two: Configure your applications to" +" use Tor</a>" msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:94 +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:59 msgid "" -"After installing Tor and Polipo, you need to configure your applications to " -"use them. The first step is to set up web browsing." +"After installing Tor, you need to configure your applications to use them. " +"The first step is to set up web browsing." msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:97 +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:62 msgid "" "You should use Tor with Firefox and Torbutton, for best safety. Simply " "install the <a href=\"<page torbutton/index>\">Torbutton plugin</a>, restart" @@ -167,14 +115,14 @@ msgstr "" #. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:103 +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:68 msgid "" "<img alt=\"Torbutton plugin for Firefox\" src=\"$(IMGROOT)/screenshot-" "torbutton.png\" > <br>" msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:110 +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:75 msgid "" "If you plan to run Firefox on a different computer than Tor, see the <a " "href=\"<wikifaq>#SocksListenAddress\"> FAQ entry for running Tor on a " @@ -182,37 +130,35 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:116 +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:81 msgid "" -"To Torify other applications that support HTTP proxies, just point them at " -"Polipo (that is, localhost port 8118). To use SOCKS directly (for instant " -"messaging, Jabber, IRC, etc), you can point your application directly at Tor" -" (localhost port 9050), but see <a href=\"<wikifaq>#SOCKSAndDNS\">this FAQ " -"entry</a> for why this may be dangerous. For applications that support " -"neither SOCKS nor HTTP, take a look at <a " -"href=\"https://code.google.com/p/torsocks/\">torsocks</a> or <a " +"To Torify other applications that support SOCKS proxies, just point them at " +"Tor's SOCKS port (127.0.0.1 port 9050). See <a " +"href=\"<wikifaq>#SOCKSAndDNS\">this FAQ entry</a> for why this may be " +"dangerous. For applications that support neither SOCKS nor HTTP, take a look" +" at <a href=\"https://code.google.com/p/torsocks/\">torsocks</a> or <a " "href=\"<wiki>doc/TorifyHOWTO#socat\">socat</a>." msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:127 +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:89 msgid "" "For information on how to Torify other applications, check out the <a " "href=\"<wiki>doc/TorifyHOWTO\">Torify HOWTO</a>." msgstr "" #. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:132 +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:93 msgid "<hr> <a id=\"verify\"></a>" msgstr "" #. type: Content of: <div><div><h2> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:134 -msgid "<a class=\"anchor\" href=\"#verify\">Step Four: Make sure it's working</a>" +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:95 +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-unix.wml:138 +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:99 msgid "" "Next, you should try using your browser with Tor and make sure that your IP " "address is being anonymized. Click on <a " @@ -224,50 +170,50 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:150 +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:109 msgid "" "If you have a personal firewall that limits your computer's ability to " "connect to itself (this includes something like SELinux on Fedora Core 4), " -"be sure to allow connections from your local applications to Polipo (local " -"port 8118) and Tor (local port 9050). If your firewall blocks outgoing " -"connections, punch a hole so it can connect to at least TCP ports 80 and " -"443, and then see <a href=\"<wikifaq>#FirewalledClient\">this FAQ entry</a>." -" If your SELinux config is not allowing tor or privoxy to run correctly, " -"create a file named booleans.local in the directory /etc/selinux/targeted. " -"Edit this file in your favorite text editor and insert \"allow_ypbind=1\". " -"Restart your machine for this change to take effect." +"be sure to allow connections from your local applications to Tor (local port" +" 9050). If your firewall blocks outgoing connections, punch a hole so it can" +" connect to at least TCP ports 80 and 443, and then see <a " +"href=\"<wikifaq>#FirewalledClient\">this FAQ entry</a>. If your SELinux " +"config is not allowing tor or privoxy to run correctly, create a file named " +"booleans.local in the directory /etc/selinux/targeted. Edit this file in " +"your favorite text editor and insert \"allow_ypbind=1\". Restart your " +"machine for this change to take effect." msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:165 +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:122 msgid "" "If it's still not working, look at <a href=\"<page " "docs/faq>#DoesntWork\">this FAQ entry</a> for hints." msgstr "" #. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:169 +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:126 msgid "<hr> <a id=\"server\"></a> <a id=\"relay\"></a>" msgstr "" #. type: Content of: <div><div><h2> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:172 -msgid "<a class=\"anchor\" href=\"#relay\">Step Five: Configure it as a relay</a>" +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:129 +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-unix.wml:175 +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:132 msgid "" "The Tor network relies on volunteers to donate bandwidth. The more people " "who run relays, the faster the Tor network will be. If you have at least 20 " -"kilobytes/s each way, please help out Tor by configuring your Tor to be a " +"KiloBytes/s each way, please help out Tor by configuring your Tor to be a " "relay too. We have many features that make Tor relays easy and convenient, " "including rate limiting for bandwidth, exit policies so you can limit your " "exposure to abuse complaints, and support for dynamic IP addresses." msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:183 +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:140 msgid "" "Having relays in many different places on the Internet is what makes Tor " "users secure. <a href=\"<wikifaq>#RelayAnonymity\">You may also get stronger" @@ -276,19 +222,19 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:190 +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:146 msgid "" "Read more at our <a href=\"<page docs/tor-doc-relay>\">Configuring a " "relay</a> guide." msgstr "" #. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:193 +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:149 msgid "<hr>" msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:195 +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:151 msgid "" "If you have suggestions for improving this document, please <a href=\"<page " "about/contact>\">send them to us</a>. Thanks!" Modified: translation/trunk/projects/website/po/ar/docs/3-low.tor-doc-web.po =================================================================== --- translation/trunk/projects/website/po/ar/docs/3-low.tor-doc-web.po 2011-07-13 13:55:34 UTC (rev 24891) +++ translation/trunk/projects/website/po/ar/docs/3-low.tor-doc-web.po 2011-07-13 18:10:49 UTC (rev 24892) @@ -7,7 +7,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-07-08 07:46+0000\n" +"PO-Revision-Date: 2011-07-13 16:53+0000\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)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-07-13 13:55:34 UTC (rev 24891) +++ translation/trunk/projects/website/po/ar/docs/3-low.tor-hidden-service.po 2011-07-13 18:10:49 UTC (rev 24892) @@ -7,7 +7,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-07-08 07:44+0000\n" +"PO-Revision-Date: 2011-07-13 16:44+0000\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)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-07-13 13:55:34 UTC (rev 24891) +++ translation/trunk/projects/website/po/ar/docs/3-low.trademark-faq.po 2011-07-13 18:10:49 UTC (rev 24892) @@ -7,7 +7,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-07-08 07:50+0000\n" +"PO-Revision-Date: 2011-07-13 17:04+0000\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)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-07-13 13:55:34 UTC (rev 24891) +++ translation/trunk/projects/website/po/ar/docs/4-optional.running-a-mirror.po 2011-07-13 18:10:49 UTC (rev 24892) @@ -7,7 +7,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-07-08 07:48+0000\n" +"PO-Revision-Date: 2011-07-13 17:03+0000\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)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-07-13 13:55:34 UTC (rev 24891) +++ translation/trunk/projects/website/po/ar/donate/3-low.become-sponsor.po 2011-07-13 18:10:49 UTC (rev 24892) @@ -7,7 +7,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-07-08 07:49+0000\n" +"PO-Revision-Date: 2011-07-13 17:04+0000\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)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-07-13 13:55:34 UTC (rev 24891) +++ translation/trunk/projects/website/po/ar/donate/3-low.donate-hardware.po 2011-07-13 18:10:49 UTC (rev 24892) @@ -7,7 +7,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-07-08 07:51+0000\n" +"PO-Revision-Date: 2011-07-13 17:06+0000\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)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-07-13 13:55:34 UTC (rev 24891) +++ translation/trunk/projects/website/po/ar/donate/3-low.donate-service.po 2011-07-13 18:10:49 UTC (rev 24892) @@ -7,7 +7,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-07-08 07:51+0000\n" +"PO-Revision-Date: 2011-07-13 17:05+0000\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" Modified: translation/trunk/projects/website/po/ar/download/1-high.download-easy.po =================================================================== --- translation/trunk/projects/website/po/ar/download/1-high.download-easy.po 2011-07-13 13:55:34 UTC (rev 24891) +++ translation/trunk/projects/website/po/ar/download/1-high.download-easy.po 2011-07-13 18:10:49 UTC (rev 24892) @@ -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-06-21 08:18+0200\n" -"PO-Revision-Date: 2011-06-22 00:57+0000\n" +"POT-Creation-Date: 2011-07-08 08:42+0200\n" +"PO-Revision-Date: 2011-07-09 01:17+0000\n" "Last-Translator: OsamaK <osamak(a)gnu.org>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -123,7 +123,7 @@ #: /home/runa/tor/website/download/en/download-easy.wml:72 msgid "" "</select> <input type=\"text\" id=\"amount\" class=\"amount\" " -"name=\"amount\" value=\"5\" size=\"10\">" +"name=\"amount\" value=\"10\" size=\"10\">" msgstr "" #. type: Content of: <div><div><table><tbody><tr><td><form><p><select> 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-07-13 13:55:34 UTC (rev 24891) +++ translation/trunk/projects/website/po/ar/download/3-low.download-unix.po 2011-07-13 18:10:49 UTC (rev 24892) @@ -7,7 +7,7 @@ "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-06-21 08:18+0200\n" -"PO-Revision-Date: 2011-07-08 07:47+0000\n" +"PO-Revision-Date: 2011-07-13 17:02+0000\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" Modified: translation/trunk/projects/website/po/ar/download/3-low.download.po =================================================================== --- translation/trunk/projects/website/po/ar/download/3-low.download.po 2011-07-13 13:55:34 UTC (rev 24891) +++ translation/trunk/projects/website/po/ar/download/3-low.download.po 2011-07-13 18:10:49 UTC (rev 24892) @@ -9,8 +9,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" -"POT-Creation-Date: 2011-06-21 08:18+0200\n" -"PO-Revision-Date: 2011-06-22 00:56+0000\n" +"POT-Creation-Date: 2011-07-08 08:42+0200\n" +"PO-Revision-Date: 2011-07-09 01:16+0000\n" "Last-Translator: imksa <malham1(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -127,7 +127,7 @@ #: /home/runa/tor/website/download/en/download.wml:65 msgid "" "</select> <input type=\"text\" id=\"amount\" class=\"amount\" " -"name=\"amount\" value=\"5\" size=\"10\">" +"name=\"amount\" value=\"10\" size=\"10\">" msgstr "" #. type: Content of: <div><div><table><tr><td><form><p><select> @@ -182,8 +182,8 @@ msgstr "" #. type: Content of: <div><div><table><tr><td><ul><li> -#: /home/runa/tor/website/download/en/download.wml:102 /tmp/FhqGC1ISDt.xml:165 -#: /tmp/FhqGC1ISDt.xml:203 +#: /home/runa/tor/website/download/en/download.wml:102 /tmp/lbSAEZiU0Z.xml:165 +#: /tmp/lbSAEZiU0Z.xml:203 msgid "" "The <strong>Tor Browser Bundle</strong> contains everything you need to " "safely browse the Internet. This package requires no installation. Just " @@ -222,7 +222,7 @@ " وكل تطبيقاتك يدويًا." #. type: Content of: <div><div><table><tr><td><p> -#: /home/runa/tor/website/download/en/download.wml:110 /tmp/FhqGC1ISDt.xml:168 +#: /home/runa/tor/website/download/en/download.wml:110 /tmp/lbSAEZiU0Z.xml:168 msgid "" "There are two versions of each package, a stable and alpha release. Stable " "packages are released when we believe the features and code will not change " @@ -607,7 +607,7 @@ "(<a href=\"../dist/tor-<version-alpha>.tar.gz.asc\">التوقيع</a>)" #. type: Content of: <div><div><div> -#: /home/runa/tor/website/download/en/download.wml:265 /tmp/FhqGC1ISDt.xml:344 +#: /home/runa/tor/website/download/en/download.wml:265 /tmp/lbSAEZiU0Z.xml:344 msgid "<br>" msgstr "<br>" Modified: translation/trunk/projects/website/po/ar/download/3-low.thankyou.po =================================================================== --- translation/trunk/projects/website/po/ar/download/3-low.thankyou.po 2011-07-13 13:55:34 UTC (rev 24891) +++ translation/trunk/projects/website/po/ar/download/3-low.thankyou.po 2011-07-13 18:10:49 UTC (rev 24892) @@ -7,7 +7,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-07-08 07:48+0000\n" +"PO-Revision-Date: 2011-07-13 17:02+0000\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)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-07-13 13:55:34 UTC (rev 24891) +++ translation/trunk/projects/website/po/ar/getinvolved/3-low.mirrors.po 2011-07-13 18:10:49 UTC (rev 24892) @@ -7,7 +7,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-07-08 07:51+0000\n" +"PO-Revision-Date: 2011-07-13 17:05+0000\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)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-07-13 13:55:34 UTC (rev 24891) +++ translation/trunk/projects/website/po/ar/getinvolved/3-low.tshirt.po 2011-07-13 18:10:49 UTC (rev 24892) @@ -7,7 +7,7 @@ "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-06-21 08:19+0200\n" -"PO-Revision-Date: 2011-07-08 07:50+0000\n" +"PO-Revision-Date: 2011-07-13 17:04+0000\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)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-07-13 13:55:34 UTC (rev 24891) +++ translation/trunk/projects/website/po/ar/getinvolved/4-optional.open-positions.po 2011-07-13 18:10:49 UTC (rev 24892) @@ -7,7 +7,7 @@ "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-06-21 08:19+0200\n" -"PO-Revision-Date: 2011-07-08 07:49+0000\n" +"PO-Revision-Date: 2011-07-13 17:03+0000\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)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-07-13 13:55:34 UTC (rev 24891) +++ translation/trunk/projects/website/po/ar/getinvolved/4-optional.research.po 2011-07-13 18:10:49 UTC (rev 24892) @@ -7,7 +7,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-07-08 07:50+0000\n" +"PO-Revision-Date: 2011-07-13 17:05+0000\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)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-07-13 13:55:34 UTC (rev 24891) +++ translation/trunk/projects/website/po/ar/getinvolved/4-optional.translation-overview.po 2011-07-13 18:10:49 UTC (rev 24892) @@ -7,7 +7,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-07-08 07:46+0000\n" +"PO-Revision-Date: 2011-07-13 16:56+0000\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)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-07-13 13:55:34 UTC (rev 24891) +++ translation/trunk/projects/website/po/ar/getinvolved/4-optional.translation.po 2011-07-13 18:10:49 UTC (rev 24892) @@ -7,7 +7,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-07-08 07:49+0000\n" +"PO-Revision-Date: 2011-07-13 17:03+0000\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)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-07-13 13:55:34 UTC (rev 24891) +++ translation/trunk/projects/website/po/ar/getinvolved/4-optional.volunteer.po 2011-07-13 18:10:49 UTC (rev 24892) @@ -7,7 +7,7 @@ "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-06-21 08:19+0200\n" -"PO-Revision-Date: 2011-07-08 07:47+0000\n" +"PO-Revision-Date: 2011-07-13 16:58+0000\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" Modified: translation/trunk/projects/website/po/ar/press/3-low.inthemedia.po =================================================================== --- translation/trunk/projects/website/po/ar/press/3-low.inthemedia.po 2011-07-13 13:55:34 UTC (rev 24891) +++ translation/trunk/projects/website/po/ar/press/3-low.inthemedia.po 2011-07-13 18:10:49 UTC (rev 24892) @@ -7,7 +7,7 @@ "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-06-29 20:41+0200\n" -"PO-Revision-Date: 2011-07-08 07:45+0000\n" +"PO-Revision-Date: 2011-07-13 16:49+0000\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" Modified: translation/trunk/projects/website/po/ar/press/3-low.press.po =================================================================== --- translation/trunk/projects/website/po/ar/press/3-low.press.po 2011-07-13 13:55:34 UTC (rev 24891) +++ translation/trunk/projects/website/po/ar/press/3-low.press.po 2011-07-13 18:10:49 UTC (rev 24892) @@ -7,7 +7,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-07-08 07:47+0000\n" +"PO-Revision-Date: 2011-07-13 17:00+0000\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)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-07-13 13:55:34 UTC (rev 24891) +++ translation/trunk/projects/website/po/ar/press/4-optional.2008-12-19-roadmap-press-release.po 2011-07-13 18:10:49 UTC (rev 24892) @@ -7,7 +7,7 @@ "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-05-02 17:00+0200\n" -"PO-Revision-Date: 2011-07-08 07:44+0000\n" +"PO-Revision-Date: 2011-07-13 16:45+0000\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)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-07-13 13:55:34 UTC (rev 24891) +++ translation/trunk/projects/website/po/ar/press/4-optional.2010-03-25-tor-store-press-release.po 2011-07-13 18:10:49 UTC (rev 24892) @@ -7,7 +7,7 @@ "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-05-02 17:00+0200\n" -"PO-Revision-Date: 2011-07-08 07:49+0000\n" +"PO-Revision-Date: 2011-07-13 17:04+0000\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)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-07-13 13:55:34 UTC (rev 24891) +++ translation/trunk/projects/website/po/ar/projects/1-high.torbrowser-split.po 2011-07-13 18:10:49 UTC (rev 24892) @@ -7,7 +7,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-07-08 07:50+0000\n" +"PO-Revision-Date: 2011-07-13 17:05+0000\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" Modified: translation/trunk/projects/website/po/ar/projects/3-low.gettor.po =================================================================== --- translation/trunk/projects/website/po/ar/projects/3-low.gettor.po 2011-07-13 13:55:34 UTC (rev 24891) +++ translation/trunk/projects/website/po/ar/projects/3-low.gettor.po 2011-07-13 18:10:49 UTC (rev 24892) @@ -7,7 +7,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-07-08 07:46+0000\n" +"PO-Revision-Date: 2011-07-13 16:54+0000\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)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-07-13 13:55:34 UTC (rev 24891) +++ translation/trunk/projects/website/po/ar/projects/3-low.projects.po 2011-07-13 18:10:49 UTC (rev 24892) @@ -7,7 +7,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-07-08 07:52+0000\n" +"PO-Revision-Date: 2011-07-13 17:06+0000\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)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-07-13 13:55:34 UTC (rev 24891) +++ translation/trunk/projects/website/po/ar/projects/3-low.puppettor.po 2011-07-13 18:10:49 UTC (rev 24892) @@ -7,7 +7,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-07-08 07:44+0000\n" +"PO-Revision-Date: 2011-07-13 16:43+0000\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)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-07-13 13:55:34 UTC (rev 24891) +++ translation/trunk/projects/website/po/ar/projects/3-low.tordnsel.po 2011-07-13 18:10:49 UTC (rev 24892) @@ -7,7 +7,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-07-08 07:43+0000\n" +"PO-Revision-Date: 2011-07-13 16:40+0000\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)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-07-13 13:55:34 UTC (rev 24891) +++ translation/trunk/projects/website/po/ar/projects/4-optional.arm.po 2011-07-13 18:10:49 UTC (rev 24892) @@ -7,7 +7,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-07-08 07:51+0000\n" +"PO-Revision-Date: 2011-07-13 17:05+0000\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)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-07-13 13:55:34 UTC (rev 24891) +++ translation/trunk/projects/website/po/ar/projects/4-optional.torbrowser-details.po 2011-07-13 18:10:49 UTC (rev 24892) @@ -7,7 +7,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-07-08 07:47+0000\n" +"PO-Revision-Date: 2011-07-13 16:59+0000\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)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-07-13 13:55:34 UTC (rev 24891) +++ translation/trunk/projects/website/po/ar/torbutton/3-low.index.po 2011-07-13 18:10:49 UTC (rev 24892) @@ -7,7 +7,7 @@ "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-06-21 08:19+0200\n" -"PO-Revision-Date: 2011-07-08 07:47+0000\n" +"PO-Revision-Date: 2011-07-13 17:02+0000\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)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-07-13 13:55:34 UTC (rev 24891) +++ translation/trunk/projects/website/po/ar/torbutton/3-low.torbutton-faq.po 2011-07-13 18:10:49 UTC (rev 24892) @@ -7,7 +7,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-07-08 07:48+0000\n" +"PO-Revision-Date: 2011-07-13 17:02+0000\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)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-07-13 13:55:34 UTC (rev 24891) +++ translation/trunk/projects/website/po/ar/torbutton/3-low.torbutton-options.po 2011-07-13 18:10:49 UTC (rev 24892) @@ -7,7 +7,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-07-08 07:48+0000\n" +"PO-Revision-Date: 2011-07-13 17:03+0000\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" Modified: translation/trunk/projects/website/po/de/about/3-low.contact.po =================================================================== --- translation/trunk/projects/website/po/de/about/3-low.contact.po 2011-07-13 13:55:34 UTC (rev 24891) +++ translation/trunk/projects/website/po/de/about/3-low.contact.po 2011-07-13 18:10:49 UTC (rev 24892) @@ -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-04-13 16:28+0200\n" -"PO-Revision-Date: 2011-05-29 16:35+0000\n" +"POT-Creation-Date: 2011-07-08 08:44+0200\n" +"PO-Revision-Date: 2011-07-09 01:09+0000\n" "Last-Translator: bmn <bmn(a)bobmail.info>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -33,89 +33,36 @@ msgid "Tor: Contact" msgstr "Tor: Kontakt" -#. type: Content of: <div><div><p> +#. type: Content of: <div><div><h3> #: /home/runa/tor/website/about/en/contact.wml:16 -msgid "" -"First, if you have a problem or question about using Tor, go look at the <a " -"href=\"<page docs/documentation>#Support\">Support section</a> for how to " -"proceed. The Tor developers spend most of their time developing Tor, and " -"there are no people devoted to user support, so try to help yourself before " -"<a href=\"<page docs/faq>#SupportMail\">politely trying to find a " -"volunteer</a>." +msgid "Email" msgstr "" -"Wenn du ein Problem hast Tor zu benutzen, informiere dich bitte erst <a " -"href=\"<page docs/documentation>#Support\">HIER</a> wie du vorgehen " -"solltest. Die Tor entwickler verbringen die meiste zeit um Tor weiter zu " -"entwickeln. Sie sind nicht dafür gewidmet Benutzern zu helfen. Also versuche" -" bitte dir erst selbst zu helfen indem du höflich versuchst <a href=\"<page " -"docs/faq>#SupportMail\">einen freiwilligen zu Finden, der dir Hilft</a>." -#. type: Content of: <div><div><p> -#: /home/runa/tor/website/about/en/contact.wml:18 -msgid "" -"If you really do need to reach us, here are some approaches. Please be " -"patient and <a href=\"http://www.catb.org/~esr/faqs/smart-" -"questions.html\">helpful</a>, and please make sure to write your mail in " -"English." -msgstr "" - #. type: Content of: <div><div> -#: /home/runa/tor/website/about/en/contact.wml:21 +#: /home/runa/tor/website/about/en/contact.wml:17 msgid "" -"<i>tor-assistants at torproject.org</i> is the catch-all address for " -"everything. It can be used for:" +"<a id=\"email\"></a> <i>tor-assistants at torproject.org</i> is the catch-" +"all address for everything. It can be used for reaching people working on " +"Tor. A few other addresses are more specific:" msgstr "" #. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/about/en/contact.wml:25 +#: /home/runa/tor/website/about/en/contact.wml:24 msgid "" -"Contacting the people who manage the directory authorities. Use this if you " -"run a Tor relay and have a question or problem with your relay." -msgstr "" - -#. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/about/en/contact.wml:28 -msgid "" -"So we can fix typos on the website, change wrong statements or directions on" -" the website, and add new sections and paragraphs that you send us. You " -"might want to make a draft of your new sections on <a href=\"<wiki>\">the " -"Tor wiki</a> first." -msgstr "" - -#. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/about/en/contact.wml:32 -msgid "" -"Hearing about your documents, patches, testing, experiences with supporting " -"applications, and so forth inspired by our <a href=\"<page " -"getinvolved/volunteer>\">volunteer page</a> (or other problems you've fixed " -"or documented about using Tor). There's no need to mail us before you start " -"working on something -- like all volunteer Internet projects, we hear from a" -" lot of excited people who vanish soon after, so we are most interested in " -"hearing about actual progress." -msgstr "" - -#. type: Content of: <div><div> -#: /home/runa/tor/website/about/en/contact.wml:42 -msgid "A few other addresses are more specific:" -msgstr "" - -#. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/about/en/contact.wml:45 -msgid "" "<i>tor-translation at lists.torproject.org</i> can put new <a href=\"<page " "getinvolved/translation>\">website translations</a> into place, and help " "answer questions about existing and new translations." msgstr "" #. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/about/en/contact.wml:48 +#: /home/runa/tor/website/about/en/contact.wml:27 msgid "" "<i>tordnsel at torproject.org</i> is the alias for the people responsible " "for the tordns exitlist." msgstr "" #. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/about/en/contact.wml:50 +#: /home/runa/tor/website/about/en/contact.wml:29 msgid "" "<i>donations at torproject.org</i> is for questions and comments about <a " "href=\"<page donate/donate>\">getting money to the developers</a>. More " @@ -124,7 +71,7 @@ msgstr "" #. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/about/en/contact.wml:55 +#: /home/runa/tor/website/about/en/contact.wml:34 msgid "" "<i>execdir at torproject.org</i> is for press/media, questions and comments " "about Tor the non-profit corporation: trademark questions, affiliation and " @@ -132,33 +79,72 @@ "etc." msgstr "" +#. type: Content of: <div><div><h3> +#: /home/runa/tor/website/about/en/contact.wml:40 +msgid "Identi.ca" +msgstr "" + +#. type: Content of: <div><div><p> +#: /home/runa/tor/website/about/en/contact.wml:41 +msgid "" +"<a id=\"identica\"></a> Contact us via our microblogging Identi.ca account " +"at <a href=\"https://identi.ca/torproject\">torproject</a>." +msgstr "" + +#. type: Content of: <div><div><h3> +#: /home/runa/tor/website/about/en/contact.wml:45 +msgid "IRC" +msgstr "" + #. type: Content of: <div><div> -#: /home/runa/tor/website/about/en/contact.wml:61 +#: /home/runa/tor/website/about/en/contact.wml:46 +msgid "<a id=\"irc\"></a>" +msgstr "" + +#. type: Content of: <div><div><p> +#: /home/runa/tor/website/about/en/contact.wml:47 msgid "" -"<a id=\"irc\"></a> Tor users and developers can also be found in the " -"following channels on <a href=\"http://www.oftc.net/oftc/\">oftc</a>:" +"Tor users and developers can also be found in the following channels on <a " +"href=\"http://www.oftc.net/oftc/\">OFTC</a>:" msgstr "" #. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/about/en/contact.wml:66 +#: /home/runa/tor/website/about/en/contact.wml:51 msgid "" "<i>#tor</i> - User and relay operation discussions. Having trouble running " "Tor or a question for other Tor users? Then this is the spot for you." msgstr "" #. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/about/en/contact.wml:69 +#: /home/runa/tor/website/about/en/contact.wml:54 msgid "" "<i>#tor-dev</i> - Channel for people who want to do development. " -"Discussions about Tor related coding, protocols, and <a href=\"<page " +"Discussions about Tor-related coding, protocols, and <a href=\"<page " "getinvolved/volunteer>\">project ideas</a> are all welcome." msgstr "" #. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/about/en/contact.wml:72 +#: /home/runa/tor/website/about/en/contact.wml:57 msgid "" "<i>#nottor</i> - This is where Tor people hang out to talk about stuff that " "is not related to Tor." msgstr "" +#. type: Content of: <div><div><h3> +#: /home/runa/tor/website/about/en/contact.wml:61 +msgid "Telephone" +msgstr "" +#. type: Content of: <div><div> +#: /home/runa/tor/website/about/en/contact.wml:62 +msgid "<a id=\"phone\"></a>" +msgstr "" + +#. type: Content of: <div><div><p> +#: /home/runa/tor/website/about/en/contact.wml:63 +msgid "" +"If none of the above appeal to you, calling +1-781-352-0568 will reach the " +"Tor office. Should there be no answer, please leave a message." +msgstr "" + + Modified: translation/trunk/projects/website/po/de/docs/2-medium.faq.po =================================================================== --- translation/trunk/projects/website/po/de/docs/2-medium.faq.po 2011-07-13 13:55:34 UTC (rev 24891) +++ translation/trunk/projects/website/po/de/docs/2-medium.faq.po 2011-07-13 18:10:49 UTC (rev 24892) @@ -7,7 +7,7 @@ "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-06-21 08:18+0200\n" -"PO-Revision-Date: 2011-07-08 07:43+0000\n" +"PO-Revision-Date: 2011-07-13 16:40+0000\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" Added: translation/trunk/projects/website/po/de/docs/3-low.android.po =================================================================== --- translation/trunk/projects/website/po/de/docs/3-low.android.po (rev 0) +++ translation/trunk/projects/website/po/de/docs/3-low.android.po 2011-07-13 18:10:49 UTC (rev 24892) @@ -0,0 +1,374 @@ +# SOME DESCRIPTIVE TITLE +# Copyright (C) YEAR The Tor Project, Inc. +# This file is distributed under the same license as the PACKAGE package. +# +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-25 16:50+0000\n" +"PO-Revision-Date: 2011-07-13 15:49+0000\n" +"Last-Translator: Sacro <Razor30(a)web.de>\n" +"Language-Team: LANGUAGE <LL(a)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/docs/en/android.wml:8 +msgid "" +"<a href=\"<page index>\">Home » </a> <a href=\"<page " +"docs/documentation>\">Documentation » </a> <a href=\"<page " +"docs/android>\">Android</a>" +msgstr "" +"<a href=\"<page index>\">Startseite » </a> <a href=\"<page " +"docs/documentation>\">Dokumentation » </a> <a href=\"<page " +"docs/android>\">Android</a>" + +#. type: Content of: <div><div><h2> +#: /home/runa/tor/website/docs/en/android.wml:13 +msgid "<a class=\"anchor\" href=\"#Android\">Tor on Android</a>" +msgstr "<a class=\"anchor\" href=\"#Android\">Tor auf Android</a>" + +#. type: Content of: <div><div> +#: /home/runa/tor/website/docs/en/android.wml:14 /tmp/FEV0CnFVUN.xml:33 +#: /tmp/FEV0CnFVUN.xml:45 /tmp/FEV0CnFVUN.xml:52 /tmp/FEV0CnFVUN.xml:59 +#: /tmp/FEV0CnFVUN.xml:80 /tmp/FEV0CnFVUN.xml:92 /tmp/FEV0CnFVUN.xml:97 +#: /tmp/FEV0CnFVUN.xml:120 +msgid "<br>" +msgstr "<br>" + +#. type: Content of: <div><div><p> +#: /home/runa/tor/website/docs/en/android.wml:16 +msgid "Tor is available for Android by installing our package named Orbot." +msgstr "" +"Tor ist auf Android verfügbar, indem man unser Paket names Orbot " +"installiert." + +#. type: Content of: <div><div><p> +#: /home/runa/tor/website/docs/en/android.wml:19 +msgid "" +"Orbot is an application that allows mobile phone users to access the web, " +"instant messaging and email without being monitored or blocked by their " +"mobile internet service provider. Orbot brings the features and " +"functionality of Tor to the Android mobile operating system." +msgstr "" +"Orbot ist eine Anwendung, die es Handybenutzern erlaubt auf das Web,Instand-" +"Messaging und Email zuzugreifen, ohne das sie von ihrem Mobilen ISP " +"beobachtet oder geblockt werden. Orbot bringt die Eigenschaften und " +"Funktionalitäten von Tor auf das Android Mobile Operating System." + +#. type: Content of: <div><div><p> +#: /home/runa/tor/website/docs/en/android.wml:25 +msgid "" +"Orbot contains Tor, libevent and privoxy. Orbot provides a local HTTP proxy " +"and the standard SOCKS4A/SOCKS5 proxy interfaces into the Tor network. Orbot" +" has the ability to transparently torify all of the TCP traffic on your " +"Android device when it has the correct permissions and system libraries." +msgstr "" +"Orbot beinhaltet Tor, libevent und privoxy. Orbot stellt einen lokalen HTTP " +"Proxy und die standard SOCKS4A/SOCKS5 Proxy Schnittstellen in das Tor-" +"Netzwerk zur Verfügung. Orbot hat die Möglichkeit, den gesammten TCP " +"Datenverkehr auf deinem Android Gerät zu Torifizieren, sofern es die nötigen" +" Berechtigungen und System Datenbanken hatt." + +#. type: Content of: <div><div> +#: /home/runa/tor/website/docs/en/android.wml:31 +msgid "<a id=\"QrCode\"></a>" +msgstr "<a id=\"QrCode\"></a>" + +#. type: Content of: <div><div><h2> +#: /home/runa/tor/website/docs/en/android.wml:32 +msgid "<a class=\"anchor\" href=\"#QrCode\">Installing Tor with a QR code</a>" +msgstr "" +"<a class=\"anchor\" href=\"#QrCode\">Installation von Tor mit einem QR " +"Code</a>" + +#. type: Content of: <div><div><p> +#: /home/runa/tor/website/docs/en/android.wml:35 +msgid "" +"Orbot is easy to install by simply scanning the following QR code with your " +"Android Barcode scanner." +msgstr "" +"Orbot ist einfach zu Installieren, indem man den folgenden QR code mit dem " +"Android Barcode Scanner scannt." + +#. type: Content of: <div><div><p> +#: /home/runa/tor/website/docs/en/android.wml:40 +msgid "" +"<a href=\"$(IMGROOT)/android/orbot-qr-code-latest.png\"><img alt=\"Android " +"QR code\" src=\"$(IMGROOT)/android/orbot-qr-code-latest.png\"/></a>" +msgstr "" +"<a href=\"$(IMGROOT)/android/orbot-qr-code-latest.png\"><img alt=\"Android " +"QR code\" src=\"$(IMGROOT)/android/orbot-qr-code-latest.png\"/></a>" + +#. type: Content of: <div><div> +#: /home/runa/tor/website/docs/en/android.wml:43 +msgid "<a id=\"Market\"></a>" +msgstr "<a id=\"Market\"></a>" + +#. type: Content of: <div><div><h2> +#: /home/runa/tor/website/docs/en/android.wml:44 +msgid "" +"<a class=\"anchor\" href=\"#Market\">Installing Tor from the Android " +"Market</a>" +msgstr "" +"<a class=\"anchor\" href=\"#Market\">Installation von Tor über den Android " +"Market</a>" + +#. type: Content of: <div><div><p> +#: /home/runa/tor/website/docs/en/android.wml:47 +msgid "Orbot is available in the Android Market." +msgstr "Orbot ist auf dem Android Market verfügbar." + +#. type: Content of: <div><div> +#: /home/runa/tor/website/docs/en/android.wml:50 +msgid "<a id=\"Manual\"></a>" +msgstr "<a id=\"Manual\"></a>" + +#. type: Content of: <div><div><h2> +#: /home/runa/tor/website/docs/en/android.wml:51 +msgid "" +"<a class=\"anchor\" href=\"#Manual\">Installing Tor from our website " +"manually</a>" +msgstr "" +"<a class=\"anchor\" href=\"#Manual\">Manuelles Installieren von Tor über " +"unsere Website</a>" + +#. type: Content of: <div><div><p> +#: /home/runa/tor/website/docs/en/android.wml:54 +msgid "" +"You can download <a href=\"../<package-androidbundle-alpha>\">our most " +"recent version of Orbot</a> and <a href=\"../<package-androidbundle-" +"alpha>.asc\">the gpg signature</a> from our server." +msgstr "" +"Du kannst <a href=\"../<package-androidbundle-alpha>\">unsere neueste " +"Version von Orbot</a> und <a href=\"../<package-androidbundle-" +"alpha>.asc\">die gpg Signatur</a> von unserem Server downloaden." + +#. type: Content of: <div><div> +#: /home/runa/tor/website/docs/en/android.wml:57 +msgid "<a id=\"Screenshots\"></a>" +msgstr "<a id=\"Screenshots\"></a>" + +#. type: Content of: <div><div><h2> +#: /home/runa/tor/website/docs/en/android.wml:58 +msgid "<a class=\"anchor\" href=\"#Screenshots\">Screenshots of Tor on Android</a>" +msgstr "<a class=\"anchor\" href=\"#Screenshots\">Screenshots von Tor auf Android</a>" + +#. type: Content of: <div><div><p> +#: /home/runa/tor/website/docs/en/android.wml:61 +msgid "" +"<a href=\"$(IMGROOT)/android/android-off.jpg\"> <img alt=\"Android Tor off\"" +" src=\"$(IMGROOT)/android/android-off-150x150.jpg\"/> </a> <a " +"href=\"$(IMGROOT)/android/android-bootstrapping.jpg\"> <img alt=\"Android " +"Tor bootstrapping\" src=\"$(IMGROOT)/android/android-bootstrapping-" +"150x150.jpg\"/> </a> <a href=\"$(IMGROOT)/android/android-activated.jpg\"> " +"<img alt=\"Android Tor activated\" src=\"$(IMGROOT)/android/android-" +"activated-150x150.jpg\"/> </a> <a href=\"$(IMGROOT)/android/android-" +"settings.jpg\"> <img alt=\"Android Tor settings\" src=\"$(IMGROOT)/android" +"/android-settings-150x150.jpg\"/> </a>" +msgstr "" +"<a href=\"$(IMGROOT)/android/android-off.jpg\"> <img alt=\"Android Tor off\"" +" src=\"$(IMGROOT)/android/android-off-150x150.jpg\"/> </a> <a " +"href=\"$(IMGROOT)/android/android-bootstrapping.jpg\"> <img alt=\"Android " +"Tor bootstrapping\" src=\"$(IMGROOT)/android/android-bootstrapping-" +"150x150.jpg\"/> </a> <a href=\"$(IMGROOT)/android/android-activated.jpg\"> " +"<img alt=\"Android Tor activated\" src=\"$(IMGROOT)/android/android-" +"activated-150x150.jpg\"/> </a> <a href=\"$(IMGROOT)/android/android-" +"settings.jpg\"> <img alt=\"Android Tor settings\" src=\"$(IMGROOT)/android" +"/android-settings-150x150.jpg\"/> </a>" + +#. type: Content of: <div><div> +#: /home/runa/tor/website/docs/en/android.wml:77 +msgid "<a id=\"ProxySettings\"></a>" +msgstr "<a id=\"ProxySettings\"></a>" + +#. type: Content of: <div><div><h2> +#: /home/runa/tor/website/docs/en/android.wml:78 +msgid "" +"<a class=\"anchor\" href=\"#ProxySettings\">Proxy settings and configuration" +" </a>" +msgstr "" +"<a class=\"anchor\" href=\"#ProxySettings\">Proxy Einstellungen und " +"Konfiguration </a>" + +#. type: Content of: <div><div><p> +#: /home/runa/tor/website/docs/en/android.wml:82 +msgid "Orbot offers three interfaces into the Tor network:" +msgstr "Orbot bietet Drei Schnittstellen in das Tor-Netzwerk:" + +#. type: Content of: <div><div><ul><li> +#: /home/runa/tor/website/docs/en/android.wml:85 +msgid "SOCKS 4A/5 proxy 127.0.0.1:9050" +msgstr "SOCKS 4A/5 proxy 127.0.0.1:9050" + +#. type: Content of: <div><div><ul><li> +#: /home/runa/tor/website/docs/en/android.wml:86 +msgid "HTTP proxy 127.0.0.1:8118" +msgstr "HTTP proxy 127.0.0.1:8118" + +#. type: Content of: <div><div><ul><li> +#: /home/runa/tor/website/docs/en/android.wml:87 +msgid "Transparent proxying (on select devices)" +msgstr "Transparent proxying (auf ausgewählten Geräten)" + +#. type: Content of: <div><div> +#: /home/runa/tor/website/docs/en/android.wml:90 +msgid "<a id=\"Notes\"></a>" +msgstr "<a id=\"Notes\"></a>" + +#. type: Content of: <div><div><h2> +#: /home/runa/tor/website/docs/en/android.wml:91 +msgid "<a class=\"anchor\" href=\"#Notes\">Platform specific notes</a>" +msgstr "<a class=\"anchor\" href=\"#Notes\">Platform Spezifische Notizen</a>" + +#. type: Content of: <div><div><p> +#: /home/runa/tor/website/docs/en/android.wml:94 +msgid "" +"The current version of Orbot ships with the following components: <b" +"><version-androidbundle-privoxy>, <version-androidbundle-libevent></b>" +msgstr "" +"Die aktuelle Version von Orbot, kommt mit den folgenden Komponenten: <b" +"><version-androidbundle-privoxy>, <version-androidbundle-libevent></b>" + +#. type: Content of: <div><div><p> +#: /home/runa/tor/website/docs/en/android.wml:99 +msgid "For standard Android 1.x devices:" +msgstr "Für standard Android 1.x Geräte:" + +#. type: Content of: <div><div><ul><li> +#: /home/runa/tor/website/docs/en/android.wml:102 +msgid "" +"The Orweb browser available in the Android Market integrates directly with " +"Orbot, and offers a number of other privacy-oriented features." +msgstr "" +"Der Orweb Browser, verfügbar im Android Market, Integriert sich direkt in " +"Orbot, und bietet eine nummer von anderen Privatsphäre orientierten " +"Funktionen." + +#. type: Content of: <div><div><ul><li> +#: /home/runa/tor/website/docs/en/android.wml:104 +msgid "" +"For Instant Messsaging, try <a " +"href=\"https://guardianproject.info/apps/gibber\">Gibberbot</a>, which " +"includes support for connecting via Tor and Off-the-Record encryption." +msgstr "" +"Für Instant Messsaging, probier <a " +"href=\"https://guardianproject.info/apps/gibber\">Gibberbot</a> aus, welches" +" Verbindungen über Tor und nicht standardmäßige Verschlüsselungen " +"unterstützt." + +#. type: Content of: <div><div><p> +#: /home/runa/tor/website/docs/en/android.wml:107 +msgid "For Android 2.x devices:" +msgstr "Für Android 2.x Geräte:" + +#. type: Content of: <div><div><ul><li> +#: /home/runa/tor/website/docs/en/android.wml:110 +msgid "" +"You must root your device and update the firmware to an iptables-capable ROM" +" for Orbot to transparently proxy all TCP traffic." +msgstr "" +"Du musst dein gerät rooten und die Firmware zu einer IPTables fähigen ROM " +"aktuallisieren, damit Orbot deinen gesammten TCP Verkehr Transparent " +"Proxying kann." + +#. type: Content of: <div><div><ul><li> +#: /home/runa/tor/website/docs/en/android.wml:111 +msgid "" +"For non-modified and non-rooted phones, you'll want to manually configure " +"HTTP or SOCKS proxy settings for specific applications." +msgstr "" +"Bei nicht modifizierten und nicht gerooteten Handys, muss für jede anwendung" +" manuell ein HTTP oder SOCKS Proxy eingerichtet werden." + +#. type: Content of: <div><div><ul><li> +#: /home/runa/tor/website/docs/en/android.wml:112 +msgid "" +"If you root your device and install an iptables-capable ROM (such as <a " +"href=\"http://cyanogenmod.com\">Cyanogen</a>), Orbot can transparently proxy" +" traffic on an app-by-app basis through Tor." +msgstr "" +"Wenn du dein Gerät rootest, und eine IPTables fähige ROM (wie zum Beispiel " +"<a href=\"http://cyanogenmod.com\">Cyanogen</a>) Installierst, kann Orbot, " +"mithilfe eines transparenten Proxys, Datenverkehr mithilfe von app-by-app " +"durch Tor leiten." + +#. type: Content of: <div><div><ul><li> +#: /home/runa/tor/website/docs/en/android.wml:113 +msgid "" +"You can also install Firefox for Android from the market with the <a " +"href=\"https://guardianproject.info/apps/proxymob\">ProxyMob Add-on</a> or " +"install the text-only “NDBrowser” from the Android Market. Both of these " +"solutions all routing of web access through Tor on standard, un-rooted " +"devices." +msgstr "" +"Du kannst auch Firefox für Android , mit dem <a " +"href=\"https://guardianproject.info/apps/proxymob\">ProxyMob Add-on</a> oder" +" den Nur-Text “NDBrowser” von dem Andriod Market Installieren. Beide Browser" +" benutzen das Tor-Netzwerk Standardmäßig, auch auf nicht gerooteten Geräten." + +#. type: Content of: <div><div><ul><li> +#: /home/runa/tor/website/docs/en/android.wml:115 +msgid "" +"For Instant Messaging, try <a " +"href=\"https://guardianproject.info/apps/gibber\">Gibberbot</a>, which " +"includes support for connecting via Tor and Off-the-Record encryption." +msgstr "" +"Für Instant Messsaging, probier <a " +"href=\"https://guardianproject.info/apps/gibber\">Gibberbot</a> aus, welches" +" Verbindungen über Tor und nicht standardmäßige Verschlüsselungen " +"unterstützt." + +#. type: Content of: <div><div> +#: /home/runa/tor/website/docs/en/android.wml:118 +msgid "<a id=\"Source\"></a>" +msgstr "<a id=\"Source\"></a>" + +#. type: Content of: <div><div><h2> +#: /home/runa/tor/website/docs/en/android.wml:119 +msgid "<a class=\"anchor\" href=\"#Source\">Source code access</a>" +msgstr "<a class=\"anchor\" href=\"#Source\">Source Code Zugriff</a>" + +#. type: Content of: <div><div><p> +#: /home/runa/tor/website/docs/en/android.wml:122 +msgid "" +"All of the source code is available in the <a " +"href=\"https://svn.torproject.org/svn/projects/android/trunk/Orbot/\">Orbot " +"subversion repository</a>." +msgstr "" +"Der gesammte Source Code, ist in dem <a " +"href=\"https://svn.torproject.org/svn/projects/android/trunk/Orbot/\">Orbot " +"Subversion Projektarchiv</a> zu finden." + +#. type: Content of: <div><div><p> +#: /home/runa/tor/website/docs/en/android.wml:128 +msgid "" +"Note that this might not always give you the latest stable Tor version. " +"Additionally, the Android web browser does not have Torbutton. This means " +"that while it may be useful for circumvention, it probably is unsuitable for" +" strong web browser anonymity requirements." +msgstr "" +"Beachte, das es sein kann, dass es dir nicht immer die neueste stabile Tor-" +"Version gibt. Außerdem besitzt der Android Webbrowser Torbutten nicht. Das " +"bedeutet, dass es zwar nützlich für umgehung, allerdings nicht für " +"Anonymität beim stärkeren Browsern nicht geeignet ist." + +#. type: Content of: <div><div> +#: /home/runa/tor/website/docs/en/android.wml:134 +msgid "<hr>" +msgstr "<hr>" + +#. type: Content of: <div><div><p> +#: /home/runa/tor/website/docs/en/android.wml:136 +msgid "" +"If you have suggestions for improving this document, please <a href=\"<page " +"about/contact>\">send them to us</a>. Thanks!" +msgstr "" +"Solltest du vorschläge haben, wie man dieses Dokument besser gestallten " +"kann, bitte <a href=\"<page about/contact>\">sende sie uns</a>. Danke!" + + Modified: translation/trunk/projects/website/po/de/download/1-high.download-easy.po =================================================================== --- translation/trunk/projects/website/po/de/download/1-high.download-easy.po 2011-07-13 13:55:34 UTC (rev 24891) +++ translation/trunk/projects/website/po/de/download/1-high.download-easy.po 2011-07-13 18:10:49 UTC (rev 24892) @@ -9,9 +9,9 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" -"POT-Creation-Date: 2011-06-21 08:18+0200\n" -"PO-Revision-Date: 2011-06-30 07:42+0000\n" -"Last-Translator: parla <lutetia(a)hushmail.com>\n" +"POT-Creation-Date: 2011-07-08 08:42+0200\n" +"PO-Revision-Date: 2011-07-09 16:01+0000\n" +"Last-Translator: Sacro <Razor30(a)web.de>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -143,10 +143,10 @@ #: /home/runa/tor/website/download/en/download-easy.wml:72 msgid "" "</select> <input type=\"text\" id=\"amount\" class=\"amount\" " -"name=\"amount\" value=\"5\" size=\"10\">" +"name=\"amount\" value=\"10\" size=\"10\">" msgstr "" "</select> <input type=\"text\" id=\"amount\" class=\"amount\" " -"name=\"amount\" value=\"5\" size=\"10\">" +"name=\"amount\" value=\"10\" size=\"10\">" #. type: Content of: <div><div><table><tbody><tr><td><form><p><select> #: /home/runa/tor/website/download/en/download-easy.wml:76 Modified: translation/trunk/projects/website/po/de/download/3-low.download.po =================================================================== --- translation/trunk/projects/website/po/de/download/3-low.download.po 2011-07-13 13:55:34 UTC (rev 24891) +++ translation/trunk/projects/website/po/de/download/3-low.download.po 2011-07-13 18:10:49 UTC (rev 24892) @@ -9,9 +9,9 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" -"POT-Creation-Date: 2011-06-21 08:18+0200\n" -"PO-Revision-Date: 2011-06-28 01:23+0000\n" -"Last-Translator: gregweb <gregweb(a)web.de>\n" +"POT-Creation-Date: 2011-07-08 08:42+0200\n" +"PO-Revision-Date: 2011-07-09 15:58+0000\n" +"Last-Translator: Sacro <Razor30(a)web.de>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -142,10 +142,10 @@ #: /home/runa/tor/website/download/en/download.wml:65 msgid "" "</select> <input type=\"text\" id=\"amount\" class=\"amount\" " -"name=\"amount\" value=\"5\" size=\"10\">" +"name=\"amount\" value=\"10\" size=\"10\">" msgstr "" "</select> <input type=\"text\" id=\"amount\" class=\"amount\" " -"name=\"amount\" value=\"5\" size=\"10\">" +"name=\"amount\" value=\"10\" size=\"10\">" #. type: Content of: <div><div><table><tr><td><form><p><select> #: /home/runa/tor/website/download/en/download.wml:69 @@ -209,8 +209,8 @@ msgstr "Tor für Windows ist in vier verschiedenen Paketen verfügbar:" #. type: Content of: <div><div><table><tr><td><ul><li> -#: /home/runa/tor/website/download/en/download.wml:102 /tmp/FhqGC1ISDt.xml:165 -#: /tmp/FhqGC1ISDt.xml:203 +#: /home/runa/tor/website/download/en/download.wml:102 /tmp/lbSAEZiU0Z.xml:165 +#: /tmp/lbSAEZiU0Z.xml:203 msgid "" "The <strong>Tor Browser Bundle</strong> contains everything you need to " "safely browse the Internet. This package requires no installation. Just " @@ -259,7 +259,7 @@ "mußt Tor mit allen deinen Anwendungen manuell konfigurieren." #. type: Content of: <div><div><table><tr><td><p> -#: /home/runa/tor/website/download/en/download.wml:110 /tmp/FhqGC1ISDt.xml:168 +#: /home/runa/tor/website/download/en/download.wml:110 /tmp/lbSAEZiU0Z.xml:168 msgid "" "There are two versions of each package, a stable and alpha release. Stable " "packages are released when we believe the features and code will not change " @@ -670,7 +670,7 @@ " (<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:265 /tmp/FhqGC1ISDt.xml:344 +#: /home/runa/tor/website/download/en/download.wml:265 /tmp/lbSAEZiU0Z.xml:344 msgid "<br>" msgstr "<br>" Modified: translation/trunk/projects/website/po/de/getinvolved/3-low.tshirt.po =================================================================== --- translation/trunk/projects/website/po/de/getinvolved/3-low.tshirt.po 2011-07-13 13:55:34 UTC (rev 24891) +++ translation/trunk/projects/website/po/de/getinvolved/3-low.tshirt.po 2011-07-13 18:10:49 UTC (rev 24892) @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # <benni(a)include-benni.de>, 2011. +# <runa.sandvik(a)gmail.com>, 2011. msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-06-21 08:19+0200\n" -"PO-Revision-Date: 2011-06-23 22:38+0000\n" -"Last-Translator: MaxCohen <f4aad64b(a)m7ik.com>\n" +"PO-Revision-Date: 2011-07-08 09:40+0000\n" +"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -26,7 +27,7 @@ msgstr "" "<a href=\"<page index>\">Home » </a> <a href=\"<page " "getinvolved/volunteer>\">Engagieren » </a> <a href=\"<page " -"engagieren/tshirt>\">Tshirt</a>" +"getinvolved/tshirt>\">Tshirt</a>" #. type: Content of: <div><div><h1> #: /home/runa/tor/website/getinvolved/en/tshirt.wml:13 Modified: translation/trunk/projects/website/po/el/about/3-low.translators.po =================================================================== --- translation/trunk/projects/website/po/el/about/3-low.translators.po 2011-07-13 13:55:34 UTC (rev 24891) +++ translation/trunk/projects/website/po/el/about/3-low.translators.po 2011-07-13 18:10:49 UTC (rev 24892) @@ -7,7 +7,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-07-08 07:52+0000\n" +"PO-Revision-Date: 2011-07-13 17:06+0000\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" Modified: translation/trunk/projects/website/po/es/about/3-low.contact.po =================================================================== --- translation/trunk/projects/website/po/es/about/3-low.contact.po 2011-07-13 13:55:34 UTC (rev 24891) +++ translation/trunk/projects/website/po/es/about/3-low.contact.po 2011-07-13 18:10:49 UTC (rev 24892) @@ -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-04-13 16:28+0200\n" -"PO-Revision-Date: 2011-04-14 00:46+0000\n" +"POT-Creation-Date: 2011-07-08 08:44+0200\n" +"PO-Revision-Date: 2011-07-09 01:09+0000\n" "Last-Translator: NinjaTuna <nort0ngh0st(a)hotmail.com>\n" "Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/torproject/team/es/)\n" "MIME-Version: 1.0\n" @@ -30,83 +30,36 @@ msgid "Tor: Contact" msgstr "Tor: contacto" -#. type: Content of: <div><div><p> +#. type: Content of: <div><div><h3> #: /home/runa/tor/website/about/en/contact.wml:16 -msgid "" -"First, if you have a problem or question about using Tor, go look at the <a " -"href=\"<page docs/documentation>#Support\">Support section</a> for how to " -"proceed. The Tor developers spend most of their time developing Tor, and " -"there are no people devoted to user support, so try to help yourself before " -"<a href=\"<page docs/faq>#SupportMail\">politely trying to find a " -"volunteer</a>." +msgid "Email" msgstr "" -#. type: Content of: <div><div><p> -#: /home/runa/tor/website/about/en/contact.wml:18 -msgid "" -"If you really do need to reach us, here are some approaches. Please be " -"patient and <a href=\"http://www.catb.org/~esr/faqs/smart-" -"questions.html\">helpful</a>, and please make sure to write your mail in " -"English." -msgstr "" - #. type: Content of: <div><div> -#: /home/runa/tor/website/about/en/contact.wml:21 +#: /home/runa/tor/website/about/en/contact.wml:17 msgid "" -"<i>tor-assistants at torproject.org</i> is the catch-all address for " -"everything. It can be used for:" +"<a id=\"email\"></a> <i>tor-assistants at torproject.org</i> is the catch-" +"all address for everything. It can be used for reaching people working on " +"Tor. A few other addresses are more specific:" msgstr "" #. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/about/en/contact.wml:25 +#: /home/runa/tor/website/about/en/contact.wml:24 msgid "" -"Contacting the people who manage the directory authorities. Use this if you " -"run a Tor relay and have a question or problem with your relay." -msgstr "" - -#. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/about/en/contact.wml:28 -msgid "" -"So we can fix typos on the website, change wrong statements or directions on" -" the website, and add new sections and paragraphs that you send us. You " -"might want to make a draft of your new sections on <a href=\"<wiki>\">the " -"Tor wiki</a> first." -msgstr "" - -#. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/about/en/contact.wml:32 -msgid "" -"Hearing about your documents, patches, testing, experiences with supporting " -"applications, and so forth inspired by our <a href=\"<page " -"getinvolved/volunteer>\">volunteer page</a> (or other problems you've fixed " -"or documented about using Tor). There's no need to mail us before you start " -"working on something -- like all volunteer Internet projects, we hear from a" -" lot of excited people who vanish soon after, so we are most interested in " -"hearing about actual progress." -msgstr "" - -#. type: Content of: <div><div> -#: /home/runa/tor/website/about/en/contact.wml:42 -msgid "A few other addresses are more specific:" -msgstr "" - -#. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/about/en/contact.wml:45 -msgid "" "<i>tor-translation at lists.torproject.org</i> can put new <a href=\"<page " "getinvolved/translation>\">website translations</a> into place, and help " "answer questions about existing and new translations." msgstr "" #. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/about/en/contact.wml:48 +#: /home/runa/tor/website/about/en/contact.wml:27 msgid "" "<i>tordnsel at torproject.org</i> is the alias for the people responsible " "for the tordns exitlist." msgstr "" #. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/about/en/contact.wml:50 +#: /home/runa/tor/website/about/en/contact.wml:29 msgid "" "<i>donations at torproject.org</i> is for questions and comments about <a " "href=\"<page donate/donate>\">getting money to the developers</a>. More " @@ -115,7 +68,7 @@ msgstr "" #. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/about/en/contact.wml:55 +#: /home/runa/tor/website/about/en/contact.wml:34 msgid "" "<i>execdir at torproject.org</i> is for press/media, questions and comments " "about Tor the non-profit corporation: trademark questions, affiliation and " @@ -123,33 +76,72 @@ "etc." msgstr "" +#. type: Content of: <div><div><h3> +#: /home/runa/tor/website/about/en/contact.wml:40 +msgid "Identi.ca" +msgstr "" + +#. type: Content of: <div><div><p> +#: /home/runa/tor/website/about/en/contact.wml:41 +msgid "" +"<a id=\"identica\"></a> Contact us via our microblogging Identi.ca account " +"at <a href=\"https://identi.ca/torproject\">torproject</a>." +msgstr "" + +#. type: Content of: <div><div><h3> +#: /home/runa/tor/website/about/en/contact.wml:45 +msgid "IRC" +msgstr "" + #. type: Content of: <div><div> -#: /home/runa/tor/website/about/en/contact.wml:61 +#: /home/runa/tor/website/about/en/contact.wml:46 +msgid "<a id=\"irc\"></a>" +msgstr "" + +#. type: Content of: <div><div><p> +#: /home/runa/tor/website/about/en/contact.wml:47 msgid "" -"<a id=\"irc\"></a> Tor users and developers can also be found in the " -"following channels on <a href=\"http://www.oftc.net/oftc/\">oftc</a>:" +"Tor users and developers can also be found in the following channels on <a " +"href=\"http://www.oftc.net/oftc/\">OFTC</a>:" msgstr "" #. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/about/en/contact.wml:66 +#: /home/runa/tor/website/about/en/contact.wml:51 msgid "" "<i>#tor</i> - User and relay operation discussions. Having trouble running " "Tor or a question for other Tor users? Then this is the spot for you." msgstr "" #. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/about/en/contact.wml:69 +#: /home/runa/tor/website/about/en/contact.wml:54 msgid "" "<i>#tor-dev</i> - Channel for people who want to do development. " -"Discussions about Tor related coding, protocols, and <a href=\"<page " +"Discussions about Tor-related coding, protocols, and <a href=\"<page " "getinvolved/volunteer>\">project ideas</a> are all welcome." msgstr "" #. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/about/en/contact.wml:72 +#: /home/runa/tor/website/about/en/contact.wml:57 msgid "" "<i>#nottor</i> - This is where Tor people hang out to talk about stuff that " "is not related to Tor." msgstr "" +#. type: Content of: <div><div><h3> +#: /home/runa/tor/website/about/en/contact.wml:61 +msgid "Telephone" +msgstr "" +#. type: Content of: <div><div> +#: /home/runa/tor/website/about/en/contact.wml:62 +msgid "<a id=\"phone\"></a>" +msgstr "" + +#. type: Content of: <div><div><p> +#: /home/runa/tor/website/about/en/contact.wml:63 +msgid "" +"If none of the above appeal to you, calling +1-781-352-0568 will reach the " +"Tor office. Should there be no answer, please leave a message." +msgstr "" + + Modified: translation/trunk/projects/website/po/es/about/3-low.contributors.po =================================================================== --- translation/trunk/projects/website/po/es/about/3-low.contributors.po 2011-07-13 13:55:34 UTC (rev 24891) +++ translation/trunk/projects/website/po/es/about/3-low.contributors.po 2011-07-13 18:10:49 UTC (rev 24892) @@ -6,8 +6,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:18+0000\n" +"POT-Creation-Date: 2011-07-08 08:44+0200\n" +"PO-Revision-Date: 2011-07-09 01:09+0000\n" "Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" "Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/torproject/team/es/)\n" "MIME-Version: 1.0\n" @@ -186,47 +186,69 @@ #. type: Content of: <div><div><dl><dt> #: /home/runa/tor/website/about/en/contributors.wml:48 +msgid "Bruce Leidl" +msgstr "" + +#. type: Content of: <div><div><dl><dd> +#: /home/runa/tor/website/about/en/contributors.wml:48 +msgid "Worked on a Tor client in Java." +msgstr "" + +#. type: Content of: <div><div><dl><dt> +#: /home/runa/tor/website/about/en/contributors.wml:49 msgid "Rebecca MacKinnon" msgstr "" #. type: Content of: <div><div><dl><dd> -#: /home/runa/tor/website/about/en/contributors.wml:48 +#: /home/runa/tor/website/about/en/contributors.wml:49 msgid "" "Former Director of Tor. Co-Founder of <a " "href=\"http://www.globalvoicesonline.org/\">Global Voices Online</a>." msgstr "" #. type: Content of: <div><div><dl><dt> -#: /home/runa/tor/website/about/en/contributors.wml:50 +#: /home/runa/tor/website/about/en/contributors.wml:51 msgid "Chris Palmer" msgstr "" #. type: Content of: <div><div><dl><dd> -#: /home/runa/tor/website/about/en/contributors.wml:50 +#: /home/runa/tor/website/about/en/contributors.wml:51 msgid "" "Our liaison and tech guy with EFF while EFF was funding us. Also helped " "advocate and write end-user docs." msgstr "" #. type: Content of: <div><div><dl><dt> -#: /home/runa/tor/website/about/en/contributors.wml:52 +#: /home/runa/tor/website/about/en/contributors.wml:53 +msgid "Martin Peck" +msgstr "" + +#. type: Content of: <div><div><dl><dd> +#: /home/runa/tor/website/about/en/contributors.wml:53 +msgid "" +"Worked on a VM-based transparent proxying approach for Tor clients on " +"Windows." +msgstr "" + +#. type: Content of: <div><div><dl><dt> +#: /home/runa/tor/website/about/en/contributors.wml:55 msgid "Matej Pfajfar" msgstr "" #. type: Content of: <div><div><dl><dd> -#: /home/runa/tor/website/about/en/contributors.wml:52 +#: /home/runa/tor/website/about/en/contributors.wml:55 msgid "" "Author of the original onion routing code that Tor is based on, so we didn't" " have to start from scratch." msgstr "" #. type: Content of: <div><div><dl><dt> -#: /home/runa/tor/website/about/en/contributors.wml:54 +#: /home/runa/tor/website/about/en/contributors.wml:57 msgid "Johannes Renner" msgstr "" #. type: Content of: <div><div><dl><dd> -#: /home/runa/tor/website/about/en/contributors.wml:54 +#: /home/runa/tor/website/about/en/contributors.wml:57 msgid "" "Worked during the 2007 Google Summer of Code on modifying <a " "href=\"https://svn.torproject.org/svn/torflow/trunk/README\">TorFlow</a> to " @@ -234,23 +256,36 @@ msgstr "" #. type: Content of: <div><div><dl><dt> -#: /home/runa/tor/website/about/en/contributors.wml:59 +#: /home/runa/tor/website/about/en/contributors.wml:62 msgid "Scott Squires" msgstr "" #. type: Content of: <div><div><dl><dd> -#: /home/runa/tor/website/about/en/contributors.wml:59 +#: /home/runa/tor/website/about/en/contributors.wml:62 msgid "" "The original developer of <a href=\"<page torbutton/index>\">Torbutton</a>." msgstr "" #. type: Content of: <div><div><dl><dt> -#: /home/runa/tor/website/about/en/contributors.wml:61 +#: /home/runa/tor/website/about/en/contributors.wml:64 +msgid "tup (a pseudonym)" +msgstr "" + +#. type: Content of: <div><div><dl><dd> +#: /home/runa/tor/website/about/en/contributors.wml:64 +msgid "" +"Added new features for making Tor easier to use as a <a " +"href=\"<wiki>TransparentProxy\">transparent proxy</a>. Also wrote the <a " +"href=\"http://p56soo2ibjkx23xo.onion/\">TorDNSEL code</a>." +msgstr "" + +#. type: Content of: <div><div><dl><dt> +#: /home/runa/tor/website/about/en/contributors.wml:69 msgid "Stephen Tyree" msgstr "" #. type: Content of: <div><div><dl><dd> -#: /home/runa/tor/website/about/en/contributors.wml:61 +#: /home/runa/tor/website/about/en/contributors.wml:69 msgid "" "Worked during Google Summer of Code 2009 to develop a plugin API for <a " "href=\"<page projects/vidalia>\">Vidalia</a> and create a plugin to allow " @@ -259,12 +294,12 @@ msgstr "" #. type: Content of: <div><div><dl><dt> -#: /home/runa/tor/website/about/en/contributors.wml:65 +#: /home/runa/tor/website/about/en/contributors.wml:73 msgid "Camilo Viecco" msgstr "" #. type: Content of: <div><div><dl><dd> -#: /home/runa/tor/website/about/en/contributors.wml:65 +#: /home/runa/tor/website/about/en/contributors.wml:73 msgid "" "Worked on Providing Blossom functionality to Vidalia (<a href=\"http://trac" ".vidalia-project.net/browser/vidalia/branches/exit-country\">svn</a>) as " @@ -272,12 +307,12 @@ msgstr "" #. type: Content of: <div><div><dl><dt> -#: /home/runa/tor/website/about/en/contributors.wml:68 +#: /home/runa/tor/website/about/en/contributors.wml:76 msgid "Fred von Lohmann" msgstr "" #. type: Content of: <div><div><dl><dd> -#: /home/runa/tor/website/about/en/contributors.wml:68 +#: /home/runa/tor/website/about/en/contributors.wml:76 msgid "" "Fred served on our Board of Directors from 2006 through 2009. His complete " "bio can be found at the <a href=\"http://www.eff.org/about/staff/fred-von-" @@ -285,12 +320,24 @@ msgstr "" #. type: Content of: <div><div><dl><dt> -#: /home/runa/tor/website/about/en/contributors.wml:72 +#: /home/runa/tor/website/about/en/contributors.wml:80 +msgid "Kyle Williams" +msgstr "" + +#. type: Content of: <div><div><dl><dd> +#: /home/runa/tor/website/about/en/contributors.wml:80 +msgid "" +"Developer for JanusVM, a VMWare-based transparent Tor proxy that makes Tor " +"easier to set up and use." +msgstr "" + +#. type: Content of: <div><div><dl><dt> +#: /home/runa/tor/website/about/en/contributors.wml:82 msgid "Christian Wilms" msgstr "" #. type: Content of: <div><div><dl><dd> -#: /home/runa/tor/website/about/en/contributors.wml:72 +#: /home/runa/tor/website/about/en/contributors.wml:82 msgid "" "Worked on Performance Enhancing Measures for Tor Hidden Services (<a " "href=\"https://svn.torproject.org/cgi-bin/viewvs.cgi/tor/branches/hidserv-" @@ -298,12 +345,12 @@ msgstr "" #. type: Content of: <div><div><dl><dt> -#: /home/runa/tor/website/about/en/contributors.wml:75 +#: /home/runa/tor/website/about/en/contributors.wml:85 msgid "Jillian C. York" msgstr "" #. type: Content of: <div><div><dl><dd> -#: /home/runa/tor/website/about/en/contributors.wml:75 +#: /home/runa/tor/website/about/en/contributors.wml:85 msgid "" "<a href=\"http://jilliancyork.com/\">Jillian C. York</a> is a writer, " "blogger, and activist based in Boston." Modified: translation/trunk/projects/website/po/es/about/3-low.volunteers.po =================================================================== --- translation/trunk/projects/website/po/es/about/3-low.volunteers.po 2011-07-13 13:55:34 UTC (rev 24891) +++ translation/trunk/projects/website/po/es/about/3-low.volunteers.po 2011-07-13 18:10:49 UTC (rev 24892) @@ -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-06-29 20:42+0200\n" -"PO-Revision-Date: 2011-06-30 00:49+0000\n" +"POT-Creation-Date: 2011-07-08 08:44+0200\n" +"PO-Revision-Date: 2011-07-09 01:11+0000\n" "Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" "Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/torproject/team/es/)\n" "MIME-Version: 1.0\n" @@ -35,67 +35,66 @@ #. type: Content of: <div><div><dl><dt> #: /home/runa/tor/website/about/en/volunteers.wml:15 -msgid "Anonym" -msgstr "Anonym" +msgid "Anonym, bertagaz, and intrigeri" +msgstr "" #. type: Content of: <div><div><dl><dd> #: /home/runa/tor/website/about/en/volunteers.wml:15 -msgid "Maintainer of the Incognito LiveCD." -msgstr "Mantiene el Incognito LiveCD." - -#. type: Content of: <div><div><dl><dt> -#: /home/runa/tor/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 msgid "" -"EFF lawyer who helped write the <a href=\"<page eff/tor-legal-faq>\">Tor " -"Legal FAQ</a> and tirelessly answers the phone when somebody in the world " -"has a legal question about Tor." +"Maintainers of <a href=\"https://tails.boum.org/\">The Amnesic Incognito " +"Live System</a>." msgstr "" -"Abogado de EFF que ayudó a escribir la <a href=\"<page eff/tor-legal-" -"faq>\">Tor Legal FAQ</a> y responde sin cansarse el teléfono cuando alguien " -"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/tor/website/about/en/volunteers.wml:17 msgid "Marco Bonetti" msgstr "Marco Bonetti" #. type: Content of: <div><div><dl><dd> -#: /home/runa/tor/website/about/en/volunteers.wml:20 +#: /home/runa/tor/website/about/en/volunteers.wml:17 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/tor/website/about/en/volunteers.wml:18 msgid "Kasimir Gabert" msgstr "Kasimir Gabert" #. type: Content of: <div><div><dl><dd> -#: /home/runa/tor/website/about/en/volunteers.wml:21 +#: /home/runa/tor/website/about/en/volunteers.wml:18 msgid "Maintains TorStatus." msgstr "" #. type: Content of: <div><div><dl><dt> -#: /home/runa/tor/website/about/en/volunteers.wml:22 +#: /home/runa/tor/website/about/en/volunteers.wml:19 +msgid "Marcia Hofmann and Kevin Bankston" +msgstr "" + +#. type: Content of: <div><div><dl><dd> +#: /home/runa/tor/website/about/en/volunteers.wml:19 +msgid "" +"EFF lawyers who helped write the <a href=\"<page eff/tor-legal-faq>\">Tor " +"Legal FAQ</a> and tirelessly answers the phone when somebody in the world " +"has a legal question about Tor." +msgstr "" + +#. type: Content of: <div><div><dl><dt> +#: /home/runa/tor/website/about/en/volunteers.wml:23 msgid "Andreas Jonsson" msgstr "Andreas Jonsson" #. type: Content of: <div><div><dl><dd> -#: /home/runa/tor/website/about/en/volunteers.wml:22 +#: /home/runa/tor/website/about/en/volunteers.wml:23 msgid "Works on OS X Tor Browser Bundle sandbox technology." msgstr "" #. type: Content of: <div><div><dl><dt> -#: /home/runa/tor/website/about/en/volunteers.wml:24 +#: /home/runa/tor/website/about/en/volunteers.wml:25 msgid "Fabian Keil" msgstr "Fabian Keil" #. type: Content of: <div><div><dl><dd> -#: /home/runa/tor/website/about/en/volunteers.wml:24 +#: /home/runa/tor/website/about/en/volunteers.wml:25 msgid "" "One of the core Privoxy developers, and also a Tor fan. He's the reason Tor " "and Privoxy still work well together." @@ -104,16 +103,6 @@ "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:26 -msgid "Bruce Leidl" -msgstr "Bruce Leidl" - -#. type: Content of: <div><div><dl><dd> -#: /home/runa/tor/website/about/en/volunteers.wml:26 -msgid "Working on a Tor client in Java." -msgstr "Trabaja con un cliente de Tor en Java." - -#. type: Content of: <div><div><dl><dt> #: /home/runa/tor/website/about/en/volunteers.wml:27 msgid "Julius Mittenzwei" msgstr "Julio Mittenzwei" @@ -157,25 +146,13 @@ #. type: Content of: <div><div><dl><dt> #: /home/runa/tor/website/about/en/volunteers.wml:34 -msgid "Martin Peck" -msgstr "" - -#. type: Content of: <div><div><dl><dd> -#: /home/runa/tor/website/about/en/volunteers.wml:34 -msgid "" -"Working on a VM-based transparent proxying approach for Tor clients on " -"Windows." -msgstr "" - -#. type: Content of: <div><div><dl><dt> -#: /home/runa/tor/website/about/en/volunteers.wml:36 msgid "rovv (a pseudonym -- he's managed to stay anonymous even from us!)" msgstr "" "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:37 +#: /home/runa/tor/website/about/en/volunteers.wml:35 msgid "" "The most dedicated bug reporter we've ever heard from. He must read Tor " "source code every day over breakfast." @@ -184,41 +161,23 @@ "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:39 -msgid "tup (another pseudonym)" -msgstr "tup (otro seudónimo)" - -#. type: Content of: <div><div><dl><dd> -#: /home/runa/tor/website/about/en/volunteers.wml:39 -msgid "" -"Periodically adds new features for making Tor easier to use as a <a " -"href=\"<wiki>TransparentProxy\">transparent proxy</a>. Also maintains the <a" -" href=\"http://p56soo2ibjkx23xo.onion/\">TorDNSEL code</a>." +#: /home/runa/tor/website/about/en/volunteers.wml:37 +msgid "Nart Villeneuve" msgstr "" -"Periódicamente añade nuevas funciones para hacer más fácil el uso de Tor, " -"tal como un <a href=\"<wiki>TransparentProxy\">proxy transparente</a> . " -"También mantiene el <a href=\"http://p56soo2ibjkx23xo.onion/\">código " -"TorDNSEL</a> ." -#. type: Content of: <div><div><dl><dt> -#: /home/runa/tor/website/about/en/volunteers.wml:44 -msgid "Kyle Williams" -msgstr "Kyle Williams" - #. type: Content of: <div><div><dl><dd> -#: /home/runa/tor/website/about/en/volunteers.wml:44 +#: /home/runa/tor/website/about/en/volunteers.wml:37 msgid "" -"Developer for JanusVM, a VMWare-based transparent Tor proxy that makes Tor " -"easier to set up and use." +"Security researcher who works with Jacob on Internet Censorship research." msgstr "" #. type: Content of: <div><div><dl><dt> -#: /home/runa/tor/website/about/en/volunteers.wml:47 +#: /home/runa/tor/website/about/en/volunteers.wml:39 msgid "Ethan Zuckerman" msgstr "Ethan Zuckerman" #. type: Content of: <div><div><dl><dd> -#: /home/runa/tor/website/about/en/volunteers.wml:47 +#: /home/runa/tor/website/about/en/volunteers.wml:39 msgid "" "A blogger who has written some <a " "href=\"http://www.ethanzuckerman.com/blog/?p=1019\">interesting</a> <a " @@ -233,7 +192,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:52 +#: /home/runa/tor/website/about/en/volunteers.wml:44 msgid "" "All our relay operators, people who write <a " "href=\"http://freehaven.net/anonbib/\">research papers</a> about Tor, people" Modified: translation/trunk/projects/website/po/es/docs/3-low.debian-vidalia.po =================================================================== --- translation/trunk/projects/website/po/es/docs/3-low.debian-vidalia.po 2011-07-13 13:55:34 UTC (rev 24891) +++ translation/trunk/projects/website/po/es/docs/3-low.debian-vidalia.po 2011-07-13 18:10:49 UTC (rev 24892) @@ -6,8 +6,8 @@ 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-03-22 16:31+0000\n" +"POT-Creation-Date: 2011-07-08 08:43+0200\n" +"PO-Revision-Date: 2011-07-09 01:14+0000\n" "Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" "Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/torproject/team/es/)\n" "MIME-Version: 1.0\n" @@ -35,7 +35,7 @@ msgstr "" #. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:16 /tmp/M9Wxp74W_E.xml:83 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:16 /tmp/LnaSOLeTA9.xml:84 msgid "<br />" msgstr "" @@ -56,72 +56,77 @@ #. type: Content of: <div><div><p><ul><li> #: /home/runa/tor/website/docs/en/debian-vidalia.wml:29 -msgid "Ubuntu 10.10 is \"maverick\" but use the \"lucid\" packages" +msgid "Ubuntu 11.04 is \"natty\"" msgstr "" #. type: Content of: <div><div><p><ul><li> #: /home/runa/tor/website/docs/en/debian-vidalia.wml:30 +msgid "Ubuntu 10.10 or Trisquel 4.5 is \"maverick\"" +msgstr "" + +#. type: Content of: <div><div><p><ul><li> +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:31 msgid "Ubuntu 10.04 or Trisquel 4.0 is \"lucid\"" msgstr "" #. type: Content of: <div><div><p><ul><li> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:31 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:32 msgid "Ubuntu 9.10 or Trisquel 3.5 is \"karmic\"" msgstr "" #. type: Content of: <div><div><p><ul><li> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:32 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:33 msgid "Ubuntu 9.04 is \"jaunty\"" msgstr "" #. type: Content of: <div><div><p><ul><li> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:33 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:34 msgid "Ubuntu 8.10 is \"intrepid\"" msgstr "" #. type: Content of: <div><div><p><ul><li> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:34 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:35 msgid "Ubuntu 8.04 is \"hardy\"" msgstr "" #. type: Content of: <div><div><p><ul><li> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:35 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:36 msgid "Debian Etch is \"etch\"" msgstr "" #. type: Content of: <div><div><p><ul><li> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:36 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:37 msgid "Debian Lenny is \"lenny\"" msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:39 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:40 msgid "Then add this line to your <tt>/etc/apt/sources.list</tt> file:<br />" msgstr "" #. type: Content of: <div><div><p><pre> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:43 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:44 #, no-wrap msgid "" "deb http://deb.torproject.org/torproject.org <DISTRIBUTION> main\n" msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:45 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:46 msgid "" "where you substitute the above word (etch, lenny, sid, karmic, jaunty, " "intrepid, hardy) in place of <DISTRIBUTION>." msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:50 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:51 msgid "" "Then add the gpg key used to sign the packages by running the following " "commands at your command prompt:" msgstr "" #. type: Content of: <div><div><p><pre> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:53 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:54 #, no-wrap msgid "" "gpg --keyserver keys.gnupg.net --recv 886DDD89\n" @@ -129,14 +134,14 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:56 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:57 msgid "" "Now refresh your sources and install Vidalia by running the following " "commands at your command prompt:" msgstr "" #. type: Content of: <div><div><p><pre> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:59 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:60 #, no-wrap msgid "" "apt-get update\n" @@ -144,8 +149,8 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:65 -#: /tmp/M9Wxp74W_E.xml:112 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:66 +#: /tmp/LnaSOLeTA9.xml:113 msgid "" "Now Vidalia is installed and running. Move on to <a href=\"<page docs/tor-" "doc-unix>#polipo\">step two</a> of the \"Vidalia on Linux/Unix\" " @@ -153,7 +158,7 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:71 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:72 msgid "" "The DNS name <code>deb.torproject.org</code> is actually a set of " "independent servers in a DNS round robin configuration. If you for some " @@ -163,38 +168,38 @@ msgstr "" #. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:79 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:80 msgid "<hr /> <a id=\"source\"></a>" msgstr "" #. type: Content of: <div><div><h2> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:82 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:83 msgid "<a class=\"anchor\" href=\"#source\">Building from source</a>" msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:86 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:87 msgid "" "If you want to build your own debs from source you must first add an " "appropriate <tt>deb-src</tt> line to <tt>sources.list</tt>." msgstr "" #. type: Content of: <div><div><p><pre> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:89 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:90 #, no-wrap msgid "" "deb-src http://deb.torproject.org/torproject.org <DISTRIBUTION> main\n" msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:91 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:92 msgid "" "You also need to install the necessary packages to build your own debs and " "the packages needed to build Vidalia:" msgstr "" #. type: Content of: <div><div><p><pre> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:94 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:95 #, no-wrap msgid "" "apt-get install build-essential fakeroot devscripts qt4-dev-tools qt4-designer libqt4-dev g++ cmake\n" @@ -202,12 +207,12 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:97 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:98 msgid "Then you can build Vidalia in ~/debian-packages:" msgstr "" #. type: Content of: <div><div><p><pre> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:99 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:100 #, no-wrap msgid "" "mkdir ~/debian-packages; cd ~/debian-packages\n" @@ -218,23 +223,23 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:105 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:106 msgid "Now you can install the new package:" msgstr "" #. type: Content of: <div><div><p><pre> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:107 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:108 #, no-wrap msgid "sudo dpkg -i vidalia_*.deb\n" msgstr "" #. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:117 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:118 msgid "<hr />" msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:119 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:120 msgid "" "If you have suggestions for improving this document, please <a href=\"<page " "about/contact>\">send them to us</a>. Thanks!" Modified: translation/trunk/projects/website/po/es/docs/3-low.debian.po =================================================================== --- translation/trunk/projects/website/po/es/docs/3-low.debian.po 2011-07-13 13:55:34 UTC (rev 24891) +++ translation/trunk/projects/website/po/es/docs/3-low.debian.po 2011-07-13 18:10:49 UTC (rev 24892) @@ -6,8 +6,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:31+0000\n" +"POT-Creation-Date: 2011-07-08 08:43+0200\n" +"PO-Revision-Date: 2011-07-09 01:14+0000\n" "Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" "Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/torproject/team/es/)\n" "MIME-Version: 1.0\n" @@ -37,8 +37,8 @@ msgstr "" #. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/debian.wml:16 /tmp/__TMvx4TV6.xml:43 -#: /tmp/__TMvx4TV6.xml:113 /tmp/__TMvx4TV6.xml:148 +#: /home/runa/tor/website/docs/en/debian.wml:16 /tmp/hXZfq9nNmb.xml:43 +#: /tmp/hXZfq9nNmb.xml:114 /tmp/hXZfq9nNmb.xml:149 msgid "<br />" msgstr "" @@ -58,8 +58,8 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian.wml:32 /tmp/__TMvx4TV6.xml:94 -#: /tmp/__TMvx4TV6.xml:139 /tmp/__TMvx4TV6.xml:182 +#: /home/runa/tor/website/docs/en/debian.wml:32 /tmp/hXZfq9nNmb.xml:95 +#: /tmp/hXZfq9nNmb.xml:140 /tmp/hXZfq9nNmb.xml:183 msgid "" "Now Tor is installed and running. Move on to <a href=\"<page docs/tor-doc-" "unix>#polipo\">step two</a> of the \"Tor on Linux/Unix\" instructions." @@ -108,57 +108,62 @@ #. type: Content of: <div><div><p><ul><li> #: /home/runa/tor/website/docs/en/debian.wml:60 -msgid "Ubuntu 10.10 is \"maverick\"" +msgid "Ubuntu 11.04 is \"natty\"" msgstr "" #. type: Content of: <div><div><p><ul><li> #: /home/runa/tor/website/docs/en/debian.wml:61 +msgid "Ubuntu 10.10 or Trisquel 4.5 is \"maverick\"" +msgstr "" + +#. type: Content of: <div><div><p><ul><li> +#: /home/runa/tor/website/docs/en/debian.wml:62 msgid "Ubuntu 10.04 or Trisquel 4.0 is \"lucid\"" msgstr "" #. type: Content of: <div><div><p><ul><li> -#: /home/runa/tor/website/docs/en/debian.wml:62 +#: /home/runa/tor/website/docs/en/debian.wml:63 msgid "Ubuntu 9.10 or Trisquel 3.5 is \"karmic\"" msgstr "" #. type: Content of: <div><div><p><ul><li> -#: /home/runa/tor/website/docs/en/debian.wml:63 +#: /home/runa/tor/website/docs/en/debian.wml:64 msgid "Ubuntu 8.04 is \"hardy\"" msgstr "" #. type: Content of: <div><div><p><ul><li> -#: /home/runa/tor/website/docs/en/debian.wml:64 +#: /home/runa/tor/website/docs/en/debian.wml:65 msgid "Ubuntu 6.06 is \"dapper\"" msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian.wml:67 +#: /home/runa/tor/website/docs/en/debian.wml:68 msgid "Then add this line to your <tt>/etc/apt/sources.list</tt> file:<br />" msgstr "" #. type: Content of: <div><div><p><pre> -#: /home/runa/tor/website/docs/en/debian.wml:71 +#: /home/runa/tor/website/docs/en/debian.wml:72 #, no-wrap msgid "" "deb http://deb.torproject.org/torproject.org <DISTRIBUTION> main\n" msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian.wml:73 +#: /home/runa/tor/website/docs/en/debian.wml:74 msgid "" "where you put the codename of your distribution (i.e. lenny, sid, maverick " "or whatever it is) in place of <DISTRIBUTION>." msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian.wml:79 +#: /home/runa/tor/website/docs/en/debian.wml:80 msgid "" "Then add the gpg key used to sign the packages by running the following " "commands at your command prompt:" msgstr "" #. type: Content of: <div><div><p><pre> -#: /home/runa/tor/website/docs/en/debian.wml:82 +#: /home/runa/tor/website/docs/en/debian.wml:83 #, no-wrap msgid "" "gpg --keyserver keys.gnupg.net --recv 886DDD89\n" @@ -166,14 +171,14 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian.wml:85 +#: /home/runa/tor/website/docs/en/debian.wml:86 msgid "" "Now refresh your sources and install Tor by running the following commands " "(as root) at your command prompt:" msgstr "" #. type: Content of: <div><div><p><pre> -#: /home/runa/tor/website/docs/en/debian.wml:88 +#: /home/runa/tor/website/docs/en/debian.wml:89 #, no-wrap msgid "" "apt-get update\n" @@ -181,7 +186,7 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian.wml:100 +#: /home/runa/tor/website/docs/en/debian.wml:101 msgid "" "The DNS name <code>deb.torproject.org</code> is actually a set of " "independent servers in a DNS round robin configuration. If you for some " @@ -191,19 +196,19 @@ msgstr "" #. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/debian.wml:108 +#: /home/runa/tor/website/docs/en/debian.wml:109 msgid "<hr /> <a id=\"development\"></a>" msgstr "" #. type: Content of: <div><div><h2> -#: /home/runa/tor/website/docs/en/debian.wml:111 +#: /home/runa/tor/website/docs/en/debian.wml:112 msgid "" "<a class=\"anchor\" href=\"#development\">Option three: Using the " "development branch of Tor on Debian or Ubuntu</a>" msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian.wml:115 +#: /home/runa/tor/website/docs/en/debian.wml:116 msgid "" "If you want to use the <a href=\"<page " "download/download>#packagediff\">development branch</a> of Tor instead (more" @@ -212,7 +217,7 @@ msgstr "" #. type: Content of: <div><div><p><pre> -#: /home/runa/tor/website/docs/en/debian.wml:120 +#: /home/runa/tor/website/docs/en/debian.wml:121 #, no-wrap msgid "" "deb http://deb.torproject.org/torproject.org <DISTRIBUTION> main\n" @@ -220,19 +225,19 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian.wml:123 +#: /home/runa/tor/website/docs/en/debian.wml:124 msgid "" "where you again substitute the name of your distro (lenny, sid, maverick, " "...) in place of <DISTRIBUTION>." msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian.wml:129 +#: /home/runa/tor/website/docs/en/debian.wml:130 msgid "Then run the following commands at your command prompt:" msgstr "" #. type: Content of: <div><div><p><pre> -#: /home/runa/tor/website/docs/en/debian.wml:131 +#: /home/runa/tor/website/docs/en/debian.wml:132 #, no-wrap msgid "" "gpg --keyserver keys.gnupg.net --recv 886DDD89\n" @@ -242,17 +247,17 @@ msgstr "" #. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/debian.wml:144 +#: /home/runa/tor/website/docs/en/debian.wml:145 msgid "<hr /> <a id=\"source\"></a>" msgstr "" #. type: Content of: <div><div><h2> -#: /home/runa/tor/website/docs/en/debian.wml:147 +#: /home/runa/tor/website/docs/en/debian.wml:148 msgid "<a class=\"anchor\" href=\"#source\">Building from source</a>" msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian.wml:151 +#: /home/runa/tor/website/docs/en/debian.wml:152 msgid "" "If you want to build your own debs from source you must first add an " "appropriate <tt>deb-src</tt> line to <tt>sources.list</tt>." @@ -261,7 +266,7 @@ #. PO4ASHARPBEGIN For the stable version.PO4ASHARPEND #. PO4ASHARPBEGIN For the unstable version.PO4ASHARPEND #. type: Content of: <div><div><p><pre> -#: /home/runa/tor/website/docs/en/debian.wml:154 +#: /home/runa/tor/website/docs/en/debian.wml:155 #, no-wrap msgid "" "\n" @@ -273,14 +278,14 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian.wml:161 +#: /home/runa/tor/website/docs/en/debian.wml:162 msgid "" "You also need to install the necessary packages to build your own debs and " "the packages needed to build Tor:" msgstr "" #. type: Content of: <div><div><p><pre> -#: /home/runa/tor/website/docs/en/debian.wml:164 +#: /home/runa/tor/website/docs/en/debian.wml:165 #, no-wrap msgid "" "apt-get install build-essential fakeroot devscripts\n" @@ -288,12 +293,12 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian.wml:167 +#: /home/runa/tor/website/docs/en/debian.wml:168 msgid "Then you can build Tor in ~/debian-packages:" msgstr "" #. type: Content of: <div><div><p><pre> -#: /home/runa/tor/website/docs/en/debian.wml:169 +#: /home/runa/tor/website/docs/en/debian.wml:170 #, no-wrap msgid "" "mkdir ~/debian-packages; cd ~/debian-packages\n" @@ -304,23 +309,23 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian.wml:175 +#: /home/runa/tor/website/docs/en/debian.wml:176 msgid "Now you can install the new package:" msgstr "" #. type: Content of: <div><div><p><pre> -#: /home/runa/tor/website/docs/en/debian.wml:177 +#: /home/runa/tor/website/docs/en/debian.wml:178 #, no-wrap msgid "sudo dpkg -i tor_*.deb\n" msgstr "" #. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/debian.wml:187 +#: /home/runa/tor/website/docs/en/debian.wml:188 msgid "<hr />" msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian.wml:189 +#: /home/runa/tor/website/docs/en/debian.wml:190 msgid "" "If you have suggestions for improving this document, please <a href=\"<page " "about/contact>\">send them to us</a>. Thanks!" Modified: translation/trunk/projects/website/po/es/docs/3-low.tor-doc-unix.po =================================================================== --- translation/trunk/projects/website/po/es/docs/3-low.tor-doc-unix.po 2011-07-13 13:55:34 UTC (rev 24891) +++ translation/trunk/projects/website/po/es/docs/3-low.tor-doc-unix.po 2011-07-13 18:10:49 UTC (rev 24892) @@ -6,8 +6,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" -"POT-Creation-Date: 2011-06-21 08:18+0200\n" -"PO-Revision-Date: 2011-06-22 00:54+0000\n" +"POT-Creation-Date: 2011-07-08 08:43+0200\n" +"PO-Revision-Date: 2011-07-09 01:14+0000\n" "Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" "Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/torproject/team/es/)\n" "MIME-Version: 1.0\n" @@ -30,9 +30,8 @@ msgstr "" #. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:14 /tmp/4vVJb7zECD.xml:26 -#: /tmp/4vVJb7zECD.xml:58 /tmp/4vVJb7zECD.xml:92 /tmp/4vVJb7zECD.xml:135 -#: /tmp/4vVJb7zECD.xml:173 +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:14 /tmp/KCUf13Jh9J.xml:26 +#: /tmp/KCUf13Jh9J.xml:57 /tmp/KCUf13Jh9J.xml:96 /tmp/KCUf13Jh9J.xml:130 msgid "<br>" msgstr "" @@ -40,9 +39,8 @@ #: /home/runa/tor/website/docs/en/tor-doc-unix.wml:17 msgid "" "<b>Note that these are the installation instructions for running a Tor " -"client. If you want to relay traffic for others to help the network grow " -"(please do), read the <a href=\"<page docs/tor-doc-relay>\">Configuring a " -"relay</a> guide.</b>" +"client. The easiest way to do this is to simply download the <a href=\"<page" +" projects/torbrowser>\">Tor Browser Bundle</a> and you are done. </b>" msgstr "" #. type: Content of: <div><div> @@ -91,75 +89,25 @@ #. type: Content of: <div><div> #: /home/runa/tor/website/docs/en/tor-doc-unix.wml:54 -msgid "<hr> <a id=\"privoxy\"></a> <a id=\"polipo\"></a>" -msgstr "" - -#. type: Content of: <div><div><h2> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:57 -msgid "" -"<a class=\"anchor\" href=\"#polipo\">Step Two: Install Polipo for Web " -"Browsing</a>" -msgstr "" - -#. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:60 -msgid "" -"After installing Tor, you need to configure your applications to use it." -msgstr "" - -#. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:64 -msgid "" -"The first step is to set up web browsing. Start by installing <a " -"href=\"http://www.pps.jussieu.fr/~jch/software/polipo/\">Polipo</a> from " -"your favorite repository. Polipo is a caching web proxy that does http " -"pipelining well, so it's well-suited for Tor's latencies. Make sure to get " -"at least Polipo 1.0.4, since earlier versions lack the SOCKS support " -"required to use Polipo with Tor. You should uninstall privoxy at this point " -"(e.g. apt-get remove privoxy or yum remove privoxy), so they don't conflict." -msgstr "" - -#. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:74 -msgid "" -"Once you've installed Polipo (either from package or from source), <b>you " -"will need to configure Polipo to use Tor</b>. Grab our <a href=\"<tbbrepo" -">/build-scripts/config/polipo.conf\">Polipo configuration for Tor</a> and " -"put it in place of your current polipo config file (e.g. /etc/polipo/config " -"or ~/.polipo). You'll need to restart Polipo for the changes to take " -"effect. For example:<br> <tt>/etc/init.d/polipo restart</tt>" -msgstr "" - -#. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:84 -msgid "" -"If you prefer, you can instead use Privoxy with <a " -"href=\"<wiki>doc/PrivoxyConfig\">this sample Privoxy configuration</a>. But " -"since the config files both use port 8118, you shouldn't run both Polipo and" -" Privoxy at the same time." -msgstr "" - -#. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:89 msgid "<hr> <a id=\"using\"></a>" msgstr "" #. type: Content of: <div><div><h2> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:91 +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:56 msgid "" -"<a class=\"anchor\" href=\"#using\">Step Three: Configure your applications " -"to use Tor</a>" +"<a class=\"anchor\" href=\"#using\">Step Two: Configure your applications to" +" use Tor</a>" msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:94 +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:59 msgid "" -"After installing Tor and Polipo, you need to configure your applications to " -"use them. The first step is to set up web browsing." +"After installing Tor, you need to configure your applications to use them. " +"The first step is to set up web browsing." msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:97 +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:62 msgid "" "You should use Tor with Firefox and Torbutton, for best safety. Simply " "install the <a href=\"<page torbutton/index>\">Torbutton plugin</a>, restart" @@ -167,14 +115,14 @@ msgstr "" #. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:103 +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:68 msgid "" "<img alt=\"Torbutton plugin for Firefox\" src=\"$(IMGROOT)/screenshot-" "torbutton.png\" > <br>" msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:110 +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:75 msgid "" "If you plan to run Firefox on a different computer than Tor, see the <a " "href=\"<wikifaq>#SocksListenAddress\"> FAQ entry for running Tor on a " @@ -182,37 +130,35 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:116 +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:81 msgid "" -"To Torify other applications that support HTTP proxies, just point them at " -"Polipo (that is, localhost port 8118). To use SOCKS directly (for instant " -"messaging, Jabber, IRC, etc), you can point your application directly at Tor" -" (localhost port 9050), but see <a href=\"<wikifaq>#SOCKSAndDNS\">this FAQ " -"entry</a> for why this may be dangerous. For applications that support " -"neither SOCKS nor HTTP, take a look at <a " -"href=\"https://code.google.com/p/torsocks/\">torsocks</a> or <a " +"To Torify other applications that support SOCKS proxies, just point them at " +"Tor's SOCKS port (127.0.0.1 port 9050). See <a " +"href=\"<wikifaq>#SOCKSAndDNS\">this FAQ entry</a> for why this may be " +"dangerous. For applications that support neither SOCKS nor HTTP, take a look" +" at <a href=\"https://code.google.com/p/torsocks/\">torsocks</a> or <a " "href=\"<wiki>doc/TorifyHOWTO#socat\">socat</a>." msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:127 +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:89 msgid "" "For information on how to Torify other applications, check out the <a " "href=\"<wiki>doc/TorifyHOWTO\">Torify HOWTO</a>." msgstr "" #. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:132 +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:93 msgid "<hr> <a id=\"verify\"></a>" msgstr "" #. type: Content of: <div><div><h2> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:134 -msgid "<a class=\"anchor\" href=\"#verify\">Step Four: Make sure it's working</a>" +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:95 +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-unix.wml:138 +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:99 msgid "" "Next, you should try using your browser with Tor and make sure that your IP " "address is being anonymized. Click on <a " @@ -224,50 +170,50 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:150 +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:109 msgid "" "If you have a personal firewall that limits your computer's ability to " "connect to itself (this includes something like SELinux on Fedora Core 4), " -"be sure to allow connections from your local applications to Polipo (local " -"port 8118) and Tor (local port 9050). If your firewall blocks outgoing " -"connections, punch a hole so it can connect to at least TCP ports 80 and " -"443, and then see <a href=\"<wikifaq>#FirewalledClient\">this FAQ entry</a>." -" If your SELinux config is not allowing tor or privoxy to run correctly, " -"create a file named booleans.local in the directory /etc/selinux/targeted. " -"Edit this file in your favorite text editor and insert \"allow_ypbind=1\". " -"Restart your machine for this change to take effect." +"be sure to allow connections from your local applications to Tor (local port" +" 9050). If your firewall blocks outgoing connections, punch a hole so it can" +" connect to at least TCP ports 80 and 443, and then see <a " +"href=\"<wikifaq>#FirewalledClient\">this FAQ entry</a>. If your SELinux " +"config is not allowing tor or privoxy to run correctly, create a file named " +"booleans.local in the directory /etc/selinux/targeted. Edit this file in " +"your favorite text editor and insert \"allow_ypbind=1\". Restart your " +"machine for this change to take effect." msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:165 +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:122 msgid "" "If it's still not working, look at <a href=\"<page " "docs/faq>#DoesntWork\">this FAQ entry</a> for hints." msgstr "" #. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:169 +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:126 msgid "<hr> <a id=\"server\"></a> <a id=\"relay\"></a>" msgstr "" #. type: Content of: <div><div><h2> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:172 -msgid "<a class=\"anchor\" href=\"#relay\">Step Five: Configure it as a relay</a>" +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:129 +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-unix.wml:175 +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:132 msgid "" "The Tor network relies on volunteers to donate bandwidth. The more people " "who run relays, the faster the Tor network will be. If you have at least 20 " -"kilobytes/s each way, please help out Tor by configuring your Tor to be a " +"KiloBytes/s each way, please help out Tor by configuring your Tor to be a " "relay too. We have many features that make Tor relays easy and convenient, " "including rate limiting for bandwidth, exit policies so you can limit your " "exposure to abuse complaints, and support for dynamic IP addresses." msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:183 +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:140 msgid "" "Having relays in many different places on the Internet is what makes Tor " "users secure. <a href=\"<wikifaq>#RelayAnonymity\">You may also get stronger" @@ -276,19 +222,19 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:190 +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:146 msgid "" "Read more at our <a href=\"<page docs/tor-doc-relay>\">Configuring a " "relay</a> guide." msgstr "" #. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:193 +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:149 msgid "<hr>" msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:195 +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:151 msgid "" "If you have suggestions for improving this document, please <a href=\"<page " "about/contact>\">send them to us</a>. Thanks!" Modified: translation/trunk/projects/website/po/es/download/1-high.download-easy.po =================================================================== --- translation/trunk/projects/website/po/es/download/1-high.download-easy.po 2011-07-13 13:55:34 UTC (rev 24891) +++ translation/trunk/projects/website/po/es/download/1-high.download-easy.po 2011-07-13 18:10:49 UTC (rev 24892) @@ -6,8 +6,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" -"POT-Creation-Date: 2011-06-21 08:18+0200\n" -"PO-Revision-Date: 2011-06-22 00:57+0000\n" +"POT-Creation-Date: 2011-07-08 08:42+0200\n" +"PO-Revision-Date: 2011-07-09 01:17+0000\n" "Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" "Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/torproject/team/es/)\n" "MIME-Version: 1.0\n" @@ -120,7 +120,7 @@ #: /home/runa/tor/website/download/en/download-easy.wml:72 msgid "" "</select> <input type=\"text\" id=\"amount\" class=\"amount\" " -"name=\"amount\" value=\"5\" size=\"10\">" +"name=\"amount\" value=\"10\" size=\"10\">" msgstr "" #. type: Content of: <div><div><table><tbody><tr><td><form><p><select> Modified: translation/trunk/projects/website/po/es/download/3-low.download.po =================================================================== --- translation/trunk/projects/website/po/es/download/3-low.download.po 2011-07-13 13:55:34 UTC (rev 24891) +++ translation/trunk/projects/website/po/es/download/3-low.download.po 2011-07-13 18:10:49 UTC (rev 24892) @@ -6,8 +6,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" -"POT-Creation-Date: 2011-06-21 08:18+0200\n" -"PO-Revision-Date: 2011-06-22 00:56+0000\n" +"POT-Creation-Date: 2011-07-08 08:42+0200\n" +"PO-Revision-Date: 2011-07-09 01:16+0000\n" "Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" "Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/torproject/team/es/)\n" "MIME-Version: 1.0\n" @@ -119,7 +119,7 @@ #: /home/runa/tor/website/download/en/download.wml:65 msgid "" "</select> <input type=\"text\" id=\"amount\" class=\"amount\" " -"name=\"amount\" value=\"5\" size=\"10\">" +"name=\"amount\" value=\"10\" size=\"10\">" msgstr "" #. type: Content of: <div><div><table><tr><td><form><p><select> @@ -174,8 +174,8 @@ msgstr "" #. type: Content of: <div><div><table><tr><td><ul><li> -#: /home/runa/tor/website/download/en/download.wml:102 /tmp/FhqGC1ISDt.xml:165 -#: /tmp/FhqGC1ISDt.xml:203 +#: /home/runa/tor/website/download/en/download.wml:102 /tmp/lbSAEZiU0Z.xml:165 +#: /tmp/lbSAEZiU0Z.xml:203 msgid "" "The <strong>Tor Browser Bundle</strong> contains everything you need to " "safely browse the Internet. This package requires no installation. Just " @@ -209,7 +209,7 @@ msgstr "" #. type: Content of: <div><div><table><tr><td><p> -#: /home/runa/tor/website/download/en/download.wml:110 /tmp/FhqGC1ISDt.xml:168 +#: /home/runa/tor/website/download/en/download.wml:110 /tmp/lbSAEZiU0Z.xml:168 msgid "" "There are two versions of each package, a stable and alpha release. Stable " "packages are released when we believe the features and code will not change " @@ -518,7 +518,7 @@ msgstr "" #. type: Content of: <div><div><div> -#: /home/runa/tor/website/download/en/download.wml:265 /tmp/FhqGC1ISDt.xml:344 +#: /home/runa/tor/website/download/en/download.wml:265 /tmp/lbSAEZiU0Z.xml:344 msgid "<br>" msgstr "" 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-07-13 13:55:34 UTC (rev 24891) +++ translation/trunk/projects/website/po/es/press/4-optional.2010-03-25-tor-store-press-release.po 2011-07-13 18:10:49 UTC (rev 24892) @@ -7,7 +7,7 @@ "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-05-02 17:00+0200\n" -"PO-Revision-Date: 2011-07-08 07:49+0000\n" +"PO-Revision-Date: 2011-07-13 17:04+0000\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/torproject/team/es/)\n" "MIME-Version: 1.0\n" Modified: translation/trunk/projects/website/po/fa/about/2-medium.torusers.po =================================================================== --- translation/trunk/projects/website/po/fa/about/2-medium.torusers.po 2011-07-13 13:55:34 UTC (rev 24891) +++ translation/trunk/projects/website/po/fa/about/2-medium.torusers.po 2011-07-13 18:10:49 UTC (rev 24892) @@ -7,7 +7,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-07-08 07:46+0000\n" +"PO-Revision-Date: 2011-07-13 16:55+0000\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" Modified: translation/trunk/projects/website/po/fa/about/3-low.board.po =================================================================== --- translation/trunk/projects/website/po/fa/about/3-low.board.po 2011-07-13 13:55:34 UTC (rev 24891) +++ translation/trunk/projects/website/po/fa/about/3-low.board.po 2011-07-13 18:10:49 UTC (rev 24892) @@ -7,7 +7,7 @@ "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-06-21 08:19+0200\n" -"PO-Revision-Date: 2011-07-08 07:49+0000\n" +"PO-Revision-Date: 2011-07-13 17:04+0000\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" Modified: translation/trunk/projects/website/po/fa/about/3-low.contact.po =================================================================== --- translation/trunk/projects/website/po/fa/about/3-low.contact.po 2011-07-13 13:55:34 UTC (rev 24891) +++ translation/trunk/projects/website/po/fa/about/3-low.contact.po 2011-07-13 18:10:49 UTC (rev 24892) @@ -6,8 +6,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" -"POT-Creation-Date: 2011-04-13 16:28+0200\n" -"PO-Revision-Date: 2011-07-08 07:43+0000\n" +"POT-Creation-Date: 2011-07-08 08:44+0200\n" +"PO-Revision-Date: 2011-07-13 16:41+0000\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -29,83 +29,36 @@ msgid "Tor: Contact" msgstr "" -#. type: Content of: <div><div><p> +#. type: Content of: <div><div><h3> #: /home/runa/tor/website/about/en/contact.wml:16 -msgid "" -"First, if you have a problem or question about using Tor, go look at the <a " -"href=\"<page docs/documentation>#Support\">Support section</a> for how to " -"proceed. The Tor developers spend most of their time developing Tor, and " -"there are no people devoted to user support, so try to help yourself before " -"<a href=\"<page docs/faq>#SupportMail\">politely trying to find a " -"volunteer</a>." +msgid "Email" msgstr "" -#. type: Content of: <div><div><p> -#: /home/runa/tor/website/about/en/contact.wml:18 -msgid "" -"If you really do need to reach us, here are some approaches. Please be " -"patient and <a href=\"http://www.catb.org/~esr/faqs/smart-" -"questions.html\">helpful</a>, and please make sure to write your mail in " -"English." -msgstr "" - #. type: Content of: <div><div> -#: /home/runa/tor/website/about/en/contact.wml:21 +#: /home/runa/tor/website/about/en/contact.wml:17 msgid "" -"<i>tor-assistants at torproject.org</i> is the catch-all address for " -"everything. It can be used for:" +"<a id=\"email\"></a> <i>tor-assistants at torproject.org</i> is the catch-" +"all address for everything. It can be used for reaching people working on " +"Tor. A few other addresses are more specific:" msgstr "" #. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/about/en/contact.wml:25 +#: /home/runa/tor/website/about/en/contact.wml:24 msgid "" -"Contacting the people who manage the directory authorities. Use this if you " -"run a Tor relay and have a question or problem with your relay." -msgstr "" - -#. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/about/en/contact.wml:28 -msgid "" -"So we can fix typos on the website, change wrong statements or directions on" -" the website, and add new sections and paragraphs that you send us. You " -"might want to make a draft of your new sections on <a href=\"<wiki>\">the " -"Tor wiki</a> first." -msgstr "" - -#. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/about/en/contact.wml:32 -msgid "" -"Hearing about your documents, patches, testing, experiences with supporting " -"applications, and so forth inspired by our <a href=\"<page " -"getinvolved/volunteer>\">volunteer page</a> (or other problems you've fixed " -"or documented about using Tor). There's no need to mail us before you start " -"working on something -- like all volunteer Internet projects, we hear from a" -" lot of excited people who vanish soon after, so we are most interested in " -"hearing about actual progress." -msgstr "" - -#. type: Content of: <div><div> -#: /home/runa/tor/website/about/en/contact.wml:42 -msgid "A few other addresses are more specific:" -msgstr "" - -#. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/about/en/contact.wml:45 -msgid "" "<i>tor-translation at lists.torproject.org</i> can put new <a href=\"<page " "getinvolved/translation>\">website translations</a> into place, and help " "answer questions about existing and new translations." msgstr "" #. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/about/en/contact.wml:48 +#: /home/runa/tor/website/about/en/contact.wml:27 msgid "" "<i>tordnsel at torproject.org</i> is the alias for the people responsible " "for the tordns exitlist." msgstr "" #. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/about/en/contact.wml:50 +#: /home/runa/tor/website/about/en/contact.wml:29 msgid "" "<i>donations at torproject.org</i> is for questions and comments about <a " "href=\"<page donate/donate>\">getting money to the developers</a>. More " @@ -114,7 +67,7 @@ msgstr "" #. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/about/en/contact.wml:55 +#: /home/runa/tor/website/about/en/contact.wml:34 msgid "" "<i>execdir at torproject.org</i> is for press/media, questions and comments " "about Tor the non-profit corporation: trademark questions, affiliation and " @@ -122,33 +75,72 @@ "etc." msgstr "" +#. type: Content of: <div><div><h3> +#: /home/runa/tor/website/about/en/contact.wml:40 +msgid "Identi.ca" +msgstr "" + +#. type: Content of: <div><div><p> +#: /home/runa/tor/website/about/en/contact.wml:41 +msgid "" +"<a id=\"identica\"></a> Contact us via our microblogging Identi.ca account " +"at <a href=\"https://identi.ca/torproject\">torproject</a>." +msgstr "" + +#. type: Content of: <div><div><h3> +#: /home/runa/tor/website/about/en/contact.wml:45 +msgid "IRC" +msgstr "" + #. type: Content of: <div><div> -#: /home/runa/tor/website/about/en/contact.wml:61 +#: /home/runa/tor/website/about/en/contact.wml:46 +msgid "<a id=\"irc\"></a>" +msgstr "" + +#. type: Content of: <div><div><p> +#: /home/runa/tor/website/about/en/contact.wml:47 msgid "" -"<a id=\"irc\"></a> Tor users and developers can also be found in the " -"following channels on <a href=\"http://www.oftc.net/oftc/\">oftc</a>:" +"Tor users and developers can also be found in the following channels on <a " +"href=\"http://www.oftc.net/oftc/\">OFTC</a>:" msgstr "" #. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/about/en/contact.wml:66 +#: /home/runa/tor/website/about/en/contact.wml:51 msgid "" "<i>#tor</i> - User and relay operation discussions. Having trouble running " "Tor or a question for other Tor users? Then this is the spot for you." msgstr "" #. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/about/en/contact.wml:69 +#: /home/runa/tor/website/about/en/contact.wml:54 msgid "" "<i>#tor-dev</i> - Channel for people who want to do development. " -"Discussions about Tor related coding, protocols, and <a href=\"<page " +"Discussions about Tor-related coding, protocols, and <a href=\"<page " "getinvolved/volunteer>\">project ideas</a> are all welcome." msgstr "" #. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/about/en/contact.wml:72 +#: /home/runa/tor/website/about/en/contact.wml:57 msgid "" "<i>#nottor</i> - This is where Tor people hang out to talk about stuff that " "is not related to Tor." msgstr "" +#. type: Content of: <div><div><h3> +#: /home/runa/tor/website/about/en/contact.wml:61 +msgid "Telephone" +msgstr "" +#. type: Content of: <div><div> +#: /home/runa/tor/website/about/en/contact.wml:62 +msgid "<a id=\"phone\"></a>" +msgstr "" + +#. type: Content of: <div><div><p> +#: /home/runa/tor/website/about/en/contact.wml:63 +msgid "" +"If none of the above appeal to you, calling +1-781-352-0568 will reach the " +"Tor office. Should there be no answer, please leave a message." +msgstr "" + + Modified: translation/trunk/projects/website/po/fa/about/3-low.contributors.po =================================================================== --- translation/trunk/projects/website/po/fa/about/3-low.contributors.po 2011-07-13 13:55:34 UTC (rev 24891) +++ translation/trunk/projects/website/po/fa/about/3-low.contributors.po 2011-07-13 18:10:49 UTC (rev 24892) @@ -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:18+0000\n" +"POT-Creation-Date: 2011-07-08 08:44+0200\n" +"PO-Revision-Date: 2011-07-09 01:09+0000\n" "Last-Translator: Ghazall <emroozz(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -187,47 +187,69 @@ #. type: Content of: <div><div><dl><dt> #: /home/runa/tor/website/about/en/contributors.wml:48 +msgid "Bruce Leidl" +msgstr "" + +#. type: Content of: <div><div><dl><dd> +#: /home/runa/tor/website/about/en/contributors.wml:48 +msgid "Worked on a Tor client in Java." +msgstr "" + +#. type: Content of: <div><div><dl><dt> +#: /home/runa/tor/website/about/en/contributors.wml:49 msgid "Rebecca MacKinnon" msgstr "" #. type: Content of: <div><div><dl><dd> -#: /home/runa/tor/website/about/en/contributors.wml:48 +#: /home/runa/tor/website/about/en/contributors.wml:49 msgid "" "Former Director of Tor. Co-Founder of <a " "href=\"http://www.globalvoicesonline.org/\">Global Voices Online</a>." msgstr "" #. type: Content of: <div><div><dl><dt> -#: /home/runa/tor/website/about/en/contributors.wml:50 +#: /home/runa/tor/website/about/en/contributors.wml:51 msgid "Chris Palmer" msgstr "" #. type: Content of: <div><div><dl><dd> -#: /home/runa/tor/website/about/en/contributors.wml:50 +#: /home/runa/tor/website/about/en/contributors.wml:51 msgid "" "Our liaison and tech guy with EFF while EFF was funding us. Also helped " "advocate and write end-user docs." msgstr "" #. type: Content of: <div><div><dl><dt> -#: /home/runa/tor/website/about/en/contributors.wml:52 +#: /home/runa/tor/website/about/en/contributors.wml:53 +msgid "Martin Peck" +msgstr "" + +#. type: Content of: <div><div><dl><dd> +#: /home/runa/tor/website/about/en/contributors.wml:53 +msgid "" +"Worked on a VM-based transparent proxying approach for Tor clients on " +"Windows." +msgstr "" + +#. type: Content of: <div><div><dl><dt> +#: /home/runa/tor/website/about/en/contributors.wml:55 msgid "Matej Pfajfar" msgstr "" #. type: Content of: <div><div><dl><dd> -#: /home/runa/tor/website/about/en/contributors.wml:52 +#: /home/runa/tor/website/about/en/contributors.wml:55 msgid "" "Author of the original onion routing code that Tor is based on, so we didn't" " have to start from scratch." msgstr "" #. type: Content of: <div><div><dl><dt> -#: /home/runa/tor/website/about/en/contributors.wml:54 +#: /home/runa/tor/website/about/en/contributors.wml:57 msgid "Johannes Renner" msgstr "" #. type: Content of: <div><div><dl><dd> -#: /home/runa/tor/website/about/en/contributors.wml:54 +#: /home/runa/tor/website/about/en/contributors.wml:57 msgid "" "Worked during the 2007 Google Summer of Code on modifying <a " "href=\"https://svn.torproject.org/svn/torflow/trunk/README\">TorFlow</a> to " @@ -235,23 +257,36 @@ msgstr "" #. type: Content of: <div><div><dl><dt> -#: /home/runa/tor/website/about/en/contributors.wml:59 +#: /home/runa/tor/website/about/en/contributors.wml:62 msgid "Scott Squires" msgstr "" #. type: Content of: <div><div><dl><dd> -#: /home/runa/tor/website/about/en/contributors.wml:59 +#: /home/runa/tor/website/about/en/contributors.wml:62 msgid "" "The original developer of <a href=\"<page torbutton/index>\">Torbutton</a>." msgstr "" #. type: Content of: <div><div><dl><dt> -#: /home/runa/tor/website/about/en/contributors.wml:61 +#: /home/runa/tor/website/about/en/contributors.wml:64 +msgid "tup (a pseudonym)" +msgstr "" + +#. type: Content of: <div><div><dl><dd> +#: /home/runa/tor/website/about/en/contributors.wml:64 +msgid "" +"Added new features for making Tor easier to use as a <a " +"href=\"<wiki>TransparentProxy\">transparent proxy</a>. Also wrote the <a " +"href=\"http://p56soo2ibjkx23xo.onion/\">TorDNSEL code</a>." +msgstr "" + +#. type: Content of: <div><div><dl><dt> +#: /home/runa/tor/website/about/en/contributors.wml:69 msgid "Stephen Tyree" msgstr "" #. type: Content of: <div><div><dl><dd> -#: /home/runa/tor/website/about/en/contributors.wml:61 +#: /home/runa/tor/website/about/en/contributors.wml:69 msgid "" "Worked during Google Summer of Code 2009 to develop a plugin API for <a " "href=\"<page projects/vidalia>\">Vidalia</a> and create a plugin to allow " @@ -260,12 +295,12 @@ msgstr "" #. type: Content of: <div><div><dl><dt> -#: /home/runa/tor/website/about/en/contributors.wml:65 +#: /home/runa/tor/website/about/en/contributors.wml:73 msgid "Camilo Viecco" msgstr "" #. type: Content of: <div><div><dl><dd> -#: /home/runa/tor/website/about/en/contributors.wml:65 +#: /home/runa/tor/website/about/en/contributors.wml:73 msgid "" "Worked on Providing Blossom functionality to Vidalia (<a href=\"http://trac" ".vidalia-project.net/browser/vidalia/branches/exit-country\">svn</a>) as " @@ -273,12 +308,12 @@ msgstr "" #. type: Content of: <div><div><dl><dt> -#: /home/runa/tor/website/about/en/contributors.wml:68 +#: /home/runa/tor/website/about/en/contributors.wml:76 msgid "Fred von Lohmann" msgstr "" #. type: Content of: <div><div><dl><dd> -#: /home/runa/tor/website/about/en/contributors.wml:68 +#: /home/runa/tor/website/about/en/contributors.wml:76 msgid "" "Fred served on our Board of Directors from 2006 through 2009. His complete " "bio can be found at the <a href=\"http://www.eff.org/about/staff/fred-von-" @@ -286,12 +321,24 @@ msgstr "" #. type: Content of: <div><div><dl><dt> -#: /home/runa/tor/website/about/en/contributors.wml:72 +#: /home/runa/tor/website/about/en/contributors.wml:80 +msgid "Kyle Williams" +msgstr "" + +#. type: Content of: <div><div><dl><dd> +#: /home/runa/tor/website/about/en/contributors.wml:80 +msgid "" +"Developer for JanusVM, a VMWare-based transparent Tor proxy that makes Tor " +"easier to set up and use." +msgstr "" + +#. type: Content of: <div><div><dl><dt> +#: /home/runa/tor/website/about/en/contributors.wml:82 msgid "Christian Wilms" msgstr "" #. type: Content of: <div><div><dl><dd> -#: /home/runa/tor/website/about/en/contributors.wml:72 +#: /home/runa/tor/website/about/en/contributors.wml:82 msgid "" "Worked on Performance Enhancing Measures for Tor Hidden Services (<a " "href=\"https://svn.torproject.org/cgi-bin/viewvs.cgi/tor/branches/hidserv-" @@ -299,12 +346,12 @@ msgstr "" #. type: Content of: <div><div><dl><dt> -#: /home/runa/tor/website/about/en/contributors.wml:75 +#: /home/runa/tor/website/about/en/contributors.wml:85 msgid "Jillian C. York" msgstr "" #. type: Content of: <div><div><dl><dd> -#: /home/runa/tor/website/about/en/contributors.wml:75 +#: /home/runa/tor/website/about/en/contributors.wml:85 msgid "" "<a href=\"http://jilliancyork.com/\">Jillian C. York</a> is a writer, " "blogger, and activist based in Boston." Modified: translation/trunk/projects/website/po/fa/about/3-low.corepeople.po =================================================================== --- translation/trunk/projects/website/po/fa/about/3-low.corepeople.po 2011-07-13 13:55:34 UTC (rev 24891) +++ translation/trunk/projects/website/po/fa/about/3-low.corepeople.po 2011-07-13 18:10:49 UTC (rev 24892) @@ -7,7 +7,7 @@ "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-06-21 08:19+0200\n" -"PO-Revision-Date: 2011-07-08 07:48+0000\n" +"PO-Revision-Date: 2011-07-13 17:02+0000\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" Modified: translation/trunk/projects/website/po/fa/about/3-low.financials.po =================================================================== --- translation/trunk/projects/website/po/fa/about/3-low.financials.po 2011-07-13 13:55:34 UTC (rev 24891) +++ translation/trunk/projects/website/po/fa/about/3-low.financials.po 2011-07-13 18:10:49 UTC (rev 24892) @@ -7,7 +7,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-07-08 07:47+0000\n" +"PO-Revision-Date: 2011-07-13 17:01+0000\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" Modified: translation/trunk/projects/website/po/fa/about/3-low.translators.po =================================================================== --- translation/trunk/projects/website/po/fa/about/3-low.translators.po 2011-07-13 13:55:34 UTC (rev 24891) +++ translation/trunk/projects/website/po/fa/about/3-low.translators.po 2011-07-13 18:10:49 UTC (rev 24892) @@ -7,7 +7,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-07-08 07:52+0000\n" +"PO-Revision-Date: 2011-07-13 17:06+0000\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" Modified: translation/trunk/projects/website/po/fa/about/3-low.volunteers.po =================================================================== --- translation/trunk/projects/website/po/fa/about/3-low.volunteers.po 2011-07-13 13:55:34 UTC (rev 24891) +++ translation/trunk/projects/website/po/fa/about/3-low.volunteers.po 2011-07-13 18:10:49 UTC (rev 24892) @@ -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-06-29 20:42+0200\n" -"PO-Revision-Date: 2011-06-30 00:49+0000\n" +"POT-Creation-Date: 2011-07-08 08:44+0200\n" +"PO-Revision-Date: 2011-07-09 01:11+0000\n" "Last-Translator: behravan <behravanhamed(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -32,80 +32,72 @@ #. type: Content of: <div><div><dl><dt> #: /home/runa/tor/website/about/en/volunteers.wml:15 -msgid "Anonym" +msgid "Anonym, bertagaz, and intrigeri" msgstr "" #. type: Content of: <div><div><dl><dd> #: /home/runa/tor/website/about/en/volunteers.wml:15 -msgid "Maintainer of the Incognito LiveCD." -msgstr "" - -#. type: Content of: <div><div><dl><dt> -#: /home/runa/tor/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 msgid "" -"EFF lawyer who helped write the <a href=\"<page eff/tor-legal-faq>\">Tor " -"Legal FAQ</a> and tirelessly answers the phone when somebody in the world " -"has a legal question about Tor." +"Maintainers of <a href=\"https://tails.boum.org/\">The Amnesic Incognito " +"Live System</a>." msgstr "" #. type: Content of: <div><div><dl><dt> -#: /home/runa/tor/website/about/en/volunteers.wml:20 +#: /home/runa/tor/website/about/en/volunteers.wml:17 msgid "Marco Bonetti" msgstr "" #. type: Content of: <div><div><dl><dd> -#: /home/runa/tor/website/about/en/volunteers.wml:20 +#: /home/runa/tor/website/about/en/volunteers.wml:17 msgid "Focusing on MobileTor for the iPhone." msgstr "" #. type: Content of: <div><div><dl><dt> -#: /home/runa/tor/website/about/en/volunteers.wml:21 +#: /home/runa/tor/website/about/en/volunteers.wml:18 msgid "Kasimir Gabert" msgstr "" #. type: Content of: <div><div><dl><dd> -#: /home/runa/tor/website/about/en/volunteers.wml:21 +#: /home/runa/tor/website/about/en/volunteers.wml:18 msgid "Maintains TorStatus." msgstr "" #. type: Content of: <div><div><dl><dt> -#: /home/runa/tor/website/about/en/volunteers.wml:22 +#: /home/runa/tor/website/about/en/volunteers.wml:19 +msgid "Marcia Hofmann and Kevin Bankston" +msgstr "" + +#. type: Content of: <div><div><dl><dd> +#: /home/runa/tor/website/about/en/volunteers.wml:19 +msgid "" +"EFF lawyers who helped write the <a href=\"<page eff/tor-legal-faq>\">Tor " +"Legal FAQ</a> and tirelessly answers the phone when somebody in the world " +"has a legal question about Tor." +msgstr "" + +#. type: Content of: <div><div><dl><dt> +#: /home/runa/tor/website/about/en/volunteers.wml:23 msgid "Andreas Jonsson" msgstr "" #. type: Content of: <div><div><dl><dd> -#: /home/runa/tor/website/about/en/volunteers.wml:22 +#: /home/runa/tor/website/about/en/volunteers.wml:23 msgid "Works on OS X Tor Browser Bundle sandbox technology." msgstr "" #. type: Content of: <div><div><dl><dt> -#: /home/runa/tor/website/about/en/volunteers.wml:24 +#: /home/runa/tor/website/about/en/volunteers.wml:25 msgid "Fabian Keil" msgstr "" #. type: Content of: <div><div><dl><dd> -#: /home/runa/tor/website/about/en/volunteers.wml:24 +#: /home/runa/tor/website/about/en/volunteers.wml:25 msgid "" "One of the core Privoxy developers, and also a Tor fan. He's the reason Tor " "and Privoxy still work well together." msgstr "" #. type: Content of: <div><div><dl><dt> -#: /home/runa/tor/website/about/en/volunteers.wml:26 -msgid "Bruce Leidl" -msgstr "" - -#. type: Content of: <div><div><dl><dd> -#: /home/runa/tor/website/about/en/volunteers.wml:26 -msgid "Working on a Tor client in Java." -msgstr "" - -#. type: Content of: <div><div><dl><dt> #: /home/runa/tor/website/about/en/volunteers.wml:27 msgid "Julius Mittenzwei" msgstr "" @@ -143,60 +135,34 @@ #. type: Content of: <div><div><dl><dt> #: /home/runa/tor/website/about/en/volunteers.wml:34 -msgid "Martin Peck" -msgstr "" - -#. type: Content of: <div><div><dl><dd> -#: /home/runa/tor/website/about/en/volunteers.wml:34 -msgid "" -"Working on a VM-based transparent proxying approach for Tor clients on " -"Windows." -msgstr "" - -#. type: Content of: <div><div><dl><dt> -#: /home/runa/tor/website/about/en/volunteers.wml:36 msgid "rovv (a pseudonym -- he's managed to stay anonymous even from us!)" msgstr "" #. type: Content of: <div><div><dl><dd> -#: /home/runa/tor/website/about/en/volunteers.wml:37 +#: /home/runa/tor/website/about/en/volunteers.wml:35 msgid "" "The most dedicated bug reporter we've ever heard from. He must read Tor " "source code every day over breakfast." msgstr "" #. type: Content of: <div><div><dl><dt> -#: /home/runa/tor/website/about/en/volunteers.wml:39 -msgid "tup (another pseudonym)" +#: /home/runa/tor/website/about/en/volunteers.wml:37 +msgid "Nart Villeneuve" msgstr "" #. type: Content of: <div><div><dl><dd> -#: /home/runa/tor/website/about/en/volunteers.wml:39 +#: /home/runa/tor/website/about/en/volunteers.wml:37 msgid "" -"Periodically adds new features for making Tor easier to use as a <a " -"href=\"<wiki>TransparentProxy\">transparent proxy</a>. Also maintains the <a" -" href=\"http://p56soo2ibjkx23xo.onion/\">TorDNSEL code</a>." +"Security researcher who works with Jacob on Internet Censorship research." msgstr "" #. type: Content of: <div><div><dl><dt> -#: /home/runa/tor/website/about/en/volunteers.wml:44 -msgid "Kyle Williams" -msgstr "" - -#. type: Content of: <div><div><dl><dd> -#: /home/runa/tor/website/about/en/volunteers.wml:44 -msgid "" -"Developer for JanusVM, a VMWare-based transparent Tor proxy that makes Tor " -"easier to set up and use." -msgstr "" - -#. type: Content of: <div><div><dl><dt> -#: /home/runa/tor/website/about/en/volunteers.wml:47 +#: /home/runa/tor/website/about/en/volunteers.wml:39 msgid "Ethan Zuckerman" msgstr "" #. type: Content of: <div><div><dl><dd> -#: /home/runa/tor/website/about/en/volunteers.wml:47 +#: /home/runa/tor/website/about/en/volunteers.wml:39 msgid "" "A blogger who has written some <a " "href=\"http://www.ethanzuckerman.com/blog/?p=1019\">interesting</a> <a " @@ -206,7 +172,7 @@ msgstr "" #. type: Content of: <div><div><dl><dt> -#: /home/runa/tor/website/about/en/volunteers.wml:52 +#: /home/runa/tor/website/about/en/volunteers.wml:44 msgid "" "All our relay operators, people who write <a " "href=\"http://freehaven.net/anonbib/\">research papers</a> about Tor, people" Modified: translation/trunk/projects/website/po/fa/docs/2-medium.installguide.po =================================================================== --- translation/trunk/projects/website/po/fa/docs/2-medium.installguide.po 2011-07-13 13:55:34 UTC (rev 24891) +++ translation/trunk/projects/website/po/fa/docs/2-medium.installguide.po 2011-07-13 18:10:49 UTC (rev 24892) @@ -2,14 +2,15 @@ # Copyright (C) YEAR The Tor Project, Inc. # This file is distributed under the same license as the PACKAGE package. # +# <kaveh.nematipour(a)gmail.com>, 2011. # <behravanhamed(a)gmail.com>, 2011. 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-26 14:32+0000\n" -"PO-Revision-Date: 2011-06-29 15:08+0000\n" -"Last-Translator: behravan <behravanhamed(a)gmail.com>\n" +"PO-Revision-Date: 2011-07-10 08:15+0000\n" +"Last-Translator: knematipour <kaveh.nematipour(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -24,11 +25,14 @@ "docs/documentation>\">Documentation » </a> <a href=\"<page " "docs/installguide>\">Installation Guides</a>" msgstr "" +"<a href=\"<page index>\">خانه و راکو; </a> <a href=\"<page " +"docs/documentation>\">مستندات و راکو; </a> <a href=\"<page " +"docs/installguide>\">راهنمای نصب</a>" #. type: Content of: <div><div><h1> #: /home/runa/transifex/website/docs/en/installguide.wml:13 msgid "Tor Installation guides" -msgstr "" +msgstr "راهنماهای نصب تر" #. type: Content of: <div><div> #: /home/runa/transifex/website/docs/en/installguide.wml:14 Modified: translation/trunk/projects/website/po/fa/docs/3-low.debian-vidalia.po =================================================================== --- translation/trunk/projects/website/po/fa/docs/3-low.debian-vidalia.po 2011-07-13 13:55:34 UTC (rev 24891) +++ translation/trunk/projects/website/po/fa/docs/3-low.debian-vidalia.po 2011-07-13 18:10:49 UTC (rev 24892) @@ -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: 2010-12-05 19:13+0000\n" -"PO-Revision-Date: 2011-03-22 16:31+0000\n" +"POT-Creation-Date: 2011-07-08 08:43+0200\n" +"PO-Revision-Date: 2011-07-09 01:14+0000\n" "Last-Translator: Ghazall <emroozz(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -39,7 +39,7 @@ msgstr "" #. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:16 /tmp/M9Wxp74W_E.xml:83 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:16 /tmp/LnaSOLeTA9.xml:84 msgid "<br />" msgstr "" @@ -60,72 +60,77 @@ #. type: Content of: <div><div><p><ul><li> #: /home/runa/tor/website/docs/en/debian-vidalia.wml:29 -msgid "Ubuntu 10.10 is \"maverick\" but use the \"lucid\" packages" +msgid "Ubuntu 11.04 is \"natty\"" msgstr "" #. type: Content of: <div><div><p><ul><li> #: /home/runa/tor/website/docs/en/debian-vidalia.wml:30 +msgid "Ubuntu 10.10 or Trisquel 4.5 is \"maverick\"" +msgstr "" + +#. type: Content of: <div><div><p><ul><li> +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:31 msgid "Ubuntu 10.04 or Trisquel 4.0 is \"lucid\"" msgstr "" #. type: Content of: <div><div><p><ul><li> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:31 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:32 msgid "Ubuntu 9.10 or Trisquel 3.5 is \"karmic\"" msgstr "" #. type: Content of: <div><div><p><ul><li> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:32 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:33 msgid "Ubuntu 9.04 is \"jaunty\"" msgstr "" #. type: Content of: <div><div><p><ul><li> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:33 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:34 msgid "Ubuntu 8.10 is \"intrepid\"" msgstr "" #. type: Content of: <div><div><p><ul><li> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:34 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:35 msgid "Ubuntu 8.04 is \"hardy\"" msgstr "" #. type: Content of: <div><div><p><ul><li> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:35 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:36 msgid "Debian Etch is \"etch\"" msgstr "" #. type: Content of: <div><div><p><ul><li> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:36 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:37 msgid "Debian Lenny is \"lenny\"" msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:39 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:40 msgid "Then add this line to your <tt>/etc/apt/sources.list</tt> file:<br />" msgstr "" #. type: Content of: <div><div><p><pre> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:43 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:44 #, no-wrap msgid "" "deb http://deb.torproject.org/torproject.org <DISTRIBUTION> main\n" msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:45 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:46 msgid "" "where you substitute the above word (etch, lenny, sid, karmic, jaunty, " "intrepid, hardy) in place of <DISTRIBUTION>." msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:50 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:51 msgid "" "Then add the gpg key used to sign the packages by running the following " "commands at your command prompt:" msgstr "" #. type: Content of: <div><div><p><pre> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:53 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:54 #, no-wrap msgid "" "gpg --keyserver keys.gnupg.net --recv 886DDD89\n" @@ -133,14 +138,14 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:56 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:57 msgid "" "Now refresh your sources and install Vidalia by running the following " "commands at your command prompt:" msgstr "" #. type: Content of: <div><div><p><pre> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:59 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:60 #, no-wrap msgid "" "apt-get update\n" @@ -148,8 +153,8 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:65 -#: /tmp/M9Wxp74W_E.xml:112 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:66 +#: /tmp/LnaSOLeTA9.xml:113 msgid "" "Now Vidalia is installed and running. Move on to <a href=\"<page docs/tor-" "doc-unix>#polipo\">step two</a> of the \"Vidalia on Linux/Unix\" " @@ -157,7 +162,7 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:71 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:72 msgid "" "The DNS name <code>deb.torproject.org</code> is actually a set of " "independent servers in a DNS round robin configuration. If you for some " @@ -167,38 +172,38 @@ msgstr "" #. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:79 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:80 msgid "<hr /> <a id=\"source\"></a>" msgstr "" #. type: Content of: <div><div><h2> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:82 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:83 msgid "<a class=\"anchor\" href=\"#source\">Building from source</a>" msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:86 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:87 msgid "" "If you want to build your own debs from source you must first add an " "appropriate <tt>deb-src</tt> line to <tt>sources.list</tt>." msgstr "" #. type: Content of: <div><div><p><pre> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:89 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:90 #, no-wrap msgid "" "deb-src http://deb.torproject.org/torproject.org <DISTRIBUTION> main\n" msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:91 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:92 msgid "" "You also need to install the necessary packages to build your own debs and " "the packages needed to build Vidalia:" msgstr "" #. type: Content of: <div><div><p><pre> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:94 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:95 #, no-wrap msgid "" "apt-get install build-essential fakeroot devscripts qt4-dev-tools qt4-designer libqt4-dev g++ cmake\n" @@ -206,12 +211,12 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:97 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:98 msgid "Then you can build Vidalia in ~/debian-packages:" msgstr "" #. type: Content of: <div><div><p><pre> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:99 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:100 #, no-wrap msgid "" "mkdir ~/debian-packages; cd ~/debian-packages\n" @@ -222,23 +227,23 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:105 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:106 msgid "Now you can install the new package:" msgstr "" #. type: Content of: <div><div><p><pre> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:107 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:108 #, no-wrap msgid "sudo dpkg -i vidalia_*.deb\n" msgstr "" #. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:117 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:118 msgid "<hr />" msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:119 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:120 msgid "" "If you have suggestions for improving this document, please <a href=\"<page " "about/contact>\">send them to us</a>. Thanks!" Modified: translation/trunk/projects/website/po/fa/docs/3-low.debian.po =================================================================== --- translation/trunk/projects/website/po/fa/docs/3-low.debian.po 2011-07-13 13:55:34 UTC (rev 24891) +++ translation/trunk/projects/website/po/fa/docs/3-low.debian.po 2011-07-13 18:10:49 UTC (rev 24892) @@ -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-06-29 15:09+0000\n" +"POT-Creation-Date: 2011-07-08 08:43+0200\n" +"PO-Revision-Date: 2011-07-09 01:14+0000\n" "Last-Translator: behravan <behravanhamed(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -38,8 +38,8 @@ msgstr "" #. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/debian.wml:16 /tmp/__TMvx4TV6.xml:43 -#: /tmp/__TMvx4TV6.xml:113 /tmp/__TMvx4TV6.xml:148 +#: /home/runa/tor/website/docs/en/debian.wml:16 /tmp/hXZfq9nNmb.xml:43 +#: /tmp/hXZfq9nNmb.xml:114 /tmp/hXZfq9nNmb.xml:149 msgid "<br />" msgstr "<br />" @@ -59,8 +59,8 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian.wml:32 /tmp/__TMvx4TV6.xml:94 -#: /tmp/__TMvx4TV6.xml:139 /tmp/__TMvx4TV6.xml:182 +#: /home/runa/tor/website/docs/en/debian.wml:32 /tmp/hXZfq9nNmb.xml:95 +#: /tmp/hXZfq9nNmb.xml:140 /tmp/hXZfq9nNmb.xml:183 msgid "" "Now Tor is installed and running. Move on to <a href=\"<page docs/tor-doc-" "unix>#polipo\">step two</a> of the \"Tor on Linux/Unix\" instructions." @@ -109,57 +109,62 @@ #. type: Content of: <div><div><p><ul><li> #: /home/runa/tor/website/docs/en/debian.wml:60 -msgid "Ubuntu 10.10 is \"maverick\"" +msgid "Ubuntu 11.04 is \"natty\"" msgstr "" #. type: Content of: <div><div><p><ul><li> #: /home/runa/tor/website/docs/en/debian.wml:61 +msgid "Ubuntu 10.10 or Trisquel 4.5 is \"maverick\"" +msgstr "" + +#. type: Content of: <div><div><p><ul><li> +#: /home/runa/tor/website/docs/en/debian.wml:62 msgid "Ubuntu 10.04 or Trisquel 4.0 is \"lucid\"" msgstr "" #. type: Content of: <div><div><p><ul><li> -#: /home/runa/tor/website/docs/en/debian.wml:62 +#: /home/runa/tor/website/docs/en/debian.wml:63 msgid "Ubuntu 9.10 or Trisquel 3.5 is \"karmic\"" msgstr "" #. type: Content of: <div><div><p><ul><li> -#: /home/runa/tor/website/docs/en/debian.wml:63 +#: /home/runa/tor/website/docs/en/debian.wml:64 msgid "Ubuntu 8.04 is \"hardy\"" msgstr "" #. type: Content of: <div><div><p><ul><li> -#: /home/runa/tor/website/docs/en/debian.wml:64 +#: /home/runa/tor/website/docs/en/debian.wml:65 msgid "Ubuntu 6.06 is \"dapper\"" msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian.wml:67 +#: /home/runa/tor/website/docs/en/debian.wml:68 msgid "Then add this line to your <tt>/etc/apt/sources.list</tt> file:<br />" msgstr "" #. type: Content of: <div><div><p><pre> -#: /home/runa/tor/website/docs/en/debian.wml:71 +#: /home/runa/tor/website/docs/en/debian.wml:72 #, no-wrap msgid "" "deb http://deb.torproject.org/torproject.org <DISTRIBUTION> main\n" msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian.wml:73 +#: /home/runa/tor/website/docs/en/debian.wml:74 msgid "" "where you put the codename of your distribution (i.e. lenny, sid, maverick " "or whatever it is) in place of <DISTRIBUTION>." msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian.wml:79 +#: /home/runa/tor/website/docs/en/debian.wml:80 msgid "" "Then add the gpg key used to sign the packages by running the following " "commands at your command prompt:" msgstr "" #. type: Content of: <div><div><p><pre> -#: /home/runa/tor/website/docs/en/debian.wml:82 +#: /home/runa/tor/website/docs/en/debian.wml:83 #, no-wrap msgid "" "gpg --keyserver keys.gnupg.net --recv 886DDD89\n" @@ -167,14 +172,14 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian.wml:85 +#: /home/runa/tor/website/docs/en/debian.wml:86 msgid "" "Now refresh your sources and install Tor by running the following commands " "(as root) at your command prompt:" msgstr "" #. type: Content of: <div><div><p><pre> -#: /home/runa/tor/website/docs/en/debian.wml:88 +#: /home/runa/tor/website/docs/en/debian.wml:89 #, no-wrap msgid "" "apt-get update\n" @@ -182,7 +187,7 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian.wml:100 +#: /home/runa/tor/website/docs/en/debian.wml:101 msgid "" "The DNS name <code>deb.torproject.org</code> is actually a set of " "independent servers in a DNS round robin configuration. If you for some " @@ -192,19 +197,19 @@ msgstr "" #. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/debian.wml:108 +#: /home/runa/tor/website/docs/en/debian.wml:109 msgid "<hr /> <a id=\"development\"></a>" msgstr "" #. type: Content of: <div><div><h2> -#: /home/runa/tor/website/docs/en/debian.wml:111 +#: /home/runa/tor/website/docs/en/debian.wml:112 msgid "" "<a class=\"anchor\" href=\"#development\">Option three: Using the " "development branch of Tor on Debian or Ubuntu</a>" msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian.wml:115 +#: /home/runa/tor/website/docs/en/debian.wml:116 msgid "" "If you want to use the <a href=\"<page " "download/download>#packagediff\">development branch</a> of Tor instead (more" @@ -213,7 +218,7 @@ msgstr "" #. type: Content of: <div><div><p><pre> -#: /home/runa/tor/website/docs/en/debian.wml:120 +#: /home/runa/tor/website/docs/en/debian.wml:121 #, no-wrap msgid "" "deb http://deb.torproject.org/torproject.org <DISTRIBUTION> main\n" @@ -221,19 +226,19 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian.wml:123 +#: /home/runa/tor/website/docs/en/debian.wml:124 msgid "" "where you again substitute the name of your distro (lenny, sid, maverick, " "...) in place of <DISTRIBUTION>." msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian.wml:129 +#: /home/runa/tor/website/docs/en/debian.wml:130 msgid "Then run the following commands at your command prompt:" msgstr "" #. type: Content of: <div><div><p><pre> -#: /home/runa/tor/website/docs/en/debian.wml:131 +#: /home/runa/tor/website/docs/en/debian.wml:132 #, no-wrap msgid "" "gpg --keyserver keys.gnupg.net --recv 886DDD89\n" @@ -243,17 +248,17 @@ msgstr "" #. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/debian.wml:144 +#: /home/runa/tor/website/docs/en/debian.wml:145 msgid "<hr /> <a id=\"source\"></a>" msgstr "" #. type: Content of: <div><div><h2> -#: /home/runa/tor/website/docs/en/debian.wml:147 +#: /home/runa/tor/website/docs/en/debian.wml:148 msgid "<a class=\"anchor\" href=\"#source\">Building from source</a>" msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian.wml:151 +#: /home/runa/tor/website/docs/en/debian.wml:152 msgid "" "If you want to build your own debs from source you must first add an " "appropriate <tt>deb-src</tt> line to <tt>sources.list</tt>." @@ -262,7 +267,7 @@ #. PO4ASHARPBEGIN For the stable version.PO4ASHARPEND #. PO4ASHARPBEGIN For the unstable version.PO4ASHARPEND #. type: Content of: <div><div><p><pre> -#: /home/runa/tor/website/docs/en/debian.wml:154 +#: /home/runa/tor/website/docs/en/debian.wml:155 #, no-wrap msgid "" "\n" @@ -274,14 +279,14 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian.wml:161 +#: /home/runa/tor/website/docs/en/debian.wml:162 msgid "" "You also need to install the necessary packages to build your own debs and " "the packages needed to build Tor:" msgstr "" #. type: Content of: <div><div><p><pre> -#: /home/runa/tor/website/docs/en/debian.wml:164 +#: /home/runa/tor/website/docs/en/debian.wml:165 #, no-wrap msgid "" "apt-get install build-essential fakeroot devscripts\n" @@ -289,12 +294,12 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian.wml:167 +#: /home/runa/tor/website/docs/en/debian.wml:168 msgid "Then you can build Tor in ~/debian-packages:" msgstr "" #. type: Content of: <div><div><p><pre> -#: /home/runa/tor/website/docs/en/debian.wml:169 +#: /home/runa/tor/website/docs/en/debian.wml:170 #, no-wrap msgid "" "mkdir ~/debian-packages; cd ~/debian-packages\n" @@ -305,23 +310,23 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian.wml:175 +#: /home/runa/tor/website/docs/en/debian.wml:176 msgid "Now you can install the new package:" msgstr "" #. type: Content of: <div><div><p><pre> -#: /home/runa/tor/website/docs/en/debian.wml:177 +#: /home/runa/tor/website/docs/en/debian.wml:178 #, no-wrap msgid "sudo dpkg -i tor_*.deb\n" msgstr "" #. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/debian.wml:187 +#: /home/runa/tor/website/docs/en/debian.wml:188 msgid "<hr />" msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian.wml:189 +#: /home/runa/tor/website/docs/en/debian.wml:190 msgid "" "If you have suggestions for improving this document, please <a href=\"<page " "about/contact>\">send them to us</a>. Thanks!" Modified: translation/trunk/projects/website/po/fa/docs/3-low.tor-doc-unix.po =================================================================== --- translation/trunk/projects/website/po/fa/docs/3-low.tor-doc-unix.po 2011-07-13 13:55:34 UTC (rev 24891) +++ translation/trunk/projects/website/po/fa/docs/3-low.tor-doc-unix.po 2011-07-13 18:10:49 UTC (rev 24892) @@ -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-06-21 08:18+0200\n" -"PO-Revision-Date: 2011-06-22 00:54+0000\n" +"POT-Creation-Date: 2011-07-08 08:43+0200\n" +"PO-Revision-Date: 2011-07-09 01:14+0000\n" "Last-Translator: pakdelreza <pakdelreza(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -35,9 +35,8 @@ "اجرای کلاينت <a href=\"<page index>\">تور</a> در محيط لينوکس، يونيکس، يا BSD" #. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:14 /tmp/4vVJb7zECD.xml:26 -#: /tmp/4vVJb7zECD.xml:58 /tmp/4vVJb7zECD.xml:92 /tmp/4vVJb7zECD.xml:135 -#: /tmp/4vVJb7zECD.xml:173 +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:14 /tmp/KCUf13Jh9J.xml:26 +#: /tmp/KCUf13Jh9J.xml:57 /tmp/KCUf13Jh9J.xml:96 /tmp/KCUf13Jh9J.xml:130 msgid "<br>" msgstr "<br>" @@ -45,14 +44,9 @@ #: /home/runa/tor/website/docs/en/tor-doc-unix.wml:17 msgid "" "<b>Note that these are the installation instructions for running a Tor " -"client. If you want to relay traffic for others to help the network grow " -"(please do), read the <a href=\"<page docs/tor-doc-relay>\">Configuring a " -"relay</a> guide.</b>" +"client. The easiest way to do this is to simply download the <a href=\"<page" +" projects/torbrowser>\">Tor Browser Bundle</a> and you are done. </b>" msgstr "" -"<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 @@ -118,96 +112,25 @@ #. type: Content of: <div><div> #: /home/runa/tor/website/docs/en/tor-doc-unix.wml:54 -msgid "<hr> <a id=\"privoxy\"></a> <a id=\"polipo\"></a>" -msgstr "<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>doc/PrivoxyConfig\">this sample Privoxy configuration</a>. But " -"since the config files both use port 8118, you shouldn't run both Polipo and" -" Privoxy at the same time." -msgstr "" - -#. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:89 msgid "<hr> <a id=\"using\"></a>" msgstr "<hr> <a id=\"using\"></a>" #. type: Content of: <div><div><h2> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:91 +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:56 msgid "" -"<a class=\"anchor\" href=\"#using\">Step Three: Configure your applications " -"to use Tor</a>" +"<a class=\"anchor\" href=\"#using\">Step Two: Configure your applications to" +" use Tor</a>" msgstr "" -"<a class=\"anchor\" href=\"#using\">گام سوّم : تنظیم برنامه های خود برای " -"استفاده از تور</a>" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:94 +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:59 msgid "" -"After installing Tor and Polipo, you need to configure your applications to " -"use them. The first step is to set up web browsing." +"After installing Tor, you need to configure your applications to use them. " +"The first step is to set up web browsing." msgstr "" -"پس از نصب تور و Polipo، بايد برنامه‌های خود را برای استفاده از آنها تنظيم " -"کنيد. اولين کار اين است که مرورگری وب را راه‌اندازی کنيد" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:97 +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:62 msgid "" "You should use Tor with Firefox and Torbutton, for best safety. Simply " "install the <a href=\"<page torbutton/index>\">Torbutton plugin</a>, restart" @@ -219,7 +142,7 @@ "تور باشد." #. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:103 +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:68 msgid "" "<img alt=\"Torbutton plugin for Firefox\" src=\"$(IMGROOT)/screenshot-" "torbutton.png\" > <br>" @@ -228,7 +151,7 @@ "torbutton.png\" > <br>" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:110 +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:75 msgid "" "If you plan to run Firefox on a different computer than Tor, see the <a " "href=\"<wikifaq>#SocksListenAddress\"> FAQ entry for running Tor on a " @@ -239,39 +162,35 @@ "رايانه متفاوت</a> مراجعه کنيد." #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:116 +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:81 msgid "" -"To Torify other applications that support HTTP proxies, just point them at " -"Polipo (that is, localhost port 8118). To use SOCKS directly (for instant " -"messaging, Jabber, IRC, etc), you can point your application directly at Tor" -" (localhost port 9050), but see <a href=\"<wikifaq>#SOCKSAndDNS\">this FAQ " -"entry</a> for why this may be dangerous. For applications that support " -"neither SOCKS nor HTTP, take a look at <a " -"href=\"https://code.google.com/p/torsocks/\">torsocks</a> or <a " +"To Torify other applications that support SOCKS proxies, just point them at " +"Tor's SOCKS port (127.0.0.1 port 9050). See <a " +"href=\"<wikifaq>#SOCKSAndDNS\">this FAQ entry</a> for why this may be " +"dangerous. For applications that support neither SOCKS nor HTTP, take a look" +" at <a href=\"https://code.google.com/p/torsocks/\">torsocks</a> or <a " "href=\"<wiki>doc/TorifyHOWTO#socat\">socat</a>." msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:127 +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:89 msgid "" "For information on how to Torify other applications, check out the <a " "href=\"<wiki>doc/TorifyHOWTO\">Torify HOWTO</a>." msgstr "" #. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:132 +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:93 msgid "<hr> <a id=\"verify\"></a>" msgstr "<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>" +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:95 +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-unix.wml:138 +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:99 msgid "" "Next, you should try using your browser with Tor and make sure that your IP " "address is being anonymized. Click on <a " @@ -290,33 +209,22 @@ "href=\"<wikifaq>#IsMyConnectionPrivate\">اين سؤال متداول</a> را ببينيد." #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:150 +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:109 msgid "" "If you have a personal firewall that limits your computer's ability to " "connect to itself (this includes something like SELinux on Fedora Core 4), " -"be sure to allow connections from your local applications to Polipo (local " -"port 8118) and Tor (local port 9050). If your firewall blocks outgoing " -"connections, punch a hole so it can connect to at least TCP ports 80 and " -"443, and then see <a href=\"<wikifaq>#FirewalledClient\">this FAQ entry</a>." -" If your SELinux config is not allowing tor or privoxy to run correctly, " -"create a file named booleans.local in the directory /etc/selinux/targeted. " -"Edit this file in your favorite text editor and insert \"allow_ypbind=1\". " -"Restart your machine for this change to take effect." +"be sure to allow connections from your local applications to Tor (local port" +" 9050). If your firewall blocks outgoing connections, punch a hole so it can" +" connect to at least TCP ports 80 and 443, and then see <a " +"href=\"<wikifaq>#FirewalledClient\">this FAQ entry</a>. If your SELinux " +"config is not allowing tor or privoxy to run correctly, create a file named " +"booleans.local in the directory /etc/selinux/targeted. Edit this file in " +"your favorite text editor and insert \"allow_ypbind=1\". Restart your " +"machine for this change to take effect." msgstr "" -"اگر يک ديوار آتش (‌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 +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:122 msgid "" "If it's still not working, look at <a href=\"<page " "docs/faq>#DoesntWork\">this FAQ entry</a> for hints." @@ -325,38 +233,28 @@ "<a href=\"<page docs/faq>#DoesntWork\">اين سؤال متداول</a> مراجعه کنيد." #. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:169 +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:126 msgid "<hr> <a id=\"server\"></a> <a id=\"relay\"></a>" msgstr "<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>" +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:129 +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-unix.wml:175 +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:132 msgid "" "The Tor network relies on volunteers to donate bandwidth. The more people " "who run relays, the faster the Tor network will be. If you have at least 20 " -"kilobytes/s each way, please help out Tor by configuring your Tor to be a " +"KiloBytes/s each way, please help out Tor by configuring your Tor to be a " "relay too. We have many features that make Tor relays easy and convenient, " "including rate limiting for bandwidth, exit policies so you can limit your " "exposure to abuse complaints, and support for dynamic IP addresses." msgstr "" -"شبکه تور تکيه دارد به داوطلبانی که پهنای باند اهدا می‌کنند. هر چقدر تعداد " -"افرادی که بازپخش‌کننده راه‌اندازی کرده‌اند بيشتر باشد، سرعت شبکه تور بيشتر " -"می‌شود. اگر حداقل به اندازه 20 کيلوبايت در ثانيه در هر دو جهت پهنای باند " -"داريد، لطفاً با تنظيم تور خود به عنوان يک بازپخش‌کننده، به تور کمک کنيد. ما " -"امکانات بسياری فراهم کرده‌ايم تا به کار گيری بازپخش‌کننده‌های تور را آسان و " -"بی دردسر نماييم. از جمله اين امکانات عبارتند از امکان محدودسازی ميزان پهنای " -"باند استفاده شده، امکان تعيين قوانين خروجی برای کاهش خطر شکايت‌های مربوط به " -"سوء استفاده، و نيز پشتيبانی از آدرس‌های IP پويا. " #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:183 +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:140 msgid "" "Having relays in many different places on the Internet is what makes Tor " "users secure. <a href=\"<wikifaq>#RelayAnonymity\">You may also get stronger" @@ -370,7 +268,7 @@ "يا بازپخش رايانه‌های ديگر هستند." #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:190 +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:146 msgid "" "Read more at our <a href=\"<page docs/tor-doc-relay>\">Configuring a " "relay</a> guide." @@ -379,12 +277,12 @@ "بازپخش‌کننده</a> مراجعه کنيد." #. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:193 +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:149 msgid "<hr>" msgstr "<hr>" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:195 +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:151 msgid "" "If you have suggestions for improving this document, please <a href=\"<page " "about/contact>\">send them to us</a>. Thanks!" Modified: translation/trunk/projects/website/po/fa/donate/3-low.matching-program.po =================================================================== --- translation/trunk/projects/website/po/fa/donate/3-low.matching-program.po 2011-07-13 13:55:34 UTC (rev 24891) +++ translation/trunk/projects/website/po/fa/donate/3-low.matching-program.po 2011-07-13 18:10:49 UTC (rev 24892) @@ -2,14 +2,15 @@ # Copyright (C) YEAR The Tor Project, Inc. # This file is distributed under the same license as the PACKAGE package. # +# <kaveh.nematipour(a)gmail.com>, 2011. # <behravanhamed(a)gmail.com>, 2011. 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-26 14:32+0000\n" -"PO-Revision-Date: 2011-06-29 15:15+0000\n" -"Last-Translator: behravan <behravanhamed(a)gmail.com>\n" +"PO-Revision-Date: 2011-07-10 08:20+0000\n" +"Last-Translator: knematipour <kaveh.nematipour(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -23,6 +24,8 @@ "<a href=\"<page index>\">Home » </a> <a href=\"<page donate/matching-" "program>\">Matching Program</a>" msgstr "" +"<a href=\"<page index>\">خانه و راکو; </a> <a href=\"<page donate/matching-" +"program>\">برنامه تطبیقی</a>" #. type: Content of: <div><div><h1> #: /home/runa/transifex/website/donate/en/matching-program.wml:12 @@ -36,5 +39,8 @@ "matching programs. Contact your local human resource department or donations" " at torproject.org for more information." msgstr "" +"اگر شما برای مایکروسافت یا جنرال موتورز کار می کنید٬ می توانید به برنامه " +"خیریه تطبیقی انها بپیوندید. با دپارتمان منابع انسانی یا خیریه در " +"torproject.org برای دریافت اطلاعات بیشتر تماس بگیرید" Modified: translation/trunk/projects/website/po/fa/download/1-high.download-easy.po =================================================================== --- translation/trunk/projects/website/po/fa/download/1-high.download-easy.po 2011-07-13 13:55:34 UTC (rev 24891) +++ translation/trunk/projects/website/po/fa/download/1-high.download-easy.po 2011-07-13 18:10:49 UTC (rev 24892) @@ -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-06-21 08:18+0200\n" -"PO-Revision-Date: 2011-06-29 15:24+0000\n" +"POT-Creation-Date: 2011-07-08 08:42+0200\n" +"PO-Revision-Date: 2011-07-09 01:17+0000\n" "Last-Translator: behravan <behravanhamed(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -121,7 +121,7 @@ #: /home/runa/tor/website/download/en/download-easy.wml:72 msgid "" "</select> <input type=\"text\" id=\"amount\" class=\"amount\" " -"name=\"amount\" value=\"5\" size=\"10\">" +"name=\"amount\" value=\"10\" size=\"10\">" msgstr "" #. type: Content of: <div><div><table><tbody><tr><td><form><p><select> Modified: translation/trunk/projects/website/po/fa/download/3-low.download.po =================================================================== --- translation/trunk/projects/website/po/fa/download/3-low.download.po 2011-07-13 13:55:34 UTC (rev 24891) +++ translation/trunk/projects/website/po/fa/download/3-low.download.po 2011-07-13 18:10:49 UTC (rev 24892) @@ -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-06-21 08:18+0200\n" -"PO-Revision-Date: 2011-06-29 15:16+0000\n" +"POT-Creation-Date: 2011-07-08 08:42+0200\n" +"PO-Revision-Date: 2011-07-09 01:16+0000\n" "Last-Translator: behravan <behravanhamed(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -120,7 +120,7 @@ #: /home/runa/tor/website/download/en/download.wml:65 msgid "" "</select> <input type=\"text\" id=\"amount\" class=\"amount\" " -"name=\"amount\" value=\"5\" size=\"10\">" +"name=\"amount\" value=\"10\" size=\"10\">" msgstr "" #. type: Content of: <div><div><table><tr><td><form><p><select> @@ -175,8 +175,8 @@ msgstr "" #. type: Content of: <div><div><table><tr><td><ul><li> -#: /home/runa/tor/website/download/en/download.wml:102 /tmp/FhqGC1ISDt.xml:165 -#: /tmp/FhqGC1ISDt.xml:203 +#: /home/runa/tor/website/download/en/download.wml:102 /tmp/lbSAEZiU0Z.xml:165 +#: /tmp/lbSAEZiU0Z.xml:203 msgid "" "The <strong>Tor Browser Bundle</strong> contains everything you need to " "safely browse the Internet. This package requires no installation. Just " @@ -210,7 +210,7 @@ msgstr "" #. type: Content of: <div><div><table><tr><td><p> -#: /home/runa/tor/website/download/en/download.wml:110 /tmp/FhqGC1ISDt.xml:168 +#: /home/runa/tor/website/download/en/download.wml:110 /tmp/lbSAEZiU0Z.xml:168 msgid "" "There are two versions of each package, a stable and alpha release. Stable " "packages are released when we believe the features and code will not change " @@ -519,7 +519,7 @@ msgstr "" #. type: Content of: <div><div><div> -#: /home/runa/tor/website/download/en/download.wml:265 /tmp/FhqGC1ISDt.xml:344 +#: /home/runa/tor/website/download/en/download.wml:265 /tmp/lbSAEZiU0Z.xml:344 msgid "<br>" msgstr "" Modified: translation/trunk/projects/website/po/fa/projects/3-low.puppettor.po =================================================================== --- translation/trunk/projects/website/po/fa/projects/3-low.puppettor.po 2011-07-13 13:55:34 UTC (rev 24891) +++ translation/trunk/projects/website/po/fa/projects/3-low.puppettor.po 2011-07-13 18:10:49 UTC (rev 24892) @@ -2,14 +2,15 @@ # Copyright (C) YEAR The Tor Project, Inc. # This file is distributed under the same license as the PACKAGE package. # +# <kaveh.nematipour(a)gmail.com>, 2011. # Ghazall <emroozz(a)gmail.com>, 2011. 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-26 14:32+0000\n" -"PO-Revision-Date: 2011-03-22 16:43+0000\n" -"Last-Translator: Ghazall <emroozz(a)gmail.com>\n" +"PO-Revision-Date: 2011-07-10 08:24+0000\n" +"Last-Translator: knematipour <kaveh.nematipour(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -31,11 +32,11 @@ #. type: Content of: <div><div><h1> #: /home/runa/transifex/website/projects/en/puppettor.wml:14 msgid "Sample Tor Project" -msgstr "" +msgstr "پروژه تر مثالی " #. type: Content of: <div><div> #: /home/runa/transifex/website/projects/en/puppettor.wml:15 msgid "Here is some information" -msgstr "" +msgstr "اینجا بعضی اطلاعات هست " Modified: translation/trunk/projects/website/po/fa/projects/3-low.torweather.po =================================================================== --- translation/trunk/projects/website/po/fa/projects/3-low.torweather.po 2011-07-13 13:55:34 UTC (rev 24891) +++ translation/trunk/projects/website/po/fa/projects/3-low.torweather.po 2011-07-13 18:10:49 UTC (rev 24892) @@ -2,14 +2,15 @@ # Copyright (C) YEAR The Tor Project, Inc. # This file is distributed under the same license as the PACKAGE package. # +# <kaveh.nematipour(a)gmail.com>, 2011. # Ghazall <emroozz(a)gmail.com>, 2011. 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:19+0000\n" -"PO-Revision-Date: 2011-03-22 16:43+0000\n" -"Last-Translator: Ghazall <emroozz(a)gmail.com>\n" +"PO-Revision-Date: 2011-07-10 08:30+0000\n" +"Last-Translator: knematipour <kaveh.nematipour(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -31,7 +32,7 @@ #. type: Content of: <div><div><h1> #: /home/runa/tor/website/projects/en/torweather.wml:14 msgid "Weather" -msgstr "" +msgstr "آب و هوا" #. type: Content of: <div><div><p> #: /home/runa/tor/website/projects/en/torweather.wml:15 @@ -41,5 +42,7 @@ "availability of their relay, whether their relay bandwidth has dramatically " "dropped, or whether their Tor version is obsolete." msgstr "" +"<a href=\"https://weather.torproject.org\">آب و هوای تور</a> یک برنامه تحت " +"وب است که به به تور اجازه می دهد " Modified: translation/trunk/projects/website/po/fi/docs/3-low.debian-vidalia.po =================================================================== --- translation/trunk/projects/website/po/fi/docs/3-low.debian-vidalia.po 2011-07-13 13:55:34 UTC (rev 24891) +++ translation/trunk/projects/website/po/fi/docs/3-low.debian-vidalia.po 2011-07-13 18:10:49 UTC (rev 24892) @@ -6,8 +6,8 @@ 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-05-23 20:32+0000\n" +"POT-Creation-Date: 2011-07-08 08:43+0200\n" +"PO-Revision-Date: 2011-07-09 01:14+0000\n" "Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -38,7 +38,7 @@ msgstr "<a class=\"anchor\" href=\"#debian\">Vidalia Ubuntussa tai Debianissa</a>" #. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:16 /tmp/M9Wxp74W_E.xml:83 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:16 /tmp/LnaSOLeTA9.xml:84 msgid "<br />" msgstr "<br />" @@ -64,59 +64,64 @@ #. type: Content of: <div><div><p><ul><li> #: /home/runa/tor/website/docs/en/debian-vidalia.wml:29 -msgid "Ubuntu 10.10 is \"maverick\" but use the \"lucid\" packages" -msgstr "Ubuntu 10.10 on \"maverick\" mutta käyttää \"lucid\" -paketteja." +msgid "Ubuntu 11.04 is \"natty\"" +msgstr "" #. type: Content of: <div><div><p><ul><li> #: /home/runa/tor/website/docs/en/debian-vidalia.wml:30 +msgid "Ubuntu 10.10 or Trisquel 4.5 is \"maverick\"" +msgstr "" + +#. type: Content of: <div><div><p><ul><li> +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:31 msgid "Ubuntu 10.04 or Trisquel 4.0 is \"lucid\"" msgstr "Ubuntu 10.04 tai Trisquel 4.0 on \"lucid\"" #. type: Content of: <div><div><p><ul><li> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:31 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:32 msgid "Ubuntu 9.10 or Trisquel 3.5 is \"karmic\"" msgstr "Ubuntu 9.10 tai Trisquel 3.5 on \"karmic\"" #. type: Content of: <div><div><p><ul><li> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:32 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:33 msgid "Ubuntu 9.04 is \"jaunty\"" msgstr "Ubuntu 9.04 on \"jaunty\"" #. type: Content of: <div><div><p><ul><li> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:33 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:34 msgid "Ubuntu 8.10 is \"intrepid\"" msgstr "Ubuntu 8.10 on \"intrepid\"" #. type: Content of: <div><div><p><ul><li> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:34 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:35 msgid "Ubuntu 8.04 is \"hardy\"" msgstr "Ubuntu 8.04 on \"hardy\"" #. type: Content of: <div><div><p><ul><li> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:35 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:36 msgid "Debian Etch is \"etch\"" msgstr "Debian Etch on \"etch\"" #. type: Content of: <div><div><p><ul><li> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:36 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:37 msgid "Debian Lenny is \"lenny\"" msgstr "Debian Lenny on \"lenny\"" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:39 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:40 msgid "Then add this line to your <tt>/etc/apt/sources.list</tt> file:<br />" msgstr "" "Lisää sitten tämä rivi tiedostoon <tt>/etc/apt/sources.list<tt> koneellasi:" #. type: Content of: <div><div><p><pre> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:43 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:44 #, no-wrap msgid "" "deb http://deb.torproject.org/torproject.org <DISTRIBUTION> main\n" msgstr "deb http://deb.torproject.org/torproject.org <JAKELUVERSIO> main\n" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:45 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:46 msgid "" "where you substitute the above word (etch, lenny, sid, karmic, jaunty, " "intrepid, hardy) in place of <DISTRIBUTION>." @@ -125,7 +130,7 @@ "karmic, jaunty, intrepid, hardy)." #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:50 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:51 msgid "" "Then add the gpg key used to sign the packages by running the following " "commands at your command prompt:" @@ -134,7 +139,7 @@ "suorittamalla päätteessä seuraavat komennot:" #. type: Content of: <div><div><p><pre> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:53 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:54 #, no-wrap msgid "" "gpg --keyserver keys.gnupg.net --recv 886DDD89\n" @@ -144,7 +149,7 @@ "gpg --export A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89 | sudo apt-key add -\n" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:56 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:57 msgid "" "Now refresh your sources and install Vidalia by running the following " "commands at your command prompt:" @@ -153,7 +158,7 @@ "seuraavat komennot:" #. type: Content of: <div><div><p><pre> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:59 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:60 #, no-wrap msgid "" "apt-get update\n" @@ -163,8 +168,8 @@ "apt-get install vidalia \n" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:65 -#: /tmp/M9Wxp74W_E.xml:112 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:66 +#: /tmp/LnaSOLeTA9.xml:113 msgid "" "Now Vidalia is installed and running. Move on to <a href=\"<page docs/tor-" "doc-unix>#polipo\">step two</a> of the \"Vidalia on Linux/Unix\" " @@ -175,7 +180,7 @@ "unix>#polipo\">toiseen vaiheeseen</a>." #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:71 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:72 msgid "" "The DNS name <code>deb.torproject.org</code> is actually a set of " "independent servers in a DNS round robin configuration. If you for some " @@ -190,17 +195,17 @@ "<code>vidalia.mirror.youam.de</code>." #. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:79 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:80 msgid "<hr /> <a id=\"source\"></a>" msgstr "<hr /> <a id=\"source\"></a>" #. type: Content of: <div><div><h2> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:82 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:83 msgid "<a class=\"anchor\" href=\"#source\">Building from source</a>" msgstr "<a class=\"anchor\" href=\"#source\">Lähdekoodista rakentaminen</a>" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:86 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:87 msgid "" "If you want to build your own debs from source you must first add an " "appropriate <tt>deb-src</tt> line to <tt>sources.list</tt>." @@ -209,14 +214,14 @@ "sopiva <tt>deb-src</tt> -rivi <tt>sources.list</tt> -tiedostoon." #. type: Content of: <div><div><p><pre> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:89 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:90 #, no-wrap msgid "" "deb-src http://deb.torproject.org/torproject.org <DISTRIBUTION> main\n" msgstr "deb-src http://deb.torproject.org/torproject.org <JAKELUVERSIO> main\n" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:91 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:92 msgid "" "You also need to install the necessary packages to build your own debs and " "the packages needed to build Vidalia:" @@ -225,7 +230,7 @@ "tekemiseen ja Vidalian rakentamiseen:" #. type: Content of: <div><div><p><pre> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:94 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:95 #, no-wrap msgid "" "apt-get install build-essential fakeroot devscripts qt4-dev-tools qt4-designer libqt4-dev g++ cmake\n" @@ -235,12 +240,12 @@ "apt-get build-dep vidalia\n" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:97 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:98 msgid "Then you can build Vidalia in ~/debian-packages:" msgstr "Sen jälkeen voit rakentaa Vidalian ~/debian-packages -hakemistossa:" #. type: Content of: <div><div><p><pre> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:99 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:100 #, no-wrap msgid "" "mkdir ~/debian-packages; cd ~/debian-packages\n" @@ -256,23 +261,23 @@ "cd ..\n" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:105 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:106 msgid "Now you can install the new package:" msgstr "Nyt voit asentaa uuden paketin:" #. type: Content of: <div><div><p><pre> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:107 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:108 #, no-wrap msgid "sudo dpkg -i vidalia_*.deb\n" msgstr "sudo dpkg -i vidalia_*.deb\n" #. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:117 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:118 msgid "<hr />" msgstr "<hr />" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:119 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:120 msgid "" "If you have suggestions for improving this document, please <a href=\"<page " "about/contact>\">send them to us</a>. Thanks!" Modified: translation/trunk/projects/website/po/fi/docs/3-low.debian.po =================================================================== --- translation/trunk/projects/website/po/fi/docs/3-low.debian.po 2011-07-13 13:55:34 UTC (rev 24891) +++ translation/trunk/projects/website/po/fi/docs/3-low.debian.po 2011-07-13 18:10:49 UTC (rev 24892) @@ -6,8 +6,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-05-23 20:29+0000\n" +"POT-Creation-Date: 2011-07-08 08:43+0200\n" +"PO-Revision-Date: 2011-07-09 01:14+0000\n" "Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -42,8 +42,8 @@ "lenny, Debian sid, tai Debian testing -versioissa</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 +#: /home/runa/tor/website/docs/en/debian.wml:16 /tmp/hXZfq9nNmb.xml:43 +#: /tmp/hXZfq9nNmb.xml:114 /tmp/hXZfq9nNmb.xml:149 msgid "<br />" msgstr "<br />" @@ -68,8 +68,8 @@ "käytät Torin viimeisintä vakaata versiota, katso alta vaihtoehto kaksi." #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian.wml:32 /tmp/__TMvx4TV6.xml:94 -#: /tmp/__TMvx4TV6.xml:139 /tmp/__TMvx4TV6.xml:182 +#: /home/runa/tor/website/docs/en/debian.wml:32 /tmp/hXZfq9nNmb.xml:95 +#: /tmp/hXZfq9nNmb.xml:140 /tmp/hXZfq9nNmb.xml:183 msgid "" "Now Tor is installed and running. Move on to <a href=\"<page docs/tor-doc-" "unix>#polipo\">step two</a> of the \"Tor on Linux/Unix\" instructions." @@ -130,44 +130,49 @@ #. type: Content of: <div><div><p><ul><li> #: /home/runa/tor/website/docs/en/debian.wml:60 -msgid "Ubuntu 10.10 is \"maverick\"" -msgstr "Ubuntu 10.10 on \"maverick\"" +msgid "Ubuntu 11.04 is \"natty\"" +msgstr "" #. type: Content of: <div><div><p><ul><li> #: /home/runa/tor/website/docs/en/debian.wml:61 +msgid "Ubuntu 10.10 or Trisquel 4.5 is \"maverick\"" +msgstr "" + +#. type: Content of: <div><div><p><ul><li> +#: /home/runa/tor/website/docs/en/debian.wml:62 msgid "Ubuntu 10.04 or Trisquel 4.0 is \"lucid\"" msgstr "Ubuntu 10.04 tai Trisquel 4.0 on \"lucid\"" #. type: Content of: <div><div><p><ul><li> -#: /home/runa/tor/website/docs/en/debian.wml:62 +#: /home/runa/tor/website/docs/en/debian.wml:63 msgid "Ubuntu 9.10 or Trisquel 3.5 is \"karmic\"" msgstr "Ubuntu 9.10 tai Trisquel 3.5 on \"karmic\"" #. type: Content of: <div><div><p><ul><li> -#: /home/runa/tor/website/docs/en/debian.wml:63 +#: /home/runa/tor/website/docs/en/debian.wml:64 msgid "Ubuntu 8.04 is \"hardy\"" msgstr "Ubuntu 8.04 on \"hardy\"" #. type: Content of: <div><div><p><ul><li> -#: /home/runa/tor/website/docs/en/debian.wml:64 +#: /home/runa/tor/website/docs/en/debian.wml:65 msgid "Ubuntu 6.06 is \"dapper\"" msgstr "Ubuntu 6.06 on \"dapper\"" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian.wml:67 +#: /home/runa/tor/website/docs/en/debian.wml:68 msgid "Then add this line to your <tt>/etc/apt/sources.list</tt> file:<br />" msgstr "" "Lisää sitten tämä rivi tiedostoon <tt>/etc/apt/sources.list<tt> koneellasi:" #. type: Content of: <div><div><p><pre> -#: /home/runa/tor/website/docs/en/debian.wml:71 +#: /home/runa/tor/website/docs/en/debian.wml:72 #, no-wrap msgid "" "deb http://deb.torproject.org/torproject.org <DISTRIBUTION> main\n" msgstr "deb http://deb.torproject.org/torproject.org <JAKELUVERSIO> main\n" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian.wml:73 +#: /home/runa/tor/website/docs/en/debian.wml:74 msgid "" "where you put the codename of your distribution (i.e. lenny, sid, maverick " "or whatever it is) in place of <DISTRIBUTION>." @@ -176,7 +181,7 @@ "tai mikä se onkaan)." #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian.wml:79 +#: /home/runa/tor/website/docs/en/debian.wml:80 msgid "" "Then add the gpg key used to sign the packages by running the following " "commands at your command prompt:" @@ -185,7 +190,7 @@ "suorittamalla päätteessä seuraavat komennot:" #. type: Content of: <div><div><p><pre> -#: /home/runa/tor/website/docs/en/debian.wml:82 +#: /home/runa/tor/website/docs/en/debian.wml:83 #, no-wrap msgid "" "gpg --keyserver keys.gnupg.net --recv 886DDD89\n" @@ -195,7 +200,7 @@ "gpg --export A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89 | sudo apt-key add -\n" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian.wml:85 +#: /home/runa/tor/website/docs/en/debian.wml:86 msgid "" "Now refresh your sources and install Tor by running the following commands " "(as root) at your command prompt:" @@ -204,7 +209,7 @@ "komennot (roottina):" #. type: Content of: <div><div><p><pre> -#: /home/runa/tor/website/docs/en/debian.wml:88 +#: /home/runa/tor/website/docs/en/debian.wml:89 #, no-wrap msgid "" "apt-get update\n" @@ -214,7 +219,7 @@ "apt-get install tor tor-geoipdb\n" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian.wml:100 +#: /home/runa/tor/website/docs/en/debian.wml:101 msgid "" "The DNS name <code>deb.torproject.org</code> is actually a set of " "independent servers in a DNS round robin configuration. If you for some " @@ -229,12 +234,12 @@ "<code>vidalia.mirror.youam.de</code>." #. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/debian.wml:108 +#: /home/runa/tor/website/docs/en/debian.wml:109 msgid "<hr /> <a id=\"development\"></a>" msgstr "<hr /> <a id=\"development\"></a>" #. type: Content of: <div><div><h2> -#: /home/runa/tor/website/docs/en/debian.wml:111 +#: /home/runa/tor/website/docs/en/debian.wml:112 msgid "" "<a class=\"anchor\" href=\"#development\">Option three: Using the " "development branch of Tor on Debian or Ubuntu</a>" @@ -243,7 +248,7 @@ "kehityshaaran käyttö Debianissa tai Ubuntussa</a>" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian.wml:115 +#: /home/runa/tor/website/docs/en/debian.wml:116 msgid "" "If you want to use the <a href=\"<page " "download/download>#packagediff\">development branch</a> of Tor instead (more" @@ -256,7 +261,7 @@ "<tt>/etc/apt/sources.list</tt> nämä rivit:<br />" #. type: Content of: <div><div><p><pre> -#: /home/runa/tor/website/docs/en/debian.wml:120 +#: /home/runa/tor/website/docs/en/debian.wml:121 #, no-wrap msgid "" "deb http://deb.torproject.org/torproject.org <DISTRIBUTION> main\n" @@ -266,7 +271,7 @@ "deb http://deb.torproject.org/torproject.org experimental-<JAKELUVERSIO> main\n" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian.wml:123 +#: /home/runa/tor/website/docs/en/debian.wml:124 msgid "" "where you again substitute the name of your distro (lenny, sid, maverick, " "...) in place of <DISTRIBUTION>." @@ -275,12 +280,12 @@ "sid, maverick, ...)." #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian.wml:129 +#: /home/runa/tor/website/docs/en/debian.wml:130 msgid "Then run the following commands at your command prompt:" msgstr "Suorita sen jälkeen päätteessä seuraavat komennot:" #. type: Content of: <div><div><p><pre> -#: /home/runa/tor/website/docs/en/debian.wml:131 +#: /home/runa/tor/website/docs/en/debian.wml:132 #, no-wrap msgid "" "gpg --keyserver keys.gnupg.net --recv 886DDD89\n" @@ -294,17 +299,17 @@ "apt-get install tor tor-geoipdb\n" #. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/debian.wml:144 +#: /home/runa/tor/website/docs/en/debian.wml:145 msgid "<hr /> <a id=\"source\"></a>" msgstr "<hr /> <a id=\"source\"></a>" #. type: Content of: <div><div><h2> -#: /home/runa/tor/website/docs/en/debian.wml:147 +#: /home/runa/tor/website/docs/en/debian.wml:148 msgid "<a class=\"anchor\" href=\"#source\">Building from source</a>" msgstr "<a class=\"anchor\" href=\"#source\">Lähdekoodista rakentaminen</a>" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian.wml:151 +#: /home/runa/tor/website/docs/en/debian.wml:152 msgid "" "If you want to build your own debs from source you must first add an " "appropriate <tt>deb-src</tt> line to <tt>sources.list</tt>." @@ -315,7 +320,7 @@ #. PO4ASHARPBEGIN For the stable version.PO4ASHARPEND #. PO4ASHARPBEGIN For the unstable version.PO4ASHARPEND #. type: Content of: <div><div><p><pre> -#: /home/runa/tor/website/docs/en/debian.wml:154 +#: /home/runa/tor/website/docs/en/debian.wml:155 #, no-wrap msgid "" "\n" @@ -333,7 +338,7 @@ "deb-src http://deb.torproject.org/torproject.org experimental-<JAKELUVERSIO> main\n" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian.wml:161 +#: /home/runa/tor/website/docs/en/debian.wml:162 msgid "" "You also need to install the necessary packages to build your own debs and " "the packages needed to build Tor:" @@ -342,7 +347,7 @@ "tekemiseen ja Torin rakentamiseen:" #. type: Content of: <div><div><p><pre> -#: /home/runa/tor/website/docs/en/debian.wml:164 +#: /home/runa/tor/website/docs/en/debian.wml:165 #, no-wrap msgid "" "apt-get install build-essential fakeroot devscripts\n" @@ -352,12 +357,12 @@ "apt-get build-dep tor\n" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian.wml:167 +#: /home/runa/tor/website/docs/en/debian.wml:168 msgid "Then you can build Tor in ~/debian-packages:" msgstr "Sen jälkeen voit rakentaa Torin ~/debian-packages -hakemistossa:" #. type: Content of: <div><div><p><pre> -#: /home/runa/tor/website/docs/en/debian.wml:169 +#: /home/runa/tor/website/docs/en/debian.wml:170 #, no-wrap msgid "" "mkdir ~/debian-packages; cd ~/debian-packages\n" @@ -373,23 +378,23 @@ "cd ..\n" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian.wml:175 +#: /home/runa/tor/website/docs/en/debian.wml:176 msgid "Now you can install the new package:" msgstr "Voit nyt asentaa uuden paketin:" #. type: Content of: <div><div><p><pre> -#: /home/runa/tor/website/docs/en/debian.wml:177 +#: /home/runa/tor/website/docs/en/debian.wml:178 #, no-wrap msgid "sudo dpkg -i tor_*.deb\n" msgstr "sudo dpkg -i tor_*.deb\n" #. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/debian.wml:187 +#: /home/runa/tor/website/docs/en/debian.wml:188 msgid "<hr />" msgstr "<hr />" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian.wml:189 +#: /home/runa/tor/website/docs/en/debian.wml:190 msgid "" "If you have suggestions for improving this document, please <a href=\"<page " "about/contact>\">send them to us</a>. Thanks!" Modified: translation/trunk/projects/website/po/fi/docs/3-low.tor-doc-unix.po =================================================================== --- translation/trunk/projects/website/po/fi/docs/3-low.tor-doc-unix.po 2011-07-13 13:55:34 UTC (rev 24891) +++ translation/trunk/projects/website/po/fi/docs/3-low.tor-doc-unix.po 2011-07-13 18:10:49 UTC (rev 24892) @@ -6,8 +6,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" -"POT-Creation-Date: 2011-06-21 08:18+0200\n" -"PO-Revision-Date: 2011-06-22 00:54+0000\n" +"POT-Creation-Date: 2011-07-08 08:43+0200\n" +"PO-Revision-Date: 2011-07-09 01:14+0000\n" "Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -35,9 +35,8 @@ "käyttöjärjestelmissä" #. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:14 /tmp/4vVJb7zECD.xml:26 -#: /tmp/4vVJb7zECD.xml:58 /tmp/4vVJb7zECD.xml:92 /tmp/4vVJb7zECD.xml:135 -#: /tmp/4vVJb7zECD.xml:173 +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:14 /tmp/KCUf13Jh9J.xml:26 +#: /tmp/KCUf13Jh9J.xml:57 /tmp/KCUf13Jh9J.xml:96 /tmp/KCUf13Jh9J.xml:130 msgid "<br>" msgstr "<br>" @@ -45,14 +44,9 @@ #: /home/runa/tor/website/docs/en/tor-doc-unix.wml:17 msgid "" "<b>Note that these are the installation instructions for running a Tor " -"client. If you want to relay traffic for others to help the network grow " -"(please do), read the <a href=\"<page docs/tor-doc-relay>\">Configuring a " -"relay</a> guide.</b>" +"client. The easiest way to do this is to simply download the <a href=\"<page" +" projects/torbrowser>\">Tor Browser Bundle</a> and you are done. </b>" msgstr "" -"Huomaathan, että nämä asennusohjeet koskevat Tor-asiakasohjelman käyttöä. " -"Jos haluat välittää toisten liikennettä ja auttaa näin verkkoa kasvamaan " -"(tee toki niin), lue ohjeet <a href=\"<page docs/tor-doc-" -"relay>\">Välityspalvelimen asetusten säätäminen</a>.</b>" #. type: Content of: <div><div> #: /home/runa/tor/website/docs/en/tor-doc-unix.wml:23 @@ -120,96 +114,25 @@ #. type: Content of: <div><div> #: /home/runa/tor/website/docs/en/tor-doc-unix.wml:54 -msgid "<hr> <a id=\"privoxy\"></a> <a id=\"polipo\"></a>" -msgstr "<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\">Toinen vaihe: Asenna Polipo verkon " -"selaamista varten</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 "Asennettuasi Tor:n sinun on asetettava sovelluksesi käyttämään sitä." - -#. 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 "" -"Ensimmäinen askel on verkon selaamisen säätäminen. Aloita asentamalla <a " -"href=\"http://www.pps.jussieu.fr/~jch/software/polipo\">Polipo</a> " -"käyttämästäsi pakettivarastosta. Polipo on välimuistina toimiva " -"välityspalvelin, joka suoriutuu hyvin http-pipeliningista, joten se sopii " -"hyvin Tor:n latensseille. Varmista, että asennat vähintään Polipon version " -"1.0.4, sillä aiemmista versioista puuttuu SOCKS-tuki, jota tarvitaan, jotta " -"Tor toimisi Polipon kanssa. Tässä vaiheessa on syytä poistaa privoxy (siis " -"apt-get remove privoxy tai yum remove privoxy), jotta ne eivät joudu " -"ristiriitaan." - -#. 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 "" -"Kun olet asentanut Polipon (joko paketista tai lähdekoodista), <b>sinun on " -"asetettava Polipo käyttämään Toria</b>. Hae laatimamme <a href=\"<tbbrepo" -">/build-scripts/config/polipo.conf\">Polipon asetukset Tor:lle</a> ja korvaa" -" sillä nykyinen Polipon asetustiedosto (esim. /etc/polipo/config tai " -"~/.polipo). Polipo on käynnistettävä uudelleen, jotta muutokset tulevat " -"voimaan. Esimerkiksi:<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>doc/PrivoxyConfig\">this sample Privoxy configuration</a>. But " -"since the config files both use port 8118, you shouldn't run both Polipo and" -" Privoxy at the same time." -msgstr "" - -#. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:89 msgid "<hr> <a id=\"using\"></a>" msgstr "<hr> <a id=\"using\"></a>" #. type: Content of: <div><div><h2> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:91 +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:56 msgid "" -"<a class=\"anchor\" href=\"#using\">Step Three: Configure your applications " -"to use Tor</a>" +"<a class=\"anchor\" href=\"#using\">Step Two: Configure your applications to" +" use Tor</a>" msgstr "" -"<a class=\"anchor\" href=\"#using\">Kolmas vaihe: aseta sovelluksesi " -"käyttämään Tor:ia</a>" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:94 +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:59 msgid "" -"After installing Tor and Polipo, you need to configure your applications to " -"use them. The first step is to set up web browsing." +"After installing Tor, you need to configure your applications to use them. " +"The first step is to set up web browsing." msgstr "" -"Asennettuasi Tor:n ja Polipon sinun on asetettava sovelluksesi käyttämään " -"niitä. Ensimmäinen askel on verkkoselaimen säätäminen." #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:97 +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:62 msgid "" "You should use Tor with Firefox and Torbutton, for best safety. Simply " "install the <a href=\"<page torbutton/index>\">Torbutton plugin</a>, restart" @@ -220,7 +143,7 @@ "lisäosa</a>, käynnistä Firefox uudelleen ja siinä kaikki:" #. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:103 +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:68 msgid "" "<img alt=\"Torbutton plugin for Firefox\" src=\"$(IMGROOT)/screenshot-" "torbutton.png\" > <br>" @@ -229,7 +152,7 @@ "torbutton.png\" > <br>" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:110 +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:75 msgid "" "If you plan to run Firefox on a different computer than Tor, see the <a " "href=\"<wikifaq>#SocksListenAddress\"> FAQ entry for running Tor on a " @@ -240,39 +163,35 @@ "tietokoneella</a>." #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:116 +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:81 msgid "" -"To Torify other applications that support HTTP proxies, just point them at " -"Polipo (that is, localhost port 8118). To use SOCKS directly (for instant " -"messaging, Jabber, IRC, etc), you can point your application directly at Tor" -" (localhost port 9050), but see <a href=\"<wikifaq>#SOCKSAndDNS\">this FAQ " -"entry</a> for why this may be dangerous. For applications that support " -"neither SOCKS nor HTTP, take a look at <a " -"href=\"https://code.google.com/p/torsocks/\">torsocks</a> or <a " +"To Torify other applications that support SOCKS proxies, just point them at " +"Tor's SOCKS port (127.0.0.1 port 9050). See <a " +"href=\"<wikifaq>#SOCKSAndDNS\">this FAQ entry</a> for why this may be " +"dangerous. For applications that support neither SOCKS nor HTTP, take a look" +" at <a href=\"https://code.google.com/p/torsocks/\">torsocks</a> or <a " "href=\"<wiki>doc/TorifyHOWTO#socat\">socat</a>." msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:127 +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:89 msgid "" "For information on how to Torify other applications, check out the <a " "href=\"<wiki>doc/TorifyHOWTO\">Torify HOWTO</a>." msgstr "" #. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:132 +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:93 msgid "<hr> <a id=\"verify\"></a>" msgstr "<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>" +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:95 +msgid "<a class=\"anchor\" href=\"#verify\">Step Three: Make sure it's working</a>" msgstr "" -"<a class=\"anchor\" href=\"#verify\">Neljäs vaihe: Varmista että se " -"toimii</a>" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:138 +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:99 msgid "" "Next, you should try using your browser with Tor and make sure that your IP " "address is being anonymized. Click on <a " @@ -292,33 +211,22 @@ "lisää vinkkejä Torin testaamiseksi.)" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:150 +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:109 msgid "" "If you have a personal firewall that limits your computer's ability to " "connect to itself (this includes something like SELinux on Fedora Core 4), " -"be sure to allow connections from your local applications to Polipo (local " -"port 8118) and Tor (local port 9050). If your firewall blocks outgoing " -"connections, punch a hole so it can connect to at least TCP ports 80 and " -"443, and then see <a href=\"<wikifaq>#FirewalledClient\">this FAQ entry</a>." -" If your SELinux config is not allowing tor or privoxy to run correctly, " -"create a file named booleans.local in the directory /etc/selinux/targeted. " -"Edit this file in your favorite text editor and insert \"allow_ypbind=1\". " -"Restart your machine for this change to take effect." +"be sure to allow connections from your local applications to Tor (local port" +" 9050). If your firewall blocks outgoing connections, punch a hole so it can" +" connect to at least TCP ports 80 and 443, and then see <a " +"href=\"<wikifaq>#FirewalledClient\">this FAQ entry</a>. If your SELinux " +"config is not allowing tor or privoxy to run correctly, create a file named " +"booleans.local in the directory /etc/selinux/targeted. Edit this file in " +"your favorite text editor and insert \"allow_ypbind=1\". Restart your " +"machine for this change to take effect." msgstr "" -"Jos käytät henkilökohtaista palomuuria, joka rajoittaa tietokoneesi kykyä " -"yhdistää itseensä (tällainen on esimerkiksi Fedora Core 4:n SELinux), muista" -" sallia paikallisten sovellusten yhteydet Polipoon (paikallinen portti 8118)" -" ja Toriin (paikallinen portti 9050). Jos palomuurisi estää ulos menevät " -"yhteydet, tee siihen aukko niin, että se antaa yhdistää ainakin TCP-" -"portteihin 80 ja 443, ja lue sitten <a " -"href=\"<wikifaq>#FirewalledClient\">tämä FAQ:n kohta</a>. Jos SELinuxin " -"asetukset eivät anna torin tai polipon toimia oikein, luo hakemistoon " -"/etc/selinux/targeted tiedosto nimeltä booleans.local. Avaa tiedosto " -"tekstieditorissa ja lisää siihen \"allow_ybind=1\". Käynnistä koneesi " -"uudelleen, jotta muutokset tulevat voimaan." #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:165 +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:122 msgid "" "If it's still not working, look at <a href=\"<page " "docs/faq>#DoesntWork\">this FAQ entry</a> for hints." @@ -327,38 +235,28 @@ "docs/faq>#DoesntWork\">tästä FAQ:n kohdasta</a>." #. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:169 +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:126 msgid "<hr> <a id=\"server\"></a> <a id=\"relay\"></a>" msgstr "<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>" +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:129 +msgid "<a class=\"anchor\" href=\"#relay\">Step Four: Configure it as a relay</a>" msgstr "" -"<a class=\"anchor\" href=\"#relay\">Viides vaihe: Aseta se " -"välityspalvelimeksi</a>" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:175 +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:132 msgid "" "The Tor network relies on volunteers to donate bandwidth. The more people " "who run relays, the faster the Tor network will be. If you have at least 20 " -"kilobytes/s each way, please help out Tor by configuring your Tor to be a " +"KiloBytes/s each way, please help out Tor by configuring your Tor to be a " "relay too. We have many features that make Tor relays easy and convenient, " "including rate limiting for bandwidth, exit policies so you can limit your " "exposure to abuse complaints, and support for dynamic IP addresses." msgstr "" -"Tor-verkko on kaistatilaa tarjoavien vapaaehtoisten varassa. Mitä useammat " -"ihmiset pitävät yllä välityspalvelimia, sitä nopeampi Tor-verkosta tulee. " -"Jos käytössäsi on vähintään 20 kilobittiä/s kumpaankin suuntaan, autathan " -"Toria asettamalla oman Torisi myös välityspalvelmieksi. Käytössämme on monia" -" ominaisuuksia, jotka tekevät Tor-välityspalvelimista helppoja ja mukavia, " -"kuten kaistanleveyden käytön rajoittaminen, poistumiskäytännöt, joiden " -"avulla voit rajoittaa sinuun kohdistuvia valituksia väärinkäytöstä, ja " -"dynaamisten IP-osoitteiden tuki." #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:183 +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:140 msgid "" "Having relays in many different places on the Internet is what makes Tor " "users secure. <a href=\"<wikifaq>#RelayAnonymity\">You may also get stronger" @@ -371,7 +269,7 @@ "sinun koneeltasi vai välitetty muilta koneilta." #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:190 +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:146 msgid "" "Read more at our <a href=\"<page docs/tor-doc-relay>\">Configuring a " "relay</a> guide." @@ -380,12 +278,12 @@ "asettaminen</a> -oppaastamme." #. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:193 +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:149 msgid "<hr>" msgstr "<hr>" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:195 +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:151 msgid "" "If you have suggestions for improving this document, please <a href=\"<page " "about/contact>\">send them to us</a>. Thanks!" Modified: translation/trunk/projects/website/po/fr/about/3-low.contact.po =================================================================== --- translation/trunk/projects/website/po/fr/about/3-low.contact.po 2011-07-13 13:55:34 UTC (rev 24891) +++ translation/trunk/projects/website/po/fr/about/3-low.contact.po 2011-07-13 18:10:49 UTC (rev 24892) @@ -6,8 +6,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" -"POT-Creation-Date: 2011-04-13 16:28+0200\n" -"PO-Revision-Date: 2011-04-14 00:46+0000\n" +"POT-Creation-Date: 2011-07-08 08:44+0200\n" +"PO-Revision-Date: 2011-07-09 01:09+0000\n" "Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -31,90 +31,36 @@ msgid "Tor: Contact" msgstr "Tor : Contacts" -#. type: Content of: <div><div><p> +#. type: Content of: <div><div><h3> #: /home/runa/tor/website/about/en/contact.wml:16 -msgid "" -"First, if you have a problem or question about using Tor, go look at the <a " -"href=\"<page docs/documentation>#Support\">Support section</a> for how to " -"proceed. The Tor developers spend most of their time developing Tor, and " -"there are no people devoted to user support, so try to help yourself before " -"<a href=\"<page docs/faq>#SupportMail\">politely trying to find a " -"volunteer</a>." +msgid "Email" msgstr "" -"Tout d'abord, si vous avez un problème ou une question sur l'utilisation de " -"Tor, allez voir à la <a href=\"<page docs/documentation>#Support\">Section " -"support</a> pour trouver les informations les plus courantes. Les " -"développeurs de Tor passent le plus clair de leur temps à développer Tor, et" -" il n'y a pas de gens dévoués à l'assistance des utilisateurs, alors essayez" -" de vous aider avant <a href=\"<page docs/faq>#SupportMail\">de demander " -"poliment de l'aide</a>." -#. type: Content of: <div><div><p> -#: /home/runa/tor/website/about/en/contact.wml:18 -msgid "" -"If you really do need to reach us, here are some approaches. Please be " -"patient and <a href=\"http://www.catb.org/~esr/faqs/smart-" -"questions.html\">helpful</a>, and please make sure to write your mail in " -"English." -msgstr "" - #. type: Content of: <div><div> -#: /home/runa/tor/website/about/en/contact.wml:21 +#: /home/runa/tor/website/about/en/contact.wml:17 msgid "" -"<i>tor-assistants at torproject.org</i> is the catch-all address for " -"everything. It can be used for:" +"<a id=\"email\"></a> <i>tor-assistants at torproject.org</i> is the catch-" +"all address for everything. It can be used for reaching people working on " +"Tor. A few other addresses are more specific:" msgstr "" #. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/about/en/contact.wml:25 +#: /home/runa/tor/website/about/en/contact.wml:24 msgid "" -"Contacting the people who manage the directory authorities. Use this if you " -"run a Tor relay and have a question or problem with your relay." -msgstr "" - -#. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/about/en/contact.wml:28 -msgid "" -"So we can fix typos on the website, change wrong statements or directions on" -" the website, and add new sections and paragraphs that you send us. You " -"might want to make a draft of your new sections on <a href=\"<wiki>\">the " -"Tor wiki</a> first." -msgstr "" - -#. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/about/en/contact.wml:32 -msgid "" -"Hearing about your documents, patches, testing, experiences with supporting " -"applications, and so forth inspired by our <a href=\"<page " -"getinvolved/volunteer>\">volunteer page</a> (or other problems you've fixed " -"or documented about using Tor). There's no need to mail us before you start " -"working on something -- like all volunteer Internet projects, we hear from a" -" lot of excited people who vanish soon after, so we are most interested in " -"hearing about actual progress." -msgstr "" - -#. type: Content of: <div><div> -#: /home/runa/tor/website/about/en/contact.wml:42 -msgid "A few other addresses are more specific:" -msgstr "" - -#. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/about/en/contact.wml:45 -msgid "" "<i>tor-translation at lists.torproject.org</i> can put new <a href=\"<page " "getinvolved/translation>\">website translations</a> into place, and help " "answer questions about existing and new translations." msgstr "" #. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/about/en/contact.wml:48 +#: /home/runa/tor/website/about/en/contact.wml:27 msgid "" "<i>tordnsel at torproject.org</i> is the alias for the people responsible " "for the tordns exitlist." msgstr "" #. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/about/en/contact.wml:50 +#: /home/runa/tor/website/about/en/contact.wml:29 msgid "" "<i>donations at torproject.org</i> is for questions and comments about <a " "href=\"<page donate/donate>\">getting money to the developers</a>. More " @@ -123,7 +69,7 @@ msgstr "" #. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/about/en/contact.wml:55 +#: /home/runa/tor/website/about/en/contact.wml:34 msgid "" "<i>execdir at torproject.org</i> is for press/media, questions and comments " "about Tor the non-profit corporation: trademark questions, affiliation and " @@ -131,33 +77,72 @@ "etc." msgstr "" +#. type: Content of: <div><div><h3> +#: /home/runa/tor/website/about/en/contact.wml:40 +msgid "Identi.ca" +msgstr "" + +#. type: Content of: <div><div><p> +#: /home/runa/tor/website/about/en/contact.wml:41 +msgid "" +"<a id=\"identica\"></a> Contact us via our microblogging Identi.ca account " +"at <a href=\"https://identi.ca/torproject\">torproject</a>." +msgstr "" + +#. type: Content of: <div><div><h3> +#: /home/runa/tor/website/about/en/contact.wml:45 +msgid "IRC" +msgstr "" + #. type: Content of: <div><div> -#: /home/runa/tor/website/about/en/contact.wml:61 +#: /home/runa/tor/website/about/en/contact.wml:46 +msgid "<a id=\"irc\"></a>" +msgstr "" + +#. type: Content of: <div><div><p> +#: /home/runa/tor/website/about/en/contact.wml:47 msgid "" -"<a id=\"irc\"></a> Tor users and developers can also be found in the " -"following channels on <a href=\"http://www.oftc.net/oftc/\">oftc</a>:" +"Tor users and developers can also be found in the following channels on <a " +"href=\"http://www.oftc.net/oftc/\">OFTC</a>:" msgstr "" #. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/about/en/contact.wml:66 +#: /home/runa/tor/website/about/en/contact.wml:51 msgid "" "<i>#tor</i> - User and relay operation discussions. Having trouble running " "Tor or a question for other Tor users? Then this is the spot for you." msgstr "" #. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/about/en/contact.wml:69 +#: /home/runa/tor/website/about/en/contact.wml:54 msgid "" "<i>#tor-dev</i> - Channel for people who want to do development. " -"Discussions about Tor related coding, protocols, and <a href=\"<page " +"Discussions about Tor-related coding, protocols, and <a href=\"<page " "getinvolved/volunteer>\">project ideas</a> are all welcome." msgstr "" #. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/about/en/contact.wml:72 +#: /home/runa/tor/website/about/en/contact.wml:57 msgid "" "<i>#nottor</i> - This is where Tor people hang out to talk about stuff that " "is not related to Tor." msgstr "" +#. type: Content of: <div><div><h3> +#: /home/runa/tor/website/about/en/contact.wml:61 +msgid "Telephone" +msgstr "" +#. type: Content of: <div><div> +#: /home/runa/tor/website/about/en/contact.wml:62 +msgid "<a id=\"phone\"></a>" +msgstr "" + +#. type: Content of: <div><div><p> +#: /home/runa/tor/website/about/en/contact.wml:63 +msgid "" +"If none of the above appeal to you, calling +1-781-352-0568 will reach the " +"Tor office. Should there be no answer, please leave a message." +msgstr "" + + Modified: translation/trunk/projects/website/po/fr/about/3-low.contributors.po =================================================================== --- translation/trunk/projects/website/po/fr/about/3-low.contributors.po 2011-07-13 13:55:34 UTC (rev 24891) +++ translation/trunk/projects/website/po/fr/about/3-low.contributors.po 2011-07-13 18:10:49 UTC (rev 24892) @@ -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:18+0000\n" +"POT-Creation-Date: 2011-07-08 08:44+0200\n" +"PO-Revision-Date: 2011-07-09 01:09+0000\n" "Last-Translator: Gordontesos <translate(a)gordontesos.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -199,47 +199,69 @@ #. type: Content of: <div><div><dl><dt> #: /home/runa/tor/website/about/en/contributors.wml:48 +msgid "Bruce Leidl" +msgstr "" + +#. type: Content of: <div><div><dl><dd> +#: /home/runa/tor/website/about/en/contributors.wml:48 +msgid "Worked on a Tor client in Java." +msgstr "" + +#. type: Content of: <div><div><dl><dt> +#: /home/runa/tor/website/about/en/contributors.wml:49 msgid "Rebecca MacKinnon" msgstr "" #. type: Content of: <div><div><dl><dd> -#: /home/runa/tor/website/about/en/contributors.wml:48 +#: /home/runa/tor/website/about/en/contributors.wml:49 msgid "" "Former Director of Tor. Co-Founder of <a " "href=\"http://www.globalvoicesonline.org/\">Global Voices Online</a>." msgstr "" #. type: Content of: <div><div><dl><dt> -#: /home/runa/tor/website/about/en/contributors.wml:50 +#: /home/runa/tor/website/about/en/contributors.wml:51 msgid "Chris Palmer" msgstr "" #. type: Content of: <div><div><dl><dd> -#: /home/runa/tor/website/about/en/contributors.wml:50 +#: /home/runa/tor/website/about/en/contributors.wml:51 msgid "" "Our liaison and tech guy with EFF while EFF was funding us. Also helped " "advocate and write end-user docs." msgstr "" #. type: Content of: <div><div><dl><dt> -#: /home/runa/tor/website/about/en/contributors.wml:52 +#: /home/runa/tor/website/about/en/contributors.wml:53 +msgid "Martin Peck" +msgstr "" + +#. type: Content of: <div><div><dl><dd> +#: /home/runa/tor/website/about/en/contributors.wml:53 +msgid "" +"Worked on a VM-based transparent proxying approach for Tor clients on " +"Windows." +msgstr "" + +#. type: Content of: <div><div><dl><dt> +#: /home/runa/tor/website/about/en/contributors.wml:55 msgid "Matej Pfajfar" msgstr "" #. type: Content of: <div><div><dl><dd> -#: /home/runa/tor/website/about/en/contributors.wml:52 +#: /home/runa/tor/website/about/en/contributors.wml:55 msgid "" "Author of the original onion routing code that Tor is based on, so we didn't" " have to start from scratch." msgstr "" #. type: Content of: <div><div><dl><dt> -#: /home/runa/tor/website/about/en/contributors.wml:54 +#: /home/runa/tor/website/about/en/contributors.wml:57 msgid "Johannes Renner" msgstr "" #. type: Content of: <div><div><dl><dd> -#: /home/runa/tor/website/about/en/contributors.wml:54 +#: /home/runa/tor/website/about/en/contributors.wml:57 msgid "" "Worked during the 2007 Google Summer of Code on modifying <a " "href=\"https://svn.torproject.org/svn/torflow/trunk/README\">TorFlow</a> to " @@ -247,23 +269,36 @@ msgstr "" #. type: Content of: <div><div><dl><dt> -#: /home/runa/tor/website/about/en/contributors.wml:59 +#: /home/runa/tor/website/about/en/contributors.wml:62 msgid "Scott Squires" msgstr "" #. type: Content of: <div><div><dl><dd> -#: /home/runa/tor/website/about/en/contributors.wml:59 +#: /home/runa/tor/website/about/en/contributors.wml:62 msgid "" "The original developer of <a href=\"<page torbutton/index>\">Torbutton</a>." msgstr "" #. type: Content of: <div><div><dl><dt> -#: /home/runa/tor/website/about/en/contributors.wml:61 +#: /home/runa/tor/website/about/en/contributors.wml:64 +msgid "tup (a pseudonym)" +msgstr "" + +#. type: Content of: <div><div><dl><dd> +#: /home/runa/tor/website/about/en/contributors.wml:64 +msgid "" +"Added new features for making Tor easier to use as a <a " +"href=\"<wiki>TransparentProxy\">transparent proxy</a>. Also wrote the <a " +"href=\"http://p56soo2ibjkx23xo.onion/\">TorDNSEL code</a>." +msgstr "" + +#. type: Content of: <div><div><dl><dt> +#: /home/runa/tor/website/about/en/contributors.wml:69 msgid "Stephen Tyree" msgstr "" #. type: Content of: <div><div><dl><dd> -#: /home/runa/tor/website/about/en/contributors.wml:61 +#: /home/runa/tor/website/about/en/contributors.wml:69 msgid "" "Worked during Google Summer of Code 2009 to develop a plugin API for <a " "href=\"<page projects/vidalia>\">Vidalia</a> and create a plugin to allow " @@ -272,12 +307,12 @@ msgstr "" #. type: Content of: <div><div><dl><dt> -#: /home/runa/tor/website/about/en/contributors.wml:65 +#: /home/runa/tor/website/about/en/contributors.wml:73 msgid "Camilo Viecco" msgstr "" #. type: Content of: <div><div><dl><dd> -#: /home/runa/tor/website/about/en/contributors.wml:65 +#: /home/runa/tor/website/about/en/contributors.wml:73 msgid "" "Worked on Providing Blossom functionality to Vidalia (<a href=\"http://trac" ".vidalia-project.net/browser/vidalia/branches/exit-country\">svn</a>) as " @@ -285,12 +320,12 @@ msgstr "" #. type: Content of: <div><div><dl><dt> -#: /home/runa/tor/website/about/en/contributors.wml:68 +#: /home/runa/tor/website/about/en/contributors.wml:76 msgid "Fred von Lohmann" msgstr "" #. type: Content of: <div><div><dl><dd> -#: /home/runa/tor/website/about/en/contributors.wml:68 +#: /home/runa/tor/website/about/en/contributors.wml:76 msgid "" "Fred served on our Board of Directors from 2006 through 2009. His complete " "bio can be found at the <a href=\"http://www.eff.org/about/staff/fred-von-" @@ -298,12 +333,24 @@ msgstr "" #. type: Content of: <div><div><dl><dt> -#: /home/runa/tor/website/about/en/contributors.wml:72 +#: /home/runa/tor/website/about/en/contributors.wml:80 +msgid "Kyle Williams" +msgstr "" + +#. type: Content of: <div><div><dl><dd> +#: /home/runa/tor/website/about/en/contributors.wml:80 +msgid "" +"Developer for JanusVM, a VMWare-based transparent Tor proxy that makes Tor " +"easier to set up and use." +msgstr "" + +#. type: Content of: <div><div><dl><dt> +#: /home/runa/tor/website/about/en/contributors.wml:82 msgid "Christian Wilms" msgstr "" #. type: Content of: <div><div><dl><dd> -#: /home/runa/tor/website/about/en/contributors.wml:72 +#: /home/runa/tor/website/about/en/contributors.wml:82 msgid "" "Worked on Performance Enhancing Measures for Tor Hidden Services (<a " "href=\"https://svn.torproject.org/cgi-bin/viewvs.cgi/tor/branches/hidserv-" @@ -311,12 +358,12 @@ msgstr "" #. type: Content of: <div><div><dl><dt> -#: /home/runa/tor/website/about/en/contributors.wml:75 +#: /home/runa/tor/website/about/en/contributors.wml:85 msgid "Jillian C. York" msgstr "" #. type: Content of: <div><div><dl><dd> -#: /home/runa/tor/website/about/en/contributors.wml:75 +#: /home/runa/tor/website/about/en/contributors.wml:85 msgid "" "<a href=\"http://jilliancyork.com/\">Jillian C. York</a> is a writer, " "blogger, and activist based in Boston." Modified: translation/trunk/projects/website/po/fr/docs/3-low.tor-doc-unix.po =================================================================== --- translation/trunk/projects/website/po/fr/docs/3-low.tor-doc-unix.po 2011-07-13 13:55:34 UTC (rev 24891) +++ translation/trunk/projects/website/po/fr/docs/3-low.tor-doc-unix.po 2011-07-13 18:10:49 UTC (rev 24892) @@ -6,8 +6,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" -"POT-Creation-Date: 2011-06-21 08:18+0200\n" -"PO-Revision-Date: 2011-06-22 00:54+0000\n" +"POT-Creation-Date: 2011-07-08 08:43+0200\n" +"PO-Revision-Date: 2011-07-09 01:14+0000\n" "Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -33,9 +33,8 @@ msgstr "Utiliser le client <a href=\"<page index>\">Tor</a> sous Linux/BSD/Unix" #. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:14 /tmp/4vVJb7zECD.xml:26 -#: /tmp/4vVJb7zECD.xml:58 /tmp/4vVJb7zECD.xml:92 /tmp/4vVJb7zECD.xml:135 -#: /tmp/4vVJb7zECD.xml:173 +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:14 /tmp/KCUf13Jh9J.xml:26 +#: /tmp/KCUf13Jh9J.xml:57 /tmp/KCUf13Jh9J.xml:96 /tmp/KCUf13Jh9J.xml:130 msgid "<br>" msgstr "<br>" @@ -43,14 +42,9 @@ #: /home/runa/tor/website/docs/en/tor-doc-unix.wml:17 msgid "" "<b>Note that these are the installation instructions for running a Tor " -"client. If you want to relay traffic for others to help the network grow " -"(please do), read the <a href=\"<page docs/tor-doc-relay>\">Configuring a " -"relay</a> guide.</b>" +"client. The easiest way to do this is to simply download the <a href=\"<page" +" projects/torbrowser>\">Tor Browser Bundle</a> and you are done. </b>" msgstr "" -"<b>Veuillez noter que ces instructions d’installation s’appliquent au client" -" Tor. Si vous souhaitez relayer le trafic pour d’autres utilisateurs afin " -"d’aider le réseau à s’étendre (merci de le faire), lisez le guide <a " -"href=\"<page docs/tor-doc-relay>\">configurer un relais</a>.</b>" #. type: Content of: <div><div> #: /home/runa/tor/website/docs/en/tor-doc-unix.wml:23 @@ -112,100 +106,25 @@ #. type: Content of: <div><div> #: /home/runa/tor/website/docs/en/tor-doc-unix.wml:54 -msgid "<hr> <a id=\"privoxy\"></a> <a id=\"polipo\"></a>" -msgstr "<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\">Étape 2 : installer Polipo pour la " -"navigation web</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 "" -"Après l’installation de Tor, vous allez devoir configurer les applications " -"qui vont l’utiliser." - -#. 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 "" -"La première étape consiste à configurer le navigateur web. Commencez par " -"installer <a " -"href=\"http://www.pps.jussieu.fr/~jch/software/polipo/\">Polipo</a> à partir" -" de votre dépôt préféré. Polipo est un proxy web gérant le cache qui permet" -" de faire des tunnels HTTP, C’est donc parfait pour les latences de Tor. " -"Soyez sûr de prendre au minimum Polipo 1.0.4, car les versions précédentes " -"ne disposent pas du support SOCKS requis par Polipo avec Tor. Vous pouvez " -"désinstaller privoxy à ce point (apt-get remove privoxy sous Debian/Ubuntu, " -"ou yum remove privoxy sous Red Hat/Fedora), pour éviter qu’ils entrent en " -"conflit." - -#. 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 "" -"Une fois que vous avez installé Polipo (par les dépots ou par les sources), " -"<b>Vous devez configurer Polipo pour utiliser Tor</b>. Prenez notre <a " -"href=\"<tbbrepo>/build-scripts/config/polipo.conf\">fichier de configuration" -" de Polipo</a> pour Tor et remplacez le vôtre (/etc/polipo/config ou " -"~/.polipo). Vous devez ensuite redémarrer Polipo pour prendre en compte les " -"changements. Par exemple :<br> <tt>/etc/init.d/polipo restart</tt>" - -#. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:84 -msgid "" -"If you prefer, you can instead use Privoxy with <a " -"href=\"<wiki>doc/PrivoxyConfig\">this sample Privoxy configuration</a>. But " -"since the config files both use port 8118, you shouldn't run both Polipo and" -" Privoxy at the same time." -msgstr "" - -#. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:89 msgid "<hr> <a id=\"using\"></a>" msgstr "<hr> <a id=\"using\"></a>" #. type: Content of: <div><div><h2> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:91 +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:56 msgid "" -"<a class=\"anchor\" href=\"#using\">Step Three: Configure your applications " -"to use Tor</a>" +"<a class=\"anchor\" href=\"#using\">Step Two: Configure your applications to" +" use Tor</a>" msgstr "" -"<a class=\"anchor\" href=\"#using\">Étape 3 : configurer vos applications " -"pour qu’elles utilisent Tor</a>" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:94 +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:59 msgid "" -"After installing Tor and Polipo, you need to configure your applications to " -"use them. The first step is to set up web browsing." +"After installing Tor, you need to configure your applications to use them. " +"The first step is to set up web browsing." msgstr "" -"Après avoir installé Tor et Polipo, vous devrez configurer vos applications " -"pour qu’elles l’utilisent. La première étape est de mettre en place la " -"navigation web." #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:97 +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:62 msgid "" "You should use Tor with Firefox and Torbutton, for best safety. Simply " "install the <a href=\"<page torbutton/index>\">Torbutton plugin</a>, restart" @@ -213,7 +132,7 @@ msgstr "" #. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:103 +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:68 msgid "" "<img alt=\"Torbutton plugin for Firefox\" src=\"$(IMGROOT)/screenshot-" "torbutton.png\" > <br>" @@ -222,7 +141,7 @@ "torbutton.png\" > <br>" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:110 +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:75 msgid "" "If you plan to run Firefox on a different computer than Tor, see the <a " "href=\"<wikifaq>#SocksListenAddress\"> FAQ entry for running Tor on a " @@ -234,37 +153,35 @@ "l'utilisation de Tor sur un autre ordinateur</a>." #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:116 +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:81 msgid "" -"To Torify other applications that support HTTP proxies, just point them at " -"Polipo (that is, localhost port 8118). To use SOCKS directly (for instant " -"messaging, Jabber, IRC, etc), you can point your application directly at Tor" -" (localhost port 9050), but see <a href=\"<wikifaq>#SOCKSAndDNS\">this FAQ " -"entry</a> for why this may be dangerous. For applications that support " -"neither SOCKS nor HTTP, take a look at <a " -"href=\"https://code.google.com/p/torsocks/\">torsocks</a> or <a " +"To Torify other applications that support SOCKS proxies, just point them at " +"Tor's SOCKS port (127.0.0.1 port 9050). See <a " +"href=\"<wikifaq>#SOCKSAndDNS\">this FAQ entry</a> for why this may be " +"dangerous. For applications that support neither SOCKS nor HTTP, take a look" +" at <a href=\"https://code.google.com/p/torsocks/\">torsocks</a> or <a " "href=\"<wiki>doc/TorifyHOWTO#socat\">socat</a>." msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:127 +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:89 msgid "" "For information on how to Torify other applications, check out the <a " "href=\"<wiki>doc/TorifyHOWTO\">Torify HOWTO</a>." msgstr "" #. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:132 +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:93 msgid "<hr> <a id=\"verify\"></a>" msgstr "<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\">Étape 4 : vérifiez que ça marche</a>" +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:95 +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-unix.wml:138 +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:99 msgid "" "Next, you should try using your browser with Tor and make sure that your IP " "address is being anonymized. Click on <a " @@ -284,70 +201,50 @@ "plus de suggestions sur comment tester Tor)." #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:150 +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:109 msgid "" "If you have a personal firewall that limits your computer's ability to " "connect to itself (this includes something like SELinux on Fedora Core 4), " -"be sure to allow connections from your local applications to Polipo (local " -"port 8118) and Tor (local port 9050). If your firewall blocks outgoing " -"connections, punch a hole so it can connect to at least TCP ports 80 and " -"443, and then see <a href=\"<wikifaq>#FirewalledClient\">this FAQ entry</a>." -" If your SELinux config is not allowing tor or privoxy to run correctly, " -"create a file named booleans.local in the directory /etc/selinux/targeted. " -"Edit this file in your favorite text editor and insert \"allow_ypbind=1\". " -"Restart your machine for this change to take effect." +"be sure to allow connections from your local applications to Tor (local port" +" 9050). If your firewall blocks outgoing connections, punch a hole so it can" +" connect to at least TCP ports 80 and 443, and then see <a " +"href=\"<wikifaq>#FirewalledClient\">this FAQ entry</a>. If your SELinux " +"config is not allowing tor or privoxy to run correctly, create a file named " +"booleans.local in the directory /etc/selinux/targeted. Edit this file in " +"your favorite text editor and insert \"allow_ypbind=1\". Restart your " +"machine for this change to take effect." msgstr "" -"Si vous avez un pare-feu personnel qui limite la capacité de votre " -"ordinateur à se connecter à lui-même (ce qui inclut SELinux sur Fedora Core " -"4 et autres), assurez-vous d’autoriser les connections de vos applications " -"locales vers Polipo (localhost port 8118) et Tor (localhost port 9050). Si " -"votre pare-feu bloque les connexions sortantes, faites-y un trou afin qu’il " -"puisse se connecter au moins en TCP sur les ports 80 et 443, et ensuite " -"lisez cette <a href=\"<wikifaq>#FirewalledClient\">cette entrée de FAQ</a>. " -"Si votre configuration de SELinux n’autorise pas Tor ou Privoxy à " -"fonctionner correctement, créez un fichier nommé booleans.local dans le " -"dossier /etc/selinux/targeted. Éditez ce fichier dans votre éditeur de texte" -" favori et insérez « allow_ypbind=1″. Redémarrez votre machine pour que ceci" -" prenne effet." #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:165 +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:122 msgid "" "If it's still not working, look at <a href=\"<page " "docs/faq>#DoesntWork\">this FAQ entry</a> for hints." msgstr "" #. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:169 +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:126 msgid "<hr> <a id=\"server\"></a> <a id=\"relay\"></a>" msgstr "<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\">Étape 5 : le configurer comme relais</a>" +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:129 +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-unix.wml:175 +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:132 msgid "" "The Tor network relies on volunteers to donate bandwidth. The more people " "who run relays, the faster the Tor network will be. If you have at least 20 " -"kilobytes/s each way, please help out Tor by configuring your Tor to be a " +"KiloBytes/s each way, please help out Tor by configuring your Tor to be a " "relay too. We have many features that make Tor relays easy and convenient, " "including rate limiting for bandwidth, exit policies so you can limit your " "exposure to abuse complaints, and support for dynamic IP addresses." msgstr "" -"Le réseau Tor existe grâce à des volontaires qui fournissent de la bande " -"passante. Plus les personnes qui relaient seront nombreuses, plus Tor sera " -"rapide. Si vous avez au minimum 20 kilobytes/s en débit " -"ascendant/descendant, merci de nous aider en configurant votre Tor en " -"relais. Nous avons beaucoup de fonctionnalités qui permettent de le faire " -"facilement et sans inconvénients, comme la limitation de bande passante, les" -" politiques de sortie qui permettent de limiter votre exposition à des " -"plaintes, et le support pour les adresses IP dynamiques." #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:183 +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:140 msgid "" "Having relays in many different places on the Internet is what makes Tor " "users secure. <a href=\"<wikifaq>#RelayAnonymity\">You may also get stronger" @@ -361,7 +258,7 @@ " été relayées." #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:190 +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:146 msgid "" "Read more at our <a href=\"<page docs/tor-doc-relay>\">Configuring a " "relay</a> guide." @@ -370,12 +267,12 @@ "href=\"<page docs/tor-doc-relay>\">guide</a> ." #. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:193 +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:149 msgid "<hr>" msgstr "<hr>" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:195 +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:151 msgid "" "If you have suggestions for improving this document, please <a href=\"<page " "about/contact>\">send them to us</a>. Thanks!" Modified: translation/trunk/projects/website/po/fr/download/1-high.download-easy.po =================================================================== --- translation/trunk/projects/website/po/fr/download/1-high.download-easy.po 2011-07-13 13:55:34 UTC (rev 24891) +++ translation/trunk/projects/website/po/fr/download/1-high.download-easy.po 2011-07-13 18:10:49 UTC (rev 24892) @@ -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-06-21 08:18+0200\n" -"PO-Revision-Date: 2011-06-22 00:57+0000\n" +"POT-Creation-Date: 2011-07-08 08:42+0200\n" +"PO-Revision-Date: 2011-07-09 01:17+0000\n" "Last-Translator: ko_pp <kbeaubestre(a)hotmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -123,7 +123,7 @@ #: /home/runa/tor/website/download/en/download-easy.wml:72 msgid "" "</select> <input type=\"text\" id=\"amount\" class=\"amount\" " -"name=\"amount\" value=\"5\" size=\"10\">" +"name=\"amount\" value=\"10\" size=\"10\">" msgstr "" #. type: Content of: <div><div><table><tbody><tr><td><form><p><select> Modified: translation/trunk/projects/website/po/fr/download/3-low.download.po =================================================================== --- translation/trunk/projects/website/po/fr/download/3-low.download.po 2011-07-13 13:55:34 UTC (rev 24891) +++ translation/trunk/projects/website/po/fr/download/3-low.download.po 2011-07-13 18:10:49 UTC (rev 24892) @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" -"POT-Creation-Date: 2011-06-21 08:18+0200\n" -"PO-Revision-Date: 2011-06-22 00:56+0000\n" +"POT-Creation-Date: 2011-07-08 08:42+0200\n" +"PO-Revision-Date: 2011-07-09 01:16+0000\n" "Last-Translator: freda <ecuriesduperche(a)free.fr>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -128,7 +128,7 @@ #: /home/runa/tor/website/download/en/download.wml:65 msgid "" "</select> <input type=\"text\" id=\"amount\" class=\"amount\" " -"name=\"amount\" value=\"5\" size=\"10\">" +"name=\"amount\" value=\"10\" size=\"10\">" msgstr "" #. type: Content of: <div><div><table><tr><td><form><p><select> @@ -183,8 +183,8 @@ msgstr "Tor pour Windows est livré de quatre façons différentes:" #. type: Content of: <div><div><table><tr><td><ul><li> -#: /home/runa/tor/website/download/en/download.wml:102 /tmp/FhqGC1ISDt.xml:165 -#: /tmp/FhqGC1ISDt.xml:203 +#: /home/runa/tor/website/download/en/download.wml:102 /tmp/lbSAEZiU0Z.xml:165 +#: /tmp/lbSAEZiU0Z.xml:203 msgid "" "The <strong>Tor Browser Bundle</strong> contains everything you need to " "safely browse the Internet. This package requires no installation. Just " @@ -233,7 +233,7 @@ "Vous aurez besoin de configurer Tor et toutes vos applications manuellement." #. type: Content of: <div><div><table><tr><td><p> -#: /home/runa/tor/website/download/en/download.wml:110 /tmp/FhqGC1ISDt.xml:168 +#: /home/runa/tor/website/download/en/download.wml:110 /tmp/lbSAEZiU0Z.xml:168 msgid "" "There are two versions of each package, a stable and alpha release. Stable " "packages are released when we believe the features and code will not change " @@ -651,7 +651,7 @@ "instable</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:265 /tmp/FhqGC1ISDt.xml:344 +#: /home/runa/tor/website/download/en/download.wml:265 /tmp/lbSAEZiU0Z.xml:344 msgid "<br>" msgstr "<br>" Modified: translation/trunk/projects/website/po/it/about/3-low.contact.po =================================================================== --- translation/trunk/projects/website/po/it/about/3-low.contact.po 2011-07-13 13:55:34 UTC (rev 24891) +++ translation/trunk/projects/website/po/it/about/3-low.contact.po 2011-07-13 18:10:49 UTC (rev 24892) @@ -6,8 +6,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" -"POT-Creation-Date: 2011-04-13 16:28+0200\n" -"PO-Revision-Date: 2011-04-14 00:46+0000\n" +"POT-Creation-Date: 2011-07-08 08:44+0200\n" +"PO-Revision-Date: 2011-07-09 01:09+0000\n" "Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" "Language-Team: Italian (http://www.transifex.net/projects/p/torproject/team/it/)\n" "MIME-Version: 1.0\n" @@ -29,83 +29,36 @@ msgid "Tor: Contact" msgstr "" -#. type: Content of: <div><div><p> +#. type: Content of: <div><div><h3> #: /home/runa/tor/website/about/en/contact.wml:16 -msgid "" -"First, if you have a problem or question about using Tor, go look at the <a " -"href=\"<page docs/documentation>#Support\">Support section</a> for how to " -"proceed. The Tor developers spend most of their time developing Tor, and " -"there are no people devoted to user support, so try to help yourself before " -"<a href=\"<page docs/faq>#SupportMail\">politely trying to find a " -"volunteer</a>." +msgid "Email" msgstr "" -#. type: Content of: <div><div><p> -#: /home/runa/tor/website/about/en/contact.wml:18 -msgid "" -"If you really do need to reach us, here are some approaches. Please be " -"patient and <a href=\"http://www.catb.org/~esr/faqs/smart-" -"questions.html\">helpful</a>, and please make sure to write your mail in " -"English." -msgstr "" - #. type: Content of: <div><div> -#: /home/runa/tor/website/about/en/contact.wml:21 +#: /home/runa/tor/website/about/en/contact.wml:17 msgid "" -"<i>tor-assistants at torproject.org</i> is the catch-all address for " -"everything. It can be used for:" +"<a id=\"email\"></a> <i>tor-assistants at torproject.org</i> is the catch-" +"all address for everything. It can be used for reaching people working on " +"Tor. A few other addresses are more specific:" msgstr "" #. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/about/en/contact.wml:25 +#: /home/runa/tor/website/about/en/contact.wml:24 msgid "" -"Contacting the people who manage the directory authorities. Use this if you " -"run a Tor relay and have a question or problem with your relay." -msgstr "" - -#. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/about/en/contact.wml:28 -msgid "" -"So we can fix typos on the website, change wrong statements or directions on" -" the website, and add new sections and paragraphs that you send us. You " -"might want to make a draft of your new sections on <a href=\"<wiki>\">the " -"Tor wiki</a> first." -msgstr "" - -#. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/about/en/contact.wml:32 -msgid "" -"Hearing about your documents, patches, testing, experiences with supporting " -"applications, and so forth inspired by our <a href=\"<page " -"getinvolved/volunteer>\">volunteer page</a> (or other problems you've fixed " -"or documented about using Tor). There's no need to mail us before you start " -"working on something -- like all volunteer Internet projects, we hear from a" -" lot of excited people who vanish soon after, so we are most interested in " -"hearing about actual progress." -msgstr "" - -#. type: Content of: <div><div> -#: /home/runa/tor/website/about/en/contact.wml:42 -msgid "A few other addresses are more specific:" -msgstr "" - -#. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/about/en/contact.wml:45 -msgid "" "<i>tor-translation at lists.torproject.org</i> can put new <a href=\"<page " "getinvolved/translation>\">website translations</a> into place, and help " "answer questions about existing and new translations." msgstr "" #. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/about/en/contact.wml:48 +#: /home/runa/tor/website/about/en/contact.wml:27 msgid "" "<i>tordnsel at torproject.org</i> is the alias for the people responsible " "for the tordns exitlist." msgstr "" #. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/about/en/contact.wml:50 +#: /home/runa/tor/website/about/en/contact.wml:29 msgid "" "<i>donations at torproject.org</i> is for questions and comments about <a " "href=\"<page donate/donate>\">getting money to the developers</a>. More " @@ -114,7 +67,7 @@ msgstr "" #. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/about/en/contact.wml:55 +#: /home/runa/tor/website/about/en/contact.wml:34 msgid "" "<i>execdir at torproject.org</i> is for press/media, questions and comments " "about Tor the non-profit corporation: trademark questions, affiliation and " @@ -122,33 +75,72 @@ "etc." msgstr "" +#. type: Content of: <div><div><h3> +#: /home/runa/tor/website/about/en/contact.wml:40 +msgid "Identi.ca" +msgstr "" + +#. type: Content of: <div><div><p> +#: /home/runa/tor/website/about/en/contact.wml:41 +msgid "" +"<a id=\"identica\"></a> Contact us via our microblogging Identi.ca account " +"at <a href=\"https://identi.ca/torproject\">torproject</a>." +msgstr "" + +#. type: Content of: <div><div><h3> +#: /home/runa/tor/website/about/en/contact.wml:45 +msgid "IRC" +msgstr "" + #. type: Content of: <div><div> -#: /home/runa/tor/website/about/en/contact.wml:61 +#: /home/runa/tor/website/about/en/contact.wml:46 +msgid "<a id=\"irc\"></a>" +msgstr "" + +#. type: Content of: <div><div><p> +#: /home/runa/tor/website/about/en/contact.wml:47 msgid "" -"<a id=\"irc\"></a> Tor users and developers can also be found in the " -"following channels on <a href=\"http://www.oftc.net/oftc/\">oftc</a>:" +"Tor users and developers can also be found in the following channels on <a " +"href=\"http://www.oftc.net/oftc/\">OFTC</a>:" msgstr "" #. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/about/en/contact.wml:66 +#: /home/runa/tor/website/about/en/contact.wml:51 msgid "" "<i>#tor</i> - User and relay operation discussions. Having trouble running " "Tor or a question for other Tor users? Then this is the spot for you." msgstr "" #. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/about/en/contact.wml:69 +#: /home/runa/tor/website/about/en/contact.wml:54 msgid "" "<i>#tor-dev</i> - Channel for people who want to do development. " -"Discussions about Tor related coding, protocols, and <a href=\"<page " +"Discussions about Tor-related coding, protocols, and <a href=\"<page " "getinvolved/volunteer>\">project ideas</a> are all welcome." msgstr "" #. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/about/en/contact.wml:72 +#: /home/runa/tor/website/about/en/contact.wml:57 msgid "" "<i>#nottor</i> - This is where Tor people hang out to talk about stuff that " "is not related to Tor." msgstr "" +#. type: Content of: <div><div><h3> +#: /home/runa/tor/website/about/en/contact.wml:61 +msgid "Telephone" +msgstr "" +#. type: Content of: <div><div> +#: /home/runa/tor/website/about/en/contact.wml:62 +msgid "<a id=\"phone\"></a>" +msgstr "" + +#. type: Content of: <div><div><p> +#: /home/runa/tor/website/about/en/contact.wml:63 +msgid "" +"If none of the above appeal to you, calling +1-781-352-0568 will reach the " +"Tor office. Should there be no answer, please leave a message." +msgstr "" + + Modified: translation/trunk/projects/website/po/it/about/3-low.contributors.po =================================================================== --- translation/trunk/projects/website/po/it/about/3-low.contributors.po 2011-07-13 13:55:34 UTC (rev 24891) +++ translation/trunk/projects/website/po/it/about/3-low.contributors.po 2011-07-13 18:10:49 UTC (rev 24892) @@ -6,8 +6,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:18+0000\n" +"POT-Creation-Date: 2011-07-08 08:44+0200\n" +"PO-Revision-Date: 2011-07-09 01:09+0000\n" "Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" "Language-Team: Italian (http://www.transifex.net/projects/p/torproject/team/it/)\n" "MIME-Version: 1.0\n" @@ -186,47 +186,69 @@ #. type: Content of: <div><div><dl><dt> #: /home/runa/tor/website/about/en/contributors.wml:48 +msgid "Bruce Leidl" +msgstr "" + +#. type: Content of: <div><div><dl><dd> +#: /home/runa/tor/website/about/en/contributors.wml:48 +msgid "Worked on a Tor client in Java." +msgstr "" + +#. type: Content of: <div><div><dl><dt> +#: /home/runa/tor/website/about/en/contributors.wml:49 msgid "Rebecca MacKinnon" msgstr "" #. type: Content of: <div><div><dl><dd> -#: /home/runa/tor/website/about/en/contributors.wml:48 +#: /home/runa/tor/website/about/en/contributors.wml:49 msgid "" "Former Director of Tor. Co-Founder of <a " "href=\"http://www.globalvoicesonline.org/\">Global Voices Online</a>." msgstr "" #. type: Content of: <div><div><dl><dt> -#: /home/runa/tor/website/about/en/contributors.wml:50 +#: /home/runa/tor/website/about/en/contributors.wml:51 msgid "Chris Palmer" msgstr "" #. type: Content of: <div><div><dl><dd> -#: /home/runa/tor/website/about/en/contributors.wml:50 +#: /home/runa/tor/website/about/en/contributors.wml:51 msgid "" "Our liaison and tech guy with EFF while EFF was funding us. Also helped " "advocate and write end-user docs." msgstr "" #. type: Content of: <div><div><dl><dt> -#: /home/runa/tor/website/about/en/contributors.wml:52 +#: /home/runa/tor/website/about/en/contributors.wml:53 +msgid "Martin Peck" +msgstr "" + +#. type: Content of: <div><div><dl><dd> +#: /home/runa/tor/website/about/en/contributors.wml:53 +msgid "" +"Worked on a VM-based transparent proxying approach for Tor clients on " +"Windows." +msgstr "" + +#. type: Content of: <div><div><dl><dt> +#: /home/runa/tor/website/about/en/contributors.wml:55 msgid "Matej Pfajfar" msgstr "" #. type: Content of: <div><div><dl><dd> -#: /home/runa/tor/website/about/en/contributors.wml:52 +#: /home/runa/tor/website/about/en/contributors.wml:55 msgid "" "Author of the original onion routing code that Tor is based on, so we didn't" " have to start from scratch." msgstr "" #. type: Content of: <div><div><dl><dt> -#: /home/runa/tor/website/about/en/contributors.wml:54 +#: /home/runa/tor/website/about/en/contributors.wml:57 msgid "Johannes Renner" msgstr "" #. type: Content of: <div><div><dl><dd> -#: /home/runa/tor/website/about/en/contributors.wml:54 +#: /home/runa/tor/website/about/en/contributors.wml:57 msgid "" "Worked during the 2007 Google Summer of Code on modifying <a " "href=\"https://svn.torproject.org/svn/torflow/trunk/README\">TorFlow</a> to " @@ -234,23 +256,36 @@ msgstr "" #. type: Content of: <div><div><dl><dt> -#: /home/runa/tor/website/about/en/contributors.wml:59 +#: /home/runa/tor/website/about/en/contributors.wml:62 msgid "Scott Squires" msgstr "" #. type: Content of: <div><div><dl><dd> -#: /home/runa/tor/website/about/en/contributors.wml:59 +#: /home/runa/tor/website/about/en/contributors.wml:62 msgid "" "The original developer of <a href=\"<page torbutton/index>\">Torbutton</a>." msgstr "" #. type: Content of: <div><div><dl><dt> -#: /home/runa/tor/website/about/en/contributors.wml:61 +#: /home/runa/tor/website/about/en/contributors.wml:64 +msgid "tup (a pseudonym)" +msgstr "" + +#. type: Content of: <div><div><dl><dd> +#: /home/runa/tor/website/about/en/contributors.wml:64 +msgid "" +"Added new features for making Tor easier to use as a <a " +"href=\"<wiki>TransparentProxy\">transparent proxy</a>. Also wrote the <a " +"href=\"http://p56soo2ibjkx23xo.onion/\">TorDNSEL code</a>." +msgstr "" + +#. type: Content of: <div><div><dl><dt> +#: /home/runa/tor/website/about/en/contributors.wml:69 msgid "Stephen Tyree" msgstr "" #. type: Content of: <div><div><dl><dd> -#: /home/runa/tor/website/about/en/contributors.wml:61 +#: /home/runa/tor/website/about/en/contributors.wml:69 msgid "" "Worked during Google Summer of Code 2009 to develop a plugin API for <a " "href=\"<page projects/vidalia>\">Vidalia</a> and create a plugin to allow " @@ -259,12 +294,12 @@ msgstr "" #. type: Content of: <div><div><dl><dt> -#: /home/runa/tor/website/about/en/contributors.wml:65 +#: /home/runa/tor/website/about/en/contributors.wml:73 msgid "Camilo Viecco" msgstr "" #. type: Content of: <div><div><dl><dd> -#: /home/runa/tor/website/about/en/contributors.wml:65 +#: /home/runa/tor/website/about/en/contributors.wml:73 msgid "" "Worked on Providing Blossom functionality to Vidalia (<a href=\"http://trac" ".vidalia-project.net/browser/vidalia/branches/exit-country\">svn</a>) as " @@ -272,12 +307,12 @@ msgstr "" #. type: Content of: <div><div><dl><dt> -#: /home/runa/tor/website/about/en/contributors.wml:68 +#: /home/runa/tor/website/about/en/contributors.wml:76 msgid "Fred von Lohmann" msgstr "" #. type: Content of: <div><div><dl><dd> -#: /home/runa/tor/website/about/en/contributors.wml:68 +#: /home/runa/tor/website/about/en/contributors.wml:76 msgid "" "Fred served on our Board of Directors from 2006 through 2009. His complete " "bio can be found at the <a href=\"http://www.eff.org/about/staff/fred-von-" @@ -285,12 +320,24 @@ msgstr "" #. type: Content of: <div><div><dl><dt> -#: /home/runa/tor/website/about/en/contributors.wml:72 +#: /home/runa/tor/website/about/en/contributors.wml:80 +msgid "Kyle Williams" +msgstr "" + +#. type: Content of: <div><div><dl><dd> +#: /home/runa/tor/website/about/en/contributors.wml:80 +msgid "" +"Developer for JanusVM, a VMWare-based transparent Tor proxy that makes Tor " +"easier to set up and use." +msgstr "" + +#. type: Content of: <div><div><dl><dt> +#: /home/runa/tor/website/about/en/contributors.wml:82 msgid "Christian Wilms" msgstr "" #. type: Content of: <div><div><dl><dd> -#: /home/runa/tor/website/about/en/contributors.wml:72 +#: /home/runa/tor/website/about/en/contributors.wml:82 msgid "" "Worked on Performance Enhancing Measures for Tor Hidden Services (<a " "href=\"https://svn.torproject.org/cgi-bin/viewvs.cgi/tor/branches/hidserv-" @@ -298,12 +345,12 @@ msgstr "" #. type: Content of: <div><div><dl><dt> -#: /home/runa/tor/website/about/en/contributors.wml:75 +#: /home/runa/tor/website/about/en/contributors.wml:85 msgid "Jillian C. York" msgstr "" #. type: Content of: <div><div><dl><dd> -#: /home/runa/tor/website/about/en/contributors.wml:75 +#: /home/runa/tor/website/about/en/contributors.wml:85 msgid "" "<a href=\"http://jilliancyork.com/\">Jillian C. York</a> is a writer, " "blogger, and activist based in Boston." Modified: translation/trunk/projects/website/po/it/about/3-low.volunteers.po =================================================================== --- translation/trunk/projects/website/po/it/about/3-low.volunteers.po 2011-07-13 13:55:34 UTC (rev 24891) +++ translation/trunk/projects/website/po/it/about/3-low.volunteers.po 2011-07-13 18:10:49 UTC (rev 24892) @@ -6,8 +6,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" -"POT-Creation-Date: 2011-06-29 20:42+0200\n" -"PO-Revision-Date: 2011-06-30 00:49+0000\n" +"POT-Creation-Date: 2011-07-08 08:44+0200\n" +"PO-Revision-Date: 2011-07-09 01:11+0000\n" "Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" "Language-Team: Italian (http://www.transifex.net/projects/p/torproject/team/it/)\n" "MIME-Version: 1.0\n" @@ -31,80 +31,72 @@ #. type: Content of: <div><div><dl><dt> #: /home/runa/tor/website/about/en/volunteers.wml:15 -msgid "Anonym" +msgid "Anonym, bertagaz, and intrigeri" msgstr "" #. type: Content of: <div><div><dl><dd> #: /home/runa/tor/website/about/en/volunteers.wml:15 -msgid "Maintainer of the Incognito LiveCD." +msgid "" +"Maintainers of <a href=\"https://tails.boum.org/\">The Amnesic Incognito " +"Live System</a>." msgstr "" #. type: Content of: <div><div><dl><dt> -#: /home/runa/tor/website/about/en/volunteers.wml:16 -msgid "Kevin Bankston" +#: /home/runa/tor/website/about/en/volunteers.wml:17 +msgid "Marco Bonetti" msgstr "" #. type: Content of: <div><div><dl><dd> -#: /home/runa/tor/website/about/en/volunteers.wml:16 -msgid "" -"EFF lawyer who helped write the <a href=\"<page eff/tor-legal-faq>\">Tor " -"Legal FAQ</a> and tirelessly answers the phone when somebody in the world " -"has a legal question about Tor." +#: /home/runa/tor/website/about/en/volunteers.wml:17 +msgid "Focusing on MobileTor for the iPhone." msgstr "" #. type: Content of: <div><div><dl><dt> -#: /home/runa/tor/website/about/en/volunteers.wml:20 -msgid "Marco Bonetti" +#: /home/runa/tor/website/about/en/volunteers.wml:18 +msgid "Kasimir Gabert" msgstr "" #. type: Content of: <div><div><dl><dd> -#: /home/runa/tor/website/about/en/volunteers.wml:20 -msgid "Focusing on MobileTor for the iPhone." +#: /home/runa/tor/website/about/en/volunteers.wml:18 +msgid "Maintains TorStatus." msgstr "" #. type: Content of: <div><div><dl><dt> -#: /home/runa/tor/website/about/en/volunteers.wml:21 -msgid "Kasimir Gabert" +#: /home/runa/tor/website/about/en/volunteers.wml:19 +msgid "Marcia Hofmann and Kevin Bankston" msgstr "" #. type: Content of: <div><div><dl><dd> -#: /home/runa/tor/website/about/en/volunteers.wml:21 -msgid "Maintains TorStatus." +#: /home/runa/tor/website/about/en/volunteers.wml:19 +msgid "" +"EFF lawyers who helped write the <a href=\"<page eff/tor-legal-faq>\">Tor " +"Legal FAQ</a> and tirelessly answers the phone when somebody in the world " +"has a legal question about Tor." msgstr "" #. type: Content of: <div><div><dl><dt> -#: /home/runa/tor/website/about/en/volunteers.wml:22 +#: /home/runa/tor/website/about/en/volunteers.wml:23 msgid "Andreas Jonsson" msgstr "" #. type: Content of: <div><div><dl><dd> -#: /home/runa/tor/website/about/en/volunteers.wml:22 +#: /home/runa/tor/website/about/en/volunteers.wml:23 msgid "Works on OS X Tor Browser Bundle sandbox technology." msgstr "" #. type: Content of: <div><div><dl><dt> -#: /home/runa/tor/website/about/en/volunteers.wml:24 +#: /home/runa/tor/website/about/en/volunteers.wml:25 msgid "Fabian Keil" msgstr "" #. type: Content of: <div><div><dl><dd> -#: /home/runa/tor/website/about/en/volunteers.wml:24 +#: /home/runa/tor/website/about/en/volunteers.wml:25 msgid "" "One of the core Privoxy developers, and also a Tor fan. He's the reason Tor " "and Privoxy still work well together." msgstr "" #. type: Content of: <div><div><dl><dt> -#: /home/runa/tor/website/about/en/volunteers.wml:26 -msgid "Bruce Leidl" -msgstr "" - -#. type: Content of: <div><div><dl><dd> -#: /home/runa/tor/website/about/en/volunteers.wml:26 -msgid "Working on a Tor client in Java." -msgstr "" - -#. type: Content of: <div><div><dl><dt> #: /home/runa/tor/website/about/en/volunteers.wml:27 msgid "Julius Mittenzwei" msgstr "" @@ -142,60 +134,34 @@ #. type: Content of: <div><div><dl><dt> #: /home/runa/tor/website/about/en/volunteers.wml:34 -msgid "Martin Peck" -msgstr "" - -#. type: Content of: <div><div><dl><dd> -#: /home/runa/tor/website/about/en/volunteers.wml:34 -msgid "" -"Working on a VM-based transparent proxying approach for Tor clients on " -"Windows." -msgstr "" - -#. type: Content of: <div><div><dl><dt> -#: /home/runa/tor/website/about/en/volunteers.wml:36 msgid "rovv (a pseudonym -- he's managed to stay anonymous even from us!)" msgstr "" #. type: Content of: <div><div><dl><dd> -#: /home/runa/tor/website/about/en/volunteers.wml:37 +#: /home/runa/tor/website/about/en/volunteers.wml:35 msgid "" "The most dedicated bug reporter we've ever heard from. He must read Tor " "source code every day over breakfast." msgstr "" #. type: Content of: <div><div><dl><dt> -#: /home/runa/tor/website/about/en/volunteers.wml:39 -msgid "tup (another pseudonym)" +#: /home/runa/tor/website/about/en/volunteers.wml:37 +msgid "Nart Villeneuve" msgstr "" #. type: Content of: <div><div><dl><dd> -#: /home/runa/tor/website/about/en/volunteers.wml:39 +#: /home/runa/tor/website/about/en/volunteers.wml:37 msgid "" -"Periodically adds new features for making Tor easier to use as a <a " -"href=\"<wiki>TransparentProxy\">transparent proxy</a>. Also maintains the <a" -" href=\"http://p56soo2ibjkx23xo.onion/\">TorDNSEL code</a>." +"Security researcher who works with Jacob on Internet Censorship research." msgstr "" #. type: Content of: <div><div><dl><dt> -#: /home/runa/tor/website/about/en/volunteers.wml:44 -msgid "Kyle Williams" -msgstr "" - -#. type: Content of: <div><div><dl><dd> -#: /home/runa/tor/website/about/en/volunteers.wml:44 -msgid "" -"Developer for JanusVM, a VMWare-based transparent Tor proxy that makes Tor " -"easier to set up and use." -msgstr "" - -#. type: Content of: <div><div><dl><dt> -#: /home/runa/tor/website/about/en/volunteers.wml:47 +#: /home/runa/tor/website/about/en/volunteers.wml:39 msgid "Ethan Zuckerman" msgstr "" #. type: Content of: <div><div><dl><dd> -#: /home/runa/tor/website/about/en/volunteers.wml:47 +#: /home/runa/tor/website/about/en/volunteers.wml:39 msgid "" "A blogger who has written some <a " "href=\"http://www.ethanzuckerman.com/blog/?p=1019\">interesting</a> <a " @@ -205,7 +171,7 @@ msgstr "" #. type: Content of: <div><div><dl><dt> -#: /home/runa/tor/website/about/en/volunteers.wml:52 +#: /home/runa/tor/website/about/en/volunteers.wml:44 msgid "" "All our relay operators, people who write <a " "href=\"http://freehaven.net/anonbib/\">research papers</a> about Tor, people" Modified: translation/trunk/projects/website/po/it/docs/3-low.debian-vidalia.po =================================================================== --- translation/trunk/projects/website/po/it/docs/3-low.debian-vidalia.po 2011-07-13 13:55:34 UTC (rev 24891) +++ translation/trunk/projects/website/po/it/docs/3-low.debian-vidalia.po 2011-07-13 18:10:49 UTC (rev 24892) @@ -6,8 +6,8 @@ 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-03-22 16:31+0000\n" +"POT-Creation-Date: 2011-07-08 08:43+0200\n" +"PO-Revision-Date: 2011-07-09 01:14+0000\n" "Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" "Language-Team: Italian (http://www.transifex.net/projects/p/torproject/team/it/)\n" "MIME-Version: 1.0\n" @@ -35,7 +35,7 @@ msgstr "" #. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:16 /tmp/M9Wxp74W_E.xml:83 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:16 /tmp/LnaSOLeTA9.xml:84 msgid "<br />" msgstr "" @@ -56,72 +56,77 @@ #. type: Content of: <div><div><p><ul><li> #: /home/runa/tor/website/docs/en/debian-vidalia.wml:29 -msgid "Ubuntu 10.10 is \"maverick\" but use the \"lucid\" packages" +msgid "Ubuntu 11.04 is \"natty\"" msgstr "" #. type: Content of: <div><div><p><ul><li> #: /home/runa/tor/website/docs/en/debian-vidalia.wml:30 +msgid "Ubuntu 10.10 or Trisquel 4.5 is \"maverick\"" +msgstr "" + +#. type: Content of: <div><div><p><ul><li> +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:31 msgid "Ubuntu 10.04 or Trisquel 4.0 is \"lucid\"" msgstr "" #. type: Content of: <div><div><p><ul><li> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:31 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:32 msgid "Ubuntu 9.10 or Trisquel 3.5 is \"karmic\"" msgstr "" #. type: Content of: <div><div><p><ul><li> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:32 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:33 msgid "Ubuntu 9.04 is \"jaunty\"" msgstr "" #. type: Content of: <div><div><p><ul><li> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:33 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:34 msgid "Ubuntu 8.10 is \"intrepid\"" msgstr "" #. type: Content of: <div><div><p><ul><li> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:34 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:35 msgid "Ubuntu 8.04 is \"hardy\"" msgstr "" #. type: Content of: <div><div><p><ul><li> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:35 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:36 msgid "Debian Etch is \"etch\"" msgstr "" #. type: Content of: <div><div><p><ul><li> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:36 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:37 msgid "Debian Lenny is \"lenny\"" msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:39 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:40 msgid "Then add this line to your <tt>/etc/apt/sources.list</tt> file:<br />" msgstr "" #. type: Content of: <div><div><p><pre> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:43 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:44 #, no-wrap msgid "" "deb http://deb.torproject.org/torproject.org <DISTRIBUTION> main\n" msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:45 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:46 msgid "" "where you substitute the above word (etch, lenny, sid, karmic, jaunty, " "intrepid, hardy) in place of <DISTRIBUTION>." msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:50 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:51 msgid "" "Then add the gpg key used to sign the packages by running the following " "commands at your command prompt:" msgstr "" #. type: Content of: <div><div><p><pre> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:53 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:54 #, no-wrap msgid "" "gpg --keyserver keys.gnupg.net --recv 886DDD89\n" @@ -129,14 +134,14 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:56 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:57 msgid "" "Now refresh your sources and install Vidalia by running the following " "commands at your command prompt:" msgstr "" #. type: Content of: <div><div><p><pre> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:59 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:60 #, no-wrap msgid "" "apt-get update\n" @@ -144,8 +149,8 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:65 -#: /tmp/M9Wxp74W_E.xml:112 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:66 +#: /tmp/LnaSOLeTA9.xml:113 msgid "" "Now Vidalia is installed and running. Move on to <a href=\"<page docs/tor-" "doc-unix>#polipo\">step two</a> of the \"Vidalia on Linux/Unix\" " @@ -153,7 +158,7 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:71 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:72 msgid "" "The DNS name <code>deb.torproject.org</code> is actually a set of " "independent servers in a DNS round robin configuration. If you for some " @@ -163,38 +168,38 @@ msgstr "" #. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:79 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:80 msgid "<hr /> <a id=\"source\"></a>" msgstr "" #. type: Content of: <div><div><h2> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:82 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:83 msgid "<a class=\"anchor\" href=\"#source\">Building from source</a>" msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:86 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:87 msgid "" "If you want to build your own debs from source you must first add an " "appropriate <tt>deb-src</tt> line to <tt>sources.list</tt>." msgstr "" #. type: Content of: <div><div><p><pre> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:89 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:90 #, no-wrap msgid "" "deb-src http://deb.torproject.org/torproject.org <DISTRIBUTION> main\n" msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:91 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:92 msgid "" "You also need to install the necessary packages to build your own debs and " "the packages needed to build Vidalia:" msgstr "" #. type: Content of: <div><div><p><pre> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:94 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:95 #, no-wrap msgid "" "apt-get install build-essential fakeroot devscripts qt4-dev-tools qt4-designer libqt4-dev g++ cmake\n" @@ -202,12 +207,12 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:97 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:98 msgid "Then you can build Vidalia in ~/debian-packages:" msgstr "" #. type: Content of: <div><div><p><pre> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:99 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:100 #, no-wrap msgid "" "mkdir ~/debian-packages; cd ~/debian-packages\n" @@ -218,23 +223,23 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:105 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:106 msgid "Now you can install the new package:" msgstr "" #. type: Content of: <div><div><p><pre> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:107 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:108 #, no-wrap msgid "sudo dpkg -i vidalia_*.deb\n" msgstr "" #. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:117 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:118 msgid "<hr />" msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:119 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:120 msgid "" "If you have suggestions for improving this document, please <a href=\"<page " "about/contact>\">send them to us</a>. Thanks!" Modified: translation/trunk/projects/website/po/it/docs/3-low.debian.po =================================================================== --- translation/trunk/projects/website/po/it/docs/3-low.debian.po 2011-07-13 13:55:34 UTC (rev 24891) +++ translation/trunk/projects/website/po/it/docs/3-low.debian.po 2011-07-13 18:10:49 UTC (rev 24892) @@ -6,8 +6,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:31+0000\n" +"POT-Creation-Date: 2011-07-08 08:43+0200\n" +"PO-Revision-Date: 2011-07-09 01:14+0000\n" "Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" "Language-Team: Italian (http://www.transifex.net/projects/p/torproject/team/it/)\n" "MIME-Version: 1.0\n" @@ -37,8 +37,8 @@ msgstr "" #. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/debian.wml:16 /tmp/__TMvx4TV6.xml:43 -#: /tmp/__TMvx4TV6.xml:113 /tmp/__TMvx4TV6.xml:148 +#: /home/runa/tor/website/docs/en/debian.wml:16 /tmp/hXZfq9nNmb.xml:43 +#: /tmp/hXZfq9nNmb.xml:114 /tmp/hXZfq9nNmb.xml:149 msgid "<br />" msgstr "" @@ -58,8 +58,8 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian.wml:32 /tmp/__TMvx4TV6.xml:94 -#: /tmp/__TMvx4TV6.xml:139 /tmp/__TMvx4TV6.xml:182 +#: /home/runa/tor/website/docs/en/debian.wml:32 /tmp/hXZfq9nNmb.xml:95 +#: /tmp/hXZfq9nNmb.xml:140 /tmp/hXZfq9nNmb.xml:183 msgid "" "Now Tor is installed and running. Move on to <a href=\"<page docs/tor-doc-" "unix>#polipo\">step two</a> of the \"Tor on Linux/Unix\" instructions." @@ -108,57 +108,62 @@ #. type: Content of: <div><div><p><ul><li> #: /home/runa/tor/website/docs/en/debian.wml:60 -msgid "Ubuntu 10.10 is \"maverick\"" +msgid "Ubuntu 11.04 is \"natty\"" msgstr "" #. type: Content of: <div><div><p><ul><li> #: /home/runa/tor/website/docs/en/debian.wml:61 +msgid "Ubuntu 10.10 or Trisquel 4.5 is \"maverick\"" +msgstr "" + +#. type: Content of: <div><div><p><ul><li> +#: /home/runa/tor/website/docs/en/debian.wml:62 msgid "Ubuntu 10.04 or Trisquel 4.0 is \"lucid\"" msgstr "" #. type: Content of: <div><div><p><ul><li> -#: /home/runa/tor/website/docs/en/debian.wml:62 +#: /home/runa/tor/website/docs/en/debian.wml:63 msgid "Ubuntu 9.10 or Trisquel 3.5 is \"karmic\"" msgstr "" #. type: Content of: <div><div><p><ul><li> -#: /home/runa/tor/website/docs/en/debian.wml:63 +#: /home/runa/tor/website/docs/en/debian.wml:64 msgid "Ubuntu 8.04 is \"hardy\"" msgstr "" #. type: Content of: <div><div><p><ul><li> -#: /home/runa/tor/website/docs/en/debian.wml:64 +#: /home/runa/tor/website/docs/en/debian.wml:65 msgid "Ubuntu 6.06 is \"dapper\"" msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian.wml:67 +#: /home/runa/tor/website/docs/en/debian.wml:68 msgid "Then add this line to your <tt>/etc/apt/sources.list</tt> file:<br />" msgstr "" #. type: Content of: <div><div><p><pre> -#: /home/runa/tor/website/docs/en/debian.wml:71 +#: /home/runa/tor/website/docs/en/debian.wml:72 #, no-wrap msgid "" "deb http://deb.torproject.org/torproject.org <DISTRIBUTION> main\n" msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian.wml:73 +#: /home/runa/tor/website/docs/en/debian.wml:74 msgid "" "where you put the codename of your distribution (i.e. lenny, sid, maverick " "or whatever it is) in place of <DISTRIBUTION>." msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian.wml:79 +#: /home/runa/tor/website/docs/en/debian.wml:80 msgid "" "Then add the gpg key used to sign the packages by running the following " "commands at your command prompt:" msgstr "" #. type: Content of: <div><div><p><pre> -#: /home/runa/tor/website/docs/en/debian.wml:82 +#: /home/runa/tor/website/docs/en/debian.wml:83 #, no-wrap msgid "" "gpg --keyserver keys.gnupg.net --recv 886DDD89\n" @@ -166,14 +171,14 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian.wml:85 +#: /home/runa/tor/website/docs/en/debian.wml:86 msgid "" "Now refresh your sources and install Tor by running the following commands " "(as root) at your command prompt:" msgstr "" #. type: Content of: <div><div><p><pre> -#: /home/runa/tor/website/docs/en/debian.wml:88 +#: /home/runa/tor/website/docs/en/debian.wml:89 #, no-wrap msgid "" "apt-get update\n" @@ -181,7 +186,7 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian.wml:100 +#: /home/runa/tor/website/docs/en/debian.wml:101 msgid "" "The DNS name <code>deb.torproject.org</code> is actually a set of " "independent servers in a DNS round robin configuration. If you for some " @@ -191,19 +196,19 @@ msgstr "" #. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/debian.wml:108 +#: /home/runa/tor/website/docs/en/debian.wml:109 msgid "<hr /> <a id=\"development\"></a>" msgstr "" #. type: Content of: <div><div><h2> -#: /home/runa/tor/website/docs/en/debian.wml:111 +#: /home/runa/tor/website/docs/en/debian.wml:112 msgid "" "<a class=\"anchor\" href=\"#development\">Option three: Using the " "development branch of Tor on Debian or Ubuntu</a>" msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian.wml:115 +#: /home/runa/tor/website/docs/en/debian.wml:116 msgid "" "If you want to use the <a href=\"<page " "download/download>#packagediff\">development branch</a> of Tor instead (more" @@ -212,7 +217,7 @@ msgstr "" #. type: Content of: <div><div><p><pre> -#: /home/runa/tor/website/docs/en/debian.wml:120 +#: /home/runa/tor/website/docs/en/debian.wml:121 #, no-wrap msgid "" "deb http://deb.torproject.org/torproject.org <DISTRIBUTION> main\n" @@ -220,19 +225,19 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian.wml:123 +#: /home/runa/tor/website/docs/en/debian.wml:124 msgid "" "where you again substitute the name of your distro (lenny, sid, maverick, " "...) in place of <DISTRIBUTION>." msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian.wml:129 +#: /home/runa/tor/website/docs/en/debian.wml:130 msgid "Then run the following commands at your command prompt:" msgstr "" #. type: Content of: <div><div><p><pre> -#: /home/runa/tor/website/docs/en/debian.wml:131 +#: /home/runa/tor/website/docs/en/debian.wml:132 #, no-wrap msgid "" "gpg --keyserver keys.gnupg.net --recv 886DDD89\n" @@ -242,17 +247,17 @@ msgstr "" #. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/debian.wml:144 +#: /home/runa/tor/website/docs/en/debian.wml:145 msgid "<hr /> <a id=\"source\"></a>" msgstr "" #. type: Content of: <div><div><h2> -#: /home/runa/tor/website/docs/en/debian.wml:147 +#: /home/runa/tor/website/docs/en/debian.wml:148 msgid "<a class=\"anchor\" href=\"#source\">Building from source</a>" msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian.wml:151 +#: /home/runa/tor/website/docs/en/debian.wml:152 msgid "" "If you want to build your own debs from source you must first add an " "appropriate <tt>deb-src</tt> line to <tt>sources.list</tt>." @@ -261,7 +266,7 @@ #. PO4ASHARPBEGIN For the stable version.PO4ASHARPEND #. PO4ASHARPBEGIN For the unstable version.PO4ASHARPEND #. type: Content of: <div><div><p><pre> -#: /home/runa/tor/website/docs/en/debian.wml:154 +#: /home/runa/tor/website/docs/en/debian.wml:155 #, no-wrap msgid "" "\n" @@ -273,14 +278,14 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian.wml:161 +#: /home/runa/tor/website/docs/en/debian.wml:162 msgid "" "You also need to install the necessary packages to build your own debs and " "the packages needed to build Tor:" msgstr "" #. type: Content of: <div><div><p><pre> -#: /home/runa/tor/website/docs/en/debian.wml:164 +#: /home/runa/tor/website/docs/en/debian.wml:165 #, no-wrap msgid "" "apt-get install build-essential fakeroot devscripts\n" @@ -288,12 +293,12 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian.wml:167 +#: /home/runa/tor/website/docs/en/debian.wml:168 msgid "Then you can build Tor in ~/debian-packages:" msgstr "" #. type: Content of: <div><div><p><pre> -#: /home/runa/tor/website/docs/en/debian.wml:169 +#: /home/runa/tor/website/docs/en/debian.wml:170 #, no-wrap msgid "" "mkdir ~/debian-packages; cd ~/debian-packages\n" @@ -304,23 +309,23 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian.wml:175 +#: /home/runa/tor/website/docs/en/debian.wml:176 msgid "Now you can install the new package:" msgstr "" #. type: Content of: <div><div><p><pre> -#: /home/runa/tor/website/docs/en/debian.wml:177 +#: /home/runa/tor/website/docs/en/debian.wml:178 #, no-wrap msgid "sudo dpkg -i tor_*.deb\n" msgstr "" #. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/debian.wml:187 +#: /home/runa/tor/website/docs/en/debian.wml:188 msgid "<hr />" msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian.wml:189 +#: /home/runa/tor/website/docs/en/debian.wml:190 msgid "" "If you have suggestions for improving this document, please <a href=\"<page " "about/contact>\">send them to us</a>. Thanks!" Modified: translation/trunk/projects/website/po/it/docs/3-low.tor-doc-unix.po =================================================================== --- translation/trunk/projects/website/po/it/docs/3-low.tor-doc-unix.po 2011-07-13 13:55:34 UTC (rev 24891) +++ translation/trunk/projects/website/po/it/docs/3-low.tor-doc-unix.po 2011-07-13 18:10:49 UTC (rev 24892) @@ -6,8 +6,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" -"POT-Creation-Date: 2011-06-21 08:18+0200\n" -"PO-Revision-Date: 2011-06-22 00:54+0000\n" +"POT-Creation-Date: 2011-07-08 08:43+0200\n" +"PO-Revision-Date: 2011-07-09 01:14+0000\n" "Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" "Language-Team: Italian (http://www.transifex.net/projects/p/torproject/team/it/)\n" "MIME-Version: 1.0\n" @@ -30,9 +30,8 @@ msgstr "" #. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:14 /tmp/4vVJb7zECD.xml:26 -#: /tmp/4vVJb7zECD.xml:58 /tmp/4vVJb7zECD.xml:92 /tmp/4vVJb7zECD.xml:135 -#: /tmp/4vVJb7zECD.xml:173 +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:14 /tmp/KCUf13Jh9J.xml:26 +#: /tmp/KCUf13Jh9J.xml:57 /tmp/KCUf13Jh9J.xml:96 /tmp/KCUf13Jh9J.xml:130 msgid "<br>" msgstr "" @@ -40,9 +39,8 @@ #: /home/runa/tor/website/docs/en/tor-doc-unix.wml:17 msgid "" "<b>Note that these are the installation instructions for running a Tor " -"client. If you want to relay traffic for others to help the network grow " -"(please do), read the <a href=\"<page docs/tor-doc-relay>\">Configuring a " -"relay</a> guide.</b>" +"client. The easiest way to do this is to simply download the <a href=\"<page" +" projects/torbrowser>\">Tor Browser Bundle</a> and you are done. </b>" msgstr "" #. type: Content of: <div><div> @@ -91,75 +89,25 @@ #. type: Content of: <div><div> #: /home/runa/tor/website/docs/en/tor-doc-unix.wml:54 -msgid "<hr> <a id=\"privoxy\"></a> <a id=\"polipo\"></a>" -msgstr "" - -#. type: Content of: <div><div><h2> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:57 -msgid "" -"<a class=\"anchor\" href=\"#polipo\">Step Two: Install Polipo for Web " -"Browsing</a>" -msgstr "" - -#. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:60 -msgid "" -"After installing Tor, you need to configure your applications to use it." -msgstr "" - -#. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:64 -msgid "" -"The first step is to set up web browsing. Start by installing <a " -"href=\"http://www.pps.jussieu.fr/~jch/software/polipo/\">Polipo</a> from " -"your favorite repository. Polipo is a caching web proxy that does http " -"pipelining well, so it's well-suited for Tor's latencies. Make sure to get " -"at least Polipo 1.0.4, since earlier versions lack the SOCKS support " -"required to use Polipo with Tor. You should uninstall privoxy at this point " -"(e.g. apt-get remove privoxy or yum remove privoxy), so they don't conflict." -msgstr "" - -#. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:74 -msgid "" -"Once you've installed Polipo (either from package or from source), <b>you " -"will need to configure Polipo to use Tor</b>. Grab our <a href=\"<tbbrepo" -">/build-scripts/config/polipo.conf\">Polipo configuration for Tor</a> and " -"put it in place of your current polipo config file (e.g. /etc/polipo/config " -"or ~/.polipo). You'll need to restart Polipo for the changes to take " -"effect. For example:<br> <tt>/etc/init.d/polipo restart</tt>" -msgstr "" - -#. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:84 -msgid "" -"If you prefer, you can instead use Privoxy with <a " -"href=\"<wiki>doc/PrivoxyConfig\">this sample Privoxy configuration</a>. But " -"since the config files both use port 8118, you shouldn't run both Polipo and" -" Privoxy at the same time." -msgstr "" - -#. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:89 msgid "<hr> <a id=\"using\"></a>" msgstr "" #. type: Content of: <div><div><h2> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:91 +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:56 msgid "" -"<a class=\"anchor\" href=\"#using\">Step Three: Configure your applications " -"to use Tor</a>" +"<a class=\"anchor\" href=\"#using\">Step Two: Configure your applications to" +" use Tor</a>" msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:94 +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:59 msgid "" -"After installing Tor and Polipo, you need to configure your applications to " -"use them. The first step is to set up web browsing." +"After installing Tor, you need to configure your applications to use them. " +"The first step is to set up web browsing." msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:97 +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:62 msgid "" "You should use Tor with Firefox and Torbutton, for best safety. Simply " "install the <a href=\"<page torbutton/index>\">Torbutton plugin</a>, restart" @@ -167,14 +115,14 @@ msgstr "" #. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:103 +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:68 msgid "" "<img alt=\"Torbutton plugin for Firefox\" src=\"$(IMGROOT)/screenshot-" "torbutton.png\" > <br>" msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:110 +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:75 msgid "" "If you plan to run Firefox on a different computer than Tor, see the <a " "href=\"<wikifaq>#SocksListenAddress\"> FAQ entry for running Tor on a " @@ -182,37 +130,35 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:116 +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:81 msgid "" -"To Torify other applications that support HTTP proxies, just point them at " -"Polipo (that is, localhost port 8118). To use SOCKS directly (for instant " -"messaging, Jabber, IRC, etc), you can point your application directly at Tor" -" (localhost port 9050), but see <a href=\"<wikifaq>#SOCKSAndDNS\">this FAQ " -"entry</a> for why this may be dangerous. For applications that support " -"neither SOCKS nor HTTP, take a look at <a " -"href=\"https://code.google.com/p/torsocks/\">torsocks</a> or <a " +"To Torify other applications that support SOCKS proxies, just point them at " +"Tor's SOCKS port (127.0.0.1 port 9050). See <a " +"href=\"<wikifaq>#SOCKSAndDNS\">this FAQ entry</a> for why this may be " +"dangerous. For applications that support neither SOCKS nor HTTP, take a look" +" at <a href=\"https://code.google.com/p/torsocks/\">torsocks</a> or <a " "href=\"<wiki>doc/TorifyHOWTO#socat\">socat</a>." msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:127 +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:89 msgid "" "For information on how to Torify other applications, check out the <a " "href=\"<wiki>doc/TorifyHOWTO\">Torify HOWTO</a>." msgstr "" #. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:132 +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:93 msgid "<hr> <a id=\"verify\"></a>" msgstr "" #. type: Content of: <div><div><h2> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:134 -msgid "<a class=\"anchor\" href=\"#verify\">Step Four: Make sure it's working</a>" +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:95 +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-unix.wml:138 +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:99 msgid "" "Next, you should try using your browser with Tor and make sure that your IP " "address is being anonymized. Click on <a " @@ -224,50 +170,50 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:150 +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:109 msgid "" "If you have a personal firewall that limits your computer's ability to " "connect to itself (this includes something like SELinux on Fedora Core 4), " -"be sure to allow connections from your local applications to Polipo (local " -"port 8118) and Tor (local port 9050). If your firewall blocks outgoing " -"connections, punch a hole so it can connect to at least TCP ports 80 and " -"443, and then see <a href=\"<wikifaq>#FirewalledClient\">this FAQ entry</a>." -" If your SELinux config is not allowing tor or privoxy to run correctly, " -"create a file named booleans.local in the directory /etc/selinux/targeted. " -"Edit this file in your favorite text editor and insert \"allow_ypbind=1\". " -"Restart your machine for this change to take effect." +"be sure to allow connections from your local applications to Tor (local port" +" 9050). If your firewall blocks outgoing connections, punch a hole so it can" +" connect to at least TCP ports 80 and 443, and then see <a " +"href=\"<wikifaq>#FirewalledClient\">this FAQ entry</a>. If your SELinux " +"config is not allowing tor or privoxy to run correctly, create a file named " +"booleans.local in the directory /etc/selinux/targeted. Edit this file in " +"your favorite text editor and insert \"allow_ypbind=1\". Restart your " +"machine for this change to take effect." msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:165 +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:122 msgid "" "If it's still not working, look at <a href=\"<page " "docs/faq>#DoesntWork\">this FAQ entry</a> for hints." msgstr "" #. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:169 +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:126 msgid "<hr> <a id=\"server\"></a> <a id=\"relay\"></a>" msgstr "" #. type: Content of: <div><div><h2> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:172 -msgid "<a class=\"anchor\" href=\"#relay\">Step Five: Configure it as a relay</a>" +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:129 +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-unix.wml:175 +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:132 msgid "" "The Tor network relies on volunteers to donate bandwidth. The more people " "who run relays, the faster the Tor network will be. If you have at least 20 " -"kilobytes/s each way, please help out Tor by configuring your Tor to be a " +"KiloBytes/s each way, please help out Tor by configuring your Tor to be a " "relay too. We have many features that make Tor relays easy and convenient, " "including rate limiting for bandwidth, exit policies so you can limit your " "exposure to abuse complaints, and support for dynamic IP addresses." msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:183 +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:140 msgid "" "Having relays in many different places on the Internet is what makes Tor " "users secure. <a href=\"<wikifaq>#RelayAnonymity\">You may also get stronger" @@ -276,19 +222,19 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:190 +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:146 msgid "" "Read more at our <a href=\"<page docs/tor-doc-relay>\">Configuring a " "relay</a> guide." msgstr "" #. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:193 +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:149 msgid "<hr>" msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:195 +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:151 msgid "" "If you have suggestions for improving this document, please <a href=\"<page " "about/contact>\">send them to us</a>. Thanks!" Modified: translation/trunk/projects/website/po/it/download/1-high.download-easy.po =================================================================== --- translation/trunk/projects/website/po/it/download/1-high.download-easy.po 2011-07-13 13:55:34 UTC (rev 24891) +++ translation/trunk/projects/website/po/it/download/1-high.download-easy.po 2011-07-13 18:10:49 UTC (rev 24892) @@ -6,8 +6,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" -"POT-Creation-Date: 2011-06-21 08:18+0200\n" -"PO-Revision-Date: 2011-06-22 00:57+0000\n" +"POT-Creation-Date: 2011-07-08 08:42+0200\n" +"PO-Revision-Date: 2011-07-09 01:17+0000\n" "Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" "Language-Team: Italian (http://www.transifex.net/projects/p/torproject/team/it/)\n" "MIME-Version: 1.0\n" @@ -120,7 +120,7 @@ #: /home/runa/tor/website/download/en/download-easy.wml:72 msgid "" "</select> <input type=\"text\" id=\"amount\" class=\"amount\" " -"name=\"amount\" value=\"5\" size=\"10\">" +"name=\"amount\" value=\"10\" size=\"10\">" msgstr "" #. type: Content of: <div><div><table><tbody><tr><td><form><p><select> Modified: translation/trunk/projects/website/po/it/download/3-low.download.po =================================================================== --- translation/trunk/projects/website/po/it/download/3-low.download.po 2011-07-13 13:55:34 UTC (rev 24891) +++ translation/trunk/projects/website/po/it/download/3-low.download.po 2011-07-13 18:10:49 UTC (rev 24892) @@ -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-06-21 08:18+0200\n" -"PO-Revision-Date: 2011-06-22 00:56+0000\n" +"POT-Creation-Date: 2011-07-08 08:42+0200\n" +"PO-Revision-Date: 2011-07-09 01:16+0000\n" "Last-Translator: zfrns84 <silviazaf(a)gmail.com>\n" "Language-Team: Italian (http://www.transifex.net/projects/p/torproject/team/it/)\n" "MIME-Version: 1.0\n" @@ -126,7 +126,7 @@ #: /home/runa/tor/website/download/en/download.wml:65 msgid "" "</select> <input type=\"text\" id=\"amount\" class=\"amount\" " -"name=\"amount\" value=\"5\" size=\"10\">" +"name=\"amount\" value=\"10\" size=\"10\">" msgstr "" #. type: Content of: <div><div><table><tr><td><form><p><select> @@ -181,8 +181,8 @@ msgstr "" #. type: Content of: <div><div><table><tr><td><ul><li> -#: /home/runa/tor/website/download/en/download.wml:102 /tmp/FhqGC1ISDt.xml:165 -#: /tmp/FhqGC1ISDt.xml:203 +#: /home/runa/tor/website/download/en/download.wml:102 /tmp/lbSAEZiU0Z.xml:165 +#: /tmp/lbSAEZiU0Z.xml:203 msgid "" "The <strong>Tor Browser Bundle</strong> contains everything you need to " "safely browse the Internet. This package requires no installation. Just " @@ -216,7 +216,7 @@ msgstr "" #. type: Content of: <div><div><table><tr><td><p> -#: /home/runa/tor/website/download/en/download.wml:110 /tmp/FhqGC1ISDt.xml:168 +#: /home/runa/tor/website/download/en/download.wml:110 /tmp/lbSAEZiU0Z.xml:168 msgid "" "There are two versions of each package, a stable and alpha release. Stable " "packages are released when we believe the features and code will not change " @@ -525,7 +525,7 @@ msgstr "" #. type: Content of: <div><div><div> -#: /home/runa/tor/website/download/en/download.wml:265 /tmp/FhqGC1ISDt.xml:344 +#: /home/runa/tor/website/download/en/download.wml:265 /tmp/lbSAEZiU0Z.xml:344 msgid "<br>" msgstr "" 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-07-13 13:55:34 UTC (rev 24891) +++ translation/trunk/projects/website/po/it/press/4-optional.2010-03-25-tor-store-press-release.po 2011-07-13 18:10:49 UTC (rev 24892) @@ -7,7 +7,7 @@ "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-05-02 17:00+0200\n" -"PO-Revision-Date: 2011-07-08 07:49+0000\n" +"PO-Revision-Date: 2011-07-13 17:04+0000\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: Italian (http://www.transifex.net/projects/p/torproject/team/it/)\n" "MIME-Version: 1.0\n" Modified: translation/trunk/projects/website/po/my/1-high.index.po =================================================================== --- translation/trunk/projects/website/po/my/1-high.index.po 2011-07-13 13:55:34 UTC (rev 24891) +++ translation/trunk/projects/website/po/my/1-high.index.po 2011-07-13 18:10:49 UTC (rev 24892) @@ -7,7 +7,7 @@ "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-07-08 07:49+0000\n" +"PO-Revision-Date: 2011-07-13 17:03+0000\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" 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-07-13 13:55:34 UTC (rev 24891) +++ translation/trunk/projects/website/po/pl_PL/about/3-low.contact.po 2011-07-13 18:10:49 UTC (rev 24892) @@ -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-04-13 16:28+0200\n" -"PO-Revision-Date: 2011-04-17 11:21+0000\n" +"POT-Creation-Date: 2011-07-08 08:44+0200\n" +"PO-Revision-Date: 2011-07-09 12:39+0000\n" "Last-Translator: bogdrozd <bog.d(a)gazeta.pl>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -33,98 +33,25 @@ msgid "Tor: Contact" msgstr "Tor: Kontakt" -#. type: Content of: <div><div><p> +#. type: Content of: <div><div><h3> #: /home/runa/tor/website/about/en/contact.wml:16 -msgid "" -"First, if you have a problem or question about using Tor, go look at the <a " -"href=\"<page docs/documentation>#Support\">Support section</a> for how to " -"proceed. The Tor developers spend most of their time developing Tor, and " -"there are no people devoted to user support, so try to help yourself before " -"<a href=\"<page docs/faq>#SupportMail\">politely trying to find a " -"volunteer</a>." -msgstr "" -"Po pierwsze, jeśli masz problem lub pytanie dotyczące używania Tora, " -"najpierw sprawdź na <a href=\"<page docs/documentation>#Support\">stronie " -"wsparcia</a>. Deweloperzy Tora większość czasu spędzają na rozwoju Tora, a " -"nie mamy ludzi, którzy zajmują się tylko pomocą użytkownikom, więc zanim <a " -"href=\"<page docs/faq>#SupportMail\">grzecznie spróbujesz znaleźć " -"ochotnika</a>, któremu zadasz pytanie, spróbuj znaleźć rozwiązanie " -"samodzielnie." +msgid "Email" +msgstr "Email" -#. type: Content of: <div><div><p> -#: /home/runa/tor/website/about/en/contact.wml:18 -msgid "" -"If you really do need to reach us, here are some approaches. Please be " -"patient and <a href=\"http://www.catb.org/~esr/faqs/smart-" -"questions.html\">helpful</a>, and please make sure to write your mail in " -"English." -msgstr "" -"Jeśli naprawdę potrzebujesz skontaktować się z nami, poniżej znajduje się " -"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:21 +#: /home/runa/tor/website/about/en/contact.wml:17 msgid "" -"<i>tor-assistants at torproject.org</i> is the catch-all address for " -"everything. It can be used for:" +"<a id=\"email\"></a> <i>tor-assistants at torproject.org</i> is the catch-" +"all address for everything. It can be used for reaching people working on " +"Tor. A few other addresses are more specific:" msgstr "" -"<i>tor-assistants małpa torproject.org</i> służy do wszelkich zagadnień. " -"Można go używać do:" +"<a id=\"email\"></a> <a id=\"email\"></a> <i>tor-assistants małpa " +"torproject.org</i> służy do wszelkich zagadnień. Można go używać do kontaktu" +" z ludźmi pracującymi nad Torem. Inne adresy są bardziej specyficzne:" #. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/about/en/contact.wml:25 +#: /home/runa/tor/website/about/en/contact.wml:24 msgid "" -"Contacting the people who manage the directory authorities. Use this if you " -"run a Tor relay and have a question or problem with your relay." -msgstr "" -"Kontaktu z ludźmi, którzy zajmują się centrami katalogowymi. Uzyj tego, " -"jeśli prowadzisz przekaźnik sieci i masz pytania lub problem ze swoim " -"przekaźnikiem." - -#. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/about/en/contact.wml:28 -msgid "" -"So we can fix typos on the website, change wrong statements or directions on" -" the website, and add new sections and paragraphs that you send us. You " -"might want to make a draft of your new sections on <a href=\"<wiki>\">the " -"Tor wiki</a> first." -msgstr "" -"Byśmy mogli poprawiać błędy na stronie, zmieniać błędne sformułowania lub " -"wskazówki oraz dodawać nowe sekcje i paragrafy, które możesz nam wysłać. " -"Jednak lepiej będzie, jeśli wcześniej zrobisz szkic nowych sekcji w <a " -"href=\"<wiki>\">wiki Tora</a>." - -#. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/about/en/contact.wml:32 -msgid "" -"Hearing about your documents, patches, testing, experiences with supporting " -"applications, and so forth inspired by our <a href=\"<page " -"getinvolved/volunteer>\">volunteer page</a> (or other problems you've fixed " -"or documented about using Tor). There's no need to mail us before you start " -"working on something -- like all volunteer Internet projects, we hear from a" -" lot of excited people who vanish soon after, so we are most interested in " -"hearing about actual progress." -msgstr "" -"Byśmy mogli usłyszeć o Twoich dokumentach, poprawkach, testach oraz " -"doświadczeniach z aplikacjami współdziałającym z Torem, także informacje " -"zainspirowane <a href=\"<page getinvolved/volunteer>\">stroną dla " -"wolontariuszy</a> (lub innymi problemami, które naprawiłeś lub " -"udokumentowałeś o używaniu Tora). Nie ma potrzeby pisać do nas zanim " -"zaczniesz pracować nad czymś -- tak jak w przypadku wielu innych projektów " -"internetowych opartych na wolontariacie, kontaktuje się z nami wiele osób, " -"które wkrótce potem znikają, więc najbardziej zainteresowani jesteśmy " -"dokonanym postępem." - -#. type: Content of: <div><div> -#: /home/runa/tor/website/about/en/contact.wml:42 -msgid "A few other addresses are more specific:" -msgstr "Inne adresy są bardziej specyficzne:" - -#. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/about/en/contact.wml:45 -msgid "" "<i>tor-translation at lists.torproject.org</i> can put new <a href=\"<page " "getinvolved/translation>\">website translations</a> into place, and help " "answer questions about existing and new translations." @@ -135,7 +62,7 @@ "tłumaczeniami." #. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/about/en/contact.wml:48 +#: /home/runa/tor/website/about/en/contact.wml:27 msgid "" "<i>tordnsel at torproject.org</i> is the alias for the people responsible " "for the tordns exitlist." @@ -144,7 +71,7 @@ "odpowiedzialnymi za listę punktów wyjściowych tordns." #. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/about/en/contact.wml:50 +#: /home/runa/tor/website/about/en/contact.wml:29 msgid "" "<i>donations at torproject.org</i> is for questions and comments about <a " "href=\"<page donate/donate>\">getting money to the developers</a>. More " @@ -158,7 +85,7 @@ "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:55 +#: /home/runa/tor/website/about/en/contact.wml:34 msgid "" "<i>execdir at torproject.org</i> is for press/media, questions and comments " "about Tor the non-profit corporation: trademark questions, affiliation and " @@ -170,17 +97,42 @@ "koordynacja, większe darowizny, informacje o kontraktach, licencjonowanie i " "certyfikacja etc." +#. type: Content of: <div><div><h3> +#: /home/runa/tor/website/about/en/contact.wml:40 +msgid "Identi.ca" +msgstr "Identi.ca" + +#. type: Content of: <div><div><p> +#: /home/runa/tor/website/about/en/contact.wml:41 +msgid "" +"<a id=\"identica\"></a> Contact us via our microblogging Identi.ca account " +"at <a href=\"https://identi.ca/torproject\">torproject</a>." +msgstr "" +"<a id=\"identica\"></a> Skontaktuj się z nami poprzez nasz konto na " +"platformie mikroblogowogwej Identi.ca na <a " +"href=\"https://identi.ca/torproject\">torproject</a>." + +#. type: Content of: <div><div><h3> +#: /home/runa/tor/website/about/en/contact.wml:45 +msgid "IRC" +msgstr "IRC" + #. type: Content of: <div><div> -#: /home/runa/tor/website/about/en/contact.wml:61 +#: /home/runa/tor/website/about/en/contact.wml:46 +msgid "<a id=\"irc\"></a>" +msgstr "<a id=\"irc\"></a>" + +#. type: Content of: <div><div><p> +#: /home/runa/tor/website/about/en/contact.wml:47 msgid "" -"<a id=\"irc\"></a> Tor users and developers can also be found in the " -"following channels on <a href=\"http://www.oftc.net/oftc/\">oftc</a>:" +"Tor users and developers can also be found in the following channels on <a " +"href=\"http://www.oftc.net/oftc/\">OFTC</a>:" msgstr "" -"<a id=\"irc\"></a> Użytkowników i deweloperów Tora można znaleźć też na " -"następująych kanałach na <a href=\"http://www.oftc.net/oftc/\">oftc</a>:" +"Użytkowników i deweloperów Tora można znaleźć też na 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:66 +#: /home/runa/tor/website/about/en/contact.wml:51 msgid "" "<i>#tor</i> - User and relay operation discussions. Having trouble running " "Tor or a question for other Tor users? Then this is the spot for you." @@ -190,10 +142,10 @@ "jest miejsce dla Ciebie." #. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/about/en/contact.wml:69 +#: /home/runa/tor/website/about/en/contact.wml:54 msgid "" "<i>#tor-dev</i> - Channel for people who want to do development. " -"Discussions about Tor related coding, protocols, and <a href=\"<page " +"Discussions about Tor-related coding, protocols, and <a href=\"<page " "getinvolved/volunteer>\">project ideas</a> are all welcome." msgstr "" "<i>#tor-dev</i> - Kanał dla osób, które chcą prowadzić rozwój. Dyskusje na " @@ -201,7 +153,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:72 +#: /home/runa/tor/website/about/en/contact.wml:57 msgid "" "<i>#nottor</i> - This is where Tor people hang out to talk about stuff that " "is not related to Tor." @@ -209,4 +161,24 @@ "<i>#nottor</i> - To jest miejsce, gdzie spotykają się ludzie Tora, by " "rozmawiać na tematy nie związane z Torem." +#. type: Content of: <div><div><h3> +#: /home/runa/tor/website/about/en/contact.wml:61 +msgid "Telephone" +msgstr "Telefon" +#. type: Content of: <div><div> +#: /home/runa/tor/website/about/en/contact.wml:62 +msgid "<a id=\"phone\"></a>" +msgstr "<a id=\"phone\"></a>" + +#. type: Content of: <div><div><p> +#: /home/runa/tor/website/about/en/contact.wml:63 +msgid "" +"If none of the above appeal to you, calling +1-781-352-0568 will reach the " +"Tor office. Should there be no answer, please leave a message." +msgstr "" +"Jeśli żaden z powyższych sposobów Ci nie odpowiada, wybranie numeru " +"+1-781-352-0568 pozwoli na osiągnięcie biura Tora. Jeśli nikt nie odbiera, " +"prosimy zostawić wiadomość." + + Modified: translation/trunk/projects/website/po/pl_PL/about/3-low.contributors.po =================================================================== --- translation/trunk/projects/website/po/pl_PL/about/3-low.contributors.po 2011-07-13 13:55:34 UTC (rev 24891) +++ translation/trunk/projects/website/po/pl_PL/about/3-low.contributors.po 2011-07-13 18:10:49 UTC (rev 24892) @@ -8,9 +8,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:08+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"POT-Creation-Date: 2011-07-08 08:44+0200\n" +"PO-Revision-Date: 2011-07-09 12:46+0000\n" +"Last-Translator: bogdrozd <bog.d(a)gazeta.pl>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -218,11 +218,21 @@ #. type: Content of: <div><div><dl><dt> #: /home/runa/tor/website/about/en/contributors.wml:48 +msgid "Bruce Leidl" +msgstr "Bruce Leidl" + +#. type: Content of: <div><div><dl><dd> +#: /home/runa/tor/website/about/en/contributors.wml:48 +msgid "Worked on a Tor client in Java." +msgstr "Pracował nad klientem Tora w Javie." + +#. type: Content of: <div><div><dl><dt> +#: /home/runa/tor/website/about/en/contributors.wml:49 msgid "Rebecca MacKinnon" msgstr "Rebecca MacKinnon" #. type: Content of: <div><div><dl><dd> -#: /home/runa/tor/website/about/en/contributors.wml:48 +#: /home/runa/tor/website/about/en/contributors.wml:49 msgid "" "Former Director of Tor. Co-Founder of <a " "href=\"http://www.globalvoicesonline.org/\">Global Voices Online</a>." @@ -231,12 +241,12 @@ "href=\"http://www.globalvoicesonline.org/\">Global Voices Online</a>." #. type: Content of: <div><div><dl><dt> -#: /home/runa/tor/website/about/en/contributors.wml:50 +#: /home/runa/tor/website/about/en/contributors.wml:51 msgid "Chris Palmer" msgstr "Chris Palmer" #. type: Content of: <div><div><dl><dd> -#: /home/runa/tor/website/about/en/contributors.wml:50 +#: /home/runa/tor/website/about/en/contributors.wml:51 msgid "" "Our liaison and tech guy with EFF while EFF was funding us. Also helped " "advocate and write end-user docs." @@ -246,12 +256,26 @@ "dokumentacji użytkownika." #. type: Content of: <div><div><dl><dt> -#: /home/runa/tor/website/about/en/contributors.wml:52 +#: /home/runa/tor/website/about/en/contributors.wml:53 +msgid "Martin Peck" +msgstr "Martin Peck" + +#. type: Content of: <div><div><dl><dd> +#: /home/runa/tor/website/about/en/contributors.wml:53 +msgid "" +"Worked on a VM-based transparent proxying approach for Tor clients on " +"Windows." +msgstr "" +"Pracował nad opartym na wirtualnych maszynach podejściu do przezroczystych " +"serwerów proxy dla klientów Tora na Windows." + +#. type: Content of: <div><div><dl><dt> +#: /home/runa/tor/website/about/en/contributors.wml:55 msgid "Matej Pfajfar" msgstr "Matej Pfajfar" #. type: Content of: <div><div><dl><dd> -#: /home/runa/tor/website/about/en/contributors.wml:52 +#: /home/runa/tor/website/about/en/contributors.wml:55 msgid "" "Author of the original onion routing code that Tor is based on, so we didn't" " have to start from scratch." @@ -260,12 +284,12 @@ "dzięki któremu nie musieliśmy zaczynać od zera." #. type: Content of: <div><div><dl><dt> -#: /home/runa/tor/website/about/en/contributors.wml:54 +#: /home/runa/tor/website/about/en/contributors.wml:57 msgid "Johannes Renner" msgstr "Johannes Renner" #. type: Content of: <div><div><dl><dd> -#: /home/runa/tor/website/about/en/contributors.wml:54 +#: /home/runa/tor/website/about/en/contributors.wml:57 msgid "" "Worked during the 2007 Google Summer of Code on modifying <a " "href=\"https://svn.torproject.org/svn/torflow/trunk/README\">TorFlow</a> to " @@ -276,12 +300,12 @@ " mierzyć różne właściwości sieci Tora; prowadzony przez Mike'a Perry'ego." #. type: Content of: <div><div><dl><dt> -#: /home/runa/tor/website/about/en/contributors.wml:59 +#: /home/runa/tor/website/about/en/contributors.wml:62 msgid "Scott Squires" msgstr "Scott Squires" #. type: Content of: <div><div><dl><dd> -#: /home/runa/tor/website/about/en/contributors.wml:59 +#: /home/runa/tor/website/about/en/contributors.wml:62 msgid "" "The original developer of <a href=\"<page torbutton/index>\">Torbutton</a>." msgstr "" @@ -289,12 +313,28 @@ "torbutton/index>\">Torbutton</a>." #. type: Content of: <div><div><dl><dt> -#: /home/runa/tor/website/about/en/contributors.wml:61 +#: /home/runa/tor/website/about/en/contributors.wml:64 +msgid "tup (a pseudonym)" +msgstr "tup (to jest pseudonim)" + +#. type: Content of: <div><div><dl><dd> +#: /home/runa/tor/website/about/en/contributors.wml:64 +msgid "" +"Added new features for making Tor easier to use as a <a " +"href=\"<wiki>TransparentProxy\">transparent proxy</a>. Also wrote the <a " +"href=\"http://p56soo2ibjkx23xo.onion/\">TorDNSEL code</a>." +msgstr "" +"Dodawał nowe cechy, by Tor był łatwiejszy w używaniu jako <a " +"href=\"<wiki>TransparentProxy\">przezroczyste proxy</a>. Napisał też <a " +"href=\"http://p56soo2ibjkx23xo.onion/\">kod TorDNSEL</a>." + +#. type: Content of: <div><div><dl><dt> +#: /home/runa/tor/website/about/en/contributors.wml:69 msgid "Stephen Tyree" msgstr "Stephen Tyree" #. type: Content of: <div><div><dl><dd> -#: /home/runa/tor/website/about/en/contributors.wml:61 +#: /home/runa/tor/website/about/en/contributors.wml:69 msgid "" "Worked during Google Summer of Code 2009 to develop a plugin API for <a " "href=\"<page projects/vidalia>\">Vidalia</a> and create a plugin to allow " @@ -307,12 +347,12 @@ "niedostępności stron poprzez zgłoszenia użytkowników." #. type: Content of: <div><div><dl><dt> -#: /home/runa/tor/website/about/en/contributors.wml:65 +#: /home/runa/tor/website/about/en/contributors.wml:73 msgid "Camilo Viecco" msgstr "Camilo Viecco" #. type: Content of: <div><div><dl><dd> -#: /home/runa/tor/website/about/en/contributors.wml:65 +#: /home/runa/tor/website/about/en/contributors.wml:73 msgid "" "Worked on Providing Blossom functionality to Vidalia (<a href=\"http://trac" ".vidalia-project.net/browser/vidalia/branches/exit-country\">svn</a>) as " @@ -323,12 +363,12 @@ "country\">svn</a>) jako część Google Summer of Code 2008." #. type: Content of: <div><div><dl><dt> -#: /home/runa/tor/website/about/en/contributors.wml:68 +#: /home/runa/tor/website/about/en/contributors.wml:76 msgid "Fred von Lohmann" msgstr "Fred von Lohmann" #. type: Content of: <div><div><dl><dd> -#: /home/runa/tor/website/about/en/contributors.wml:68 +#: /home/runa/tor/website/about/en/contributors.wml:76 msgid "" "Fred served on our Board of Directors from 2006 through 2009. His complete " "bio can be found at the <a href=\"http://www.eff.org/about/staff/fred-von-" @@ -340,12 +380,26 @@ "Personelu EFF</a>." #. type: Content of: <div><div><dl><dt> -#: /home/runa/tor/website/about/en/contributors.wml:72 +#: /home/runa/tor/website/about/en/contributors.wml:80 +msgid "Kyle Williams" +msgstr "Kyle Williams" + +#. type: Content of: <div><div><dl><dd> +#: /home/runa/tor/website/about/en/contributors.wml:80 +msgid "" +"Developer for JanusVM, a VMWare-based transparent Tor proxy that makes Tor " +"easier to set up and use." +msgstr "" +"Deweloper JanusVM, przezroczystego proxy Tora opartego na VMWare, które " +"ułatwia zainstalowanie i używanie Tora." + +#. type: Content of: <div><div><dl><dt> +#: /home/runa/tor/website/about/en/contributors.wml:82 msgid "Christian Wilms" msgstr "Christian Wilms" #. type: Content of: <div><div><dl><dd> -#: /home/runa/tor/website/about/en/contributors.wml:72 +#: /home/runa/tor/website/about/en/contributors.wml:82 msgid "" "Worked on Performance Enhancing Measures for Tor Hidden Services (<a " "href=\"https://svn.torproject.org/cgi-bin/viewvs.cgi/tor/branches/hidserv-" @@ -356,12 +410,12 @@ "perf/\">svn</a>) jako część Google Summer of Code 2008." #. type: Content of: <div><div><dl><dt> -#: /home/runa/tor/website/about/en/contributors.wml:75 +#: /home/runa/tor/website/about/en/contributors.wml:85 msgid "Jillian C. York" msgstr "Jillian C. York" #. type: Content of: <div><div><dl><dd> -#: /home/runa/tor/website/about/en/contributors.wml:75 +#: /home/runa/tor/website/about/en/contributors.wml:85 msgid "" "<a href=\"http://jilliancyork.com/\">Jillian C. York</a> is a writer, " "blogger, and activist based in Boston." Modified: translation/trunk/projects/website/po/pl_PL/about/3-low.sponsors.po =================================================================== --- translation/trunk/projects/website/po/pl_PL/about/3-low.sponsors.po 2011-07-13 13:55:34 UTC (rev 24891) +++ translation/trunk/projects/website/po/pl_PL/about/3-low.sponsors.po 2011-07-13 18:10:49 UTC (rev 24892) @@ -3,14 +3,15 @@ # This file is distributed under the same license as the PACKAGE package. # # bogdrozd <bog.d(a)gazeta.pl>, 2011. +# <runa.sandvik(a)gmail.com>, 2011. # runasand <runa.sandvik(a)gmail.com>, 2011. msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-06-29 20:42+0200\n" -"PO-Revision-Date: 2011-07-03 11:22+0000\n" -"Last-Translator: bogdrozd <bog.d(a)gazeta.pl>\n" +"PO-Revision-Date: 2011-07-08 09:38+0000\n" +"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -144,8 +145,8 @@ "<a href=\"<page donate/donate>\">More than 600 personal donations from " "individuals like you</a> (2006-2011)" msgstr "" -"<a href=\"<page donate>\">Ponad 600 osobistych dotacji od ludzi takich jak " -"Ty</a> (2006-2011)" +"<a href=\"<page donate/donate>\">Ponad 600 osobistych dotacji od ludzi " +"takich jak Ty</a> (2006-2011)" #. type: Content of: <div><div><ul><li> #: /home/runa/tor/website/about/en/sponsors.wml:52 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-07-13 13:55:34 UTC (rev 24891) +++ translation/trunk/projects/website/po/pl_PL/about/3-low.volunteers.po 2011-07-13 18:10:49 UTC (rev 24892) @@ -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-06-29 20:42+0200\n" -"PO-Revision-Date: 2011-07-03 11:24+0000\n" +"POT-Creation-Date: 2011-07-08 08:44+0200\n" +"PO-Revision-Date: 2011-07-09 12:50+0000\n" "Last-Translator: bogdrozd <bog.d(a)gazeta.pl>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -35,68 +35,72 @@ #. type: Content of: <div><div><dl><dt> #: /home/runa/tor/website/about/en/volunteers.wml:15 -msgid "Anonym" -msgstr "Anonim" +msgid "Anonym, bertagaz, and intrigeri" +msgstr "Anonim, bertagaz i intrigeri" #. type: Content of: <div><div><dl><dd> #: /home/runa/tor/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 -msgid "Kevin Bankston" -msgstr "Kevin Bankston" - -#. type: Content of: <div><div><dl><dd> -#: /home/runa/tor/website/about/en/volunteers.wml:16 msgid "" -"EFF lawyer who helped write the <a href=\"<page eff/tor-legal-faq>\">Tor " -"Legal FAQ</a> and tirelessly answers the phone when somebody in the world " -"has a legal question about Tor." +"Maintainers of <a href=\"https://tails.boum.org/\">The Amnesic Incognito " +"Live System</a>." msgstr "" -"Prawnik EFF, który pomógł napisać <a href=\"<page eff/tor-legal-" -"faq>\">Prawne FAQ Tora</a> i bez spoczynku odbiera telefon, gdy ktoś na " -"świecie ma prawne pytanie na temat Tora." +"Zajmują się projektem <a href=\"https://tails.boum.org/\">The Amnesic " +"Incognito Live System</a>." #. type: Content of: <div><div><dl><dt> -#: /home/runa/tor/website/about/en/volunteers.wml:20 +#: /home/runa/tor/website/about/en/volunteers.wml:17 msgid "Marco Bonetti" msgstr "Marco Bonetti" #. type: Content of: <div><div><dl><dd> -#: /home/runa/tor/website/about/en/volunteers.wml:20 +#: /home/runa/tor/website/about/en/volunteers.wml:17 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/tor/website/about/en/volunteers.wml:18 msgid "Kasimir Gabert" msgstr "Kasimir Gabert" #. type: Content of: <div><div><dl><dd> -#: /home/runa/tor/website/about/en/volunteers.wml:21 +#: /home/runa/tor/website/about/en/volunteers.wml:18 msgid "Maintains TorStatus." msgstr "Opiekuje się stroną TorStatus." #. type: Content of: <div><div><dl><dt> -#: /home/runa/tor/website/about/en/volunteers.wml:22 +#: /home/runa/tor/website/about/en/volunteers.wml:19 +msgid "Marcia Hofmann and Kevin Bankston" +msgstr "Marcia Hofmann i Kevin Bankston" + +#. type: Content of: <div><div><dl><dd> +#: /home/runa/tor/website/about/en/volunteers.wml:19 +msgid "" +"EFF lawyers who helped write the <a href=\"<page eff/tor-legal-faq>\">Tor " +"Legal FAQ</a> and tirelessly answers the phone when somebody in the world " +"has a legal question about Tor." +msgstr "" +"Prawnicy EFF, którzy pomogli napisać <a href=\"<page eff/tor-legal-" +"faq>\">Prawne FAQ Tora</a> i bez spoczynku odbierają telefon, gdy ktoś na " +"świecie ma prawne pytanie na temat Tora." + +#. type: Content of: <div><div><dl><dt> +#: /home/runa/tor/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:22 +#: /home/runa/tor/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:24 +#: /home/runa/tor/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:24 +#: /home/runa/tor/website/about/en/volunteers.wml:25 msgid "" "One of the core Privoxy developers, and also a Tor fan. He's the reason Tor " "and Privoxy still work well together." @@ -105,16 +109,6 @@ "Privoxy nadal działają dobrze razem." #. type: Content of: <div><div><dl><dt> -#: /home/runa/tor/website/about/en/volunteers.wml:26 -msgid "Bruce Leidl" -msgstr "Bruce Leidl" - -#. type: Content of: <div><div><dl><dd> -#: /home/runa/tor/website/about/en/volunteers.wml:26 -msgid "Working on a Tor client in Java." -msgstr "Pracuje nad klientem Tora w Javie." - -#. type: Content of: <div><div><dl><dt> #: /home/runa/tor/website/about/en/volunteers.wml:27 msgid "Julius Mittenzwei" msgstr "Julius Mittenzwei" @@ -158,26 +152,12 @@ #. type: Content of: <div><div><dl><dt> #: /home/runa/tor/website/about/en/volunteers.wml:34 -msgid "Martin Peck" -msgstr "Martin Peck" - -#. type: Content of: <div><div><dl><dd> -#: /home/runa/tor/website/about/en/volunteers.wml:34 -msgid "" -"Working on a VM-based transparent proxying approach for Tor clients on " -"Windows." -msgstr "" -"Pracuje nad opartym na wirtualnych maszynach podejściu do przezroczystych " -"serwerów proxy dla klientów Tora na Windows." - -#. type: Content of: <div><div><dl><dt> -#: /home/runa/tor/website/about/en/volunteers.wml:36 msgid "rovv (a pseudonym -- he's managed to stay anonymous even from us!)" msgstr "" "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:37 +#: /home/runa/tor/website/about/en/volunteers.wml:35 msgid "" "The most dedicated bug reporter we've ever heard from. He must read Tor " "source code every day over breakfast." @@ -186,42 +166,25 @@ "kod źródłowy Tora codziennie przy śniadaniu." #. type: Content of: <div><div><dl><dt> -#: /home/runa/tor/website/about/en/volunteers.wml:39 -msgid "tup (another pseudonym)" -msgstr "tup (to też jest pseudonim)" +#: /home/runa/tor/website/about/en/volunteers.wml:37 +msgid "Nart Villeneuve" +msgstr "Nart Villeneuve" #. type: Content of: <div><div><dl><dd> -#: /home/runa/tor/website/about/en/volunteers.wml:39 +#: /home/runa/tor/website/about/en/volunteers.wml:37 msgid "" -"Periodically adds new features for making Tor easier to use as a <a " -"href=\"<wiki>TransparentProxy\">transparent proxy</a>. Also maintains the <a" -" href=\"http://p56soo2ibjkx23xo.onion/\">TorDNSEL code</a>." +"Security researcher who works with Jacob on Internet Censorship research." msgstr "" -"Okresowo dodaje nowe cechy, które czynią Tora łatwiejszym w używaniu jako <a" -" href=\"<wiki>TransparentProxy\">przezroczyste proxy</a>. Zajmuje się też <a" -" href=\"http://p56soo2ibjkx23xo.onion/\">kodem TorDNSEL</a>." +"Badacz bezpieczeństwa, który pracuje z Jacobem nad badaniem cenzury w " +"Internecie." #. type: Content of: <div><div><dl><dt> -#: /home/runa/tor/website/about/en/volunteers.wml:44 -msgid "Kyle Williams" -msgstr "Kyle Williams" - -#. type: Content of: <div><div><dl><dd> -#: /home/runa/tor/website/about/en/volunteers.wml:44 -msgid "" -"Developer for JanusVM, a VMWare-based transparent Tor proxy that makes Tor " -"easier to set up and use." -msgstr "" -"Deweloper JanusVM, przezroczystego proxy Tora opartego na VMWare, które " -"ułatwia zainstalowanie i używanie Tora." - -#. type: Content of: <div><div><dl><dt> -#: /home/runa/tor/website/about/en/volunteers.wml:47 +#: /home/runa/tor/website/about/en/volunteers.wml:39 msgid "Ethan Zuckerman" msgstr "Ethan Zuckerman" #. type: Content of: <div><div><dl><dd> -#: /home/runa/tor/website/about/en/volunteers.wml:47 +#: /home/runa/tor/website/about/en/volunteers.wml:39 msgid "" "A blogger who has written some <a " "href=\"http://www.ethanzuckerman.com/blog/?p=1019\">interesting</a> <a " @@ -236,7 +199,7 @@ " Torze i podobnych narzędziach." #. type: Content of: <div><div><dl><dt> -#: /home/runa/tor/website/about/en/volunteers.wml:52 +#: /home/runa/tor/website/about/en/volunteers.wml:44 msgid "" "All our relay operators, people who write <a " "href=\"http://freehaven.net/anonbib/\">research papers</a> about Tor, people" Modified: translation/trunk/projects/website/po/pl_PL/docs/3-low.debian-vidalia.po =================================================================== --- translation/trunk/projects/website/po/pl_PL/docs/3-low.debian-vidalia.po 2011-07-13 13:55:34 UTC (rev 24891) +++ translation/trunk/projects/website/po/pl_PL/docs/3-low.debian-vidalia.po 2011-07-13 18:10:49 UTC (rev 24892) @@ -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: 2010-12-05 19:13+0000\n" -"PO-Revision-Date: 2011-03-22 16:31+0000\n" +"POT-Creation-Date: 2011-07-08 08:43+0200\n" +"PO-Revision-Date: 2011-07-09 12:22+0000\n" "Last-Translator: bogdrozd <bog.d(a)gazeta.pl>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -39,7 +39,7 @@ msgstr "<a class=\"anchor\" href=\"#debian\">Vidalia na Ubuntu lub Debianie</a>" #. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:16 /tmp/M9Wxp74W_E.xml:83 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:16 /tmp/LnaSOLeTA9.xml:84 msgid "<br />" msgstr "<br />" @@ -66,53 +66,58 @@ #. type: Content of: <div><div><p><ul><li> #: /home/runa/tor/website/docs/en/debian-vidalia.wml:29 -msgid "Ubuntu 10.10 is \"maverick\" but use the \"lucid\" packages" -msgstr "Ubuntu 10.10 to \"maverick\", ale używajcie paczek dla \"lucid\"" +msgid "Ubuntu 11.04 is \"natty\"" +msgstr "Ubuntu 11.04 to \"natty\"" #. type: Content of: <div><div><p><ul><li> #: /home/runa/tor/website/docs/en/debian-vidalia.wml:30 +msgid "Ubuntu 10.10 or Trisquel 4.5 is \"maverick\"" +msgstr "Ubuntu 10.10 lub Trisquel 4.5 to \"maverick\"" + +#. type: Content of: <div><div><p><ul><li> +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:31 msgid "Ubuntu 10.04 or Trisquel 4.0 is \"lucid\"" msgstr "Ubuntu 10.04 lub Trisquel 4.0 to \"lucid\"" #. type: Content of: <div><div><p><ul><li> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:31 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:32 msgid "Ubuntu 9.10 or Trisquel 3.5 is \"karmic\"" msgstr "Ubuntu 9.10 lub Trisquel 3.5 to \"karmic\"" #. type: Content of: <div><div><p><ul><li> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:32 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:33 msgid "Ubuntu 9.04 is \"jaunty\"" msgstr "Ubuntu 9.04 to \"jaunty\"" #. type: Content of: <div><div><p><ul><li> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:33 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:34 msgid "Ubuntu 8.10 is \"intrepid\"" msgstr "Ubuntu 8.10 to \"intrepid\"" #. type: Content of: <div><div><p><ul><li> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:34 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:35 msgid "Ubuntu 8.04 is \"hardy\"" msgstr "Ubuntu 8.04 to \"hardy\"" #. type: Content of: <div><div><p><ul><li> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:35 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:36 msgid "Debian Etch is \"etch\"" msgstr "Debian Etch to \"etch\"" #. type: Content of: <div><div><p><ul><li> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:36 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:37 msgid "Debian Lenny is \"lenny\"" msgstr "Debian Lenny to \"lenny\"" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:39 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:40 msgid "Then add this line to your <tt>/etc/apt/sources.list</tt> file:<br />" msgstr "" "Potem dodajcie tę linię do swojego pliku <tt>/etc/apt/sources.list</tt>:<br " "/>" #. type: Content of: <div><div><p><pre> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:43 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:44 #, no-wrap msgid "" "deb http://deb.torproject.org/torproject.org <DISTRIBUTION> main\n" @@ -120,7 +125,7 @@ "deb http://deb.torproject.org/torproject.org <DISTRIBUTION> main\n" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:45 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:46 msgid "" "where you substitute the above word (etch, lenny, sid, karmic, jaunty, " "intrepid, hardy) in place of <DISTRIBUTION>." @@ -129,7 +134,7 @@ "intrepid, hardy) w miejsce <DISTRIBUTION>." #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:50 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:51 msgid "" "Then add the gpg key used to sign the packages by running the following " "commands at your command prompt:" @@ -138,7 +143,7 @@ "następujące komendy w linii poleceń:" #. type: Content of: <div><div><p><pre> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:53 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:54 #, no-wrap msgid "" "gpg --keyserver keys.gnupg.net --recv 886DDD89\n" @@ -148,7 +153,7 @@ "gpg --export A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89 | sudo apt-key add -\n" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:56 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:57 msgid "" "Now refresh your sources and install Vidalia by running the following " "commands at your command prompt:" @@ -157,7 +162,7 @@ " komendy w linii poleceń:" #. type: Content of: <div><div><p><pre> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:59 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:60 #, no-wrap msgid "" "apt-get update\n" @@ -167,8 +172,8 @@ "apt-get install vidalia \n" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:65 -#: /tmp/M9Wxp74W_E.xml:112 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:66 +#: /tmp/LnaSOLeTA9.xml:113 msgid "" "Now Vidalia is installed and running. Move on to <a href=\"<page docs/tor-" "doc-unix>#polipo\">step two</a> of the \"Vidalia on Linux/Unix\" " @@ -179,7 +184,7 @@ "Linux/Unix\"." #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:71 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:72 msgid "" "The DNS name <code>deb.torproject.org</code> is actually a set of " "independent servers in a DNS round robin configuration. If you for some " @@ -194,17 +199,17 @@ "<code>mirror.netcologne.de</code> lub <code>tor.mirror.youam.de</code>." #. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:79 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:80 msgid "<hr /> <a id=\"source\"></a>" msgstr "<hr /> <a id=\"source\"></a>" #. type: Content of: <div><div><h2> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:82 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:83 msgid "<a class=\"anchor\" href=\"#source\">Building from source</a>" msgstr "<a class=\"anchor\" href=\"#source\">Kompilacja ze źródeł</a>" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:86 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:87 msgid "" "If you want to build your own debs from source you must first add an " "appropriate <tt>deb-src</tt> line to <tt>sources.list</tt>." @@ -213,7 +218,7 @@ "odpowiednią linię <tt>deb-src</tt> do <tt>sources.list</tt>." #. type: Content of: <div><div><p><pre> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:89 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:90 #, no-wrap msgid "" "deb-src http://deb.torproject.org/torproject.org <DISTRIBUTION> main\n" @@ -221,7 +226,7 @@ "deb-src http://deb.torproject.org/torproject.org <DISTRIBUTION> main\n" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:91 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:92 msgid "" "You also need to install the necessary packages to build your own debs and " "the packages needed to build Vidalia:" @@ -230,7 +235,7 @@ " nezbędne do kompilacji Vidalii:" #. type: Content of: <div><div><p><pre> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:94 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:95 #, no-wrap msgid "" "apt-get install build-essential fakeroot devscripts qt4-dev-tools qt4-designer libqt4-dev g++ cmake\n" @@ -240,12 +245,12 @@ "apt-get build-dep vidalia\n" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:97 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:98 msgid "Then you can build Vidalia in ~/debian-packages:" msgstr "Wtedy możecie skompilować Vidalię w ~/debian-packages:" #. type: Content of: <div><div><p><pre> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:99 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:100 #, no-wrap msgid "" "mkdir ~/debian-packages; cd ~/debian-packages\n" @@ -261,23 +266,23 @@ "cd ..\n" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:105 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:106 msgid "Now you can install the new package:" msgstr "Teraz możecie zainstalować nową paczkę:" #. type: Content of: <div><div><p><pre> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:107 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:108 #, no-wrap msgid "sudo dpkg -i vidalia_*.deb\n" msgstr "sudo dpkg -i vidalia_*.deb\n" #. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:117 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:118 msgid "<hr />" msgstr "<hr />" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:119 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:120 msgid "" "If you have suggestions for improving this document, please <a href=\"<page " "about/contact>\">send them to us</a>. Thanks!" Modified: translation/trunk/projects/website/po/pl_PL/docs/3-low.debian.po =================================================================== --- translation/trunk/projects/website/po/pl_PL/docs/3-low.debian.po 2011-07-13 13:55:34 UTC (rev 24891) +++ translation/trunk/projects/website/po/pl_PL/docs/3-low.debian.po 2011-07-13 18:10:49 UTC (rev 24892) @@ -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:31+0000\n" +"POT-Creation-Date: 2011-07-08 08:43+0200\n" +"PO-Revision-Date: 2011-07-09 12:20+0000\n" "Last-Translator: bogdrozd <bog.d(a)gazeta.pl>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -43,8 +43,8 @@ "Debianie sid lub Debianie testing</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 +#: /home/runa/tor/website/docs/en/debian.wml:16 /tmp/hXZfq9nNmb.xml:43 +#: /tmp/hXZfq9nNmb.xml:114 /tmp/hXZfq9nNmb.xml:149 msgid "<br />" msgstr "<br />" @@ -70,8 +70,8 @@ "najnowszą stabilną wersję Tora, spójrz na opcję drugą poniżej." #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian.wml:32 /tmp/__TMvx4TV6.xml:94 -#: /tmp/__TMvx4TV6.xml:139 /tmp/__TMvx4TV6.xml:182 +#: /home/runa/tor/website/docs/en/debian.wml:32 /tmp/hXZfq9nNmb.xml:95 +#: /tmp/hXZfq9nNmb.xml:140 /tmp/hXZfq9nNmb.xml:183 msgid "" "Now Tor is installed and running. Move on to <a href=\"<page docs/tor-doc-" "unix>#polipo\">step two</a> of the \"Tor on Linux/Unix\" instructions." @@ -132,38 +132,43 @@ #. type: Content of: <div><div><p><ul><li> #: /home/runa/tor/website/docs/en/debian.wml:60 -msgid "Ubuntu 10.10 is \"maverick\"" -msgstr "Ubuntu 10.10 to \"maverick\"" +msgid "Ubuntu 11.04 is \"natty\"" +msgstr "Ubuntu 11.04 to \"natty\"" #. type: Content of: <div><div><p><ul><li> #: /home/runa/tor/website/docs/en/debian.wml:61 +msgid "Ubuntu 10.10 or Trisquel 4.5 is \"maverick\"" +msgstr "Ubuntu 10.10 lub Trisquel 4.5 to \"maverick\"" + +#. type: Content of: <div><div><p><ul><li> +#: /home/runa/tor/website/docs/en/debian.wml:62 msgid "Ubuntu 10.04 or Trisquel 4.0 is \"lucid\"" msgstr "Ubuntu 10.04 lub Trisquel 4.0 to \"lucid\"" #. type: Content of: <div><div><p><ul><li> -#: /home/runa/tor/website/docs/en/debian.wml:62 +#: /home/runa/tor/website/docs/en/debian.wml:63 msgid "Ubuntu 9.10 or Trisquel 3.5 is \"karmic\"" msgstr "Ubuntu 9.10 lub Trisquel 3.5 to \"karmic\"" #. type: Content of: <div><div><p><ul><li> -#: /home/runa/tor/website/docs/en/debian.wml:63 +#: /home/runa/tor/website/docs/en/debian.wml:64 msgid "Ubuntu 8.04 is \"hardy\"" msgstr "Ubuntu 8.04 to \"hardy\"" #. type: Content of: <div><div><p><ul><li> -#: /home/runa/tor/website/docs/en/debian.wml:64 +#: /home/runa/tor/website/docs/en/debian.wml:65 msgid "Ubuntu 6.06 is \"dapper\"" msgstr "Ubuntu 6.06 to \"dapper\"" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian.wml:67 +#: /home/runa/tor/website/docs/en/debian.wml:68 msgid "Then add this line to your <tt>/etc/apt/sources.list</tt> file:<br />" msgstr "" "Potem dodajcie tę linię do swojego pliku <tt>/etc/apt/sources.list</tt>:<br " "/>" #. type: Content of: <div><div><p><pre> -#: /home/runa/tor/website/docs/en/debian.wml:71 +#: /home/runa/tor/website/docs/en/debian.wml:72 #, no-wrap msgid "" "deb http://deb.torproject.org/torproject.org <DISTRIBUTION> main\n" @@ -171,7 +176,7 @@ "deb http://deb.torproject.org/torproject.org <DISTRIBUTION> main\n" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian.wml:73 +#: /home/runa/tor/website/docs/en/debian.wml:74 msgid "" "where you put the codename of your distribution (i.e. lenny, sid, maverick " "or whatever it is) in place of <DISTRIBUTION>." @@ -180,7 +185,7 @@ " maverick czy cokolwiek to jest) w miejsce <DISTRIBUTION>." #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian.wml:79 +#: /home/runa/tor/website/docs/en/debian.wml:80 msgid "" "Then add the gpg key used to sign the packages by running the following " "commands at your command prompt:" @@ -189,7 +194,7 @@ "następujące komendy w linii poleceń:" #. type: Content of: <div><div><p><pre> -#: /home/runa/tor/website/docs/en/debian.wml:82 +#: /home/runa/tor/website/docs/en/debian.wml:83 #, no-wrap msgid "" "gpg --keyserver keys.gnupg.net --recv 886DDD89\n" @@ -199,7 +204,7 @@ "gpg --export A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89 | sudo apt-key add -\n" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian.wml:85 +#: /home/runa/tor/website/docs/en/debian.wml:86 msgid "" "Now refresh your sources and install Tor by running the following commands " "(as root) at your command prompt:" @@ -208,7 +213,7 @@ "komendy (jako root) w linii poleceń:" #. type: Content of: <div><div><p><pre> -#: /home/runa/tor/website/docs/en/debian.wml:88 +#: /home/runa/tor/website/docs/en/debian.wml:89 #, no-wrap msgid "" "apt-get update\n" @@ -218,7 +223,7 @@ "apt-get install tor tor-geoipdb\n" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian.wml:100 +#: /home/runa/tor/website/docs/en/debian.wml:101 msgid "" "The DNS name <code>deb.torproject.org</code> is actually a set of " "independent servers in a DNS round robin configuration. If you for some " @@ -233,12 +238,12 @@ "<code>mirror.netcologne.de</code> lub <code>tor.mirror.youam.de</code>." #. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/debian.wml:108 +#: /home/runa/tor/website/docs/en/debian.wml:109 msgid "<hr /> <a id=\"development\"></a>" msgstr "<hr /> <a id=\"development\"></a>" #. type: Content of: <div><div><h2> -#: /home/runa/tor/website/docs/en/debian.wml:111 +#: /home/runa/tor/website/docs/en/debian.wml:112 msgid "" "<a class=\"anchor\" href=\"#development\">Option three: Using the " "development branch of Tor on Debian or Ubuntu</a>" @@ -247,7 +252,7 @@ "rozwojowej Tora na Debianie lub Ubuntu</a>" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian.wml:115 +#: /home/runa/tor/website/docs/en/debian.wml:116 msgid "" "If you want to use the <a href=\"<page " "download/download>#packagediff\">development branch</a> of Tor instead (more" @@ -259,7 +264,7 @@ "inny zestaw linii do swojego pliku <tt>/etc/apt/sources.list</tt>:<br />" #. type: Content of: <div><div><p><pre> -#: /home/runa/tor/website/docs/en/debian.wml:120 +#: /home/runa/tor/website/docs/en/debian.wml:121 #, no-wrap msgid "" "deb http://deb.torproject.org/torproject.org <DISTRIBUTION> main\n" @@ -269,7 +274,7 @@ "deb http://deb.torproject.org/torproject.org experimental-<DISTRIBUTION> main\n" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian.wml:123 +#: /home/runa/tor/website/docs/en/debian.wml:124 msgid "" "where you again substitute the name of your distro (lenny, sid, maverick, " "...) in place of <DISTRIBUTION>." @@ -278,12 +283,12 @@ "maverick, ...) zamiast <DISTRIBUTION>." #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian.wml:129 +#: /home/runa/tor/website/docs/en/debian.wml:130 msgid "Then run the following commands at your command prompt:" msgstr "Potem wykonajcie następujące komendy w linii poleceń:" #. type: Content of: <div><div><p><pre> -#: /home/runa/tor/website/docs/en/debian.wml:131 +#: /home/runa/tor/website/docs/en/debian.wml:132 #, no-wrap msgid "" "gpg --keyserver keys.gnupg.net --recv 886DDD89\n" @@ -297,17 +302,17 @@ "apt-get install tor tor-geoipdb\n" #. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/debian.wml:144 +#: /home/runa/tor/website/docs/en/debian.wml:145 msgid "<hr /> <a id=\"source\"></a>" msgstr "<hr /> <a id=\"source\"></a>" #. type: Content of: <div><div><h2> -#: /home/runa/tor/website/docs/en/debian.wml:147 +#: /home/runa/tor/website/docs/en/debian.wml:148 msgid "<a class=\"anchor\" href=\"#source\">Building from source</a>" msgstr "<a class=\"anchor\" href=\"#source\">Kompilacja ze źródeł</a>" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian.wml:151 +#: /home/runa/tor/website/docs/en/debian.wml:152 msgid "" "If you want to build your own debs from source you must first add an " "appropriate <tt>deb-src</tt> line to <tt>sources.list</tt>." @@ -318,7 +323,7 @@ #. PO4ASHARPBEGIN For the stable version.PO4ASHARPEND #. PO4ASHARPBEGIN For the unstable version.PO4ASHARPEND #. type: Content of: <div><div><p><pre> -#: /home/runa/tor/website/docs/en/debian.wml:154 +#: /home/runa/tor/website/docs/en/debian.wml:155 #, no-wrap msgid "" "\n" @@ -336,7 +341,7 @@ "deb-src http://deb.torproject.org/torproject.org experimental-<DISTRIBUTION> main\n" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian.wml:161 +#: /home/runa/tor/website/docs/en/debian.wml:162 msgid "" "You also need to install the necessary packages to build your own debs and " "the packages needed to build Tor:" @@ -345,7 +350,7 @@ " nezbędne do kompilacji Tora:" #. type: Content of: <div><div><p><pre> -#: /home/runa/tor/website/docs/en/debian.wml:164 +#: /home/runa/tor/website/docs/en/debian.wml:165 #, no-wrap msgid "" "apt-get install build-essential fakeroot devscripts\n" @@ -355,12 +360,12 @@ "apt-get build-dep tor\n" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian.wml:167 +#: /home/runa/tor/website/docs/en/debian.wml:168 msgid "Then you can build Tor in ~/debian-packages:" msgstr "Wtedy możecie skompilować Tora w ~/debian-packages:" #. type: Content of: <div><div><p><pre> -#: /home/runa/tor/website/docs/en/debian.wml:169 +#: /home/runa/tor/website/docs/en/debian.wml:170 #, no-wrap msgid "" "mkdir ~/debian-packages; cd ~/debian-packages\n" @@ -376,23 +381,23 @@ "cd ..\n" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian.wml:175 +#: /home/runa/tor/website/docs/en/debian.wml:176 msgid "Now you can install the new package:" msgstr "Teraz możecie zainstalować nową paczkę:" #. type: Content of: <div><div><p><pre> -#: /home/runa/tor/website/docs/en/debian.wml:177 +#: /home/runa/tor/website/docs/en/debian.wml:178 #, no-wrap msgid "sudo dpkg -i tor_*.deb\n" msgstr "sudo dpkg -i tor_*.deb\n" #. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/debian.wml:187 +#: /home/runa/tor/website/docs/en/debian.wml:188 msgid "<hr />" msgstr "<hr />" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian.wml:189 +#: /home/runa/tor/website/docs/en/debian.wml:190 msgid "" "If you have suggestions for improving this document, please <a href=\"<page " "about/contact>\">send them to us</a>. Thanks!" Modified: translation/trunk/projects/website/po/pl_PL/docs/3-low.tor-doc-unix.po =================================================================== --- translation/trunk/projects/website/po/pl_PL/docs/3-low.tor-doc-unix.po 2011-07-13 13:55:34 UTC (rev 24891) +++ translation/trunk/projects/website/po/pl_PL/docs/3-low.tor-doc-unix.po 2011-07-13 18:10:49 UTC (rev 24892) @@ -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-06-21 08:18+0200\n" -"PO-Revision-Date: 2011-06-26 09:40+0000\n" +"POT-Creation-Date: 2011-07-08 08:43+0200\n" +"PO-Revision-Date: 2011-07-09 12:32+0000\n" "Last-Translator: bogdrozd <bog.d(a)gazeta.pl>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -34,9 +34,8 @@ msgstr "Uruchamianie klienta <a href=\"<page index>\">Tora</a> na Linux/BSD/Unix" #. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:14 /tmp/4vVJb7zECD.xml:26 -#: /tmp/4vVJb7zECD.xml:58 /tmp/4vVJb7zECD.xml:92 /tmp/4vVJb7zECD.xml:135 -#: /tmp/4vVJb7zECD.xml:173 +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:14 /tmp/KCUf13Jh9J.xml:26 +#: /tmp/KCUf13Jh9J.xml:57 /tmp/KCUf13Jh9J.xml:96 /tmp/KCUf13Jh9J.xml:130 msgid "<br>" msgstr "<br>" @@ -44,14 +43,12 @@ #: /home/runa/tor/website/docs/en/tor-doc-unix.wml:17 msgid "" "<b>Note that these are the installation instructions for running a Tor " -"client. If you want to relay traffic for others to help the network grow " -"(please do), read the <a href=\"<page docs/tor-doc-relay>\">Configuring a " -"relay</a> guide.</b>" +"client. The easiest way to do this is to simply download the <a href=\"<page" +" projects/torbrowser>\">Tor Browser Bundle</a> and you are done. </b>" msgstr "" -"<b>To są instrukcje do instalacji klienta Tora. Jeśli chcesz przekazywać " -"ruch innych, by wspomóc rozwój sieci (prosimy), przeczytaj poradnik o <a " -"href=\"<page docs/tor-doc-relay>\">Konfigurowaniu przekaźnika sieci " -"Tor</a>.</b>" +"<b>To są instrukcje do instalacji klienta Tora. Najłatwiejszym sposobem, by " +"to zrobić, jest pobranie <a href=\"<page projects/torbrowser>\">Paczki Tora " +"z Przeglądarką</a> i to starczy.</b>" #. type: Content of: <div><div> #: /home/runa/tor/website/docs/en/tor-doc-unix.wml:23 @@ -119,100 +116,29 @@ #. 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\">Krok 2: Instalacja Polipo do " -"przeglądania sieci WWW</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 "" -"Po instalacji Tora musisz skonfigurować swoje aplikacje, by go używały." - -#. 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 "" -"Pierwszym krokiem jest ustawienie sposobu przeglądania sieci WWW. Zacznij od" -" instalacji <a " -"href=\"http://www.pps.jussieu.fr/~jch/software/polipo/\">Polipo</a> ze " -"swojego ulubionego repozytorium. Polipo to pośrednik WWW z pamięcią " -"podręczną, który dobrze wykonuje HTTP pipelining, więc dobrze pasuje do " -"długich czasów oczekiwania w Torze. Pobierz wersję co najmniej Polipo 1.0.4," -" gdyż w poprzednich wersjach brakuje obsługi SOCKS wymaganej do używania " -"Polipo z Torem. Powinieneś/aś teraz usunąć Privoxy (np. apt-get remove " -"privoxy lub yum remove privoxy), by nie było konfliktów." - -#. 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 "" -"Po instalacji Polipo (z paczki lub źródeł) <b>musisz skonfigurować Polipo, " -"by używało Tora</b>. Pobierz naszą <a href=\"<tbbrepo>/build-" -"scripts/config/polipo.conf\">konfigurację Polipo dla Tora</a> i umieść ją " -"zamiast swojego bieżącego pliku konfiguracyjnego Polipo (np. " -"/etc/polipo/config lub ~/.polipo). Musisz ponownie uruchomić Polipo, by " -"zmiany odniosły skutek. Na przykład:<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>doc/PrivoxyConfig\">this sample Privoxy configuration</a>. But " -"since the config files both use port 8118, you shouldn't run both Polipo and" -" Privoxy at the same time." -msgstr "" -"Jeśli wolisz, możesz używać Privoxy z <a href=\"<wiki>doc/PrivoxyConfig\">tą" -" przykładową konfiguracją Privoxy</a>. Ale jako że oba pliki konfiguracyjne " -"używają portu 8118, nie powinieneś/aś używać Polipo i Privoxy jednocześnie." - -#. 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 +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:56 msgid "" -"<a class=\"anchor\" href=\"#using\">Step Three: Configure your applications " -"to use Tor</a>" +"<a class=\"anchor\" href=\"#using\">Step Two: Configure your applications to" +" use Tor</a>" msgstr "" -"<a class=\"anchor\" href=\"#using\">Krok 3: Konfiguracja aplikacji, by " +"<a class=\"anchor\" href=\"#using\">Krok 2: Konfiguracja aplikacji, by " "używały Tora</a>" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:94 +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:59 msgid "" -"After installing Tor and Polipo, you need to configure your applications to " -"use them. The first step is to set up web browsing." +"After installing Tor, you need to configure your applications to use them. " +"The first step is to set up web browsing." msgstr "" -"Po instalacji Tora i Polipo musisz skonfigurować swoje aplikacje, by ich " -"używały. Pierwszym krokiem jest ustawienie sposobu przeglądania sieci WWW." +"Po instalacji Tora musisz skonfigurować swoje aplikacje, by go używały. " +"Pierwszym krokiem jest ustawienie sposobu przeglądania sieci WWW." #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:97 +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:62 msgid "" "You should use Tor with Firefox and Torbutton, for best safety. Simply " "install the <a href=\"<page torbutton/index>\">Torbutton plugin</a>, restart" @@ -224,7 +150,7 @@ "gotowe:" #. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:103 +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:68 msgid "" "<img alt=\"Torbutton plugin for Firefox\" src=\"$(IMGROOT)/screenshot-" "torbutton.png\" > <br>" @@ -233,7 +159,7 @@ ")/screenshot-torbutton.png\" > <br>" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:110 +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:75 msgid "" "If you plan to run Firefox on a different computer than Tor, see the <a " "href=\"<wikifaq>#SocksListenAddress\"> FAQ entry for running Tor on a " @@ -244,28 +170,24 @@ "uruchamiania Tora na innym komputerze</a>." #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:116 +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:81 msgid "" -"To Torify other applications that support HTTP proxies, just point them at " -"Polipo (that is, localhost port 8118). To use SOCKS directly (for instant " -"messaging, Jabber, IRC, etc), you can point your application directly at Tor" -" (localhost port 9050), but see <a href=\"<wikifaq>#SOCKSAndDNS\">this FAQ " -"entry</a> for why this may be dangerous. For applications that support " -"neither SOCKS nor HTTP, take a look at <a " -"href=\"https://code.google.com/p/torsocks/\">torsocks</a> or <a " +"To Torify other applications that support SOCKS proxies, just point them at " +"Tor's SOCKS port (127.0.0.1 port 9050). See <a " +"href=\"<wikifaq>#SOCKSAndDNS\">this FAQ entry</a> for why this may be " +"dangerous. For applications that support neither SOCKS nor HTTP, take a look" +" at <a href=\"https://code.google.com/p/torsocks/\">torsocks</a> or <a " "href=\"<wiki>doc/TorifyHOWTO#socat\">socat</a>." msgstr "" -"By \"storyfikować\" inne aplikacje, które używają proxy dla HTTP, po prostu " -"skieruj je na Polipo (czyli localhost, port 8118). By aplikacje bezpośrednio" -" używały serwera SOCKS (do komunikatorów, Jabbera, IRC, itp.), skieruj je " -"bezpośrednio na Tora (localhost, port 9050), ale przeczytaj <a " +"By \"storyfikować\" inne aplikacje, które używają proxy SOCKS, skieruj je " +"bezpośrednio na Tora (127.0.01, port 9050), ale przeczytaj <a " "href=\"<wikifaq>#SOCKSAndDNS\">ten wpis do FAQ</a>, dlaczego to może być " "niebezpieczne. Jeśli aplikacja nie obsługuje ani proxy dla HTTP, ani dla " "SOCKS, spójrz na <a href=\"https://code.google.com/p/torsocks/\">tsocks</a> " "lub <a href=\"<wiki>doc/TorifyHOWTO#socat\">socat</a>." #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:127 +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:89 msgid "" "For information on how to Torify other applications, check out the <a " "href=\"<wiki>doc/TorifyHOWTO\">Torify HOWTO</a>." @@ -274,19 +196,19 @@ "href=\"<wiki>doc/TorifyHOWTO\">Torify HOWTO</a>." #. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:132 +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:93 msgid "<hr> <a id=\"verify\"></a>" msgstr "<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>" +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:95 +msgid "<a class=\"anchor\" href=\"#verify\">Step Three: Make sure it's working</a>" msgstr "" -"<a class=\"anchor\" href=\"#verify\">Krok 4: Upewnij się, że wszystko " +"<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-unix.wml:138 +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:99 msgid "" "Next, you should try using your browser with Tor and make sure that your IP " "address is being anonymized. Click on <a " @@ -304,32 +226,32 @@ "by poznać więcej sposobów na testowanie swojego Tora.)" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:150 +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:109 msgid "" "If you have a personal firewall that limits your computer's ability to " "connect to itself (this includes something like SELinux on Fedora Core 4), " -"be sure to allow connections from your local applications to Polipo (local " -"port 8118) and Tor (local port 9050). If your firewall blocks outgoing " -"connections, punch a hole so it can connect to at least TCP ports 80 and " -"443, and then see <a href=\"<wikifaq>#FirewalledClient\">this FAQ entry</a>." -" If your SELinux config is not allowing tor or privoxy to run correctly, " -"create a file named booleans.local in the directory /etc/selinux/targeted. " -"Edit this file in your favorite text editor and insert \"allow_ypbind=1\". " -"Restart your machine for this change to take effect." +"be sure to allow connections from your local applications to Tor (local port" +" 9050). If your firewall blocks outgoing connections, punch a hole so it can" +" connect to at least TCP ports 80 and 443, and then see <a " +"href=\"<wikifaq>#FirewalledClient\">this FAQ entry</a>. If your SELinux " +"config is not allowing tor or privoxy to run correctly, create a file named " +"booleans.local in the directory /etc/selinux/targeted. Edit this file in " +"your favorite text editor and insert \"allow_ypbind=1\". Restart your " +"machine for this change to take effect." msgstr "" "Jeśli masz zaporę ogniową, która ogranicza możliwości Twojego komputera co " "do łączenia się z samym sobą (wliczając w to coś jak SELinux na Fedora Core " -"4), zezwól w niej na połączenia od programów lokalnych do Polipo (port " -"lokalny 8118) i Tora (port lokalny 9050). Jeśli zapora blokuje połączenia " -"wychodzące, spraw, by można się było połączyć choć z portami 80 i 433, po " -"czym przeczytaj <a href=\"<wikifaq>#FirewalledClient\">ten wpis do FAQ</a>. " -"Jeśli Twoja konfiguracja SELinuksa nie pozwala na prawidłowe działanie Tora " -"lub Privoxy, utwórz plik o nazwie booleans.local w katalogu " -"/etc/selinux/targeted. Wyedytuj ten plik swoim ulubionym edytorem i dopisz " -"\"allow_ypbind=1\". Aby zmiany odniosły efekt, ponownie uruchom komputer." +"4), zezwól w niej na połączenia od programów lokalnych do Tora (port lokalny" +" 9050). Jeśli zapora blokuje połączenia wychodzące, spraw, by można się było" +" połączyć choć z portami 80 i 433, po czym przeczytaj <a " +"href=\"<wikifaq>#FirewalledClient\">ten wpis do FAQ</a>. Jeśli Twoja " +"konfiguracja SELinuksa nie pozwala na prawidłowe działanie Tora lub Privoxy," +" utwórz plik o nazwie booleans.local w katalogu /etc/selinux/targeted. " +"Wyedytuj ten plik swoim ulubionym edytorem i dopisz \"allow_ypbind=1\". Aby " +"zmiany odniosły efekt, ponownie uruchom komputer." #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:165 +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:122 msgid "" "If it's still not working, look at <a href=\"<page " "docs/faq>#DoesntWork\">this FAQ entry</a> for hints." @@ -338,23 +260,23 @@ "docs/faq>#ItDoesntWork\">ten wpis FAQ</a>, by poszukać wskazówek." #. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:169 +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:126 msgid "<hr> <a id=\"server\"></a> <a id=\"relay\"></a>" msgstr "<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>" +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:129 +msgid "<a class=\"anchor\" href=\"#relay\">Step Four: Configure it as a relay</a>" msgstr "" -"<a class=\"anchor\" href=\"#relay\">Krok 5: Konfiguracja Tora jako " +"<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-unix.wml:175 +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:132 msgid "" "The Tor network relies on volunteers to donate bandwidth. The more people " "who run relays, the faster the Tor network will be. If you have at least 20 " -"kilobytes/s each way, please help out Tor by configuring your Tor to be a " +"KiloBytes/s each way, please help out Tor by configuring your Tor to be a " "relay too. We have many features that make Tor relays easy and convenient, " "including rate limiting for bandwidth, exit policies so you can limit your " "exposure to abuse complaints, and support for dynamic IP addresses." @@ -368,7 +290,7 @@ "obsługą dynamicznych adresów IP." #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:183 +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:140 msgid "" "Having relays in many different places on the Internet is what makes Tor " "users secure. <a href=\"<wikifaq>#RelayAnonymity\">You may also get stronger" @@ -382,7 +304,7 @@ "zostało przekierowane z innych." #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:190 +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:146 msgid "" "Read more at our <a href=\"<page docs/tor-doc-relay>\">Configuring a " "relay</a> guide." @@ -391,12 +313,12 @@ "relay>\">Konfiguracji przekaźnika sieci Tor</a>." #. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:193 +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:149 msgid "<hr>" msgstr "<hr>" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:195 +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:151 msgid "" "If you have suggestions for improving this document, please <a href=\"<page " "about/contact>\">send them to us</a>. Thanks!" Modified: translation/trunk/projects/website/po/pl_PL/download/1-high.download-easy.po =================================================================== --- translation/trunk/projects/website/po/pl_PL/download/1-high.download-easy.po 2011-07-13 13:55:34 UTC (rev 24891) +++ translation/trunk/projects/website/po/pl_PL/download/1-high.download-easy.po 2011-07-13 18:10:49 UTC (rev 24892) @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" -"POT-Creation-Date: 2011-06-21 08:18+0200\n" -"PO-Revision-Date: 2011-06-26 11:13+0000\n" +"POT-Creation-Date: 2011-07-08 08:42+0200\n" +"PO-Revision-Date: 2011-07-09 12:18+0000\n" "Last-Translator: bogdrozd <bog.d(a)gazeta.pl>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -142,10 +142,10 @@ #: /home/runa/tor/website/download/en/download-easy.wml:72 msgid "" "</select> <input type=\"text\" id=\"amount\" class=\"amount\" " -"name=\"amount\" value=\"5\" size=\"10\">" +"name=\"amount\" value=\"10\" size=\"10\">" msgstr "" "</select> <input type=\"text\" id=\"amount\" class=\"amount\" " -"name=\"amount\" value=\"5\" size=\"10\">" +"name=\"amount\" value=\"10\" size=\"10\">" #. type: Content of: <div><div><table><tbody><tr><td><form><p><select> #: /home/runa/tor/website/download/en/download-easy.wml:76 Modified: translation/trunk/projects/website/po/pl_PL/download/3-low.download.po =================================================================== --- translation/trunk/projects/website/po/pl_PL/download/3-low.download.po 2011-07-13 13:55:34 UTC (rev 24891) +++ translation/trunk/projects/website/po/pl_PL/download/3-low.download.po 2011-07-13 18:10:49 UTC (rev 24892) @@ -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-06-21 08:18+0200\n" -"PO-Revision-Date: 2011-06-26 11:14+0000\n" +"POT-Creation-Date: 2011-07-08 08:42+0200\n" +"PO-Revision-Date: 2011-07-09 12:16+0000\n" "Last-Translator: bogdrozd <bog.d(a)gazeta.pl>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -139,10 +139,10 @@ #: /home/runa/tor/website/download/en/download.wml:65 msgid "" "</select> <input type=\"text\" id=\"amount\" class=\"amount\" " -"name=\"amount\" value=\"5\" size=\"10\">" +"name=\"amount\" value=\"10\" size=\"10\">" msgstr "" "</select> <input type=\"text\" id=\"amount\" class=\"amount\" " -"name=\"amount\" value=\"5\" size=\"10\">" +"name=\"amount\" value=\"10\" size=\"10\">" #. type: Content of: <div><div><table><tr><td><form><p><select> #: /home/runa/tor/website/download/en/download.wml:69 @@ -206,8 +206,8 @@ msgstr "Oprogramowanie Tor dla Windows jest pakowane na cztery różne sposoby:" #. type: Content of: <div><div><table><tr><td><ul><li> -#: /home/runa/tor/website/download/en/download.wml:102 /tmp/FhqGC1ISDt.xml:165 -#: /tmp/FhqGC1ISDt.xml:203 +#: /home/runa/tor/website/download/en/download.wml:102 /tmp/lbSAEZiU0Z.xml:165 +#: /tmp/lbSAEZiU0Z.xml:203 msgid "" "The <strong>Tor Browser Bundle</strong> contains everything you need to " "safely browse the Internet. This package requires no installation. Just " @@ -255,7 +255,7 @@ "Musisz ręcznie skonfigurować Tora i wszystkie swoje aplikacje." #. type: Content of: <div><div><table><tr><td><p> -#: /home/runa/tor/website/download/en/download.wml:110 /tmp/FhqGC1ISDt.xml:168 +#: /home/runa/tor/website/download/en/download.wml:110 /tmp/lbSAEZiU0Z.xml:168 msgid "" "There are two versions of each package, a stable and alpha release. Stable " "packages are released when we believe the features and code will not change " @@ -666,7 +666,7 @@ "href=\"../dist/tor-<version-alpha>.tar.gz.asc\">sig</a>)" #. type: Content of: <div><div><div> -#: /home/runa/tor/website/download/en/download.wml:265 /tmp/FhqGC1ISDt.xml:344 +#: /home/runa/tor/website/download/en/download.wml:265 /tmp/lbSAEZiU0Z.xml:344 msgid "<br>" msgstr "<br>" Added: translation/trunk/projects/website/po/pt_BR/1-high.index.po =================================================================== --- translation/trunk/projects/website/po/pt_BR/1-high.index.po (rev 0) +++ translation/trunk/projects/website/po/pt_BR/1-high.index.po 2011-07-13 18:10:49 UTC (rev 24892) @@ -0,0 +1,346 @@ +# SOME DESCRIPTIVE TITLE +# Copyright (C) YEAR The Tor Project, Inc. +# This file is distributed under the same license as the PACKAGE package. +# +# <brunogola(a)gmail.com>, 2011. +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-07-10 20:30+0000\n" +"Last-Translator: brunogola <brunogola(a)gmail.com>\n" +"Language-Team: LANGUAGE <LL(a)li.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: pt_BR\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 "" +"O Tor impede qualquer pessoa de descobrir sua localização ou seus hábitos na" +" internet." + +#. 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 "" +"O Tor funciona em navegadores web, clientes de bate papo, acesso remoto, e " +"mais." + +#. 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 "" +"O Tor é gratuito e de código aberto para Windows, Mac, Linux/Unix, e " +"Android." + +#. type: Content of: <div><div><div><div><h1> +#: /home/runa/dev/website/en/index.wml:16 +msgid "Anonymity Online" +msgstr "Anonimato 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 "" +"Proteja sua privacidade. Defenda-se contra vigilancia na rede e análise de " +"tráfego." + +#. 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\">Baixe o " +"Tor</span></a></div>\n" + +#. type: Content of: <div><div><div><div><div><h2> +#: /home/runa/dev/website/en/index.wml:26 +msgid "What is Tor?" +msgstr "O que é o 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 " +"»</a></span>" +msgstr "" +"O Tor é um software livre e uma rede aberta que te ajuda\n" +" a se defender contra uma forma de vigilancia na rede que\n" +" ameaça sua privacidade, sua liberdade, negócios confidenciais,\n" +" atividades e relacionamentos, e segurança estatal conhecida como <a\n" +" href=\"<page about/overview>\">análise de trafego</a><br><span\n" +" class=\"continue\"><a href=\"<page about/overview>\">Aprenda mais\n" +" sobre Tor »</a></span>" + +#. type: Content of: <div><div><div><div><div><h2> +#: /home/runa/dev/website/en/index.wml:36 +msgid "Why Anonymity Matters" +msgstr "Porque o Anonimato é Importante" + +#. 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 »</a></span>" +msgstr "" +"O Tor proteje você carregando suas comunicações através\n" +" de uma rede distribuida de relays mantidos por voluntários ao redor\n" +" do mundo: ele impede que alguém monitorando sua conexão com a Internet\n" +" descubra quais sistes você visita, e ele impede que os sites\n" +" que você visita saibam sua localização física.\n" +" O Tor funciona com muitos programas existentes, incluindo\n" +" navegadores web, clientes de bate papo, de acesso remoto e outros\n" +" programas que têm como base o protocolo TCP.<br><span\n" +" class=\"continue\"><a href=\"<page getinvolved/volunteer>\">Involva-se com\n" +" o Tor »</a></span>" + +#. type: Content of: <div><div><div><div><h2> +#: /home/runa/dev/website/en/index.wml:50 +msgid "Our Projects" +msgstr "Nossos Projetos" + +#. 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 Icon\">" + +#. 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 "Torbutton" + +#. 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 é um uma botão que possibilita usuários\n" +" do Firefox a habilitar ou desabilitar o Tor no Firefox\n" +" com apenas 1 clique." + +#. 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 Icon\">" + +#. 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 "" +"Ferramenta que verifica se você esta navegando\n" +" pela rede 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 Icon\">" + +#. 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 "Vidalia" + +#. 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 é uma interface gráfica para você ver e controlar\n" +" as configurações e connexões do Tor." + +#. 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 Icon\">" + +#. 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 "Tor Browser" + +#. 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 é um navegador que tem tudo que você precisa para\n" +" navegar com segurança pela web." + +#. type: Content of: <div><div><div><div><h2> +#: /home/runa/dev/website/en/index.wml:90 +msgid "Who Uses Tor?" +msgstr "Que Usa o 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 & Friends</a>" +msgstr "" +"<a href=\"<page about/torusers>#normalusers\"><img " +"src=\"$(IMGROOT)/family.jpg\" alt=\"Normal People\">Familia & Amigos</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 "" +"Pessoas como você e a sua familia usam o Tor para se protegerem, protegerem " +"seus filhos e sua dignidade enquanto usam a Internet." + +#. 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=\"Businesses\">Empresas</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 "" +"Empresas usam o Tor para pesquisar, competir, manter suas estratégias de " +"negócio confidenciais e facilitar a prestação de contas internament." + +#. 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 & " +"Whistleblowers\">Activists</a>" +msgstr "" +"<a href=\"<page about/torusers>#activists\"><img " +"src=\"$(IMGROOT)/activists.jpg\" alt=\"Activists & " +"Whistleblowers\">Ativistas</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 "" +"Ativistas usam o Tor para reportar anonimamente abusos em zonas de perigo. " +"Denunciantes usam o Tor para reportar e denunciar corrupção com segurança." + +#. 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=\"Journalists and the Media\">Mídia</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 "" +"Jornalistas e a mídia usam o Tor para proteger suas pesquisas e suas fontes " +"online." + +#. 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 & Law Enforcement</a>" +msgstr "" +"<a href=\"<page about/torusers>#military\"><img " +"src=\"$(IMGROOT)/military.jpg\" alt=\"Military and Law " +"Enforcement\">Militares & Governos</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 "" +"Militares e governos usam o Tor para proteger suas comunicações, " +"investigações e reuniões online." + +#. type: Content of: <div><div><div><div><h2> +#: /home/runa/dev/website/en/index.wml:123 +msgid "Announcements" +msgstr "Anúncios" + +#. 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 "<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 "" +"O Projeto Tor ganha o prêmio \"Projeto de Benefício Social\" da \n" +" Fundação\n" +" Software Livre e Projeto GNU. Nós estamos honrados\n" +" em ganhar este prêmio e por estarmos listados entre\n" +" os outros ganhadores. <a\n" +" href=\"https://blog.torproject.org/blog/tor-project-receives-fsf-award\">Leia mais\n" +" </a> sobre o prêmio." + +#. 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\">Fev</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 "" +"A última versão estável do Tor, 0.2.1.30, é <a\n" +" href=\"https://lists.torproject.org/pipermail/tor-announce/2011-February/000000.ht…">lançada</a>.\n" +" Tor 0.2.1.30 conserta vários problemas menos críticos. A maior mudança\n" +" é uma pequena modificação no handshake TLS que faz com que\n" +" relays e pontes que rodam essa versão sejam acessíveis novamente\n" +" do Iran. Não esperamos que essa nova versão vá ganhar a corrida\n" +" a longo prazo, mas assim ganhamos um pouco de tempo até\n" +" acharmos uma solução melhor." + + Added: translation/trunk/projects/website/po/pt_BR/about/3-low.board.po =================================================================== --- translation/trunk/projects/website/po/pt_BR/about/3-low.board.po (rev 0) +++ translation/trunk/projects/website/po/pt_BR/about/3-low.board.po 2011-07-13 18:10:49 UTC (rev 24892) @@ -0,0 +1,201 @@ +# SOME DESCRIPTIVE TITLE +# Copyright (C) YEAR The Tor Project, Inc. +# This file is distributed under the same license as the PACKAGE package. +# +# <brunogola(a)gmail.com>, 2011. +msgid "" +msgstr "" +"Project-Id-Version: The Tor Project\n" +"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" +"POT-Creation-Date: 2011-06-21 08:19+0200\n" +"PO-Revision-Date: 2011-07-12 13:20+0000\n" +"Last-Translator: brunogola <brunogola(a)gmail.com>\n" +"Language-Team: LANGUAGE <LL(a)li.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: pt_BR\n" +"Plural-Forms: nplurals=2; plural=(n > 1)\n" + +#. type: Content of: <div><div> +#: /home/runa/tor/website/about/en/board.wml:8 +msgid "" +"<a href=\"<page index>\">Home » </a> <a href=\"<page " +"about/overview>\">About » </a> <a href=\"<page about/board>\">Board of" +" Directors</a>" +msgstr "" +"<a href=\"<page index>\">Home » </a> <a href=\"<page " +"about/overview>\">Sobre » </a> <a href=\"<page " +"about/board>\">Diretoria</a>" + +#. type: Content of: <div><div><h1> +#: /home/runa/tor/website/about/en/board.wml:13 +msgid "Board of Directors" +msgstr "Diretoria" + +#. type: Content of: <div><div><table><tr><td><div> +#: /home/runa/tor/website/about/en/board.wml:17 +msgid "Roger Dingledine" +msgstr "Roger Dingledine" + +#. type: Content of: <div><div><table><tr><td><div> +#: /home/runa/tor/website/about/en/board.wml:18 +msgid "President and Director" +msgstr "Presidente e Diretor" + +#. type: Content of: <div><div><table><tr><td><p> +#: /home/runa/tor/website/about/en/board.wml:19 +msgid "" +"Original developer of Tor along with Nick Mathewson and Paul Syverson. " +"Leading researcher in the anonymous communications field. Frequent speaker " +"at conferences to advocate Tor and explain what Tor is and can do. Helps " +"coordinate academic researchers." +msgstr "" +"Desenvolvedor original do Tor junto com Nick Mathewson e Paul Syverson. Um " +"dos principais pesquisadores na Ã¡rea de comunicações anônimas. Palestrante" +" frequente em conferências, defendendo e explicando o que é o Tor e o que o " +"Tor pode fazer. Ajuda a coordenar pesquisas e pesquisadores da academia" + +#. type: Content of: <div><div><table><tr><td><div> +#: /home/runa/tor/website/about/en/board.wml:22 +msgid "Meredith Hoban-Dunn" +msgstr "Meredith Hoban-Dunn" + +#. type: Content of: <div><div><table><tr><td><div> +#: /home/runa/tor/website/about/en/board.wml:23 +msgid "Audit Committee Chair" +msgstr "Presidente do Comite de Auditoria" + +#. type: Content of: <div><div><table><tr><td><p> +#: /home/runa/tor/website/about/en/board.wml:24 +msgid "" +"Meredith is an accomplished accountant, advisor, and banker. Her role is to" +" help us make sure we're able to pass our corporate audits correctly, watch " +"for internal fraud, tell us when we're doing things in a non-standard way, " +"and so on." +msgstr "" +"Meredith é contadora, conselheira e banqueira. Seu papel é nos ajudar com " +"nossas auditorias corporativas corretamente, fiscalizar fraudes internas, " +"nos alertar quando nós não fazemos as coisas da forma padrão, e assim por " +"diante." + +#. type: Content of: <div><div><table><tr><td><div> +#: /home/runa/tor/website/about/en/board.wml:29 +msgid "Ian Goldberg" +msgstr "Ian Goldberg" + +#. type: Content of: <div><div><table><tr><td><div> +#: /home/runa/tor/website/about/en/board.wml:30 +msgid "Chairman of the Board" +msgstr "Presidente do Conselho" + +#. type: Content of: <div><div><table><tr><td><p> +#: /home/runa/tor/website/about/en/board.wml:31 +msgid "" +"Cryptographer, privacy expert, and professor; one of the designers of <a " +"href=\"http://www.cypherpunks.ca/otr/\">Off-the-Record Messaging</a>." +msgstr "" +"Especialista em criptografia e privacidade e professor; um dos projetistas " +"do <a href=\"http://www.cypherpunks.ca/otr/\">Off-the-Record Messaging</a>." + +#. type: Content of: <div><div><table><tr><td><div> +#: /home/runa/tor/website/about/en/board.wml:34 +msgid "Andrew Lewman" +msgstr "Andrew Lewman" + +#. type: Content of: <div><div><table><tr><td><div> +#: /home/runa/tor/website/about/en/board.wml:35 +msgid "Secretary, Treasurer, and Executive Director" +msgstr "Secretário, Tesoureiro e Diretor Executivo" + +#. type: Content of: <div><div><table><tr><td><p> +#: /home/runa/tor/website/about/en/board.wml:36 +msgid "" +"Andrew is the Executive Director reponsible for all operations of The Tor " +"Project, Inc. His current activities can be found at <a " +"href=\"http://lewman.is\">his website</a>." +msgstr "" +"Andrew é o Diretor Executivo, responsável por todas as operações da The Tor " +"Project, Inc. Suas atividades podem ser vistas em <a " +"href=\"http://lewman.is\">seu website</a>." + +#. type: Content of: <div><div><table><tr><td><div> +#: /home/runa/tor/website/about/en/board.wml:43 +msgid "Nick Mathewson" +msgstr "Nick Mathewson" + +#. type: Content of: <div><div><table><tr><td><div> +#: /home/runa/tor/website/about/en/board.wml:44 +msgid "Vice-President and Director" +msgstr "Vice Presidente and Diretor" + +#. type: Content of: <div><div><table><tr><td><p> +#: /home/runa/tor/website/about/en/board.wml:45 +msgid "" +"Nick is one of the original developers of Tor. He's the Chief Architect of " +"The Tor Project, Inc." +msgstr "" +"Nick é um dos desenvolvedores originais do Tor. Ele \n" +"é o Arquiteto Chefe da The Tor Project, Inc." + +#. type: Content of: <div><div><table><tr><td><div> +#: /home/runa/tor/website/about/en/board.wml:48 +msgid "Xianghui (Isaac) Mao" +msgstr "Xianghui (Isaac) Mao" + +#. type: Content of: <div><div><table><tr><td><div> +#: /home/runa/tor/website/about/en/board.wml:49 /tmp/b5Ptkc4L_E.xml:56 +#: /tmp/b5Ptkc4L_E.xml:61 /tmp/b5Ptkc4L_E.xml:68 +msgid "Director" +msgstr "Diretor" + +#. type: Content of: <div><div><table><tr><td><p> +#: /home/runa/tor/website/about/en/board.wml:50 +msgid "" +"Chinese blogging and privacy activist. His current activities can be found " +"at <a href=\"http://isaacmao.com/\">his website</a>." +msgstr "" +"Blogueiro Chines e ativista da privacidade. Suas atividades recentes podem " +"ser vistas em <a href=\"http://isaacmao.com/\">seu website</a>." + +#. type: Content of: <div><div><table><tr><td><div> +#: /home/runa/tor/website/about/en/board.wml:55 +msgid "Frank Rieger" +msgstr "Frank Rieger" + +#. type: Content of: <div><div><table><tr><td><p> +#: /home/runa/tor/website/about/en/board.wml:57 +msgid "CTO of <a href=\"http://www.cryptophone.de/\">GSMK Cryptophone</a>." +msgstr "CTO da <a href=\"http://www.cryptophone.de/\">GSMK Cryptophone</a>." + +#. type: Content of: <div><div><table><tr><td><div> +#: /home/runa/tor/website/about/en/board.wml:60 +msgid "Wendy Seltzer" +msgstr "Wendy Seltzer" + +#. type: Content of: <div><div><table><tr><td><p> +#: /home/runa/tor/website/about/en/board.wml:62 +msgid "" +"Lawyer, cyberlaw professor, and founder of <a " +"href=\"http://chillingeffects.org/\">ChillingEffects.org</a>." +msgstr "" +"Advogado, professor de Lei Digital e fundador do <a " +"href=\"http://chillingeffects.org/\">ChillingEffects.org</a>." + +#. type: Content of: <div><div><table><tr><td><div> +#: /home/runa/tor/website/about/en/board.wml:67 +msgid "Rob Thomas" +msgstr "Rob Thomas" + +#. type: Content of: <div><div><table><tr><td><p> +#: /home/runa/tor/website/about/en/board.wml:69 +msgid "" +"Rob Thomas is CEO and founder of Team Cymru, and a Cymru Fellow. You can " +"learn more about Rob at the <a href=\"http://www.team-cymru.org/\">Team " +"Cymru</a> websites." +msgstr "" +"Rob Thomas é o CEO e fundador do Team Cymru, e um\n" +" Cymru Fellow. Você pode saber mais sobre Rob no website do <a\n" +" href=\"http://www.team-cymru.org/\">Team Cymru</a>." + + Added: translation/trunk/projects/website/po/pt_BR/about/3-low.contact.po =================================================================== --- translation/trunk/projects/website/po/pt_BR/about/3-low.contact.po (rev 0) +++ translation/trunk/projects/website/po/pt_BR/about/3-low.contact.po 2011-07-13 18:10:49 UTC (rev 24892) @@ -0,0 +1,181 @@ +# SOME DESCRIPTIVE TITLE +# Copyright (C) YEAR The Tor Project, Inc. +# This file is distributed under the same license as the PACKAGE package. +# +# <brunogola(a)gmail.com>, 2011. +msgid "" +msgstr "" +"Project-Id-Version: The Tor Project\n" +"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" +"POT-Creation-Date: 2011-07-08 08:44+0200\n" +"PO-Revision-Date: 2011-07-12 13:54+0000\n" +"Last-Translator: brunogola <brunogola(a)gmail.com>\n" +"Language-Team: LANGUAGE <LL(a)li.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: pt_BR\n" +"Plural-Forms: nplurals=2; plural=(n > 1)\n" + +#. type: Content of: <div><div> +#: /home/runa/tor/website/about/en/contact.wml:9 +msgid "" +"<a href=\"<page index>\">Home » </a> <a href=\"<page " +"about/overview>\">About » </a> <a href=\"<page " +"about/contact>\">Contact</a>" +msgstr "" +"<a href=\"<page index>\">Home » </a>\n" +" <a href=\"<page about/overview>\">Sobre » </a>\n" +" <a href=\"<page about/contact>\">Contato</a>" + +#. type: Content of: <div><div><h2> +#: /home/runa/tor/website/about/en/contact.wml:14 +msgid "Tor: Contact" +msgstr "Tor: Contato" + +#. type: Content of: <div><div><h3> +#: /home/runa/tor/website/about/en/contact.wml:16 +msgid "Email" +msgstr "Email" + +#. type: Content of: <div><div> +#: /home/runa/tor/website/about/en/contact.wml:17 +msgid "" +"<a id=\"email\"></a> <i>tor-assistants at torproject.org</i> is the catch-" +"all address for everything. It can be used for reaching people working on " +"Tor. A few other addresses are more specific:" +msgstr "" +"<i>tor-assistants em torproject.org</i> \n" +"é o endereçoo geral para qualquer assunto. Pode ser usado\n" +" para entrar em contato com pessoas trabalhando no Tor.\n" +"\n" +" Alguns outros endereÃ§os sÃ£o mais específicos:" + +#. type: Content of: <div><div><ul><li> +#: /home/runa/tor/website/about/en/contact.wml:24 +msgid "" +"<i>tor-translation at lists.torproject.org</i> can put new <a href=\"<page " +"getinvolved/translation>\">website translations</a> into place, and help " +"answer questions about existing and new translations." +msgstr "" +"<i>tor-translation em lists.torproject.org</i> pode colocar novas <a href=\"<page\n" +" getinvolved/translation>\">traduções do website</a> no lugar,\n" +" e ajudar a responder questões sobre traduções novas ou existentes." + +#. type: Content of: <div><div><ul><li> +#: /home/runa/tor/website/about/en/contact.wml:27 +msgid "" +"<i>tordnsel at torproject.org</i> is the alias for the people responsible " +"for the tordns exitlist." +msgstr "atalho para chegar às pessoas responsaveis pelo tordns exitlist." + +#. type: Content of: <div><div><ul><li> +#: /home/runa/tor/website/about/en/contact.wml:29 +msgid "" +"<i>donations at torproject.org</i> is for questions and comments about <a " +"href=\"<page donate/donate>\">getting money to the developers</a>. More " +"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 at torproject.org</i> para fazer perguntas e comentários sobre <a\n" +" href=\"<page donate/donate>\">doações em dinheiro para os desenvolvedores</a>. Mais\n" +" doações significam <a href=\"<page docs/faq>#Funding\">mais\n" +" Tor</a>. Ficaremos felizes em ajuda-lo a pensar em formas criativas para contribuir." + +#. type: Content of: <div><div><ul><li> +#: /home/runa/tor/website/about/en/contact.wml:34 +msgid "" +"<i>execdir at torproject.org</i> is for press/media, questions and comments " +"about Tor the non-profit corporation: trademark questions, affiliation and " +"coordination, major gifts, contract inquiries, licensing and certification, " +"etc." +msgstr "" +"<i>execdir at torproject.org</i> para imprensa/mídia, perguntas e comentários sobre\n" +" Tor, a organização sem fins lucrativos: perguntas sobre marca registrada, afiliação\n" +" e coordenação, grandes doações, questões contratuais, licenciamento e certificação, etc." + +#. type: Content of: <div><div><h3> +#: /home/runa/tor/website/about/en/contact.wml:40 +msgid "Identi.ca" +msgstr "Identi.ca" + +#. type: Content of: <div><div><p> +#: /home/runa/tor/website/about/en/contact.wml:41 +msgid "" +"<a id=\"identica\"></a> Contact us via our microblogging Identi.ca account " +"at <a href=\"https://identi.ca/torproject\">torproject</a>." +msgstr "" +"<a id=\"identica\"></a>\n" +" Entre em contato pela nossa conta no serviço de microblogging Identi.ca em <a\n" +" href=\"https://identi.ca/torproject\">torproject</a>." + +#. type: Content of: <div><div><h3> +#: /home/runa/tor/website/about/en/contact.wml:45 +msgid "IRC" +msgstr "IRC" + +#. type: Content of: <div><div> +#: /home/runa/tor/website/about/en/contact.wml:46 +msgid "<a id=\"irc\"></a>" +msgstr "<a id=\"irc\"></a>" + +#. type: Content of: <div><div><p> +#: /home/runa/tor/website/about/en/contact.wml:47 +msgid "" +"Tor users and developers can also be found in the following channels on <a " +"href=\"http://www.oftc.net/oftc/\">OFTC</a>:" +msgstr "" +"Usuários e desenvolvedores Tor também podem ser encontrados nos seguintes canais na rede <a\n" +" href=\"http://www.oftc.net/oftc/\">OFTC</a>:" + +#. type: Content of: <div><div><ul><li> +#: /home/runa/tor/website/about/en/contact.wml:51 +msgid "" +"<i>#tor</i> - User and relay operation discussions. Having trouble running " +"Tor or a question for other Tor users? Then this is the spot for you." +msgstr "" +"<i>#tor</i> - Discussões a respeito de usuários e da operação de relays. " +"Problemas para usar o Tor ou tem uma pergunta direcionada a outros usuários?" +" Então esse é o lugar para você." + +#. type: Content of: <div><div><ul><li> +#: /home/runa/tor/website/about/en/contact.wml:54 +msgid "" +"<i>#tor-dev</i> - Channel for people who want to do development. " +"Discussions about Tor-related coding, protocols, and <a href=\"<page " +"getinvolved/volunteer>\">project ideas</a> are all welcome." +msgstr "" +"<i>#tor-dev</i> - Canal para pessoas interessadas no desenvolvimento do Tor.\n" +" Discussões sobre o código do Tor, protocolos e <a href=\"<page\n" +" getinvolved/volunteer>\">idéias</a> são todos bem vindos." + +#. type: Content of: <div><div><ul><li> +#: /home/runa/tor/website/about/en/contact.wml:57 +msgid "" +"<i>#nottor</i> - This is where Tor people hang out to talk about stuff that " +"is not related to Tor." +msgstr "" +"<i>#nottor</i> - O lugar onde as pessoas envolvidas com o Tor se encontram " +"para conversar sobre outras coisas não relacionadas ao Tor." + +#. type: Content of: <div><div><h3> +#: /home/runa/tor/website/about/en/contact.wml:61 +msgid "Telephone" +msgstr "Telefone" + +#. type: Content of: <div><div> +#: /home/runa/tor/website/about/en/contact.wml:62 +msgid "<a id=\"phone\"></a>" +msgstr "<a id=\"phone\"></a>" + +#. type: Content of: <div><div><p> +#: /home/runa/tor/website/about/en/contact.wml:63 +msgid "" +"If none of the above appeal to you, calling +1-781-352-0568 will reach the " +"Tor office. Should there be no answer, please leave a message." +msgstr "" +"Se nenhuma das formas de contato acima resolver, ligue para +1-781-352-0568," +" o telefone do nosso escritório. Se não obtiver resposta, por favor deixe " +"uma mensagem." + + Modified: translation/trunk/projects/website/po/ru/about/3-low.contact.po =================================================================== --- translation/trunk/projects/website/po/ru/about/3-low.contact.po 2011-07-13 13:55:34 UTC (rev 24891) +++ translation/trunk/projects/website/po/ru/about/3-low.contact.po 2011-07-13 18:10:49 UTC (rev 24892) @@ -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-04-13 16:28+0200\n" -"PO-Revision-Date: 2011-04-14 00:46+0000\n" +"POT-Creation-Date: 2011-07-08 08:44+0200\n" +"PO-Revision-Date: 2011-07-09 01:09+0000\n" "Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" "Language-Team: Russian (http://www.transifex.net/projects/p/torproject/team/ru/)\n" "MIME-Version: 1.0\n" @@ -33,90 +33,36 @@ msgid "Tor: Contact" msgstr "Tor: Контакты" -#. type: Content of: <div><div><p> +#. type: Content of: <div><div><h3> #: /home/runa/tor/website/about/en/contact.wml:16 -msgid "" -"First, if you have a problem or question about using Tor, go look at the <a " -"href=\"<page docs/documentation>#Support\">Support section</a> for how to " -"proceed. The Tor developers spend most of their time developing Tor, and " -"there are no people devoted to user support, so try to help yourself before " -"<a href=\"<page docs/faq>#SupportMail\">politely trying to find a " -"volunteer</a>." +msgid "Email" msgstr "" -"Во-первых, если у вас проблема или вопрос об использовании Tor, перво-" -"наперво посмотрите <a href=\"<page docs/documentation>#Support\">раздел " -"\"Поддержка\"</a>. Разработчики Tor тратят большую часть своего времени на " -"разработку Tor, специальных людей для поддержки пользователей нет, поэтому " -"постарайтесь помочь себе сами перед тем <a href=\"<page " -"docs/faq>#SupportMail\">, как вежливо попытаться найти добровольного " -"помощника</a> ." -#. type: Content of: <div><div><p> -#: /home/runa/tor/website/about/en/contact.wml:18 -msgid "" -"If you really do need to reach us, here are some approaches. Please be " -"patient and <a href=\"http://www.catb.org/~esr/faqs/smart-" -"questions.html\">helpful</a>, and please make sure to write your mail in " -"English." -msgstr "" - #. type: Content of: <div><div> -#: /home/runa/tor/website/about/en/contact.wml:21 +#: /home/runa/tor/website/about/en/contact.wml:17 msgid "" -"<i>tor-assistants at torproject.org</i> is the catch-all address for " -"everything. It can be used for:" +"<a id=\"email\"></a> <i>tor-assistants at torproject.org</i> is the catch-" +"all address for everything. It can be used for reaching people working on " +"Tor. A few other addresses are more specific:" msgstr "" #. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/about/en/contact.wml:25 +#: /home/runa/tor/website/about/en/contact.wml:24 msgid "" -"Contacting the people who manage the directory authorities. Use this if you " -"run a Tor relay and have a question or problem with your relay." -msgstr "" - -#. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/about/en/contact.wml:28 -msgid "" -"So we can fix typos on the website, change wrong statements or directions on" -" the website, and add new sections and paragraphs that you send us. You " -"might want to make a draft of your new sections on <a href=\"<wiki>\">the " -"Tor wiki</a> first." -msgstr "" - -#. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/about/en/contact.wml:32 -msgid "" -"Hearing about your documents, patches, testing, experiences with supporting " -"applications, and so forth inspired by our <a href=\"<page " -"getinvolved/volunteer>\">volunteer page</a> (or other problems you've fixed " -"or documented about using Tor). There's no need to mail us before you start " -"working on something -- like all volunteer Internet projects, we hear from a" -" lot of excited people who vanish soon after, so we are most interested in " -"hearing about actual progress." -msgstr "" - -#. type: Content of: <div><div> -#: /home/runa/tor/website/about/en/contact.wml:42 -msgid "A few other addresses are more specific:" -msgstr "" - -#. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/about/en/contact.wml:45 -msgid "" "<i>tor-translation at lists.torproject.org</i> can put new <a href=\"<page " "getinvolved/translation>\">website translations</a> into place, and help " "answer questions about existing and new translations." msgstr "" #. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/about/en/contact.wml:48 +#: /home/runa/tor/website/about/en/contact.wml:27 msgid "" "<i>tordnsel at torproject.org</i> is the alias for the people responsible " "for the tordns exitlist." msgstr "" #. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/about/en/contact.wml:50 +#: /home/runa/tor/website/about/en/contact.wml:29 msgid "" "<i>donations at torproject.org</i> is for questions and comments about <a " "href=\"<page donate/donate>\">getting money to the developers</a>. More " @@ -125,7 +71,7 @@ msgstr "" #. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/about/en/contact.wml:55 +#: /home/runa/tor/website/about/en/contact.wml:34 msgid "" "<i>execdir at torproject.org</i> is for press/media, questions and comments " "about Tor the non-profit corporation: trademark questions, affiliation and " @@ -133,33 +79,72 @@ "etc." msgstr "" +#. type: Content of: <div><div><h3> +#: /home/runa/tor/website/about/en/contact.wml:40 +msgid "Identi.ca" +msgstr "" + +#. type: Content of: <div><div><p> +#: /home/runa/tor/website/about/en/contact.wml:41 +msgid "" +"<a id=\"identica\"></a> Contact us via our microblogging Identi.ca account " +"at <a href=\"https://identi.ca/torproject\">torproject</a>." +msgstr "" + +#. type: Content of: <div><div><h3> +#: /home/runa/tor/website/about/en/contact.wml:45 +msgid "IRC" +msgstr "" + #. type: Content of: <div><div> -#: /home/runa/tor/website/about/en/contact.wml:61 +#: /home/runa/tor/website/about/en/contact.wml:46 +msgid "<a id=\"irc\"></a>" +msgstr "" + +#. type: Content of: <div><div><p> +#: /home/runa/tor/website/about/en/contact.wml:47 msgid "" -"<a id=\"irc\"></a> Tor users and developers can also be found in the " -"following channels on <a href=\"http://www.oftc.net/oftc/\">oftc</a>:" +"Tor users and developers can also be found in the following channels on <a " +"href=\"http://www.oftc.net/oftc/\">OFTC</a>:" msgstr "" #. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/about/en/contact.wml:66 +#: /home/runa/tor/website/about/en/contact.wml:51 msgid "" "<i>#tor</i> - User and relay operation discussions. Having trouble running " "Tor or a question for other Tor users? Then this is the spot for you." msgstr "" #. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/about/en/contact.wml:69 +#: /home/runa/tor/website/about/en/contact.wml:54 msgid "" "<i>#tor-dev</i> - Channel for people who want to do development. " -"Discussions about Tor related coding, protocols, and <a href=\"<page " +"Discussions about Tor-related coding, protocols, and <a href=\"<page " "getinvolved/volunteer>\">project ideas</a> are all welcome." msgstr "" #. type: Content of: <div><div><ul><li> -#: /home/runa/tor/website/about/en/contact.wml:72 +#: /home/runa/tor/website/about/en/contact.wml:57 msgid "" "<i>#nottor</i> - This is where Tor people hang out to talk about stuff that " "is not related to Tor." msgstr "" +#. type: Content of: <div><div><h3> +#: /home/runa/tor/website/about/en/contact.wml:61 +msgid "Telephone" +msgstr "" +#. type: Content of: <div><div> +#: /home/runa/tor/website/about/en/contact.wml:62 +msgid "<a id=\"phone\"></a>" +msgstr "" + +#. type: Content of: <div><div><p> +#: /home/runa/tor/website/about/en/contact.wml:63 +msgid "" +"If none of the above appeal to you, calling +1-781-352-0568 will reach the " +"Tor office. Should there be no answer, please leave a message." +msgstr "" + + Modified: translation/trunk/projects/website/po/ru/about/3-low.contributors.po =================================================================== --- translation/trunk/projects/website/po/ru/about/3-low.contributors.po 2011-07-13 13:55:34 UTC (rev 24891) +++ translation/trunk/projects/website/po/ru/about/3-low.contributors.po 2011-07-13 18:10:49 UTC (rev 24892) @@ -6,8 +6,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:18+0000\n" +"POT-Creation-Date: 2011-07-08 08:44+0200\n" +"PO-Revision-Date: 2011-07-09 01:09+0000\n" "Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" "Language-Team: Russian (http://www.transifex.net/projects/p/torproject/team/ru/)\n" "MIME-Version: 1.0\n" @@ -186,47 +186,69 @@ #. type: Content of: <div><div><dl><dt> #: /home/runa/tor/website/about/en/contributors.wml:48 +msgid "Bruce Leidl" +msgstr "" + +#. type: Content of: <div><div><dl><dd> +#: /home/runa/tor/website/about/en/contributors.wml:48 +msgid "Worked on a Tor client in Java." +msgstr "" + +#. type: Content of: <div><div><dl><dt> +#: /home/runa/tor/website/about/en/contributors.wml:49 msgid "Rebecca MacKinnon" msgstr "" #. type: Content of: <div><div><dl><dd> -#: /home/runa/tor/website/about/en/contributors.wml:48 +#: /home/runa/tor/website/about/en/contributors.wml:49 msgid "" "Former Director of Tor. Co-Founder of <a " "href=\"http://www.globalvoicesonline.org/\">Global Voices Online</a>." msgstr "" #. type: Content of: <div><div><dl><dt> -#: /home/runa/tor/website/about/en/contributors.wml:50 +#: /home/runa/tor/website/about/en/contributors.wml:51 msgid "Chris Palmer" msgstr "" #. type: Content of: <div><div><dl><dd> -#: /home/runa/tor/website/about/en/contributors.wml:50 +#: /home/runa/tor/website/about/en/contributors.wml:51 msgid "" "Our liaison and tech guy with EFF while EFF was funding us. Also helped " "advocate and write end-user docs." msgstr "" #. type: Content of: <div><div><dl><dt> -#: /home/runa/tor/website/about/en/contributors.wml:52 +#: /home/runa/tor/website/about/en/contributors.wml:53 +msgid "Martin Peck" +msgstr "" + +#. type: Content of: <div><div><dl><dd> +#: /home/runa/tor/website/about/en/contributors.wml:53 +msgid "" +"Worked on a VM-based transparent proxying approach for Tor clients on " +"Windows." +msgstr "" + +#. type: Content of: <div><div><dl><dt> +#: /home/runa/tor/website/about/en/contributors.wml:55 msgid "Matej Pfajfar" msgstr "" #. type: Content of: <div><div><dl><dd> -#: /home/runa/tor/website/about/en/contributors.wml:52 +#: /home/runa/tor/website/about/en/contributors.wml:55 msgid "" "Author of the original onion routing code that Tor is based on, so we didn't" " have to start from scratch." msgstr "" #. type: Content of: <div><div><dl><dt> -#: /home/runa/tor/website/about/en/contributors.wml:54 +#: /home/runa/tor/website/about/en/contributors.wml:57 msgid "Johannes Renner" msgstr "" #. type: Content of: <div><div><dl><dd> -#: /home/runa/tor/website/about/en/contributors.wml:54 +#: /home/runa/tor/website/about/en/contributors.wml:57 msgid "" "Worked during the 2007 Google Summer of Code on modifying <a " "href=\"https://svn.torproject.org/svn/torflow/trunk/README\">TorFlow</a> to " @@ -234,23 +256,36 @@ msgstr "" #. type: Content of: <div><div><dl><dt> -#: /home/runa/tor/website/about/en/contributors.wml:59 +#: /home/runa/tor/website/about/en/contributors.wml:62 msgid "Scott Squires" msgstr "" #. type: Content of: <div><div><dl><dd> -#: /home/runa/tor/website/about/en/contributors.wml:59 +#: /home/runa/tor/website/about/en/contributors.wml:62 msgid "" "The original developer of <a href=\"<page torbutton/index>\">Torbutton</a>." msgstr "" #. type: Content of: <div><div><dl><dt> -#: /home/runa/tor/website/about/en/contributors.wml:61 +#: /home/runa/tor/website/about/en/contributors.wml:64 +msgid "tup (a pseudonym)" +msgstr "" + +#. type: Content of: <div><div><dl><dd> +#: /home/runa/tor/website/about/en/contributors.wml:64 +msgid "" +"Added new features for making Tor easier to use as a <a " +"href=\"<wiki>TransparentProxy\">transparent proxy</a>. Also wrote the <a " +"href=\"http://p56soo2ibjkx23xo.onion/\">TorDNSEL code</a>." +msgstr "" + +#. type: Content of: <div><div><dl><dt> +#: /home/runa/tor/website/about/en/contributors.wml:69 msgid "Stephen Tyree" msgstr "" #. type: Content of: <div><div><dl><dd> -#: /home/runa/tor/website/about/en/contributors.wml:61 +#: /home/runa/tor/website/about/en/contributors.wml:69 msgid "" "Worked during Google Summer of Code 2009 to develop a plugin API for <a " "href=\"<page projects/vidalia>\">Vidalia</a> and create a plugin to allow " @@ -259,12 +294,12 @@ msgstr "" #. type: Content of: <div><div><dl><dt> -#: /home/runa/tor/website/about/en/contributors.wml:65 +#: /home/runa/tor/website/about/en/contributors.wml:73 msgid "Camilo Viecco" msgstr "" #. type: Content of: <div><div><dl><dd> -#: /home/runa/tor/website/about/en/contributors.wml:65 +#: /home/runa/tor/website/about/en/contributors.wml:73 msgid "" "Worked on Providing Blossom functionality to Vidalia (<a href=\"http://trac" ".vidalia-project.net/browser/vidalia/branches/exit-country\">svn</a>) as " @@ -272,12 +307,12 @@ msgstr "" #. type: Content of: <div><div><dl><dt> -#: /home/runa/tor/website/about/en/contributors.wml:68 +#: /home/runa/tor/website/about/en/contributors.wml:76 msgid "Fred von Lohmann" msgstr "" #. type: Content of: <div><div><dl><dd> -#: /home/runa/tor/website/about/en/contributors.wml:68 +#: /home/runa/tor/website/about/en/contributors.wml:76 msgid "" "Fred served on our Board of Directors from 2006 through 2009. His complete " "bio can be found at the <a href=\"http://www.eff.org/about/staff/fred-von-" @@ -285,12 +320,24 @@ msgstr "" #. type: Content of: <div><div><dl><dt> -#: /home/runa/tor/website/about/en/contributors.wml:72 +#: /home/runa/tor/website/about/en/contributors.wml:80 +msgid "Kyle Williams" +msgstr "" + +#. type: Content of: <div><div><dl><dd> +#: /home/runa/tor/website/about/en/contributors.wml:80 +msgid "" +"Developer for JanusVM, a VMWare-based transparent Tor proxy that makes Tor " +"easier to set up and use." +msgstr "" + +#. type: Content of: <div><div><dl><dt> +#: /home/runa/tor/website/about/en/contributors.wml:82 msgid "Christian Wilms" msgstr "" #. type: Content of: <div><div><dl><dd> -#: /home/runa/tor/website/about/en/contributors.wml:72 +#: /home/runa/tor/website/about/en/contributors.wml:82 msgid "" "Worked on Performance Enhancing Measures for Tor Hidden Services (<a " "href=\"https://svn.torproject.org/cgi-bin/viewvs.cgi/tor/branches/hidserv-" @@ -298,12 +345,12 @@ msgstr "" #. type: Content of: <div><div><dl><dt> -#: /home/runa/tor/website/about/en/contributors.wml:75 +#: /home/runa/tor/website/about/en/contributors.wml:85 msgid "Jillian C. York" msgstr "" #. type: Content of: <div><div><dl><dd> -#: /home/runa/tor/website/about/en/contributors.wml:75 +#: /home/runa/tor/website/about/en/contributors.wml:85 msgid "" "<a href=\"http://jilliancyork.com/\">Jillian C. York</a> is a writer, " "blogger, and activist based in Boston." Modified: translation/trunk/projects/website/po/ru/about/3-low.volunteers.po =================================================================== --- translation/trunk/projects/website/po/ru/about/3-low.volunteers.po 2011-07-13 13:55:34 UTC (rev 24891) +++ translation/trunk/projects/website/po/ru/about/3-low.volunteers.po 2011-07-13 18:10:49 UTC (rev 24892) @@ -6,8 +6,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" -"POT-Creation-Date: 2011-06-29 20:42+0200\n" -"PO-Revision-Date: 2011-06-30 00:49+0000\n" +"POT-Creation-Date: 2011-07-08 08:44+0200\n" +"PO-Revision-Date: 2011-07-09 01:11+0000\n" "Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" "Language-Team: Russian (http://www.transifex.net/projects/p/torproject/team/ru/)\n" "MIME-Version: 1.0\n" @@ -31,80 +31,72 @@ #. type: Content of: <div><div><dl><dt> #: /home/runa/tor/website/about/en/volunteers.wml:15 -msgid "Anonym" +msgid "Anonym, bertagaz, and intrigeri" msgstr "" #. type: Content of: <div><div><dl><dd> #: /home/runa/tor/website/about/en/volunteers.wml:15 -msgid "Maintainer of the Incognito LiveCD." +msgid "" +"Maintainers of <a href=\"https://tails.boum.org/\">The Amnesic Incognito " +"Live System</a>." msgstr "" #. type: Content of: <div><div><dl><dt> -#: /home/runa/tor/website/about/en/volunteers.wml:16 -msgid "Kevin Bankston" +#: /home/runa/tor/website/about/en/volunteers.wml:17 +msgid "Marco Bonetti" msgstr "" #. type: Content of: <div><div><dl><dd> -#: /home/runa/tor/website/about/en/volunteers.wml:16 -msgid "" -"EFF lawyer who helped write the <a href=\"<page eff/tor-legal-faq>\">Tor " -"Legal FAQ</a> and tirelessly answers the phone when somebody in the world " -"has a legal question about Tor." +#: /home/runa/tor/website/about/en/volunteers.wml:17 +msgid "Focusing on MobileTor for the iPhone." msgstr "" #. type: Content of: <div><div><dl><dt> -#: /home/runa/tor/website/about/en/volunteers.wml:20 -msgid "Marco Bonetti" +#: /home/runa/tor/website/about/en/volunteers.wml:18 +msgid "Kasimir Gabert" msgstr "" #. type: Content of: <div><div><dl><dd> -#: /home/runa/tor/website/about/en/volunteers.wml:20 -msgid "Focusing on MobileTor for the iPhone." +#: /home/runa/tor/website/about/en/volunteers.wml:18 +msgid "Maintains TorStatus." msgstr "" #. type: Content of: <div><div><dl><dt> -#: /home/runa/tor/website/about/en/volunteers.wml:21 -msgid "Kasimir Gabert" +#: /home/runa/tor/website/about/en/volunteers.wml:19 +msgid "Marcia Hofmann and Kevin Bankston" msgstr "" #. type: Content of: <div><div><dl><dd> -#: /home/runa/tor/website/about/en/volunteers.wml:21 -msgid "Maintains TorStatus." +#: /home/runa/tor/website/about/en/volunteers.wml:19 +msgid "" +"EFF lawyers who helped write the <a href=\"<page eff/tor-legal-faq>\">Tor " +"Legal FAQ</a> and tirelessly answers the phone when somebody in the world " +"has a legal question about Tor." msgstr "" #. type: Content of: <div><div><dl><dt> -#: /home/runa/tor/website/about/en/volunteers.wml:22 +#: /home/runa/tor/website/about/en/volunteers.wml:23 msgid "Andreas Jonsson" msgstr "" #. type: Content of: <div><div><dl><dd> -#: /home/runa/tor/website/about/en/volunteers.wml:22 +#: /home/runa/tor/website/about/en/volunteers.wml:23 msgid "Works on OS X Tor Browser Bundle sandbox technology." msgstr "" #. type: Content of: <div><div><dl><dt> -#: /home/runa/tor/website/about/en/volunteers.wml:24 +#: /home/runa/tor/website/about/en/volunteers.wml:25 msgid "Fabian Keil" msgstr "" #. type: Content of: <div><div><dl><dd> -#: /home/runa/tor/website/about/en/volunteers.wml:24 +#: /home/runa/tor/website/about/en/volunteers.wml:25 msgid "" "One of the core Privoxy developers, and also a Tor fan. He's the reason Tor " "and Privoxy still work well together." msgstr "" #. type: Content of: <div><div><dl><dt> -#: /home/runa/tor/website/about/en/volunteers.wml:26 -msgid "Bruce Leidl" -msgstr "" - -#. type: Content of: <div><div><dl><dd> -#: /home/runa/tor/website/about/en/volunteers.wml:26 -msgid "Working on a Tor client in Java." -msgstr "" - -#. type: Content of: <div><div><dl><dt> #: /home/runa/tor/website/about/en/volunteers.wml:27 msgid "Julius Mittenzwei" msgstr "" @@ -142,60 +134,34 @@ #. type: Content of: <div><div><dl><dt> #: /home/runa/tor/website/about/en/volunteers.wml:34 -msgid "Martin Peck" -msgstr "" - -#. type: Content of: <div><div><dl><dd> -#: /home/runa/tor/website/about/en/volunteers.wml:34 -msgid "" -"Working on a VM-based transparent proxying approach for Tor clients on " -"Windows." -msgstr "" - -#. type: Content of: <div><div><dl><dt> -#: /home/runa/tor/website/about/en/volunteers.wml:36 msgid "rovv (a pseudonym -- he's managed to stay anonymous even from us!)" msgstr "" #. type: Content of: <div><div><dl><dd> -#: /home/runa/tor/website/about/en/volunteers.wml:37 +#: /home/runa/tor/website/about/en/volunteers.wml:35 msgid "" "The most dedicated bug reporter we've ever heard from. He must read Tor " "source code every day over breakfast." msgstr "" #. type: Content of: <div><div><dl><dt> -#: /home/runa/tor/website/about/en/volunteers.wml:39 -msgid "tup (another pseudonym)" +#: /home/runa/tor/website/about/en/volunteers.wml:37 +msgid "Nart Villeneuve" msgstr "" #. type: Content of: <div><div><dl><dd> -#: /home/runa/tor/website/about/en/volunteers.wml:39 +#: /home/runa/tor/website/about/en/volunteers.wml:37 msgid "" -"Periodically adds new features for making Tor easier to use as a <a " -"href=\"<wiki>TransparentProxy\">transparent proxy</a>. Also maintains the <a" -" href=\"http://p56soo2ibjkx23xo.onion/\">TorDNSEL code</a>." +"Security researcher who works with Jacob on Internet Censorship research." msgstr "" #. type: Content of: <div><div><dl><dt> -#: /home/runa/tor/website/about/en/volunteers.wml:44 -msgid "Kyle Williams" -msgstr "" - -#. type: Content of: <div><div><dl><dd> -#: /home/runa/tor/website/about/en/volunteers.wml:44 -msgid "" -"Developer for JanusVM, a VMWare-based transparent Tor proxy that makes Tor " -"easier to set up and use." -msgstr "" - -#. type: Content of: <div><div><dl><dt> -#: /home/runa/tor/website/about/en/volunteers.wml:47 +#: /home/runa/tor/website/about/en/volunteers.wml:39 msgid "Ethan Zuckerman" msgstr "" #. type: Content of: <div><div><dl><dd> -#: /home/runa/tor/website/about/en/volunteers.wml:47 +#: /home/runa/tor/website/about/en/volunteers.wml:39 msgid "" "A blogger who has written some <a " "href=\"http://www.ethanzuckerman.com/blog/?p=1019\">interesting</a> <a " @@ -205,7 +171,7 @@ msgstr "" #. type: Content of: <div><div><dl><dt> -#: /home/runa/tor/website/about/en/volunteers.wml:52 +#: /home/runa/tor/website/about/en/volunteers.wml:44 msgid "" "All our relay operators, people who write <a " "href=\"http://freehaven.net/anonbib/\">research papers</a> about Tor, people" Modified: translation/trunk/projects/website/po/ru/docs/3-low.debian-vidalia.po =================================================================== --- translation/trunk/projects/website/po/ru/docs/3-low.debian-vidalia.po 2011-07-13 13:55:34 UTC (rev 24891) +++ translation/trunk/projects/website/po/ru/docs/3-low.debian-vidalia.po 2011-07-13 18:10:49 UTC (rev 24892) @@ -6,8 +6,8 @@ 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-03-22 16:31+0000\n" +"POT-Creation-Date: 2011-07-08 08:43+0200\n" +"PO-Revision-Date: 2011-07-09 01:14+0000\n" "Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" "Language-Team: Russian (http://www.transifex.net/projects/p/torproject/team/ru/)\n" "MIME-Version: 1.0\n" @@ -35,7 +35,7 @@ msgstr "" #. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:16 /tmp/M9Wxp74W_E.xml:83 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:16 /tmp/LnaSOLeTA9.xml:84 msgid "<br />" msgstr "" @@ -56,72 +56,77 @@ #. type: Content of: <div><div><p><ul><li> #: /home/runa/tor/website/docs/en/debian-vidalia.wml:29 -msgid "Ubuntu 10.10 is \"maverick\" but use the \"lucid\" packages" +msgid "Ubuntu 11.04 is \"natty\"" msgstr "" #. type: Content of: <div><div><p><ul><li> #: /home/runa/tor/website/docs/en/debian-vidalia.wml:30 +msgid "Ubuntu 10.10 or Trisquel 4.5 is \"maverick\"" +msgstr "" + +#. type: Content of: <div><div><p><ul><li> +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:31 msgid "Ubuntu 10.04 or Trisquel 4.0 is \"lucid\"" msgstr "" #. type: Content of: <div><div><p><ul><li> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:31 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:32 msgid "Ubuntu 9.10 or Trisquel 3.5 is \"karmic\"" msgstr "" #. type: Content of: <div><div><p><ul><li> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:32 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:33 msgid "Ubuntu 9.04 is \"jaunty\"" msgstr "" #. type: Content of: <div><div><p><ul><li> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:33 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:34 msgid "Ubuntu 8.10 is \"intrepid\"" msgstr "" #. type: Content of: <div><div><p><ul><li> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:34 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:35 msgid "Ubuntu 8.04 is \"hardy\"" msgstr "" #. type: Content of: <div><div><p><ul><li> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:35 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:36 msgid "Debian Etch is \"etch\"" msgstr "" #. type: Content of: <div><div><p><ul><li> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:36 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:37 msgid "Debian Lenny is \"lenny\"" msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:39 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:40 msgid "Then add this line to your <tt>/etc/apt/sources.list</tt> file:<br />" msgstr "" #. type: Content of: <div><div><p><pre> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:43 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:44 #, no-wrap msgid "" "deb http://deb.torproject.org/torproject.org <DISTRIBUTION> main\n" msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:45 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:46 msgid "" "where you substitute the above word (etch, lenny, sid, karmic, jaunty, " "intrepid, hardy) in place of <DISTRIBUTION>." msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:50 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:51 msgid "" "Then add the gpg key used to sign the packages by running the following " "commands at your command prompt:" msgstr "" #. type: Content of: <div><div><p><pre> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:53 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:54 #, no-wrap msgid "" "gpg --keyserver keys.gnupg.net --recv 886DDD89\n" @@ -129,14 +134,14 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:56 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:57 msgid "" "Now refresh your sources and install Vidalia by running the following " "commands at your command prompt:" msgstr "" #. type: Content of: <div><div><p><pre> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:59 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:60 #, no-wrap msgid "" "apt-get update\n" @@ -144,8 +149,8 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:65 -#: /tmp/M9Wxp74W_E.xml:112 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:66 +#: /tmp/LnaSOLeTA9.xml:113 msgid "" "Now Vidalia is installed and running. Move on to <a href=\"<page docs/tor-" "doc-unix>#polipo\">step two</a> of the \"Vidalia on Linux/Unix\" " @@ -153,7 +158,7 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:71 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:72 msgid "" "The DNS name <code>deb.torproject.org</code> is actually a set of " "independent servers in a DNS round robin configuration. If you for some " @@ -163,38 +168,38 @@ msgstr "" #. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:79 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:80 msgid "<hr /> <a id=\"source\"></a>" msgstr "" #. type: Content of: <div><div><h2> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:82 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:83 msgid "<a class=\"anchor\" href=\"#source\">Building from source</a>" msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:86 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:87 msgid "" "If you want to build your own debs from source you must first add an " "appropriate <tt>deb-src</tt> line to <tt>sources.list</tt>." msgstr "" #. type: Content of: <div><div><p><pre> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:89 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:90 #, no-wrap msgid "" "deb-src http://deb.torproject.org/torproject.org <DISTRIBUTION> main\n" msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:91 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:92 msgid "" "You also need to install the necessary packages to build your own debs and " "the packages needed to build Vidalia:" msgstr "" #. type: Content of: <div><div><p><pre> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:94 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:95 #, no-wrap msgid "" "apt-get install build-essential fakeroot devscripts qt4-dev-tools qt4-designer libqt4-dev g++ cmake\n" @@ -202,12 +207,12 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:97 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:98 msgid "Then you can build Vidalia in ~/debian-packages:" msgstr "" #. type: Content of: <div><div><p><pre> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:99 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:100 #, no-wrap msgid "" "mkdir ~/debian-packages; cd ~/debian-packages\n" @@ -218,23 +223,23 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:105 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:106 msgid "Now you can install the new package:" msgstr "" #. type: Content of: <div><div><p><pre> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:107 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:108 #, no-wrap msgid "sudo dpkg -i vidalia_*.deb\n" msgstr "" #. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:117 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:118 msgid "<hr />" msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian-vidalia.wml:119 +#: /home/runa/tor/website/docs/en/debian-vidalia.wml:120 msgid "" "If you have suggestions for improving this document, please <a href=\"<page " "about/contact>\">send them to us</a>. Thanks!" Modified: translation/trunk/projects/website/po/ru/docs/3-low.debian.po =================================================================== --- translation/trunk/projects/website/po/ru/docs/3-low.debian.po 2011-07-13 13:55:34 UTC (rev 24891) +++ translation/trunk/projects/website/po/ru/docs/3-low.debian.po 2011-07-13 18:10:49 UTC (rev 24892) @@ -6,8 +6,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:31+0000\n" +"POT-Creation-Date: 2011-07-08 08:43+0200\n" +"PO-Revision-Date: 2011-07-09 01:14+0000\n" "Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" "Language-Team: Russian (http://www.transifex.net/projects/p/torproject/team/ru/)\n" "MIME-Version: 1.0\n" @@ -37,8 +37,8 @@ msgstr "" #. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/debian.wml:16 /tmp/__TMvx4TV6.xml:43 -#: /tmp/__TMvx4TV6.xml:113 /tmp/__TMvx4TV6.xml:148 +#: /home/runa/tor/website/docs/en/debian.wml:16 /tmp/hXZfq9nNmb.xml:43 +#: /tmp/hXZfq9nNmb.xml:114 /tmp/hXZfq9nNmb.xml:149 msgid "<br />" msgstr "" @@ -58,8 +58,8 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian.wml:32 /tmp/__TMvx4TV6.xml:94 -#: /tmp/__TMvx4TV6.xml:139 /tmp/__TMvx4TV6.xml:182 +#: /home/runa/tor/website/docs/en/debian.wml:32 /tmp/hXZfq9nNmb.xml:95 +#: /tmp/hXZfq9nNmb.xml:140 /tmp/hXZfq9nNmb.xml:183 msgid "" "Now Tor is installed and running. Move on to <a href=\"<page docs/tor-doc-" "unix>#polipo\">step two</a> of the \"Tor on Linux/Unix\" instructions." @@ -108,57 +108,62 @@ #. type: Content of: <div><div><p><ul><li> #: /home/runa/tor/website/docs/en/debian.wml:60 -msgid "Ubuntu 10.10 is \"maverick\"" +msgid "Ubuntu 11.04 is \"natty\"" msgstr "" #. type: Content of: <div><div><p><ul><li> #: /home/runa/tor/website/docs/en/debian.wml:61 +msgid "Ubuntu 10.10 or Trisquel 4.5 is \"maverick\"" +msgstr "" + +#. type: Content of: <div><div><p><ul><li> +#: /home/runa/tor/website/docs/en/debian.wml:62 msgid "Ubuntu 10.04 or Trisquel 4.0 is \"lucid\"" msgstr "" #. type: Content of: <div><div><p><ul><li> -#: /home/runa/tor/website/docs/en/debian.wml:62 +#: /home/runa/tor/website/docs/en/debian.wml:63 msgid "Ubuntu 9.10 or Trisquel 3.5 is \"karmic\"" msgstr "" #. type: Content of: <div><div><p><ul><li> -#: /home/runa/tor/website/docs/en/debian.wml:63 +#: /home/runa/tor/website/docs/en/debian.wml:64 msgid "Ubuntu 8.04 is \"hardy\"" msgstr "" #. type: Content of: <div><div><p><ul><li> -#: /home/runa/tor/website/docs/en/debian.wml:64 +#: /home/runa/tor/website/docs/en/debian.wml:65 msgid "Ubuntu 6.06 is \"dapper\"" msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian.wml:67 +#: /home/runa/tor/website/docs/en/debian.wml:68 msgid "Then add this line to your <tt>/etc/apt/sources.list</tt> file:<br />" msgstr "" #. type: Content of: <div><div><p><pre> -#: /home/runa/tor/website/docs/en/debian.wml:71 +#: /home/runa/tor/website/docs/en/debian.wml:72 #, no-wrap msgid "" "deb http://deb.torproject.org/torproject.org <DISTRIBUTION> main\n" msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian.wml:73 +#: /home/runa/tor/website/docs/en/debian.wml:74 msgid "" "where you put the codename of your distribution (i.e. lenny, sid, maverick " "or whatever it is) in place of <DISTRIBUTION>." msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian.wml:79 +#: /home/runa/tor/website/docs/en/debian.wml:80 msgid "" "Then add the gpg key used to sign the packages by running the following " "commands at your command prompt:" msgstr "" #. type: Content of: <div><div><p><pre> -#: /home/runa/tor/website/docs/en/debian.wml:82 +#: /home/runa/tor/website/docs/en/debian.wml:83 #, no-wrap msgid "" "gpg --keyserver keys.gnupg.net --recv 886DDD89\n" @@ -166,14 +171,14 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian.wml:85 +#: /home/runa/tor/website/docs/en/debian.wml:86 msgid "" "Now refresh your sources and install Tor by running the following commands " "(as root) at your command prompt:" msgstr "" #. type: Content of: <div><div><p><pre> -#: /home/runa/tor/website/docs/en/debian.wml:88 +#: /home/runa/tor/website/docs/en/debian.wml:89 #, no-wrap msgid "" "apt-get update\n" @@ -181,7 +186,7 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian.wml:100 +#: /home/runa/tor/website/docs/en/debian.wml:101 msgid "" "The DNS name <code>deb.torproject.org</code> is actually a set of " "independent servers in a DNS round robin configuration. If you for some " @@ -191,19 +196,19 @@ msgstr "" #. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/debian.wml:108 +#: /home/runa/tor/website/docs/en/debian.wml:109 msgid "<hr /> <a id=\"development\"></a>" msgstr "" #. type: Content of: <div><div><h2> -#: /home/runa/tor/website/docs/en/debian.wml:111 +#: /home/runa/tor/website/docs/en/debian.wml:112 msgid "" "<a class=\"anchor\" href=\"#development\">Option three: Using the " "development branch of Tor on Debian or Ubuntu</a>" msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian.wml:115 +#: /home/runa/tor/website/docs/en/debian.wml:116 msgid "" "If you want to use the <a href=\"<page " "download/download>#packagediff\">development branch</a> of Tor instead (more" @@ -212,7 +217,7 @@ msgstr "" #. type: Content of: <div><div><p><pre> -#: /home/runa/tor/website/docs/en/debian.wml:120 +#: /home/runa/tor/website/docs/en/debian.wml:121 #, no-wrap msgid "" "deb http://deb.torproject.org/torproject.org <DISTRIBUTION> main\n" @@ -220,19 +225,19 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian.wml:123 +#: /home/runa/tor/website/docs/en/debian.wml:124 msgid "" "where you again substitute the name of your distro (lenny, sid, maverick, " "...) in place of <DISTRIBUTION>." msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian.wml:129 +#: /home/runa/tor/website/docs/en/debian.wml:130 msgid "Then run the following commands at your command prompt:" msgstr "" #. type: Content of: <div><div><p><pre> -#: /home/runa/tor/website/docs/en/debian.wml:131 +#: /home/runa/tor/website/docs/en/debian.wml:132 #, no-wrap msgid "" "gpg --keyserver keys.gnupg.net --recv 886DDD89\n" @@ -242,17 +247,17 @@ msgstr "" #. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/debian.wml:144 +#: /home/runa/tor/website/docs/en/debian.wml:145 msgid "<hr /> <a id=\"source\"></a>" msgstr "" #. type: Content of: <div><div><h2> -#: /home/runa/tor/website/docs/en/debian.wml:147 +#: /home/runa/tor/website/docs/en/debian.wml:148 msgid "<a class=\"anchor\" href=\"#source\">Building from source</a>" msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian.wml:151 +#: /home/runa/tor/website/docs/en/debian.wml:152 msgid "" "If you want to build your own debs from source you must first add an " "appropriate <tt>deb-src</tt> line to <tt>sources.list</tt>." @@ -261,7 +266,7 @@ #. PO4ASHARPBEGIN For the stable version.PO4ASHARPEND #. PO4ASHARPBEGIN For the unstable version.PO4ASHARPEND #. type: Content of: <div><div><p><pre> -#: /home/runa/tor/website/docs/en/debian.wml:154 +#: /home/runa/tor/website/docs/en/debian.wml:155 #, no-wrap msgid "" "\n" @@ -273,14 +278,14 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian.wml:161 +#: /home/runa/tor/website/docs/en/debian.wml:162 msgid "" "You also need to install the necessary packages to build your own debs and " "the packages needed to build Tor:" msgstr "" #. type: Content of: <div><div><p><pre> -#: /home/runa/tor/website/docs/en/debian.wml:164 +#: /home/runa/tor/website/docs/en/debian.wml:165 #, no-wrap msgid "" "apt-get install build-essential fakeroot devscripts\n" @@ -288,12 +293,12 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian.wml:167 +#: /home/runa/tor/website/docs/en/debian.wml:168 msgid "Then you can build Tor in ~/debian-packages:" msgstr "" #. type: Content of: <div><div><p><pre> -#: /home/runa/tor/website/docs/en/debian.wml:169 +#: /home/runa/tor/website/docs/en/debian.wml:170 #, no-wrap msgid "" "mkdir ~/debian-packages; cd ~/debian-packages\n" @@ -304,23 +309,23 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian.wml:175 +#: /home/runa/tor/website/docs/en/debian.wml:176 msgid "Now you can install the new package:" msgstr "" #. type: Content of: <div><div><p><pre> -#: /home/runa/tor/website/docs/en/debian.wml:177 +#: /home/runa/tor/website/docs/en/debian.wml:178 #, no-wrap msgid "sudo dpkg -i tor_*.deb\n" msgstr "" #. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/debian.wml:187 +#: /home/runa/tor/website/docs/en/debian.wml:188 msgid "<hr />" msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/debian.wml:189 +#: /home/runa/tor/website/docs/en/debian.wml:190 msgid "" "If you have suggestions for improving this document, please <a href=\"<page " "about/contact>\">send them to us</a>. Thanks!" Modified: translation/trunk/projects/website/po/ru/docs/3-low.tor-doc-unix.po =================================================================== --- translation/trunk/projects/website/po/ru/docs/3-low.tor-doc-unix.po 2011-07-13 13:55:34 UTC (rev 24891) +++ translation/trunk/projects/website/po/ru/docs/3-low.tor-doc-unix.po 2011-07-13 18:10:49 UTC (rev 24892) @@ -6,8 +6,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" -"POT-Creation-Date: 2011-06-21 08:18+0200\n" -"PO-Revision-Date: 2011-06-22 00:54+0000\n" +"POT-Creation-Date: 2011-07-08 08:43+0200\n" +"PO-Revision-Date: 2011-07-09 01:14+0000\n" "Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" "Language-Team: Russian (http://www.transifex.net/projects/p/torproject/team/ru/)\n" "MIME-Version: 1.0\n" @@ -30,9 +30,8 @@ msgstr "" #. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:14 /tmp/4vVJb7zECD.xml:26 -#: /tmp/4vVJb7zECD.xml:58 /tmp/4vVJb7zECD.xml:92 /tmp/4vVJb7zECD.xml:135 -#: /tmp/4vVJb7zECD.xml:173 +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:14 /tmp/KCUf13Jh9J.xml:26 +#: /tmp/KCUf13Jh9J.xml:57 /tmp/KCUf13Jh9J.xml:96 /tmp/KCUf13Jh9J.xml:130 msgid "<br>" msgstr "" @@ -40,9 +39,8 @@ #: /home/runa/tor/website/docs/en/tor-doc-unix.wml:17 msgid "" "<b>Note that these are the installation instructions for running a Tor " -"client. If you want to relay traffic for others to help the network grow " -"(please do), read the <a href=\"<page docs/tor-doc-relay>\">Configuring a " -"relay</a> guide.</b>" +"client. The easiest way to do this is to simply download the <a href=\"<page" +" projects/torbrowser>\">Tor Browser Bundle</a> and you are done. </b>" msgstr "" #. type: Content of: <div><div> @@ -91,75 +89,25 @@ #. type: Content of: <div><div> #: /home/runa/tor/website/docs/en/tor-doc-unix.wml:54 -msgid "<hr> <a id=\"privoxy\"></a> <a id=\"polipo\"></a>" -msgstr "" - -#. type: Content of: <div><div><h2> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:57 -msgid "" -"<a class=\"anchor\" href=\"#polipo\">Step Two: Install Polipo for Web " -"Browsing</a>" -msgstr "" - -#. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:60 -msgid "" -"After installing Tor, you need to configure your applications to use it." -msgstr "" - -#. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:64 -msgid "" -"The first step is to set up web browsing. Start by installing <a " -"href=\"http://www.pps.jussieu.fr/~jch/software/polipo/\">Polipo</a> from " -"your favorite repository. Polipo is a caching web proxy that does http " -"pipelining well, so it's well-suited for Tor's latencies. Make sure to get " -"at least Polipo 1.0.4, since earlier versions lack the SOCKS support " -"required to use Polipo with Tor. You should uninstall privoxy at this point " -"(e.g. apt-get remove privoxy or yum remove privoxy), so they don't conflict." -msgstr "" - -#. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:74 -msgid "" -"Once you've installed Polipo (either from package or from source), <b>you " -"will need to configure Polipo to use Tor</b>. Grab our <a href=\"<tbbrepo" -">/build-scripts/config/polipo.conf\">Polipo configuration for Tor</a> and " -"put it in place of your current polipo config file (e.g. /etc/polipo/config " -"or ~/.polipo). You'll need to restart Polipo for the changes to take " -"effect. For example:<br> <tt>/etc/init.d/polipo restart</tt>" -msgstr "" - -#. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:84 -msgid "" -"If you prefer, you can instead use Privoxy with <a " -"href=\"<wiki>doc/PrivoxyConfig\">this sample Privoxy configuration</a>. But " -"since the config files both use port 8118, you shouldn't run both Polipo and" -" Privoxy at the same time." -msgstr "" - -#. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:89 msgid "<hr> <a id=\"using\"></a>" msgstr "" #. type: Content of: <div><div><h2> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:91 +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:56 msgid "" -"<a class=\"anchor\" href=\"#using\">Step Three: Configure your applications " -"to use Tor</a>" +"<a class=\"anchor\" href=\"#using\">Step Two: Configure your applications to" +" use Tor</a>" msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:94 +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:59 msgid "" -"After installing Tor and Polipo, you need to configure your applications to " -"use them. The first step is to set up web browsing." +"After installing Tor, you need to configure your applications to use them. " +"The first step is to set up web browsing." msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:97 +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:62 msgid "" "You should use Tor with Firefox and Torbutton, for best safety. Simply " "install the <a href=\"<page torbutton/index>\">Torbutton plugin</a>, restart" @@ -167,14 +115,14 @@ msgstr "" #. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:103 +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:68 msgid "" "<img alt=\"Torbutton plugin for Firefox\" src=\"$(IMGROOT)/screenshot-" "torbutton.png\" > <br>" msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:110 +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:75 msgid "" "If you plan to run Firefox on a different computer than Tor, see the <a " "href=\"<wikifaq>#SocksListenAddress\"> FAQ entry for running Tor on a " @@ -182,37 +130,35 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:116 +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:81 msgid "" -"To Torify other applications that support HTTP proxies, just point them at " -"Polipo (that is, localhost port 8118). To use SOCKS directly (for instant " -"messaging, Jabber, IRC, etc), you can point your application directly at Tor" -" (localhost port 9050), but see <a href=\"<wikifaq>#SOCKSAndDNS\">this FAQ " -"entry</a> for why this may be dangerous. For applications that support " -"neither SOCKS nor HTTP, take a look at <a " -"href=\"https://code.google.com/p/torsocks/\">torsocks</a> or <a " +"To Torify other applications that support SOCKS proxies, just point them at " +"Tor's SOCKS port (127.0.0.1 port 9050). See <a " +"href=\"<wikifaq>#SOCKSAndDNS\">this FAQ entry</a> for why this may be " +"dangerous. For applications that support neither SOCKS nor HTTP, take a look" +" at <a href=\"https://code.google.com/p/torsocks/\">torsocks</a> or <a " "href=\"<wiki>doc/TorifyHOWTO#socat\">socat</a>." msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:127 +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:89 msgid "" "For information on how to Torify other applications, check out the <a " "href=\"<wiki>doc/TorifyHOWTO\">Torify HOWTO</a>." msgstr "" #. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:132 +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:93 msgid "<hr> <a id=\"verify\"></a>" msgstr "" #. type: Content of: <div><div><h2> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:134 -msgid "<a class=\"anchor\" href=\"#verify\">Step Four: Make sure it's working</a>" +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:95 +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-unix.wml:138 +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:99 msgid "" "Next, you should try using your browser with Tor and make sure that your IP " "address is being anonymized. Click on <a " @@ -224,50 +170,50 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:150 +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:109 msgid "" "If you have a personal firewall that limits your computer's ability to " "connect to itself (this includes something like SELinux on Fedora Core 4), " -"be sure to allow connections from your local applications to Polipo (local " -"port 8118) and Tor (local port 9050). If your firewall blocks outgoing " -"connections, punch a hole so it can connect to at least TCP ports 80 and " -"443, and then see <a href=\"<wikifaq>#FirewalledClient\">this FAQ entry</a>." -" If your SELinux config is not allowing tor or privoxy to run correctly, " -"create a file named booleans.local in the directory /etc/selinux/targeted. " -"Edit this file in your favorite text editor and insert \"allow_ypbind=1\". " -"Restart your machine for this change to take effect." +"be sure to allow connections from your local applications to Tor (local port" +" 9050). If your firewall blocks outgoing connections, punch a hole so it can" +" connect to at least TCP ports 80 and 443, and then see <a " +"href=\"<wikifaq>#FirewalledClient\">this FAQ entry</a>. If your SELinux " +"config is not allowing tor or privoxy to run correctly, create a file named " +"booleans.local in the directory /etc/selinux/targeted. Edit this file in " +"your favorite text editor and insert \"allow_ypbind=1\". Restart your " +"machine for this change to take effect." msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:165 +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:122 msgid "" "If it's still not working, look at <a href=\"<page " "docs/faq>#DoesntWork\">this FAQ entry</a> for hints." msgstr "" #. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:169 +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:126 msgid "<hr> <a id=\"server\"></a> <a id=\"relay\"></a>" msgstr "" #. type: Content of: <div><div><h2> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:172 -msgid "<a class=\"anchor\" href=\"#relay\">Step Five: Configure it as a relay</a>" +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:129 +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-unix.wml:175 +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:132 msgid "" "The Tor network relies on volunteers to donate bandwidth. The more people " "who run relays, the faster the Tor network will be. If you have at least 20 " -"kilobytes/s each way, please help out Tor by configuring your Tor to be a " +"KiloBytes/s each way, please help out Tor by configuring your Tor to be a " "relay too. We have many features that make Tor relays easy and convenient, " "including rate limiting for bandwidth, exit policies so you can limit your " "exposure to abuse complaints, and support for dynamic IP addresses." msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:183 +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:140 msgid "" "Having relays in many different places on the Internet is what makes Tor " "users secure. <a href=\"<wikifaq>#RelayAnonymity\">You may also get stronger" @@ -276,19 +222,19 @@ msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:190 +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:146 msgid "" "Read more at our <a href=\"<page docs/tor-doc-relay>\">Configuring a " "relay</a> guide." msgstr "" #. type: Content of: <div><div> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:193 +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:149 msgid "<hr>" msgstr "" #. type: Content of: <div><div><p> -#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:195 +#: /home/runa/tor/website/docs/en/tor-doc-unix.wml:151 msgid "" "If you have suggestions for improving this document, please <a href=\"<page " "about/contact>\">send them to us</a>. Thanks!" Modified: translation/trunk/projects/website/po/ru/download/1-high.download-easy.po =================================================================== --- translation/trunk/projects/website/po/ru/download/1-high.download-easy.po 2011-07-13 13:55:34 UTC (rev 24891) +++ translation/trunk/projects/website/po/ru/download/1-high.download-easy.po 2011-07-13 18:10:49 UTC (rev 24892) @@ -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-06-21 08:18+0200\n" -"PO-Revision-Date: 2011-06-22 00:57+0000\n" +"POT-Creation-Date: 2011-07-08 08:42+0200\n" +"PO-Revision-Date: 2011-07-09 01:17+0000\n" "Last-Translator: axe <axe.rode(a)ymail.com>\n" "Language-Team: Russian (http://www.transifex.net/projects/p/torproject/team/ru/)\n" "MIME-Version: 1.0\n" @@ -123,7 +123,7 @@ #: /home/runa/tor/website/download/en/download-easy.wml:72 msgid "" "</select> <input type=\"text\" id=\"amount\" class=\"amount\" " -"name=\"amount\" value=\"5\" size=\"10\">" +"name=\"amount\" value=\"10\" size=\"10\">" msgstr "" #. type: Content of: <div><div><table><tbody><tr><td><form><p><select> Modified: translation/trunk/projects/website/po/ru/download/3-low.download.po =================================================================== --- translation/trunk/projects/website/po/ru/download/3-low.download.po 2011-07-13 13:55:34 UTC (rev 24891) +++ translation/trunk/projects/website/po/ru/download/3-low.download.po 2011-07-13 18:10:49 UTC (rev 24892) @@ -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-06-21 08:18+0200\n" -"PO-Revision-Date: 2011-06-22 00:56+0000\n" +"POT-Creation-Date: 2011-07-08 08:42+0200\n" +"PO-Revision-Date: 2011-07-09 01:16+0000\n" "Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" "Language-Team: Russian (http://www.transifex.net/projects/p/torproject/team/ru/)\n" "MIME-Version: 1.0\n" @@ -127,7 +127,7 @@ #: /home/runa/tor/website/download/en/download.wml:65 msgid "" "</select> <input type=\"text\" id=\"amount\" class=\"amount\" " -"name=\"amount\" value=\"5\" size=\"10\">" +"name=\"amount\" value=\"10\" size=\"10\">" msgstr "" #. type: Content of: <div><div><table><tr><td><form><p><select> @@ -182,8 +182,8 @@ msgstr "" #. type: Content of: <div><div><table><tr><td><ul><li> -#: /home/runa/tor/website/download/en/download.wml:102 /tmp/FhqGC1ISDt.xml:165 -#: /tmp/FhqGC1ISDt.xml:203 +#: /home/runa/tor/website/download/en/download.wml:102 /tmp/lbSAEZiU0Z.xml:165 +#: /tmp/lbSAEZiU0Z.xml:203 msgid "" "The <strong>Tor Browser Bundle</strong> contains everything you need to " "safely browse the Internet. This package requires no installation. Just " @@ -222,7 +222,7 @@ "нужно настроить Tor и все ваши приложения вручную." #. type: Content of: <div><div><table><tr><td><p> -#: /home/runa/tor/website/download/en/download.wml:110 /tmp/FhqGC1ISDt.xml:168 +#: /home/runa/tor/website/download/en/download.wml:110 /tmp/lbSAEZiU0Z.xml:168 msgid "" "There are two versions of each package, a stable and alpha release. Stable " "packages are released when we believe the features and code will not change " @@ -617,7 +617,7 @@ ")" #. type: Content of: <div><div><div> -#: /home/runa/tor/website/download/en/download.wml:265 /tmp/FhqGC1ISDt.xml:344 +#: /home/runa/tor/website/download/en/download.wml:265 /tmp/lbSAEZiU0Z.xml:344 msgid "<br>" msgstr "<br>" 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-07-13 13:55:34 UTC (rev 24891) +++ translation/trunk/projects/website/po/ru/press/4-optional.2010-03-25-tor-store-press-release.po 2011-07-13 18:10:49 UTC (rev 24892) @@ -7,7 +7,7 @@ "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-05-02 17:00+0200\n" -"PO-Revision-Date: 2011-07-08 07:49+0000\n" +"PO-Revision-Date: 2011-07-13 17:04+0000\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: Russian (http://www.transifex.net/projects/p/torproject/team/ru/)\n" "MIME-Version: 1.0\n" Modified: translation/trunk/projects/website/po/vi/download/3-low.download.po =================================================================== --- translation/trunk/projects/website/po/vi/download/3-low.download.po 2011-07-13 13:55:34 UTC (rev 24891) +++ translation/trunk/projects/website/po/vi/download/3-low.download.po 2011-07-13 18:10:49 UTC (rev 24892) @@ -6,8 +6,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" -"POT-Creation-Date: 2011-06-21 08:18+0200\n" -"PO-Revision-Date: 2011-07-08 07:44+0000\n" +"POT-Creation-Date: 2011-07-08 08:42+0200\n" +"PO-Revision-Date: 2011-07-13 16:46+0000\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -119,7 +119,7 @@ #: /home/runa/tor/website/download/en/download.wml:65 msgid "" "</select> <input type=\"text\" id=\"amount\" class=\"amount\" " -"name=\"amount\" value=\"5\" size=\"10\">" +"name=\"amount\" value=\"10\" size=\"10\">" msgstr "" #. type: Content of: <div><div><table><tr><td><form><p><select> @@ -174,8 +174,8 @@ msgstr "" #. type: Content of: <div><div><table><tr><td><ul><li> -#: /home/runa/tor/website/download/en/download.wml:102 /tmp/FhqGC1ISDt.xml:165 -#: /tmp/FhqGC1ISDt.xml:203 +#: /home/runa/tor/website/download/en/download.wml:102 /tmp/lbSAEZiU0Z.xml:165 +#: /tmp/lbSAEZiU0Z.xml:203 msgid "" "The <strong>Tor Browser Bundle</strong> contains everything you need to " "safely browse the Internet. This package requires no installation. Just " @@ -209,7 +209,7 @@ msgstr "" #. type: Content of: <div><div><table><tr><td><p> -#: /home/runa/tor/website/download/en/download.wml:110 /tmp/FhqGC1ISDt.xml:168 +#: /home/runa/tor/website/download/en/download.wml:110 /tmp/lbSAEZiU0Z.xml:168 msgid "" "There are two versions of each package, a stable and alpha release. Stable " "packages are released when we believe the features and code will not change " @@ -518,7 +518,7 @@ msgstr "" #. type: Content of: <div><div><div> -#: /home/runa/tor/website/download/en/download.wml:265 /tmp/FhqGC1ISDt.xml:344 +#: /home/runa/tor/website/download/en/download.wml:265 /tmp/lbSAEZiU0Z.xml:344 msgid "<br>" msgstr "" 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-07-13 13:55:34 UTC (rev 24891) +++ translation/trunk/projects/website/po/zh_CN/about/2-medium.overview.po 2011-07-13 18:10:49 UTC (rev 24892) @@ -7,7 +7,7 @@ "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-06-29 20:42+0200\n" -"PO-Revision-Date: 2011-07-08 07:50+0000\n" +"PO-Revision-Date: 2011-07-13 17:04+0000\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" Modified: translation/trunk/projects/website/po/zh_CN/download/3-low.download.po =================================================================== --- translation/trunk/projects/website/po/zh_CN/download/3-low.download.po 2011-07-13 13:55:34 UTC (rev 24891) +++ translation/trunk/projects/website/po/zh_CN/download/3-low.download.po 2011-07-13 18:10:49 UTC (rev 24892) @@ -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-06-21 08:18+0200\n" -"PO-Revision-Date: 2011-06-27 07:58+0000\n" +"POT-Creation-Date: 2011-07-08 08:42+0200\n" +"PO-Revision-Date: 2011-07-09 01:16+0000\n" "Last-Translator: xtoaster <zhazhenzhong(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -122,7 +122,7 @@ #: /home/runa/tor/website/download/en/download.wml:65 msgid "" "</select> <input type=\"text\" id=\"amount\" class=\"amount\" " -"name=\"amount\" value=\"5\" size=\"10\">" +"name=\"amount\" value=\"10\" size=\"10\">" msgstr "" #. type: Content of: <div><div><table><tr><td><form><p><select> @@ -177,8 +177,8 @@ msgstr "" #. type: Content of: <div><div><table><tr><td><ul><li> -#: /home/runa/tor/website/download/en/download.wml:102 /tmp/FhqGC1ISDt.xml:165 -#: /tmp/FhqGC1ISDt.xml:203 +#: /home/runa/tor/website/download/en/download.wml:102 /tmp/lbSAEZiU0Z.xml:165 +#: /tmp/lbSAEZiU0Z.xml:203 msgid "" "The <strong>Tor Browser Bundle</strong> contains everything you need to " "safely browse the Internet. This package requires no installation. Just " @@ -214,7 +214,7 @@ msgstr "<strong>专家软件包</strong>仅包含Tor的，别无其他。你需要配置Tor和所有的应用程序手动。" #. type: Content of: <div><div><table><tr><td><p> -#: /home/runa/tor/website/download/en/download.wml:110 /tmp/FhqGC1ISDt.xml:168 +#: /home/runa/tor/website/download/en/download.wml:110 /tmp/lbSAEZiU0Z.xml:168 msgid "" "There are two versions of each package, a stable and alpha release. Stable " "packages are released when we believe the features and code will not change " @@ -527,7 +527,7 @@ "href=\"../dist/tor-<version-alpha>.tar.gz.asc\">数字签名</a> ）" #. type: Content of: <div><div><div> -#: /home/runa/tor/website/download/en/download.wml:265 /tmp/FhqGC1ISDt.xml:344 +#: /home/runa/tor/website/download/en/download.wml:265 /tmp/lbSAEZiU0Z.xml:344 msgid "<br>" msgstr ""

1 0

[tor/master] Fix cut'n'paste bug in comment.
by nickm＠torproject.org 13 Jul '11

13 Jul '11

commit 4ce302c8e5f19e0ac4417f2a75e206b64a1fc63d Author: Linus Nordberg <linus(a)nordberg.se> Date: Mon Jul 11 20:51:26 2011 +0200 Fix cut'n'paste bug in comment. --- src/or/or.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/or/or.h b/src/or/or.h index 3c76444..e9fab82 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -3119,7 +3119,7 @@ struct socks_request_t { * see usernamelen for its length. */ char *username; /** The negotiated password value if any (for socks5). This value is NOT - * nul-terminated; see usernamelen for its length. */ + * nul-terminated; see passwordlen for its length. */ char *password; };

1 0

[tor/master] Record username/password data in socks_request_t
by nickm＠torproject.org 13 Jul '11

13 Jul '11

commit 2e6604f42ee614156ceeb29bdcab5c78cc1d84ba Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 29 12:31:17 2011 -0400 Record username/password data in socks_request_t This change also requires us to add and use a pair of allocator/deallocator functions for socks_request_t, instead of using tor_malloc_zero/tor_free directly. --- src/or/buffers.c | 43 +++++++++++++++++++++++++++++++++++++++---- src/or/buffers.h | 2 ++ src/or/connection.c | 8 +++----- src/or/or.h | 12 ++++++++++++ src/test/test.c | 20 ++++++++++---------- 5 files changed, 66 insertions(+), 19 deletions(-) diff --git a/src/or/buffers.c b/src/or/buffers.c index 7b212a7..0e2dbbe 100644 --- a/src/or/buffers.c +++ b/src/or/buffers.c @@ -1475,6 +1475,25 @@ log_unsafe_socks_warning(int socks_protocol, const char *address, socks_protocol, address, (int)port); } +/** Return a new socks_request_t. */ +socks_request_t * +socks_request_new(void) +{ + return tor_malloc_zero(sizeof(socks_request_t)); +} + +/** Free all storage held in the socks_request_t <b>req</b>. */ +void +socks_request_free(socks_request_t *req) +{ + if (!req) + return; + tor_free(req->username); + tor_free(req->password); + memset(req, 0xCC, sizeof(socks_request_t)); + tor_free(req); +} + /** There is a (possibly incomplete) socks handshake on <b>buf</b>, of one * of the forms * - socks4: "socksheader username\\0" @@ -1631,7 +1650,6 @@ parse_socks(const char *data, size_t datalen, socks_request_t *req, tor_addr_t destaddr; uint32_t destip; uint8_t socksver; - enum {socks4, socks4a} socks4_prot = socks4a; char *next, *startaddr; unsigned char usernamelen, passlen; struct in_addr in; @@ -1662,6 +1680,14 @@ parse_socks(const char *data, size_t datalen, socks_request_t *req, req->reply[1] = 0; /* authentication successful */ log_debug(LD_APP, "socks5: Accepted username/password without checking."); + if (usernamelen) { + req->username = tor_memdup(data+2u, usernamelen); + req->usernamelen = usernamelen; + } + if (passlen) { + req->password = tor_memdup(data+3u+usernamelen, passlen); + req->passwordlen = passlen; + } *drain_out = 2u + usernamelen + 1u + passlen; req->got_auth = 1; return 0; @@ -1813,7 +1839,9 @@ parse_socks(const char *data, size_t datalen, socks_request_t *req, return -1; } tor_assert(0); - case 4: /* socks4 */ + case 4: { /* socks4 */ + enum {socks4, socks4a} socks4_prot = socks4a; + const char *authstart, *authend; /* http://ss5.sourceforge.net/socks4.protocol.txt */ /* http://ss5.sourceforge.net/socks4A.protocol.txt */ @@ -1854,7 +1882,8 @@ parse_socks(const char *data, size_t datalen, socks_request_t *req, socks4_prot = socks4; } - next = memchr(data+SOCKS4_NETWORK_LEN, 0, + authstart = data + SOCKS4_NETWORK_LEN; + next = memchr(authstart, 0, datalen-SOCKS4_NETWORK_LEN); if (!next) { if (datalen >= 1024) { @@ -1865,6 +1894,7 @@ parse_socks(const char *data, size_t datalen, socks_request_t *req, *want_length_out = datalen+1024; /* ???? */ return 0; } + authend = next; tor_assert(next < data+datalen); startaddr = NULL; @@ -1914,10 +1944,15 @@ parse_socks(const char *data, size_t datalen, socks_request_t *req, req->port, escaped(req->address)); return -1; } + if (authend != authstart) { + req->got_auth = 1; + req->usernamelen = authend - authstart; + req->username = tor_memdup(authstart, authend - authstart); + } /* next points to the final \0 on inbuf */ *drain_out = next - data + 1; return 1; - + } case 'G': /* get */ case 'H': /* head */ case 'P': /* put/post */ diff --git a/src/or/buffers.h b/src/or/buffers.h index 35c1dd2..fad509e 100644 --- a/src/or/buffers.h +++ b/src/or/buffers.h @@ -41,6 +41,8 @@ int fetch_from_buf_http(buf_t *buf, char **headers_out, size_t max_headerlen, char **body_out, size_t *body_used, size_t max_bodylen, int force_complete); +socks_request_t *socks_request_new(void); +void socks_request_free(socks_request_t *req); int fetch_from_buf_socks(buf_t *buf, socks_request_t *req, int log_sockstype, int safe_socks); int fetch_from_buf_socks_client(buf_t *buf, int state, char **reason); diff --git a/src/or/connection.c b/src/or/connection.c index 6f9ae20..2a4a6f7 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -246,7 +246,7 @@ edge_connection_new(int type, int socket_family) tor_assert(type == CONN_TYPE_EXIT || type == CONN_TYPE_AP); connection_init(time(NULL), TO_CONN(edge_conn), type, socket_family); if (type == CONN_TYPE_AP) - edge_conn->socks_request = tor_malloc_zero(sizeof(socks_request_t)); + edge_conn->socks_request = socks_request_new(); return edge_conn; } @@ -440,10 +440,8 @@ _connection_free(connection_t *conn) if (CONN_IS_EDGE(conn)) { edge_connection_t *edge_conn = TO_EDGE_CONN(conn); tor_free(edge_conn->chosen_exit_name); - if (edge_conn->socks_request) { - memset(edge_conn->socks_request, 0xcc, sizeof(socks_request_t)); - tor_free(edge_conn->socks_request); - } + if (edge_conn->socks_request) + socks_request_free(edge_conn->socks_request); rend_data_free(edge_conn->rend_data); } diff --git a/src/or/or.h b/src/or/or.h index bc80e39..3c76444 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -3109,6 +3109,18 @@ struct socks_request_t { * make sure we send back a socks reply for * every connection. */ unsigned int got_auth : 1; /**< Have we received any authentication data? */ + + /** Number of bytes in username; 0 if username is NULL */ + uint8_t usernamelen; + /** Number of bytes in password; 0 if password is NULL */ + uint8_t passwordlen; + /** The negotiated username value if any (for socks5), or the entire + * authentication string (for socks4). This value is NOT nul-terminated; + * see usernamelen for its length. */ + char *username; + /** The negotiated password value if any (for socks5). This value is NOT + * nul-terminated; see usernamelen for its length. */ + char *password; }; /********************************* circuitbuild.c **********************/ diff --git a/src/test/test.c b/src/test/test.c index d0e24d1..38729cf 100644 --- a/src/test/test.c +++ b/src/test/test.c @@ -627,54 +627,54 @@ test_buffers(void) /* Test fetch_from_buf_socks() */ buf = buf_new_with_capacity(256); - socks = tor_malloc_zero(sizeof(socks_request_t));; + socks = socks_request_new(); config_register_addressmaps(get_options()); /* Sending auth credentials before we've negotiated a method */ test_buffers_socks5_auth_before_negotiation_helper(cp, buf, socks); - tor_free(socks); + socks_request_free(socks); buf_free(buf); buf = NULL; buf = buf_new_with_capacity(256); - socks = tor_malloc_zero(sizeof(socks_request_t));; + socks = socks_request_new(); /* A SOCKS 5 client that only supports authentication */ test_buffers_socks5_authenticate_helper(cp, buf, socks); test_buffers_socks5_supported_commands_helper(cp, buf, socks); test_buffers_socks5_unsupported_commands_helper(cp, buf, socks); - tor_free(socks); + socks_request_free(socks); buf_free(buf); buf = NULL; buf = buf_new_with_capacity(256); - socks = tor_malloc_zero(sizeof(socks_request_t));; + socks = socks_request_new(); /* A SOCKS 5 client that sends credentials and data in one go */ test_buffers_socks5_authenticate_with_data_helper(cp, buf, socks); - tor_free(socks); + socks_request_free(socks); buf_free(buf); buf = NULL; buf = buf_new_with_capacity(256); - socks = tor_malloc_zero(sizeof(socks_request_t));; + socks = socks_request_new(); /* A SOCKS 5 client that doesn't want authentication */ test_buffers_socks5_no_authenticate_helper(cp, buf, socks); test_buffers_socks5_supported_commands_helper(cp, buf, socks); test_buffers_socks5_unsupported_commands_helper(cp, buf, socks); - tor_free(socks); + socks_request_free(socks); buf_free(buf); buf = NULL; buf = buf_new_with_capacity(256); - socks = tor_malloc_zero(sizeof(socks_request_t));; + socks = socks_request_new(); /* A SOCKS 4(a) client */ test_buffers_socks4_supported_commands_helper(cp, buf, socks); test_buffers_socks4_unsupported_commands_helper(cp, buf, socks); - tor_free(socks); + socks_request_free(socks); buf_free(buf); buf = NULL;

1 0

[tor/master] Merge remote-tracking branch 'public/bug1666'
by nickm＠torproject.org 13 Jul '11

13 Jul '11

commit 1aab5b6b391ca179d9acded9465ee4941ec4700b Merge: 9a6642f 16c5a62 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 13 12:12:16 2011 -0400 Merge remote-tracking branch 'public/bug1666' Conflicts: doc/spec/socks-extensions.txt src/or/buffers.c src/or/config.c src/or/connection_edge.c changes/bug1666 | 4 + src/or/buffers.c | 182 ++++++++++++++++------ src/or/buffers.h | 2 + src/or/config.c | 3 +- src/or/config.h | 2 + src/or/connection.c | 8 +- src/or/connection_edge.c | 23 ++-- src/or/or.h | 26 +++- src/test/test.c | 384 ++++++++++++++++++++++++++++++++++++++++++++++ 9 files changed, 566 insertions(+), 68 deletions(-) diff --cc src/or/buffers.c index 7312749,b7567bf..256b507 --- a/src/or/buffers.c +++ b/src/or/buffers.c @@@ -1482,10 -1475,25 +1482,29 @@@ log_unsafe_socks_warning(int socks_prot socks_protocol, address, (int)port); } +/** Do not attempt to parse socks messages longer than this. This value is + * actually significantly higher than the longest possible socks message. */ +#define MAX_SOCKS_MESSAGE_LEN 512 + + /** Return a new socks_request_t. */ + socks_request_t * + socks_request_new(void) + { + return tor_malloc_zero(sizeof(socks_request_t)); + } + + /** Free all storage held in the socks_request_t <b>req</b>. */ + void + socks_request_free(socks_request_t *req) + { + if (!req) + return; + tor_free(req->username); + tor_free(req->password); + memset(req, 0xCC, sizeof(socks_request_t)); + tor_free(req); + } + /** There is a (possibly incomplete) socks handshake on <b>buf</b>, of one * of the forms * - socks4: "socksheader username\\0" diff --cc src/or/config.c index 4a9d2c9,d2dbdaa..cdf0122 --- a/src/or/config.c +++ b/src/or/config.c @@@ -547,44 -521,38 +547,43 @@@ static char *get_windows_conf_root(void #endif static void config_line_append(config_line_t **lst, const char *key, const char *val); -static void option_clear(config_format_t *fmt, or_options_t *options, - config_var_t *var); -static void option_reset(config_format_t *fmt, or_options_t *options, - config_var_t *var, int use_defaults); -static void config_free(config_format_t *fmt, void *options); +static void option_clear(const config_format_t *fmt, or_options_t *options, + const config_var_t *var); +static void option_reset(const config_format_t *fmt, or_options_t *options, + const config_var_t *var, int use_defaults); +static void config_free(const config_format_t *fmt, void *options); static int config_lines_eq(config_line_t *a, config_line_t *b); -static int option_is_same(config_format_t *fmt, - or_options_t *o1, or_options_t *o2, +static int option_is_same(const config_format_t *fmt, + const or_options_t *o1, const or_options_t *o2, const char *name); -static or_options_t *options_dup(config_format_t *fmt, or_options_t *old); -static int options_validate(or_options_t *old_options, or_options_t *options, +static or_options_t *options_dup(const config_format_t *fmt, + const or_options_t *old); +static int options_validate(or_options_t *old_options, + or_options_t *options, int from_setconf, char **msg); -static int options_act_reversible(or_options_t *old_options, char **msg); -static int options_act(or_options_t *old_options); -static int options_transition_allowed(or_options_t *old, or_options_t *new, +static int options_act_reversible(const or_options_t *old_options, char **msg); +static int options_act(const or_options_t *old_options); +static int options_transition_allowed(const or_options_t *old, + const or_options_t *new, char **msg); -static int options_transition_affects_workers(or_options_t *old_options, - or_options_t *new_options); -static int options_transition_affects_descriptor(or_options_t *old_options, - or_options_t *new_options); +static int options_transition_affects_workers( + const or_options_t *old_options, const or_options_t *new_options); +static int options_transition_affects_descriptor( + const or_options_t *old_options, const or_options_t *new_options); static int check_nickname_list(const char *lst, const char *name, char **msg); - static void config_register_addressmaps(const or_options_t *options); static int parse_bridge_line(const char *line, int validate_only); +static int parse_client_transport_line(const char *line, int validate_only); static int parse_dir_server_line(const char *line, - authority_type_t required_type, + dirinfo_type_t required_type, int validate_only); static int validate_data_directory(or_options_t *options); -static int write_configuration_file(const char *fname, or_options_t *options); -static config_line_t *get_assigned_option(config_format_t *fmt, - void *options, const char *key, - int escape_val); -static void config_init(config_format_t *fmt, void *options); +static int write_configuration_file(const char *fname, + const or_options_t *options); +static config_line_t *get_assigned_option(const config_format_t *fmt, + const void *options, const char *key, + int escape_val); +static void config_init(const config_format_t *fmt, void *options); static int or_state_validate(or_state_t *old_options, or_state_t *options, int from_setconf, char **msg); static int or_state_load(void); @@@ -4430,8 -4313,8 +4429,8 @@@ get_torrc_fname(void /** Adjust the address map based on the MapAddress elements in the * configuration <b>options</b> */ - static void + void -config_register_addressmaps(or_options_t *options) +config_register_addressmaps(const or_options_t *options) { smartlist_t *elts; config_line_t *opt; diff --cc src/or/config.h index bc71191,db871d4..8a06f44 --- a/src/or/config.h +++ b/src/or/config.h @@@ -79,5 -76,7 +79,7 @@@ uint32_t get_effective_bwburst(const or or_options_t *options_new(void); #endif -void config_register_addressmaps(or_options_t *options); ++void config_register_addressmaps(const or_options_t *options); + #endif diff --cc src/or/connection_edge.c index 7516716,bff73d4..c19e8b7 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@@ -2144,7 -1882,8 +2144,8 @@@ connection_ap_handshake_process_socks(e { socks_request_t *socks; int sockshere; - or_options_t *options = get_options(); + const or_options_t *options = get_options(); + int had_reply = 0; tor_assert(conn); tor_assert(conn->_base.type == CONN_TYPE_AP);

1 0

[tor/master] Add more error checks to socks parsing code
by nickm＠torproject.org 13 Jul '11

13 Jul '11

commit 16c5a62a66098274dde726c8e02110238866fe0b Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 12 10:51:31 2011 -0400 Add more error checks to socks parsing code Suggested by Linus to avoid uninitialized reads or infinite loops if it turns out our code is buggier than we had thought. --- src/or/buffers.c | 35 ++++++++++++++++++++--------------- 1 files changed, 20 insertions(+), 15 deletions(-) diff --git a/src/or/buffers.c b/src/or/buffers.c index 1310b42..b7567bf 100644 --- a/src/or/buffers.c +++ b/src/or/buffers.c @@ -1544,7 +1544,8 @@ fetch_from_buf_socks(buf_t *buf, socks_request_t *req, else if (n_drain > 0) buf_remove_from_front(buf, n_drain); - } while (res == 0 && buf->head && want_length < buf->datalen); + } while (res == 0 && buf->head && want_length < buf->datalen && + buf->datalen >= 2); return res; } @@ -1595,12 +1596,14 @@ fetch_from_evbuffer_socks(struct evbuffer *buf, socks_request_t *req, * will need more data than we currently have. */ /* Loop while we have more data that we haven't given parse_socks() yet. */ - while (evbuffer_get_length(buf) > datalen) { + do { int free_data = 0; + const size_t last_wanted = want_length; n_drain = 0; data = NULL; datalen = inspect_evbuffer(buf, &data, want_length, &free_data, NULL); + want_length = 0; res = parse_socks(data, datalen, req, log_sockstype, safe_socks, &n_drain, &want_length); @@ -1612,20 +1615,16 @@ fetch_from_evbuffer_socks(struct evbuffer *buf, socks_request_t *req, else if (n_drain > 0) evbuffer_drain(buf, n_drain); - if (res) /* If res is nonzero, parse_socks() made up its mind. */ - return res; - - /* If parse_socks says that we want less data than we actually tried to - give it, we've got some kind of weird situation; just exit the loop for - now. - */ - if (want_length <= datalen) + if (res == 0 && n_drain == 0 && want_length <= last_wanted) { + /* If we drained nothing, and we didn't ask for more than last time, + * we're stuck in a loop. That's bad. It shouldn't be possible, but + * let's make sure. */ + log_warn(LD_BUG, "We seem to be caught in a parse loop; breaking out"); break; - /* Otherwise, it wants more data than we gave it. If we can provide more - * data than we gave it, we'll try to do so in the next iteration of the - * loop. If we can't, the while loop will exit. It's okay if it asked for - * more than we have total; maybe it doesn't really need so much. */ - } + } + + buflen = evbuffer_get_length(buf); + } while (res == 0 && want_length <= buflen && buflen >= 2); return res; } @@ -1652,6 +1651,12 @@ parse_socks(const char *data, size_t datalen, socks_request_t *req, unsigned char usernamelen, passlen; struct in_addr in; + if (datalen < 2) { + /* We always need at least 2 bytes. */ + *want_length_out = 2; + return 0; + } + if (req->socks_version == 5 && !req->got_auth) { /* See if we have received authentication. Strictly speaking, we should also check whether we actually negotiated username/password

1 0

[tor/master] Resolve a warning from the bug1666 branch
by nickm＠torproject.org 13 Jul '11

13 Jul '11

commit e8bfe89365e86dc9ed311431d3cc87af88132f34 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 13 12:13:12 2011 -0400 Resolve a warning from the bug1666 branch --- src/or/connection_edge.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index c19e8b7..a4a77af 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -2166,7 +2166,8 @@ connection_ap_handshake_process_socks(edge_connection_t *conn) if (socks->replylen) { had_reply = 1; - connection_write_to_buf(socks->reply, socks->replylen, TO_CONN(conn)); + connection_write_to_buf((const char*)socks->reply, socks->replylen, + TO_CONN(conn)); socks->replylen = 0; }

1 0

[tor/master] Refactor socks unit tests into a suite of their own
by nickm＠torproject.org 13 Jul '11

13 Jul '11

commit 5d43a1572094868e598541f9ce686546c910f071 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 29 17:30:55 2011 -0400 Refactor socks unit tests into a suite of their own --- src/test/test.c | 352 +++++++++++++++++++++++++++++++++---------------------- 1 files changed, 214 insertions(+), 138 deletions(-) diff --git a/src/test/test.c b/src/test/test.c index 38729cf..64916ea 100644 --- a/src/test/test.c +++ b/src/test/test.c @@ -197,14 +197,59 @@ free_pregenerated_keys(void) } } -/** Helper: Perform supported SOCKS 4 commands */ +typedef struct socks_test_data_t { + socks_request_t *req; + buf_t *buf; +} socks_test_data_t; + +static void * +socks_test_setup(const struct testcase_t *testcase) +{ + socks_test_data_t *data = tor_malloc(sizeof(socks_test_data_t)); + (void)testcase; + data->buf = buf_new_with_capacity(256); + data->req = socks_request_new(); + config_register_addressmaps(get_options()); + return data; +} +static int +socks_test_cleanup(const struct testcase_t *testcase, void *ptr) +{ + socks_test_data_t *data = ptr; + (void)testcase; + buf_free(data->buf); + socks_request_free(data->req); + tor_free(data); + return 1; +} + +const struct testcase_setup_t socks_setup = { + socks_test_setup, socks_test_cleanup +}; + +#define SOCKS_TEST_INIT() \ + socks_test_data_t *testdata = ptr; \ + buf_t *buf = testdata->buf; \ + socks_request_t *socks = testdata->req; +#define ADD_DATA(buf, s) \ + write_to_buf(s, sizeof(s)-1, buf) + +static void +socks_request_clear(socks_request_t *socks) +{ + tor_free(socks->username); + tor_free(socks->password); + memset(socks, 0, sizeof(socks_request_t)); +} + +/** Perform unsupported SOCKS 4 commands */ static void -test_buffers_socks4_unsupported_commands_helper(const char *cp, buf_t *buf, - socks_request_t *socks) +test_socks_4_unsupported_commands(void *ptr) { + SOCKS_TEST_INIT(); + /* SOCKS 4 Send BIND [02] to IP address 2.2.2.2:4369 */ - cp = "\x04\x02\x11\x11\x02\x02\x02\x02\x00"; - write_to_buf(cp, 9, buf); + ADD_DATA(buf, "\x04\x02\x11\x11\x02\x02\x02\x02\x00"); test_assert(fetch_from_buf_socks(buf, socks, get_options()->TestSocks, get_options()->SafeSocks) == -1); test_eq(4, socks->socks_version); @@ -214,138 +259,186 @@ test_buffers_socks4_unsupported_commands_helper(const char *cp, buf_t *buf, ; } -/** Helper: Perform supported SOCKS 4 commands */ +/** Perform supported SOCKS 4 commands */ static void -test_buffers_socks4_supported_commands_helper(const char *cp, buf_t *buf, - socks_request_t *socks) +test_socks_4_supported_commands(void *ptr) { - /* SOCKS 4 Send CONNECT [01] to IP address 2.2.2.2:4369 */ - cp = "\x04\x01\x11\x11\x02\x02\x02\x02\x00"; - write_to_buf(cp, 9, buf); + SOCKS_TEST_INIT(); + + test_eq(0, buf_datalen(buf)); + + /* SOCKS 4 Send CONNECT [01] to IP address 2.2.2.2:4370 */ + ADD_DATA(buf, "\x04\x01\x11\x12\x02\x02\x02\x03\x00"); test_assert(fetch_from_buf_socks(buf, socks, get_options()->TestSocks, get_options()->SafeSocks) == 1); test_eq(4, socks->socks_version); test_eq(0, socks->replylen); /* XXX: shouldn't tor reply? */ - test_streq("2.2.2.2", socks->address); - test_eq(4369, socks->port); + test_eq(SOCKS_COMMAND_CONNECT, socks->command); + test_streq("2.2.2.3", socks->address); + test_eq(4370, socks->port); + test_assert(socks->got_auth == 0); + test_assert(! socks->username); + + test_eq(0, buf_datalen(buf)); + socks_request_clear(socks); /* SOCKS 4 Send CONNECT [01] to IP address 2.2.2.2:4369 with userid*/ - cp = "\x04\x01\x11\x11\x02\x02\x02\x02\x02me\x00"; - write_to_buf(cp, 12, buf); + ADD_DATA(buf, "\x04\x01\x11\x12\x02\x02\x02\x04me\x00"); test_assert(fetch_from_buf_socks(buf, socks, get_options()->TestSocks, get_options()->SafeSocks) == 1); test_eq(4, socks->socks_version); test_eq(0, socks->replylen); /* XXX: shouldn't tor reply? */ - test_streq("2.2.2.2", socks->address); - test_eq(4369, socks->port); - - /* SOCKS 4a Send RESOLVE [F0] request for torproject.org:4369 */ - cp = "\x04\xF0\x01\x01\x00\x00\x00\x02\x02me\x00tor.org\x00"; - write_to_buf(cp, 20, buf); + test_eq(SOCKS_COMMAND_CONNECT, socks->command); + test_streq("2.2.2.4", socks->address); + test_eq(4370, socks->port); + test_assert(socks->got_auth == 1); + test_assert(socks->username); + test_eq(2, socks->usernamelen); + test_memeq("me", socks->username, 2); + + test_eq(0, buf_datalen(buf)); + socks_request_clear(socks); + + /* SOCKS 4a Send RESOLVE [F0] request for torproject.org */ + ADD_DATA(buf, "\x04\xF0\x01\x01\x00\x00\x00\x02me\x00torproject.org\x00"); test_assert(fetch_from_buf_socks(buf, socks, get_options()->TestSocks, - get_options()->SafeSocks)); + get_options()->SafeSocks) == 1); test_eq(4, socks->socks_version); test_eq(0, socks->replylen); /* XXX: shouldn't tor reply? */ - test_streq("tor.org", socks->address); + test_streq("torproject.org", socks->address); + + test_eq(0, buf_datalen(buf)); done: ; } -/** Helper: Perform supported SOCKS 5 commands */ +/** Perform unsupported SOCKS 5 commands */ static void -test_buffers_socks5_unsupported_commands_helper(const char *cp, buf_t *buf, - socks_request_t *socks) +test_socks_5_unsupported_commands(void *ptr) { + SOCKS_TEST_INIT(); + /* SOCKS 5 Send unsupported BIND [02] command */ - cp = "\x05\x02\x00\x01\x02\x02\x02\x02\x01\x01"; - write_to_buf(cp, 10, buf); - test_assert(fetch_from_buf_socks(buf, socks, get_options()->TestSocks, - get_options()->SafeSocks) == -1); + ADD_DATA(buf, "\x05\x02\x00\x01"); + + test_eq(fetch_from_buf_socks(buf, socks, get_options()->TestSocks, + get_options()->SafeSocks), 0); + test_eq(0, buf_datalen(buf)); test_eq(5, socks->socks_version); test_eq(2, socks->replylen); test_eq(5, socks->reply[0]); - test_eq(0, socks->reply[1]); /* XXX: shouldn't tor reply 'command - not supported' [07]? */ + test_eq(0, socks->reply[1]); + ADD_DATA(buf, "\x05\x02\x00\x01\x02\x02\x02\x01\x01\x01"); + test_eq(fetch_from_buf_socks(buf, socks, get_options()->TestSocks, + get_options()->SafeSocks), -1); + /* XXX: shouldn't tor reply 'command not supported' [07]? */ + + buf_clear(buf); + socks_request_clear(socks); /* SOCKS 5 Send unsupported UDP_ASSOCIATE [03] command */ - cp = "\x05\x03\x00\x01\x02\x02\x02\x02\x01\x01"; - write_to_buf(cp, 10, buf); - test_assert(fetch_from_buf_socks(buf, socks, get_options()->TestSocks, - get_options()->SafeSocks) == -1); + ADD_DATA(buf, "\x05\x03\x00\x01\x02"); + test_eq(fetch_from_buf_socks(buf, socks, get_options()->TestSocks, + get_options()->SafeSocks), 0); test_eq(5, socks->socks_version); test_eq(2, socks->replylen); test_eq(5, socks->reply[0]); - test_eq(0, socks->reply[1]); /* XXX: shouldn't tor reply 'command - not supported' [07]? */ + test_eq(0, socks->reply[1]); + ADD_DATA(buf, "\x05\x03\x00\x01\x02\x02\x02\x01\x01\x01"); + test_eq(fetch_from_buf_socks(buf, socks, get_options()->TestSocks, + get_options()->SafeSocks), -1); + /* XXX: shouldn't tor reply 'command not supported' [07]? */ done: ; } -/** Helper: Perform supported SOCKS 5 commands */ +/** Perform supported SOCKS 5 commands */ static void -test_buffers_socks5_supported_commands_helper(const char *cp, buf_t *buf, - socks_request_t *socks) +test_socks_5_supported_commands(void *ptr) { + SOCKS_TEST_INIT(); + /* SOCKS 5 Send CONNECT [01] to IP address 2.2.2.2:4369 */ - cp = "\x05\x01\x00\x01\x02\x02\x02\x02\x11\x11"; - write_to_buf(cp, 10, buf); - test_assert(fetch_from_buf_socks(buf, socks, get_options()->TestSocks, - get_options()->SafeSocks) == 1); + ADD_DATA(buf, "\x05\x01\x00"); + test_eq(fetch_from_buf_socks(buf, socks, get_options()->TestSocks, + get_options()->SafeSocks), 0); test_eq(5, socks->socks_version); test_eq(2, socks->replylen); test_eq(5, socks->reply[0]); test_eq(0, socks->reply[1]); + + ADD_DATA(buf, "\x05\x01\x00\x01\x02\x02\x02\x02\x11\x11"); + test_eq(fetch_from_buf_socks(buf, socks, get_options()->TestSocks, + get_options()->SafeSocks), 1); test_streq("2.2.2.2", socks->address); test_eq(4369, socks->port); + test_eq(0, buf_datalen(buf)); + socks_request_clear(socks); + /* SOCKS 5 Send CONNECT [01] to FQDN torproject.org:4369 */ - cp = "\x05\x01\x00\x03\x07tor.org\x11\x11"; - write_to_buf(cp, 14, buf); - test_assert(fetch_from_buf_socks(buf, socks, get_options()->TestSocks, - get_options()->SafeSocks)); + ADD_DATA(buf, "\x05\x01\x00"); + ADD_DATA(buf, "\x05\x01\x00\x03\x0Etorproject.org\x11\x11"); + test_eq(fetch_from_buf_socks(buf, socks, get_options()->TestSocks, + get_options()->SafeSocks), 0); + test_eq(fetch_from_buf_socks(buf, socks, get_options()->TestSocks, + get_options()->SafeSocks), 1); + test_eq(5, socks->socks_version); test_eq(2, socks->replylen); test_eq(5, socks->reply[0]); test_eq(0, socks->reply[1]); - test_streq("tor.org", socks->address); + test_streq("torproject.org", socks->address); test_eq(4369, socks->port); + test_eq(0, buf_datalen(buf)); + socks_request_clear(socks); + /* SOCKS 5 Send RESOLVE [F0] request for torproject.org:4369 */ - cp = "\x05\xF0\x00\x03\x07tor.org"; - write_to_buf(cp, 14, buf); + ADD_DATA(buf, "\x05\x01\x00"); + ADD_DATA(buf, "\x05\xF0\x00\x03\x0Etorproject.org\x01\x02"); test_assert(fetch_from_buf_socks(buf, socks, get_options()->TestSocks, - get_options()->SafeSocks)); + get_options()->SafeSocks) == 0); + test_assert(fetch_from_buf_socks(buf, socks, get_options()->TestSocks, + get_options()->SafeSocks) == 1); test_eq(5, socks->socks_version); test_eq(2, socks->replylen); test_eq(5, socks->reply[0]); test_eq(0, socks->reply[1]); - test_streq("tor.org", socks->address); + test_streq("torproject.org", socks->address); - /* SOCKS 5 Send RESOLVE_PTR [F1] for IP address 2.2.2.2 */ - cp = "\x05\xF1\x00\x01\x02\x02\x02\x02"; - write_to_buf(cp, 10, buf); + test_eq(0, buf_datalen(buf)); + socks_request_clear(socks); + + /* SOCKS 5 Send RESOLVE_PTR [F1] for IP address 2.2.2.5 */ + ADD_DATA(buf, "\x05\x01\x00"); + ADD_DATA(buf, "\x05\xF1\x00\x01\x02\x02\x02\x05\x01\x03"); + test_assert(fetch_from_buf_socks(buf, socks, get_options()->TestSocks, + get_options()->SafeSocks) == 0); test_assert(fetch_from_buf_socks(buf, socks, get_options()->TestSocks, get_options()->SafeSocks) == 1); test_eq(5, socks->socks_version); test_eq(2, socks->replylen); test_eq(5, socks->reply[0]); test_eq(0, socks->reply[1]); - test_streq("2.2.2.2", socks->address); + test_streq("2.2.2.5", socks->address); + + test_eq(0, buf_datalen(buf)); done: ; } -/** Helper: Perform SOCKS 5 authentication */ +/** Perform SOCKS 5 authentication */ static void -test_buffers_socks5_no_authenticate_helper(const char *cp, buf_t *buf, - socks_request_t *socks) +test_socks_5_no_authenticate(void *ptr) { + SOCKS_TEST_INIT(); + /*SOCKS 5 No Authentication */ - cp = "\x05\x01\x00"; - write_to_buf(cp, 3, buf); + ADD_DATA(buf,"\x05\x01\x00"); test_assert(!fetch_from_buf_socks(buf, socks, get_options()->TestSocks, get_options()->SafeSocks)); @@ -353,9 +446,10 @@ test_buffers_socks5_no_authenticate_helper(const char *cp, buf_t *buf, test_eq(5, socks->reply[0]); test_eq(SOCKS_NO_AUTH, socks->reply[1]); + test_eq(0, buf_datalen(buf)); + /*SOCKS 5 Send username/password anyway - pretend to be broken */ - cp = "\x01\x02\x01\x01\x02\x01\x01"; - write_to_buf(cp, 7, buf); + ADD_DATA(buf,"\x01\x02\x01\x01\x02\x01\x01"); test_assert(!fetch_from_buf_socks(buf, socks, get_options()->TestSocks, get_options()->SafeSocks)); @@ -364,18 +458,25 @@ test_buffers_socks5_no_authenticate_helper(const char *cp, buf_t *buf, test_eq(5, socks->reply[0]); test_eq(0, socks->reply[1]); + test_eq(2, socks->usernamelen); + test_eq(2, socks->passwordlen); + + test_memeq("\x01\x01", socks->username, 2); + test_memeq("\x01\x01", socks->password, 2); + done: ; } -/** Helper: Perform SOCKS 5 authentication */ +/** Perform SOCKS 5 authentication */ static void -test_buffers_socks5_authenticate_helper(const char *cp, buf_t *buf, - socks_request_t *socks) +test_socks_5_authenticate(void *ptr) { + SOCKS_TEST_INIT(); + /* SOCKS 5 Negotiate username/password authentication */ - cp = "\x05\x01\x02"; - write_to_buf(cp, 3, buf); + ADD_DATA(buf, "\x05\x01\x02"); + test_assert(!fetch_from_buf_socks(buf, socks, get_options()->TestSocks, get_options()->SafeSocks)); @@ -384,9 +485,10 @@ test_buffers_socks5_authenticate_helper(const char *cp, buf_t *buf, test_eq(SOCKS_USER_PASS, socks->reply[1]); test_eq(5, socks->socks_version); + test_eq(0, buf_datalen(buf)); + /* SOCKS 5 Send username/password */ - cp = "\x01\x02me\x02me"; - write_to_buf(cp, 7, buf); + ADD_DATA(buf, "\x01\x02me\x08mypasswd"); test_assert(!fetch_from_buf_socks(buf, socks, get_options()->TestSocks, get_options()->SafeSocks)); @@ -394,18 +496,26 @@ test_buffers_socks5_authenticate_helper(const char *cp, buf_t *buf, test_eq(2, socks->replylen); test_eq(5, socks->reply[0]); test_eq(0, socks->reply[1]); + + test_eq(2, socks->usernamelen); + test_eq(8, socks->passwordlen); + + test_memeq("me", socks->username, 2); + test_memeq("mypasswd", socks->password, 8); + done: ; } -/** Helper: Perform SOCKS 5 authentication and send data all in one go */ +/** Perform SOCKS 5 authentication and send data all in one go */ static void -test_buffers_socks5_authenticate_with_data_helper(const char *cp, buf_t *buf, - socks_request_t *socks) +test_socks_5_authenticate_with_data(void *ptr) { + SOCKS_TEST_INIT(); + /* SOCKS 5 Negotiate username/password authentication */ - cp = "\x05\x01\x02"; - write_to_buf(cp, 3, buf); + ADD_DATA(buf, "\x05\x01\x02"); + test_assert(!fetch_from_buf_socks(buf, socks, get_options()->TestSocks, get_options()->SafeSocks)); @@ -414,10 +524,11 @@ test_buffers_socks5_authenticate_with_data_helper(const char *cp, buf_t *buf, test_eq(SOCKS_USER_PASS, socks->reply[1]); test_eq(5, socks->socks_version); + test_eq(0, buf_datalen(buf)); + /* SOCKS 5 Send username/password */ /* SOCKS 5 Send CONNECT [01] to IP address 2.2.2.2:4369 */ - cp = "\x01\x02me\x02me\x05\x01\x00\x01\x02\x02\x02\x02\x11\x11"; - write_to_buf(cp, 17, buf); + ADD_DATA(buf, "\x01\x02me\x02me\x05\x01\x00\x01\x02\x02\x02\x02\x11\x11"); test_assert(!fetch_from_buf_socks(buf, socks, get_options()->TestSocks, get_options()->SafeSocks)); @@ -434,18 +545,19 @@ test_buffers_socks5_authenticate_with_data_helper(const char *cp, buf_t *buf, test_eq(0, socks->reply[1]); test_streq("2.2.2.2", socks->address); test_eq(4369, socks->port); + done: ; } -/** Helper: Perform SOCKS 5 authentication before method negotiated */ +/** Perform SOCKS 5 authentication before method negotiated */ static void -test_buffers_socks5_auth_before_negotiation_helper(const char *cp, buf_t *buf, - socks_request_t *socks) +test_socks_5_auth_before_negotiation(void *ptr) { + SOCKS_TEST_INIT(); + /* SOCKS 5 Send username/password */ - cp = "\x01\x02me\x02me"; - write_to_buf(cp, 7, buf); + ADD_DATA(buf, "\x01\x02me\x02me"); test_assert(fetch_from_buf_socks(buf, socks, get_options()->TestSocks, get_options()->SafeSocks) == -1); @@ -467,7 +579,6 @@ test_buffers(void) buf_t *buf = NULL, *buf2 = NULL; const char *cp; - socks_request_t *socks; int j; size_t r; @@ -625,59 +736,6 @@ test_buffers(void) buf_free(buf); buf = NULL; - /* Test fetch_from_buf_socks() */ - buf = buf_new_with_capacity(256); - socks = socks_request_new(); - config_register_addressmaps(get_options()); - - /* Sending auth credentials before we've negotiated a method */ - test_buffers_socks5_auth_before_negotiation_helper(cp, buf, socks); - - socks_request_free(socks); - buf_free(buf); - buf = NULL; - buf = buf_new_with_capacity(256); - socks = socks_request_new(); - - /* A SOCKS 5 client that only supports authentication */ - test_buffers_socks5_authenticate_helper(cp, buf, socks); - test_buffers_socks5_supported_commands_helper(cp, buf, socks); - test_buffers_socks5_unsupported_commands_helper(cp, buf, socks); - - socks_request_free(socks); - buf_free(buf); - buf = NULL; - buf = buf_new_with_capacity(256); - socks = socks_request_new(); - - /* A SOCKS 5 client that sends credentials and data in one go */ - test_buffers_socks5_authenticate_with_data_helper(cp, buf, socks); - - socks_request_free(socks); - buf_free(buf); - buf = NULL; - buf = buf_new_with_capacity(256); - socks = socks_request_new(); - - /* A SOCKS 5 client that doesn't want authentication */ - test_buffers_socks5_no_authenticate_helper(cp, buf, socks); - test_buffers_socks5_supported_commands_helper(cp, buf, socks); - test_buffers_socks5_unsupported_commands_helper(cp, buf, socks); - - socks_request_free(socks); - buf_free(buf); - buf = NULL; - buf = buf_new_with_capacity(256); - socks = socks_request_new(); - - /* A SOCKS 4(a) client */ - test_buffers_socks4_supported_commands_helper(cp, buf, socks); - test_buffers_socks4_unsupported_commands_helper(cp, buf, socks); - - socks_request_free(socks); - buf_free(buf); - buf = NULL; - done: if (buf) buf_free(buf); @@ -1564,6 +1622,23 @@ static struct testcase_t test_array[] = { END_OF_TESTCASES }; +#define SOCKSENT(name) \ + { #name, test_socks_##name, TT_FORK, &socks_setup, NULL } + +static struct testcase_t socks_tests[] = { + SOCKSENT(4_unsupported_commands), + SOCKSENT(4_supported_commands), + + SOCKSENT(5_unsupported_commands), + SOCKSENT(5_supported_commands), + SOCKSENT(5_no_authenticate), + SOCKSENT(5_auth_before_negotiation), + SOCKSENT(5_authenticate), + SOCKSENT(5_authenticate_with_data), + + END_OF_TESTCASES +}; + extern struct testcase_t addr_tests[]; extern struct testcase_t crypto_tests[]; extern struct testcase_t container_tests[]; @@ -1573,6 +1648,7 @@ extern struct testcase_t microdesc_tests[]; static struct testgroup_t testgroups[] = { { "", test_array }, + { "socks/", socks_tests }, { "addr/", addr_tests }, { "crypto/", crypto_tests }, { "container/", container_tests },

1 0

[tor/master] Refactor fetch_from_buf_socks() to be greedy
by nickm＠torproject.org 13 Jul '11

13 Jul '11

commit 05c424f4b830e98595b33397b58504462dbda8db Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 29 17:44:29 2011 -0400 Refactor fetch_from_buf_socks() to be greedy Previously, fetch_from_buf_socks() might return 0 if there was still data on the buffer and a subsequent call to fetch_from_buf_socks() would return 1. This was making some of the socks5 unit tests harder to write, and could potentially have caused misbehavior with some overly verbose SOCKS implementations. Now, fetch_from_buf_socks() does as much processing as it can, and returns 0 only if it really needs more data. This brings it into line with the evbuffer socks implementation. --- src/or/buffers.c | 13 ++++++------- src/or/connection_edge.c | 23 ++++++++++------------- src/test/test.c | 23 ++++++++--------------- 3 files changed, 24 insertions(+), 35 deletions(-) diff --git a/src/or/buffers.c b/src/or/buffers.c index 44a492a..1310b42 100644 --- a/src/or/buffers.c +++ b/src/or/buffers.c @@ -1544,9 +1544,7 @@ fetch_from_buf_socks(buf_t *buf, socks_request_t *req, else if (n_drain > 0) buf_remove_from_front(buf, n_drain); - } while (res == 0 && buf->head && - buf->datalen > buf->head->datalen && - want_length < buf->head->datalen); + } while (res == 0 && buf->head && want_length < buf->datalen); return res; } @@ -1690,6 +1688,7 @@ parse_socks(const char *data, size_t datalen, socks_request_t *req, } *drain_out = 2u + usernamelen + 1u + passlen; req->got_auth = 1; + *want_length_out = 7; /* Minimal socks5 sommand. */ return 0; } else if (req->auth_type == SOCKS_USER_PASS) { /* unknown version byte */ @@ -1749,8 +1748,8 @@ parse_socks(const char *data, size_t datalen, socks_request_t *req, } /* we know the method; read in the request */ log_debug(LD_APP,"socks5: checking request"); - if (datalen < 8) {/* basic info plus >=2 for addr plus 2 for port */ - *want_length_out = 8; + if (datalen < 7) {/* basic info plus >=1 for addr plus 2 for port */ + *want_length_out = 7; return 0; /* not yet */ } req->command = (unsigned char) *(data+1); @@ -1891,7 +1890,7 @@ parse_socks(const char *data, size_t datalen, socks_request_t *req, return -1; } log_debug(LD_APP,"socks4: Username not here yet."); - *want_length_out = datalen+1024; /* ???? */ + *want_length_out = datalen+1024; /* More than we need, but safe */ return 0; } authend = next; @@ -1919,7 +1918,7 @@ parse_socks(const char *data, size_t datalen, socks_request_t *req, return -1; } log_debug(LD_APP,"socks4: Destaddr not all here yet."); - *want_length_out = datalen + 1024; + *want_length_out = datalen + 1024; /* More than we need, but safe */ return 0; } if (MAX_SOCKS_ADDR_LEN <= next-startaddr) { diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index 4e988bd..bff73d4 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -1883,6 +1883,7 @@ connection_ap_handshake_process_socks(edge_connection_t *conn) socks_request_t *socks; int sockshere; or_options_t *options = get_options(); + int had_reply = 0; tor_assert(conn); tor_assert(conn->_base.type == CONN_TYPE_AP); @@ -1900,22 +1901,18 @@ connection_ap_handshake_process_socks(edge_connection_t *conn) sockshere = fetch_from_buf_socks(conn->_base.inbuf, socks, options->TestSocks, options->SafeSocks); }; + + if (socks->replylen) { + had_reply = 1; + connection_write_to_buf(socks->reply, socks->replylen, TO_CONN(conn)); + socks->replylen = 0; + } + if (sockshere == 0) { - if (socks->replylen) { - connection_write_to_buf(socks->reply, socks->replylen, TO_CONN(conn)); - /* zero it out so we can do another round of negotiation */ - socks->replylen = 0; - } else { - log_debug(LD_APP,"socks handshake not all here yet."); - } + log_debug(LD_APP,"socks handshake not all here yet."); return 0; } else if (sockshere == -1) { - if (socks->replylen) { /* we should send reply back */ - log_debug(LD_APP,"reply is already set for us. Using it."); - connection_ap_handshake_socks_reply(conn, socks->reply, socks->replylen, - END_STREAM_REASON_SOCKSPROTOCOL); - - } else { + if (!had_reply) { log_warn(LD_APP,"Fetching socks handshake failed. Closing."); connection_ap_handshake_socks_reply(conn, NULL, 0, END_STREAM_REASON_SOCKSPROTOCOL); diff --git a/src/test/test.c b/src/test/test.c index 64916ea..01fb30c 100644 --- a/src/test/test.c +++ b/src/test/test.c @@ -382,8 +382,6 @@ test_socks_5_supported_commands(void *ptr) ADD_DATA(buf, "\x05\x01\x00"); ADD_DATA(buf, "\x05\x01\x00\x03\x0Etorproject.org\x11\x11"); test_eq(fetch_from_buf_socks(buf, socks, get_options()->TestSocks, - get_options()->SafeSocks), 0); - test_eq(fetch_from_buf_socks(buf, socks, get_options()->TestSocks, get_options()->SafeSocks), 1); test_eq(5, socks->socks_version); @@ -400,8 +398,6 @@ test_socks_5_supported_commands(void *ptr) ADD_DATA(buf, "\x05\x01\x00"); ADD_DATA(buf, "\x05\xF0\x00\x03\x0Etorproject.org\x01\x02"); test_assert(fetch_from_buf_socks(buf, socks, get_options()->TestSocks, - get_options()->SafeSocks) == 0); - test_assert(fetch_from_buf_socks(buf, socks, get_options()->TestSocks, get_options()->SafeSocks) == 1); test_eq(5, socks->socks_version); test_eq(2, socks->replylen); @@ -416,8 +412,6 @@ test_socks_5_supported_commands(void *ptr) ADD_DATA(buf, "\x05\x01\x00"); ADD_DATA(buf, "\x05\xF1\x00\x01\x02\x02\x02\x05\x01\x03"); test_assert(fetch_from_buf_socks(buf, socks, get_options()->TestSocks, - get_options()->SafeSocks) == 0); - test_assert(fetch_from_buf_socks(buf, socks, get_options()->TestSocks, get_options()->SafeSocks) == 1); test_eq(5, socks->socks_version); test_eq(2, socks->replylen); @@ -528,24 +522,23 @@ test_socks_5_authenticate_with_data(void *ptr) /* SOCKS 5 Send username/password */ /* SOCKS 5 Send CONNECT [01] to IP address 2.2.2.2:4369 */ - ADD_DATA(buf, "\x01\x02me\x02me\x05\x01\x00\x01\x02\x02\x02\x02\x11\x11"); - test_assert(!fetch_from_buf_socks(buf, socks, + ADD_DATA(buf, "\x01\x02me\x03you\x05\x01\x00\x01\x02\x02\x02\x02\x11\x11"); + test_assert(fetch_from_buf_socks(buf, socks, get_options()->TestSocks, - get_options()->SafeSocks)); - test_eq(5, socks->socks_version); - test_eq(2, socks->replylen); - test_eq(5, socks->reply[0]); - test_eq(0, socks->reply[1]); - - test_assert(fetch_from_buf_socks(buf, socks, get_options()->TestSocks, get_options()->SafeSocks) == 1); test_eq(5, socks->socks_version); test_eq(2, socks->replylen); test_eq(5, socks->reply[0]); test_eq(0, socks->reply[1]); + test_streq("2.2.2.2", socks->address); test_eq(4369, socks->port); + test_eq(2, socks->usernamelen); + test_eq(3, socks->passwordlen); + test_memeq("me", socks->username, 2); + test_memeq("you", socks->password, 3); + done: ; }

1 0

← Newer
1
...
50
51
52
53
54
55
56
...
87
Older →

Jump to page: