commit aca82e08c2a3e874e1dcd1caf5f728133ab1629d
Author: Translation commit bot <translation(a)torproject.org>
Date: Thu May 23 13:16:54 2013 +0000
Update translations for tsum_completed
---
nb/short-user-manual_nb_noimg.xhtml | 22 ++++++-------
zh_CN/short-user-manual_zh_CN_noimg.xhtml | 48 ++++++++++++++---------------
2 files changed, 35 insertions(+), 35 deletions(-)
diff --git a/nb/short-user-manual_nb_noimg.xhtml b/nb/short-user-manual_nb_noimg.xhtml
index 531a89a..4bf00bd 100644
--- a/nb/short-user-manual_nb_noimg.xhtml
+++ b/nb/short-user-manual_nb_noimg.xhtml
@@ -13,23 +13,23 @@
<p>Tor anonymiserer opprinnelsen av trafikken din, og krypterer alt i mellom deg og Tor-nettverket. Tor krypterer også trafikken din innenfor Tor-nettverket, mens trafikken fra Tor-nettverket til det åpne nettet er ikke kryptert.</p>
<p>Hvis du sender sensitiv informasjon, som for eksempel når du logger deg på en nettside med brukernavn og passord, er det derfor viktig at du bruker HTTPS (som i <strong>https</strong>://torproject.org/, ikke <strong>http</strong>://torproject.org). Dette legger til et ekstra lag med kryptering hele veien fra deg til destinasjonen.</p>
<h2 id="how-to-download-tor">Hvordan laste ned Tor:</h2>
- <p>Program-pakken vi anbefaler de fleste brukere er <a href="https://www.torproject.org/projects/torbrowser.html">Tor Nettleser Pakken</a>. Denne ferdiglagde pakken inneholder en nettleser forhåndsinnstilt for sikker surfing på nettet gjennom Tor, og krever ingen installasjon. Du bare laster ned pakken, pakker den ut, og starter Tor.</p>
+ <p>Program-pakken vi anbefaler de fleste brukere er <a href="https://www.torproject.org/projects/torbrowser.html">Tor Browser Bundle</a>. Denne ferdiglagde pakken inneholder en nettleser forhåndsinnstilt for sikker surfing på nettet gjennom Tor, og krever ingen installasjon. Du bare laster ned pakken, pakker den ut, og starter Tor.</p>
<p>Det er to måter å få tak i Tor programmet på. Du kan enten gå til <a href="https://www.torproject.org/">nettsiden Tor Prosjektet</a> og laste det ned der, eller bruke GetTor, vår automatiske besvarte email.</p>
<h3 id="how-to-get-tor-via-email">Hvordan få Tor på email:</h3>
- <p>For å motta den engelske versjonen av Tor Nettleser Pakken til Windows sender du en email til gettor(a)torproject.org med ordet <strong>windows</strong> i emailen. Du trenger ikke fylle inn tittelen.</p>
- <p>Du kan også få Tor Nettleser Pakken til Mac OS X (skriv <strong>macos-i386</strong>), og Linux (skriv <strong>linux-i386</strong> for 32-bit eller <strong>linux-x86_64</strong> for 64-bit systemer). </p>
+ <p>For å motta den engelske versjonen av Tor Browser Bundle til Windows sender du en email til gettor(a)torproject.org med ordet <strong>windows</strong> i emailen. Du trenger ikke fylle inn tittelen.</p>
+ <p>Du kan også få Tor Browser Bundle til Mac OS X (skriv <strong>macos-i386</strong>), og Linux (skriv <strong>linux-i386</strong> for 32-bit eller <strong>linux-x86_64</strong> for 64-bit systemer). </p>
<p>Hvis du ønsker en oversatt versjon av Tor, skriv <strong>help</strong> i stedet. Du vil da motta en email med instruksjoner og en liste over tilgjengelige språk.</p>
- <p><strong>NB:</strong> Tor Nettleser Pakken for Mac OS X og Linux er relativt store, og du kan ikke motta disse på Gmail, Hotmail eller Yahoo. Hvis dette er tilfellet for deg, send oss en email på help(a)rt.torproject.org og vi kan sende deg en liste over alternative nettsider du kan bruke. </p>
+ <p><strong>NB:</strong> Tor Browser Bundle for Mac OS X og Linux er relativt store, og du kan ikke motta disse på Gmail, Hotmail eller Yahoo. Hvis dette er tilfellet for deg, send oss en email på help(a)rt.torproject.org og vi kan sende deg en liste over alternative nettsider du kan bruke. </p>
<h3 id="tor-for-smartphones">Tor for smart-telefoner:</h3>
<p>Du kan få Tor på smart-telefonen din ved å installere en software-pakke som heter <em>Orbot</em>. For informasjon om hvordan du kan laste ned og installere Orbot, vennligst gå til <<a href="https://www.torproject.org/docs/android.html.en">Tor Prosjektets nettside.</a></p>
<p>Vi har også eksperimentelle program-pakker for <a href="https://www.torproject.org/docs/N900.html.en">Nokia Maemo/N900</a> og <a href="http://sid77.slackware.it/ios/">Apple iOS</a>.</p>
<h3 id="how-to-verify-that-you-have-the-right-version">Hvordan sjekke at du har riktig versjon:</h3>
- <p>Før du bruker Tor Nettleser Pakken, burde du forsikre deg om at du har riktig versjon.</p>
+ <p>Før du bruker Tor Browser Bundle, burde du forsikre deg om at du har riktig versjon.</p>
<p>Når du laster ned program-pakken følger det med en fil som har samme navn som program-pakken, men etterfulgt av <.asc> i navnet. Denne .asc filen er en GPG signatur, som gjør at du kan forsikre deg om at programmet du har lastet ned inneholder nøyaktig det vi har laget - med andre ord at ingen har tuklet med programmet uten vår viten.</p>
<p>For å verifisere signaturen må du laste ned programmet GnuPG.</p>
<p><strong>Windows</strong>: <a href="http://gpg4win.org/download.html">http://gpg4win.org/download.html</a><br/><strong>Mac OS X</strong>: <a href="http://www.gpgtools.org/">http://www.gpgtools.org/</a><br/><strong>Linux</strong>: De fleste Linux distribusjoner kommer med GnuPG ferdig installert.</p>
<p>Vær oppmerksom på at du kanskje må forandre på filplasseringen og kommandoene brukt i eksempelet under for at det skal fungere på ditt system.</p>
- <p>Erinn Clark signerer Tor Nettleser Pakken med nøkkelen 0x63FEE659. For å importere Erinns nøkkel, kjør</p>
+ <p>Erinn Clark signerer Tor Browser Bundle med nøkkelen 0x63FEE659. For å importere Erinns nøkkel, kjør</p>
<pre>
<code>gpg --keyserver hkp://keys.gnupg.net --recv-keys 0x63FEE659
</code>
@@ -56,9 +56,9 @@ sub 2048R/EB399FD7 2003-10-16
</pre>
<p>Du skal da få <em>"Good signature"</em> i svar. En falsk signatur ("Bad signature") betyr at det kan ha vært gjort endringer i filen som vi ikke har godkjent. Hvis du ser en falsk signatur, send detaljer om hvor du lastet ned pakken fra, hvordan du verifiserte signaturen, og svaret du fikk fra kommandoen du gjorde i GnuPG i en email til help(a)rt.torproject.org.</p>
<p>Så fort du har verifisert signaturen og fått <em>"Good signature"</em> som svar, kan du pakke ut filene. Det vil da opprettes en filmappe som heter <strong>tor-browser_en-US</strong> eller liknende. Inne i den mappa finner du en annen mappe som heter <strong>Docs</strong>, som inneholder en fil som heter <strong>changelog</strong>. Du bør forsikre deg om at versjonsnummeret på øverste linje i denne changelog-fila stemmer med versjonsnummeret på filnavnet til hoved-pakken du lastet ned.</p>
- <h3 id="how-to-use-the-tor-browser-bundle">Hvordan bruke Tor Nettleser Pakken:</h3>
+ <h3 id="how-to-use-the-tor-browser-bundle">Hvordan bruke Tor Browser Bundle:</h3>
<p>Etter at du har lastet ned Tor Browser Bundle kan du pakke ut program-pakken til skrivebordet eller på en minnepinne. Du skal da få en mappe som inneholder flere filer. En av disse filene heter "Start Tor Browser" (eller "start-tor-browser" avhengig av hvilket operativ system du kjører) og er kjørbar.</p>
- <p>Når du starter Tor Nettleser Pakken vil du først se et program som heter Vidalia starte opp som vil koble deg til Tor nettverket. Når det er gjort, vil nettleseren automatisk starte opp og ta deg til en side som bekrefter at du nå bruker Tor, <a href="https://check.torproject.org/">https://check.torproject.org/</a>, og vise teksten <em>You can now browse the Internet through Tor</em>.</p>
+ <p>Når du starter Tor Browser Bundle vil du først se et program som heter Vidalia starte opp som vil koble deg til Tor nettverket. Når det er gjort, vil nettleseren automatisk starte opp og ta deg til en side som bekrefter at du nå bruker Tor, <a href="https://check.torproject.org/">https://check.torproject.org/</a>, og vise teksten: You can now browse the Internet through Tor.</p>
<p>
<em>Vær oppmerksom på at det er viktig at du bruker nettleseren som følger med pakken, og ikke en annen nettleser.</em>
</p>
@@ -115,16 +115,16 @@ sub 2048R/EB399FD7 2003-10-16
</ol>
<h3 id="vidalia-asks-for-a-password">Vidalia spør etter et passord.</h3>
<p>Det skal ikke være nødvendig å skrive inn passord når du starter Vidalia. Hvis du blir spurt om et passord, er det mest sannsynlig ett av følgende som er problemet:</p>
- <p><strong>Du kjører allerede Vidalia og Tor</strong>: Dette kan for eksempel skje hvis du først installerte Vidalia pakken og nå prøver å kjøre Tor Nettleser Pakken. I så tilfelle må du stenge Vidalia pakken og Tor før du kan kjøre Tor Nettleser Pakken.</p>
+ <p><strong>Du kjører allerede Vidalia og Tor</strong>: Dette kan for eksempel skje hvis du først installerte Vidalia pakken og nå prøver å kjøre Tor Browser Bundle. I så tilfelle må du stenge Vidalia pakken og Tor før du kan kjøre Tor Browser Bundle.</p>
<p><strong>Vidalia krasjet, men Tor fortsatte å kjøre.</strong> Hvis meldingsvinduet som spør deg om et passord har en Reset-knapp, kan du trykke denne og Vidalia vil restarte Tor med et nytt, selv-generert passord. Hvis du ikke ser en Reset-knapp, eller hvis Vidalia ikke klarer å restarte Tor for deg, kan du gå inn i oppgavebehandling (task manager) og manuelt stoppe Tor prosessen. Bruk så Vidalia til å starte Tor igjen.</p>
<p>For mer informasjon, se <a href="https://torproject.org/docs/faq.html#VidaliaPassword">FAQ</a> på Tor Prosjektets nettside.</p>
<h3 id="flash-does-not-work">Flash fungerer ikke</h3>
<p>Av sikkerhetshensyn er Flash, Java og andre tilleggsprogrammer for øyeblikket stengt av for Tor. Tilleggsprogrammer opererer uavhengig av Firefox og kan foreta seg handlinger på din datamaskin som avslører din identitet og dermed ødelegger din anonymitet.</p>
<p>De fleste YouTube videoer fungerer med HTML5, og det er mulig å se disse videoene gjennom Tor. Du må bare melde deg på <a href="https://www.youtube.com/html5">HTML5 prøveordningen</a> på YouTubes nettside før du kan benytte deg av HTML5 spilleren.</p>
- <p>Merk deg forøvrig at nettleseren ikke vil lagre at du meldte deg på HTML5 prøveordningen når du stenger nettleseren, så du må melde deg på nytt neste gang du kjører Tor Nettleser Pakken.</p>
+ <p>Merk deg forøvrig at nettleseren ikke vil lagre at du meldte deg på HTML5 prøveordningen når du stenger nettleseren, så du må melde deg på nytt neste gang du kjører Tor Browser Bundle.</p>
<p>For mer informasjon, se <a href="https://torproject.org/docs/faq.html#noflash">FAQ</a> på Tor Prosjektets nettside.</p>
<h3 id="i-want-to-use-another-browser">Jeg ønsker å bruke en annen nettleser.</h3>
- <p>Av sikkerhetshensyn anbefaler vi at du kun bruker surfer på Tor gjennom Tor Nettleser Pakken. Det er teknisk mulig å bruke Tor med andre nettlesere, men du vil åpne deg opp for mulige angrep.</p>
+ <p>Av sikkerhetshensyn anbefaler vi at du kun bruker surfer på Tor gjennom Tor Browser Bundle. Det er teknisk mulig å bruke Tor med andre nettlesere, men du vil åpne deg opp for mulige angrep.</p>
<h3 id="why-tor-is-slow">Hvorfor det går tregt å surfe med Tor</h3>
<p>Tor kan noen ganger være litt tregere enn din vanlige internett-tilkobling. Trafikken er tross alt send gjennom mange forskjellige land, og noen ganger over verdenshav rundt hele verden!</p>
</body>
diff --git a/zh_CN/short-user-manual_zh_CN_noimg.xhtml b/zh_CN/short-user-manual_zh_CN_noimg.xhtml
index dcc2932..34750e0 100644
--- a/zh_CN/short-user-manual_zh_CN_noimg.xhtml
+++ b/zh_CN/short-user-manual_zh_CN_noimg.xhtml
@@ -6,12 +6,12 @@
<body>
<h1 id="the-short-user-manual">简明用户手册</h1>
<p>本用户手册所含内容:如何下载与使用 Tor,以及 Tor 无法连接到网络时该怎么办。如果本手册未提供你所需的答案,请发送电子邮件至 help-zh(a)rt.torproject.xn--org()-8n1h080l.</p>
- <p>请注意:由于每天收到大量的电子邮件,而我们提供的支持服务是志愿性的,因此,如未能及时回复,请勿着急。</p>
+ <p>请注意:由于每天收到大量的电子邮件,同时支持服务是志愿性的,如未能及时收到回复,请耐心等待。</p>
<h2 id="how-tor-works">Tor 是如何工作的</h2>
<p>Tor 是一个由虚拟通道组成的网络,用于提高用户的互联网安全和隐私。用户的网络数据发送到公用的互联网之前,Tor 将通过三台随机的服务器(也称为“中继”)来传输这些数据。</p>
<p>上图展示了用户如何通过 Tor 网络来浏览不同的网站。绿色显示器表示 Tor 网络中的中继服务器;三把钥匙表示用户与每个中继之间的加密层。</p>
- <p>Tor 将隐去用户网络通信的来源,并将对用户与 Tor 网络之间的所有数据进行加密。另外,Tor 对于 Tor 网络内部的用户通信也将进行加密,但对于 Tor 网络与最终目的站点之间的通信,Tor 并未进行加密。</p>
- <p>如果你的通信涉及敏感信息,例如使用用户名和密码登录网站,请务必使用 HTTPS(例如,使用 <strong>https</strong>://torproject.org/,而不是 <strong>http</strong>://torproject.org/)。</p>
+ <p>Tor 将隐去用户网络通信的来源,并对用户与 Tor 网络之间的所有数据进行加密。另外,Tor 对于 Tor 网络内部的用户通信也将进行加密,但对于 Tor 网络与最终目的站点之间的通信,Tor 并未进行加密。</p>
+ <p>如果你的通信涉及敏感信息,例如需使用用户名和密码登录网站,请务必使用 HTTPS(例如,使用 <strong>https</strong>://torproject.org/,而不是 <strong>http</strong>://torproject.org/)。</p>
<h2 id="how-to-download-tor">如何下载 Tor</h2>
<p>对于大多数用户,我们推荐使用 <a href="https://www.torproject.org/projects/torbrowser.html">Tor Browser Bundle</a>。该软件包含一个预先配置好的浏览器,可通过 Tor 网络安全地浏览互联网,而且无需安装。只需下载软件包,然后解压文档即可运行 Tor。</p>
<p>获取到 Tor 软件有两种方法。通过 <a href="https://www.torproject.org/">Tor Project 网站</a> 下载,或者使用电子邮件自动回复服务 GetTor。</p>
@@ -19,12 +19,12 @@
<p>如需获取 Windows 版英文 Tor Browser Bundle,请发送电子邮件至 gettor(a)torproject.org ,正文内包含 <strong>windows</strong> 即可。标题部分可不填。</p>
<p>另外,还可以获取 Mac OS X 版本的 Tor Browser Bundle(正文内包含 <strong>macos-i386</strong>),以及 Linux 版本(正文内包含 <strong>linux-i386</strong>,或 <strong>linux-x86_64</strong>,前者用于 32 位系统,后者用于 64 位系统)。</p>
<p>如需其他语言版本的 Tor,请在邮件正文内包含 <strong>help</strong>。你将收到一封电子邮件,内含可用语言版本的列表以及相关的指示说明。</p>
- <p><strong>注意</strong>:Linux 和 Mac OS X 的 Tor 浏览器软件包相当大,Gmail、Hotmail 或雅虎邮箱无法接收。 如果无法获取所需的软件包,请发送邮件至 help-zh(a)rt.torproject.xn--org(),-gn7i1ll1d5erm22ahx18ku4fr34fghgvjihu3i8yqfic188f9i0d.</p>
- <h3 id="tor-for-smartphones">智能手机版的 Tor</h3>
+ <p><strong>注意</strong>:Linux 和 Mac OS X 的 Tor 浏览器软件包相当大,Gmail、Hotmail 或雅虎邮箱无法接收。 如果无法获取所需的软件包,请发送邮件至 help-zh(a)rt.torproject.xn--org(),-gn7i1ll1d5e08rqqec6gnp7a79t7umjl2gl2qlp3bi05azrx.</p>
+ <h3 id="tor-for-smartphones">用于智能手机的 Tor</h3>
<p>在 Android 设备上安装 <em>Orbot</em> 软件包即可使用 Tor 网络。如何下载和安装 Orbot,请参阅 <a href="https://www.torproject.org/docs/android.html.en">Tor Project 网站</a>。</p>
<p>另外,还提供用于 <a href="https://www.torproject.org/docs/N900.html.en">Nokia Maemo/N900</a> 和 <a href="http://sid77.slackware.it/iphone/">Apple iOS</a> 的体验软件包。</p>
- <h3 id="how-to-verify-that-you-have-the-right-version">如何验证你已拥有正确的版本</h3>
- <p>在运行 Tor 浏览器软件包之前,你应该确保你持有正确的版本。</p>
+ <h3 id="how-to-verify-that-you-have-the-right-version">如何验证你获得了正确的版本</h3>
+ <p>在运行 Tor 浏览器软件包之前,应确保你获得了正确的版本。</p>
<p>与你所收到的软件相对应,还有一个与该软件包文件名相同而扩展名为 <strong>.asc</strong> 的文件。这个 .asc 文件即 GPG 签名,用于验证是否下载了你想要的文件。</p>
<p>在验证签名之前,需下载并安装 GnuPG:</p>
<p><strong>Windows</strong>: <a href="http://gpg4win.org/download.html">http://gpg4win.org/download.html</a><br/><strong>Mac OS X</strong>: <a href="http://macgpg.sourceforge.net/">http://macgpg.sourceforge.net/</a><br/><strong>Linux</strong>: 大多数 Linux 发行版已预装 GnuPG 程序。</p>
@@ -39,7 +39,7 @@
<code>gpg --fingerprint 0x63FEE659
</code>
</pre>
- <p>你应该会看到:</p>
+ <p>你将看到:</p>
<pre>
<code>pub 2048R/63FEE659 2003-10-16
Key fingerprint = 8738 A680 B84B 3031 A630 F2DB 416F 0610 63FE E659
@@ -56,9 +56,9 @@ sub 2048R/EB399FD7 2003-10-16
</code>
</pre>
<p>输出的结果应为 <em>Good signature</em>。错误签名表示该文件可能受到篡改。如果遇到错误签名,请把该软件包的下载地址、签名验证方式,以及 GunPG 的输出结果一并发送到 help(a)rt.torproject.org 或 help-zh(a)rt.torproject.xn--org()-8n1h080l.</p>
- <p>当你已完成验证并且输出结果是 <em>Good signature</em>,请把软件包解压缩,然后你应该会看到一个名称类似于 <strong>tor-browser_en-US</strong> 的文件夹。此文件夹包含一个名为 <strong>Docs</strong> 的文件夹,其中有一个 <strong>changelog</strong> 文件。请确保 changelog 里第一行的版本号与文件名中的版本号相符。</p>
+ <p>如果完成验证并且输出结果是 <em>Good signature</em>,请将软件包解压缩,然后将生成一个名称类似于 <strong>tor-browser_en-US</strong> 的文件夹。此文件夹包含一个名为 <strong>Docs</strong> 的文件夹,其中有一个 <strong>changelog</strong> 文件。请确保 changelog 里第一行的版本号与文件名中的版本号相符。</p>
<h3 id="how-to-use-the-tor-browser-bundle">如何使用 Tor Browser Bundle</h3>
- <p>下载 Tor Browser Bundle 并提取文件之后,将会出现一个包含几个文件的文件夹。其中包含一个可执行文件,文件名为“Start Tor Browser“(或”start-tor-browser“,这取决于你的操作系统)。</p>
+ <p>下载 Tor Browser Bundle 并提取文件之后,将会出现一个包含几个文件的文件夹。其中包含一个可执行文件,文件名为“Start Tor Browser”(或“start-tor-browser”,这取决于你的操作系统)。</p>
<p>运行 Tor Browser Bundle 时,首先启动 Vidalia 与 Tor 网络建立连接,成功连接之后将打开 <a href="https://check.torproject.org/">https://check.torproject.org/</a> 页面,以确认用户正在使用 Tor 网络。至此,用户即可开始通过 Tor 访问互联网。</p>
<p>
<em>请注意:务必使用该软件包附带的浏览器,而不是用户自己安装的浏览器。这点至关重要。</em>
@@ -67,13 +67,13 @@ sub 2048R/EB399FD7 2003-10-16
<p>有时,在尝试连接 Tor 网络时 Vidalia 会停滞不前。如果出现这种情况,请确保你已连接到互联网。如需通过代理服务器连接,请参阅下面的 “如何使用代理服务器”。</p>
<p>如果互联网连接正常但 Tor 无法连接到网络,请尝试以下操作:打开 Vidalia 控制面板,点击“消息日志”,然后选择“高级”标签页。Tor 网络无法连接的原因可能在于:</p>
<p><strong>你的系统时钟不准确</strong>:请确保你系统中的日期和时间正确,然后重启 Tor。可能需要把系统时钟与网络时间服务器进行同步。</p>
- <p><strong>防火墙限制</strong>:为了让 Tor 仅使用 80 和 443 端口,请打开 Vidalia 控制面板,点击 <strong>设置</strong> > <strong>网络</strong>,然后选中<strong>防火墙仅允许连接某些端口</strong>。</p>
+ <p><strong>防火墙限制</strong>:为了让 Tor 仅使用 80 和 443 端口,请打开 Vidalia 控制面板,点击<em>设置</em> 和 <em>网络</em>,然后选中<em>防火墙仅允许连接某些端口</em>。</p>
<p><strong>杀毒软件封锁 Tor</strong>:请确保杀毒软件没有封锁 Tor 网络连接。</p>
<p>如果 Tor 仍然无法正常运行,可能是互联网服务提供商 (ISP) 封锁了 Tor。很多时候,可使用不易被封锁的隐藏中继 <strong>Tor 网桥</strong>来突破封锁。</p>
<p>如果因 Tor 无法连接需要帮助,请发送电子邮件到 help-zh(a)rt.torproject.org ,并附上日志文件中相关部分的内容。</p>
<h3 id="how-to-find-a-bridge">如何查找网桥</h3>
<p>如需使用网桥,首先需要获得一个网桥地址:浏览页面 <a href="https://bridges.torproject.org/">bridges.torproject.org</a>,或者发送电子邮件到 bridges(a)torproject.org 。发送电子邮件的方式需确保邮件正文含有 <strong>get bridges</strong> 字样,否则将不会收到回复。请注意:需使用 gmail.com 或 yahoo.com 邮箱来发送该邮件。</p>
- <p>配置一个以上的网桥地址,能让 Tor 的连接在某些网桥无法访问时更加稳定。无法保证当前所用的网桥明天仍然能用,所以应养成时常更新网桥列表的习惯。</p>
+ <p>配置一个以上的网桥地址,能让 Tor 的连接在某些网桥无法访问时更加稳定。无法保证当前所用的网桥以后仍然能用,所以应养成时常更新网桥列表的习惯。</p>
<h3 id="how-to-use-a-bridge">如何使用网桥</h3>
<p>找到可用的网桥后,打开 Vidalia 控制面板,点击 <em>设置</em>,<em>网络</em>,然后勾选 <em>我的 ISP 阻挡了对 Tor 网络的连接</em> 的选项框。在下面的方框里填上网桥地址,点击 <em>确定</em> 并再次启动 Tor。</p>
<h3 id="how-to-use-an-open-proxy">如何使用开放代理</h3>
@@ -81,15 +81,15 @@ sub 2048R/EB399FD7 2003-10-16
<p>如果已对 Tor/Vidalia 进行正确的配置,并获得了 HTTPS、SOCKS4 或 SOCKS5 代理列表,请按照以下步骤进行:</p>
<ol style="list-style-type: decimal">
<li>打开 Vidalia 控制面板,点击 <em>设置</em>。</li>
- <li>点击 <em>网络</em>,选择 <em>使用代理服务器连接互联网</em>。</li>
+ <li>点击 <em>网络</em>,选择<em>使用代理服务器连接互联网</em>。</li>
<li>在 <em>地址</em> 栏输入开放代理地址,可以是主机名或 IP 地址。</li>
<li>输入代理端口。</li>
<li>通常,无需输入用户名和密码。如果需要,请在相应字段填写。</li>
- <li>选择所用代理的 <em>类型</em>,可以是 HTTP/HTTPS、SOCKS4 或 SOCKS5。</li>
- <li>点击 <em>确定</em> 按钮。现在,已将 Vidalia 和 Tor 配置为使用代理连接 Tor 网络。</li>
+ <li>选择所用代理的<em>类型</em>,可以是 HTTP/HTTPS、SOCKS4 或 SOCKS5。</li>
+ <li>点击<em>确定</em>按钮。现在,已将 Vidalia 和 Tor 配置为使用代理连接 Tor 网络。</li>
</ol>
<h2 id="frequently-asked-questions">常见问题</h2>
- <p>本节会回答一些常见的问题。如果这里没有你问题的答案,请发送电子邮件至 help(a)rt.torproject.org 或 help-zh(a)rt.torproject.xn--org()-8n1h080l.</p>
+ <p>本节会回答一些常见的问题。如果这里没有你需要的答案,请发送电子邮件至 help(a)rt.torproject.org 或 help-zh(a)rt.torproject.xn--org()-8n1h080l.</p>
<h3 id="unable-to-extract-the-archive">无法解压文档</h3>
<p>如果你的系统为 Windows 且无法解压文档,请下载并安装 <a href="http://www.7-zip.org/">7-Zip</a>。</p>
<p>如果无法下载 7-Zip,请尝试将 .z 文件重命名为 .zip,然后用 WinZip 解压文档。在重命名之前,需将 Windows 设置为可显示文件扩展名:</p>
@@ -102,14 +102,14 @@ sub 2048R/EB399FD7 2003-10-16
</ol>
<h4 id="windows-vista">Windows Vista</h4>
<ol style="list-style-type: decimal">
- <li>打 <em>我的电脑</em></li>
+ <li>打开<em>我的电脑</em></li>
<li>点击<em>组织</em>,在菜单里选择<em>文件夹和搜索选项</em></li>
<li>点击<em>查看</em>选项卡</li>
<li>取消选中<em>隐藏已知文件类型的扩展名</em>,然后点击<em>确定</em></li>
</ol>
<h4 id="windows-7">Windows 7</h4>
<ol style="list-style-type: decimal">
- <li>打 <em>我的电脑</em></li>
+ <li>打开<em>我的电脑</em></li>
<li>点击<em>组织</em>,在菜单里选择<em>文件夹和搜索选项</em></li>
<li>点击<em>查看</em>选项卡</li>
<li>取消选中<em>隐藏已知文件类型的扩展名</em>,然后点击<em>确定</em></li>
@@ -117,16 +117,16 @@ sub 2048R/EB399FD7 2003-10-16
<h3 id="vidalia-asks-for-a-password">Vidalia 要求输入密码</h3>
<p>启动 Vidalia 时无需输入密码。如果出现密码输入提升,可能存在以下问题:</p>
<p><strong>Vidalia 和 Tor 已在运行</strong>:例如,如果已安装 Vidalia 软件包,在尝试运行 Tor Browser Bundle 时可能出现这种情况。这时需关闭旧版的 Vidalia 和 Tor,然后运行当前版本。</p>
- <p><strong>Vidalia 崩溃了,但 Tor 仍在运行</strong>: 如果控制密码提示框有”重置“按钮, 可点击该按钮。Vidalia 将使用新的随机控制密码重启 Tor。 如果没有”重置“按钮,或者 Vidalia 无法重启 Tor, 请打开进程或任务管理器,结束 Tor 进程,然后再用 Vidalia 来重启 Tor。</p>
+ <p><strong>Vidalia 崩溃了,但 Tor 仍在运行</strong>: 如果控制密码提示框有“重置”按钮, 可点击该按钮。Vidalia 将使用新的随机控制密码重启 Tor。 如果没有“重置”按钮,或者 Vidalia 无法重启 Tor, 请打开进程或任务管理器,结束 Tor 进程,然后再用 Vidalia 来重启 Tor。</p>
<p>更多信息,请参阅 Tor Project 网站上的<a href="https://torproject.org/docs/faq.html#VidaliaPassword">常见问题</a>。</p>
<h3 id="flash-does-not-work">Flash 无法运行</h3>
- <p>出于安全考虑,当前 Tor 禁用了 Flash、Java 和其他插件。插件的运行独立于 Firefox,并且在计算机上某些活动可对你的匿名性造成危害。</p>
- <p>大多数 YouTube 视频兼容 HTML5,通过 Tor 网络可以观看这些视频。需在 YouTube 网站上加入 <a href="https://www.youtube.com/html5">HTML5 体验计划</a> 才能使用 HTML5 播放器。</p>
- <p>请注意:Tor Browser Bundle 中浏览器在关闭后不会记住你已加入体验计划,所以下次运行该软件时需重新加入体验计划。</p>
+ <p>出于安全考虑,当前 Tor 禁用了 Flash、Java 和其他插件。插件的运行独立于 Firefox,并且这些插件在计算机上某些活动可对你的匿名性造成危害。</p>
+ <p>大多数 YouTube 视频兼容 HTML5,通过 Tor 网络可以观看这些视频。在 YouTube 网站上加入 <a href="https://www.youtube.com/html5">HTML5 体验计划</a> 即可使用 HTML5 播放器。</p>
+ <p>请注意:Tor Browser Bundle 中集成的浏览器在关闭后不会记住你已加入体验计划,所以下次运行该软件时需重新加入。</p>
<p>更多信息,请参阅 <a href="https://www.torproject.org/torbutton/torbutton-faq.html#noflash">Torbutton 常见问题</a> 。</p>
<h3 id="i-want-to-use-another-browser">我想使用其它浏览器</h3>
- <p>基于安全理由,我们推荐使用 Tor Browser Bundle 来浏览互联网。在技术上 Tor 可与其它浏览器一起使用,但这样做存在遭受潜在攻击的风险。</p>
+ <p>出于安全考虑,我们建议使用 Tor Browser Bundle 来浏览互联网。在技术上 Tor 可与其它浏览器一起使用,但这样做用户将承担遭受攻击的潜在风险。</p>
<h3 id="why-tor-is-slow">为什么 Tor 这么慢</h3>
- <p>Tor 有时比正常互联网连接慢一些。要知道,你发送的数据需通过多个国家,甚至需跨越海洋大陆才能抵达目的地。</p>
+ <p>Tor 有时比正常互联网连接慢一些。因为你发送的数据需经过多个国家,甚至跨越海洋大陆才能抵达目的地。</p>
</body>
</html>
commit 54f89820dfcaa26a0642f6cb533f4e3ee3e11705
Author: Translation commit bot <translation(a)torproject.org>
Date: Thu May 23 13:16:51 2013 +0000
Update translations for tsum
---
cs/short-user-manual_cs_noimg.xhtml | 4 +-
el_GR/short-user-manual_el_GR_noimg.xhtml | 132 +++++++++++++++++++++++++++++
eu/short-user-manual_eu_noimg.xhtml | 4 +-
gu_IN/short-user-manual_gu_IN_noimg.xhtml | 132 +++++++++++++++++++++++++++++
hr_HR/short-user-manual_hr_HR_noimg.xhtml | 132 +++++++++++++++++++++++++++++
ms/short-user-manual_ms_noimg.xhtml | 8 +-
nb/short-user-manual_nb_noimg.xhtml | 22 ++---
pl_PL/short-user-manual_pl_PL_noimg.xhtml | 2 +-
pt/short-user-manual_pt_noimg.xhtml | 10 +--
si/short-user-manual_si_noimg.xhtml | 132 +++++++++++++++++++++++++++++
si_LK/short-user-manual_si_LK_noimg.xhtml | 132 +++++++++++++++++++++++++++++
te_IN/short-user-manual_te_IN_noimg.xhtml | 132 +++++++++++++++++++++++++++++
uk/short-user-manual_uk_noimg.xhtml | 4 +-
zh_CN/short-user-manual_zh_CN_noimg.xhtml | 48 +++++------
zh_TW/short-user-manual_zh_TW_noimg.xhtml | 132 +++++++++++++++++++++++++++++
15 files changed, 975 insertions(+), 51 deletions(-)
diff --git a/cs/short-user-manual_cs_noimg.xhtml b/cs/short-user-manual_cs_noimg.xhtml
index 79ca629..988ab36 100644
--- a/cs/short-user-manual_cs_noimg.xhtml
+++ b/cs/short-user-manual_cs_noimg.xhtml
@@ -22,7 +22,7 @@
<p><strong>Poznámka</strong>: Tor Browser Bundle pro Linux a Mac OS X jsou docela velké a s účtem u Gmailu, Hotmailu nebo Yahoo je nebudete moci přijmout. Pokud nemůžete přijmout balíček který chcete, pošlete email na help(a)rt.torproject.org a dáme vám seznam webových mirrorů.</p>
<h3 id="tor-for-smartphones">Tor pro chytré mobilní telefony</h3>
<p>Můžete získat Tor na vaše Android zařízení nainstalováním balíčku se jménem <em>Orbot</em>. Pro informace o tom jak stáhnout a nainstalovat Orbot, navštivte prosím <a href="https://www.torproject.org/docs/android.html.en">stránku projektu Tor</a>.</p>
- <p>We also have experimental packages for <a href="https://www.torproject.org/docs/N900.html.en">Nokia Maemo/N900</a> and <a href="http://sid77.slackware.it/iphone/">Apple iOS</a>.</p>
+ <p>Máme také experimentální balíčky pro systémy <a href="https://www.torproject.org/docs/N900.html.en">Nokia Maemo/N900</a> a <a href="http://sid77.slackware.it/iphone/">Apple iOS</a>.</p>
<h3 id="how-to-verify-that-you-have-the-right-version">Jak ověřit, že máte správnou verzi</h3>
<p>Před spuštením Tor Browser Bundle byste se měli ujistit, že máte správnou verzi.</p>
<p>Software který obdržíte je doprovázen souborem se stejným jménem jako balíček a příponou <strong>.asc</strong>. Tento .asc soubor je GPG podpis a umožní vám ověřit že stáhlý soubor je přesně ten co jsme vám chtěli dát.</p>
@@ -58,7 +58,7 @@ sub 2048R/EB399FD7 2003-10-16
<p>Výstup by měl psát <em>&quot;Good signature&quot;</em>. Špatný podpis může znamenat že do souboru někdo zasahoval. Uvidíte-li špatný podpis, pošlete detaily o místě ze kterého jste balíček stáhli, jak jste ověřovali podpis a výpis GnuPG v emailu na help(a)rt.torproject.org.</p>
<p>Po ověření že podpis je v pořádku můžete archiv extrahovat. Měli byste poté vidět adresář na způsob <strong>tor-browser_en-US</strong>. Uvnitř tohoto adresáře je další adresář se jménem <strong>Docs</strong>, který obsahuje soubor <strong>changelog</strong>. Ujistěte se, že verze na prvním řádku tohoto souboru je stejná jako verze ve jméně.</p>
<h3 id="how-to-use-the-tor-browser-bundle">Jak použít Tor Browser Bundle</h3>
- <p>After downloading the Tor Browser Bundle and extracting the package, you should have a directory with a few files in it. One of the files is an executable called "Start Tor Browser" (or "start-tor-browser", depending on your operating system).</p>
+ <p>Po stažení Tor Browser Bundle a rozbalení balíčku byste měli mít adresář s několika soubory. Jeden z nich bude spustitelný soubor nazvaný &quot;Start Tor Browser&quot; (nebo &quot;start-tor-browser&quot;, podle vašeho operačního systému).</p>
<p>Po spuštění Tor Browser Bundle uvidíte nejprve startovat program Vidalia a připojit se k síti Tor. Po té uvidéte prohlížeč potvrzující že nyní používáte Tor. K tomuto ověření se využívá <a href="https://check.torproject.org/">https://check.torproject.org/</a>. Nyní můžete brouzdat Internet skrz Tor.</p>
<p>
<em>Vezměte prosím na vědomí, že je důležité abyste použili prohlížeč který je součástí balíčků, a ne váš vlastní.</em>
diff --git a/el_GR/short-user-manual_el_GR_noimg.xhtml b/el_GR/short-user-manual_el_GR_noimg.xhtml
new file mode 100644
index 0000000..b7a4f2a
--- /dev/null
+++ b/el_GR/short-user-manual_el_GR_noimg.xhtml
@@ -0,0 +1,132 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+ <title/>
+ </head>
+ <body>
+ <h1 id="the-short-user-manual">The Short User Manual</h1>
+ <p>Αυτό το εγχειρίδιο χρήσης περιέχει πληροφορίες πώς να κατεβάσετε το Tor, πώς να το χρησιμοποιήσετε και τι να κάνετε αν το Tor δεν μπορεί να συνδεθεί στο δίκτυο. Αν δεν μπορείτε να βρείτε την λύση στο πρόβλημά σας, στείλτε μήνυμα στη διεύθυνση help(a)rt.torproject.org.</p>
+ <p>Να ξέρετε ότι η υποστήριξη γίνεται σε εθελοντική βάση και κάθε ημέρα λαμβάνουμε πολλά ηλεκτρονικά μηνύματα. Δεν πρέπει να ανησυχείτε αν δεν επικοινωνήσουμε μαζί σας αμέσως.</p>
+ <h2 id="how-tor-works">How Tor works</h2>
+ <p>Tor is a network of virtual tunnels that allows you to improve your privacy and security on the Internet. Tor works by sending your traffic through three random servers (also known as <em>relays</em>) in the Tor network, before the traffic is sent out onto the public Internet.</p>
+ <p>Η παραπάνω εικόνα δείχνει έναν χρήστη να περιηγείται σε διάφορους ιστοχώρους μέσω Tor. Οι πράσινες οθόνες αναπαριστούν αναμεταδότες του δικτύου Tor, ενώ τα τρία κλειδιά αναπαριστούν τα επίπεδα κρυπτογράφησης μεταξύ του χρήστη και καθενός εκ των αναμεταδοτών.</p>
+ <p>Το Tor "ανωνυμοποιεί" την προέλευση της κυκλοφορίας σας και κρυπτογραφεί όλα τα δεδομένα μεταξύ του χρήστη και του δικτύου Tor. Το Tor, επίσης, κρυπτογραφεί την κυκλοφορία των δεδομένων σας εντός του δικτύου του, αλλά δεν κρυπτογραφεί την κυκλοφορία μεταξύ του δικτύου του και του τελικού προορισμού της.</p>
+ <p>If you are communicating sensitive information, for example when logging on to a website with a username and password, make sure that you are using HTTPS (e.g. <strong>https</strong>://torproject.org/, not <strong>http</strong>://torproject.org/).</p>
+ <h2 id="how-to-download-tor">How to download Tor</h2>
+ <p>The bundle we recommend to most users is the <a href="https://www.torproject.org/projects/torbrowser.html">Tor Browser Bundle</a>. This bundle contains a browser preconfigured to safely browse the Internet through Tor, and requires no installation. You download the bundle, extract the archive, and start Tor.</p>
+ <p>There are two different ways to get hold of the Tor software. You can either browse to the <a href="https://www.torproject.org/">Tor Project website</a> and download it there, or you can use GetTor, the email autoresponder.</p>
+ <h3 id="how-to-get-tor-via-email">How to get Tor via email</h3>
+ <p>To receive the English Tor Browser Bundle for Windows, send an email to gettor(a)torproject.org with <strong>windows</strong> in the body of the message. You can leave the subject blank.</p>
+ <p>You can also request the Tor Browser Bundle for Mac OS X (write <strong>macos-i386</strong>), and Linux (write <strong>linux-i386</strong> for 32-bit systems or <strong>linux-x86_64</strong> for 64-bit systems).</p>
+ <p>If you want a translated version of Tor, write <strong>help</strong> instead. You will then receive an email with instructions and a list of available languages.</p>
+ <p><strong>Note</strong>: The Tor Browser Bundles for Linux and Mac OS X are rather large, and you will not be able to receive any of these bundles with a Gmail, Hotmail or Yahoo account. If you cannot receive the bundle you want, send an email to help(a)rt.torproject.org and we will give you a list of website mirrors to use.</p>
+ <h3 id="tor-for-smartphones">Tor for smartphones</h3>
+ <p>You can get Tor on your Android device by installing the package named <em>Orbot</em>. For information about how to download and install Orbot, please see the <a href="https://www.torproject.org/docs/android.html.en">Tor Project website</a>.</p>
+ <p>We also have experimental packages for <a href="https://www.torproject.org/docs/N900.html.en">Nokia Maemo/N900</a> and <a href="http://sid77.slackware.it/iphone/">Apple iOS</a>.</p>
+ <h3 id="how-to-verify-that-you-have-the-right-version">How to verify that you have the right version</h3>
+ <p>Before running the Tor Browser Bundle, you should make sure that you have the right version.</p>
+ <p>The software you receive is accompanied by a file with the same name as the bundle and the extension <strong>.asc</strong>. This .asc file is a GPG signature, and will allow you to verify the file you've downloaded is exactly the one that we intended you to get.</p>
+ <p>Before you can verify the signature, you will have to download and install GnuPG:</p>
+ <p><strong>Windows</strong>: <a href="http://gpg4win.org/download.html">http://gpg4win.org/download.html</a><br/><strong>Mac OS X</strong>: <a href="http://macgpg.sourceforge.net/">http://macgpg.sourceforge.net/</a><br/><strong>Linux</strong>: Most Linux distributions come with GnuPG preinstalled.</p>
+ <p>Σημειώστε ότι ίσως χρειαστεί να επεξεργαστείτε τις διαδρομές και εντολές που χρησιμοποιούμε παρακάτω ώστε να λειτουργήσει στο σύστημά σας.</p>
+ <p>Η Erinn Clark υπογράφει τα Πακέτα Φυλλομετρητή Tor με κλειδί 0x63FEE659. Για να εισάγετε το κλειδί της Erinn, εκτελέστε:</p>
+ <pre>
+ <code>gpg --keyserver hkp://keys.gnupg.net --recv-keys 0x63FEE659
+</code>
+ </pre>
+ <p>Μετά την εισαγωγή του κλειδιού, βεβαιωθείτε ότι το αποτύπωμά του είναι το σωστό:</p>
+ <pre>
+ <code>gpg --fingerprint 0x63FEE659
+</code>
+ </pre>
+ <p>Θα πρέπει να δείτε:</p>
+ <pre>
+ <code>pub 2048R/63FEE659 2003-10-16
+ Key fingerprint = 8738 A680 B84B 3031 A630 F2DB 416F 0610 63FE E659
+uid Erinn Clark <erinn(a)torproject.org>
+uid Erinn Clark <erinn(a)debian.org>
+
+uid Erinn Clark <erinn(a)double-helix.org>
+sub 2048R/EB399FD7 2003-10-16
+</code>
+ </pre>
+ <p>Για να εξακριβώσετε την υπογραφή του πακέτου που κατεβάσατε, εκτελέστε την ακόλουθη εντολή:</p>
+ <pre>
+ <code>gpg --verify tor-browser-2.2.33-2_en-US.exe.asc tor-browser-2.2.33-2_en-US.exe
+</code>
+ </pre>
+ <p>The output should say <em>"Good signature"</em>. A bad signature means that the file may have been tampered with. If you see a bad signature, send details about where you downloaded the package from, how you verified the signature, and the output from GnuPG in an email to help(a)rt.torproject.org.</p>
+ <p>Once you have verified the signature and seen the <em>"Good signature"</em> output, go ahead and extract the package archive. You should then see a directory similar to <strong>tor-browser_en-US</strong>. Inside that directory is another directory called <strong>Docs</strong>, which contains a file called <strong>changelog</strong>. You want to make sure that the version number on the top line of the changelog file matches the version number in the filename.</p>
+ <h3 id="how-to-use-the-tor-browser-bundle">How to use the Tor Browser Bundle</h3>
+ <p>After downloading the Tor Browser Bundle and extracting the package, you should have a directory with a few files in it. One of the files is an executable called "Start Tor Browser" (or "start-tor-browser", depending on your operating system).</p>
+ <p>When you start the Tor Browser Bundle, you will first see Vidalia start up and connect you to the Tor network. After that, you will see a browser confirming that you are now using Tor. This is done by displaying <a href="https://check.torproject.org/">https://check.torproject.org/</a>. You can now browse the Internet through Tor.</p>
+ <p>
+ <em>Please note that it is important that you use the browser that comes with the bundle, and not your own browser.</em>
+ </p>
+ <h3 id="what-to-do-when-tor-does-not-connect">What to do when Tor does not connect</h3>
+ <p>Some users will notice that Vidalia gets stuck when trying to connect to the Tor network. If this happens, make sure that you are connected to the Internet. If you need to connect to a proxy server, see <em>How to use an open proxy</em> below.</p>
+ <p>If your normal Internet connection is working, but Tor still can't connect to the network, try the following; open the Vidalia control panel, click on <em>Message Log</em> and select the <em>Advanced</em> tab. It may be that Tor won't connect because:</p>
+ <p><strong>Your system clock is off</strong>: Make sure that the date and time on your system is correct, and restart Tor. You may need to synchronize your system clock with an Internet time server.</p>
+ <p><strong>You are behind a restrictive firewall</strong>: To tell Tor to only try port 80 and port 443, open the Vidalia control panel, click on <em>Settings</em> and <em>Network</em>, and tick the box that says <em>My firewall only lets me connect to certain ports</em>.</p>
+ <p><strong>Your anti-virus program is blocking Tor</strong>: Make sure that your anti-virus program is not preventing Tor from making network connections.</p>
+ <p>If Tor still doesn't work, it's likely that your Internet Service Provider (ISP) is blocking Tor. Very often this can be worked around with <strong>Tor bridges</strong>, hidden relays that aren't as easy to block.</p>
+ <p>Αν χρειαστείτε βοήθεια όταν το Tor δεν μπορεί να συνδεθεί, στείλτε ηλεκτρονικό μήνυμα στην διεύθυνση help(a)rt.torproject.org και προσθέστε τα σχετικά τμήματα από το αρχείο καταγραφής.</p>
+ <h3 id="how-to-find-a-bridge">How to find a bridge</h3>
+ <p>To use a bridge, you will first have to locate one; you can either browse to <a href="https://bridges.torproject.org/">bridges.torproject.org</a>, or you can send an email to bridges(a)torproject.org. If you do send an email, please make sure that you write <strong>get bridges</strong> in the body of the email. Without this, you will not get a reply. Note that you need to send this email from either a gmail.com or a yahoo.com address.</p>
+ <p>Σε περίπτωση που κάποια από τις γέφυρες καταστεί απροσπέλαστη, η ρύθμιση περισσοτέρων της μιας διευθύνσεων γέφυρας θα κάνει τις συνδέσεις σας με το Tor σταθερότερες.</p>
+ <h3 id="how-to-use-a-bridge">How to use a bridge</h3>
+ <p>Once you have a set of bridges to use, open the Vidalia control panel, click on <em>Settings</em>, <em>Network</em> and tick the box that says <em>My ISP blocks connections to the Tor network</em>. Enter the bridges in the box below, hit <em>OK</em> and start Tor again.</p>
+ <h3 id="how-to-use-an-open-proxy">How to use an open proxy</h3>
+ <p>If using a bridge does not work, try configuring Tor to use any HTTPS or SOCKS proxy to get access to the Tor network. This means even if Tor is blocked by your local network, open proxies can be safely used to connect to the Tor Network and on to the uncensored Internet.</p>
+ <p>Στα βήματα που ακολουθούν υποθέτουμε ότι έχετε μια λειτουργική ρύθμιση των Tor/Vidalia και έχετε στην διάθεσή σας μια λίστα με πληρεξούσιους εξυπηρετητές HTTPS, SOCKS4 ή SOCKS5.</p>
+ <ol style="list-style-type: decimal">
+ <li>Open the Vidalia control panel, click on <em>Settings</em>.</li>
+ <li>Click <em>Network</em>. Select <em>I use a proxy to access the Internet</em>.</li>
+ <li>On the <em>Address</em> line, enter the open proxy address. This can be a hostname or an IP Address.</li>
+ <li>Enter the port for the proxy.</li>
+ <li>Generally, you do not need a username and password. If you do, enter the information in the proper fields.</li>
+ <li>Choose the <em>Type</em> of proxy you are using, whether HTTP/HTTPS, SOCKS4, or SOCKS5.</li>
+ <li>Push the <em>OK</em> button. Vidalia and Tor are now configured to use a proxy to access the rest of the Tor network.</li>
+ </ol>
+ <h2 id="frequently-asked-questions">Frequently Asked Questions</h2>
+ <p>This section will answer some of the most common questions. If your question is not mentioned here, please send an email to help(a)rt.torproject.org.</p>
+ <h3 id="unable-to-extract-the-archive">Unable to extract the archive</h3>
+ <p>If you are using Windows and find that you cannot extract the archive, download and install <a href="http://www.7-zip.org/">7-Zip</a>.</p>
+ <p>Αν δεν μπορείτε να κατεβάσετε το 7-Zip, προσπαθείστε να μετονομάσετε το αρχείο από .z σε .zip και χρησιμοποιήστε το winzip για την αποσυμίεσή του. Πριν μετονομάσετε το αρχείο, ρυθμίστε τα Windows ώστε να εμφανίζουν τις επεκτάσεις των αρχείων:</p>
+ <h4 id="windows-xp">Windows XP</h4>
+ <ol style="list-style-type: decimal">
+ <li>Open <em>My Computer</em></li>
+ <li>Click on <em>Tools</em> and choose <em>Folder Options...</em> in the menu</li>
+ <li>Click on the <em>View</em> tab</li>
+ <li>Uncheck <em>Hide extensions for known file types</em> and click <em>OK</em></li>
+ </ol>
+ <h4 id="windows-vista">Windows Vista</h4>
+ <ol style="list-style-type: decimal">
+ <li>Open <em>Computer</em></li>
+ <li>Click on <em>Organize</em> and choose <em>Folder and search options</em> in the menu</li>
+ <li>Click on the <em>View</em> tab</li>
+ <li>Uncheck <em>Hide extensions for known file types</em> and click <em>OK</em></li>
+ </ol>
+ <h4 id="windows-7">Windows 7</h4>
+ <ol style="list-style-type: decimal">
+ <li>Open <em>Computer</em></li>
+ <li>Click on <em>Organize</em> and choose <em>Folder and search options</em> in the menu</li>
+ <li>Click on the <em>View</em> tab</li>
+ <li>Uncheck <em>Hide extensions for known file types</em> and click <em>OK</em></li>
+ </ol>
+ <h3 id="vidalia-asks-for-a-password">Vidalia asks for a password</h3>
+ <p>You should not have to enter a password when starting Vidalia. If you are prompted for one, you are likely affected by one of these problems:</p>
+ <p><strong>You are already running Vidalia and Tor</strong>: For example, this situation can happen if you installed the Vidalia bundle and now you're trying to run the Tor Browser Bundle. In that case, you will need to close the old Vidalia and Tor before you can run this one.</p>
+ <p><strong>Vidalia crashed, but left Tor running</strong>: If the dialog that prompts you for a control password has a Reset button, you can click the button and Vidalia will restart Tor with a new random control password. If you do not see a Reset button, or if Vidalia is unable to restart Tor for you; go into your process or task manager, and terminate the Tor process. Then use Vidalia to restart Tor.</p>
+ <p>For more information, see the <a href="https://torproject.org/docs/faq.html#VidaliaPassword">FAQ</a> on the Tor Project website.</p>
+ <h3 id="flash-does-not-work">Flash does not work</h3>
+ <p>For security reasons, Flash, Java, and other plugins are currently disabled for Tor. Plugins operate independently from Firefox and can perform activity on your computer that ruins your anonymity.</p>
+ <p>Most YouTube videos work with HTML5, and it is possible to view these videos over Tor. You need to join the <a href="https://www.youtube.com/html5">HTML5 trial</a> on the YouTube website before you can use the HTML5 player.</p>
+ <p>Σημειώστε ότι ο φυλλομετρητής σας δεν θα θυμάται ότι εγγραφήκατε στην δοκιμή του HTML5 όταν τον κλείσετε και θα χρειαστεί να εγγραφείτε εκ νέου στην δοκιμή την επόμενη φορά που θα εκτελέσετε το Πακέτο Φυλλομετρητή Tor.</p>
+ <p>Please see the <a href="https://www.torproject.org/torbutton/torbutton-faq.html#noflash">Torbutton FAQ</a> for more information.</p>
+ <h3 id="i-want-to-use-another-browser">I want to use another browser</h3>
+ <p>For security reasons, we recommend that you only browse the web through Tor using the Tor Browser Bundle. It is technically possible to use Tor with other browsers, but by doing so you open yourself up to potential attacks.</p>
+ <h3 id="why-tor-is-slow">Why Tor is slow</h3>
+ <p>Tor can sometimes be a bit slower than your normal Internet connection. After all, your traffic is sent through many different countries, sometimes across oceans around the world!</p>
+ </body>
+</html>
diff --git a/eu/short-user-manual_eu_noimg.xhtml b/eu/short-user-manual_eu_noimg.xhtml
index c0157f8..2611712 100644
--- a/eu/short-user-manual_eu_noimg.xhtml
+++ b/eu/short-user-manual_eu_noimg.xhtml
@@ -10,7 +10,7 @@
<h2 id="how-tor-works">Nola egiten du lan Tor</h2>
<p>Tor is a network of virtual tunnels that allows you to improve your privacy and security on the Internet. Tor works by sending your traffic through three random servers (also known as <em>relays</em>) in the Tor network, before the traffic is sent out onto the public Internet.</p>
<p>Goiko irudiak Tor bitartez webgune ezberdinetatik nabigatzen duen erabiltzaile bat erakusten du. Pantaila berdeak Tor sareko erreleak irudikatzen dituzte, hiru giltzek erabiltzailea eta errele bakoitzaren arteko enkriptazio mailak irudikatzen dituzten bitartean.</p>
- <p>Tor will anonymize the origin of your traffic, and it will encrypt everything between you and the Tor network. Tor will also encrypt your traffic inside the Tor network, but it cannot encrypt your traffic between the Tor network and its final destination.</p>
+ <p>Tor-ek zure trafikoaren iturria anonimo bihurtarazten du, eta zure eta Tor-en arteko guztia enrkiptatuko du. Tor-ek bere barneko trafikoa ere enkriptatuko du, baina ezin du zure trafikoa enkriptatu Tor sarea eta bere azkeneko helmuga bitartean.</p>
<p>Informazio sentikorra komunikatzen ari bazara, adibidez webgune batean erabiltzaile eta pasahitz batekin saioa hasterakoan, egiaztatu HTTPS erabiltzen ari zarela (adib <strong>https</strong>://torproject.org/, ez <strong>http</strong>://torproject.org/).</p>
<h2 id="how-to-download-tor">Tor nola deskargatu</h2>
<p>The bundle we recommend to most users is the <a href="https://www.torproject.org/projects/torbrowser.html">Tor Browser Bundle</a>. This bundle contains a browser preconfigured to safely browse the Internet through Tor, and requires no installation. You download the bundle, extract the archive, and start Tor.</p>
@@ -121,7 +121,7 @@ sub 2048R/EB399FD7 2003-10-16
<p>Informazio gehiago lortzeko, Tor Project webgunean <a href="https://torproject.org/docs/faq.html#VidaliaPassword">FAQ-a</a> ikusi.</p>
<h3 id="flash-does-not-work">Flash ez du funtzionatzen</h3>
<p>Segurtasun arrazoiengatik, Flash, Java eta beste pluginak ezgaituta daude Torentzako. Pluginek Firefoxetik kanpo egiten dute lan eta zure anonimotasuna hondatu dezakeen ekintzak gauzatu ditzakete.</p>
- <p>YouTubeko bideo gehienek HTML5ekin funtzionatzen dute, eta bideo hauek Tor bidez ikusi ahal dira. Youtubeko webgunean <a href="https://www.youtube.com/html5">HTML5 saiakeran</a> sartu behar zara HTML5 erreproduzitzailea erabili ahal baino lehen.</p>
+ <p>YouTubeko bideo gehienek HTML5ekin funtzionatzen dute, eta bideo hauek Tor bidez ikusi ahal dira. Youtubeko webgunean <a href="https://www.youtube.com/html5">HTML5 saiakeran</a> sartu behar zara HTML5 erreproduzitzailea erabili ahal izan baino lehen.</p>
<p>Kontuan izan nabigatzailea itxi ondoren saiakeran sartu zarenik ez duela gogoratuko, beraz Tor Browser Bundlea exekutatzen duzun hurrengo aldian saiakeran berriz sartu beharko zara.</p>
<p>Mesedez ikusi <a href="https://www.torproject.org/torbutton/torbutton-faq.html#noflash">Torbutton FAQ-a</a> informazio gehiagorako.</p>
<h3 id="i-want-to-use-another-browser">Beste nabigatzaile bat erabili nahi dut</h3>
diff --git a/gu_IN/short-user-manual_gu_IN_noimg.xhtml b/gu_IN/short-user-manual_gu_IN_noimg.xhtml
new file mode 100644
index 0000000..681e5b7
--- /dev/null
+++ b/gu_IN/short-user-manual_gu_IN_noimg.xhtml
@@ -0,0 +1,132 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+ <title/>
+ </head>
+ <body>
+ <h1 id="the-short-user-manual">The Short User Manual</h1>
+ <p>This user manual contains information about how to download Tor, how to use it, and what to do if Tor is unable to connect to the network. If you can't find the answer to your question in this document, email help(a)rt.torproject.org.</p>
+ <p>Please note that we are providing support on a voluntary basis, and we get a lot of emails every single day. There is no need to worry if we don't get back to you straight away.</p>
+ <h2 id="how-tor-works">How Tor works</h2>
+ <p>Tor is a network of virtual tunnels that allows you to improve your privacy and security on the Internet. Tor works by sending your traffic through three random servers (also known as <em>relays</em>) in the Tor network, before the traffic is sent out onto the public Internet.</p>
+ <p>The image above illustrates a user browsing to different websites over Tor. The green monitors represent relays in the Tor network, while the three keys represent the layers of encryption between the user and each relay.</p>
+ <p>Tor will anonymize the origin of your traffic, and it will encrypt everything between you and the Tor network. Tor will also encrypt your traffic inside the Tor network, but it cannot encrypt your traffic between the Tor network and its final destination.</p>
+ <p>If you are communicating sensitive information, for example when logging on to a website with a username and password, make sure that you are using HTTPS (e.g. <strong>https</strong>://torproject.org/, not <strong>http</strong>://torproject.org/).</p>
+ <h2 id="how-to-download-tor">How to download Tor</h2>
+ <p>The bundle we recommend to most users is the <a href="https://www.torproject.org/projects/torbrowser.html">Tor Browser Bundle</a>. This bundle contains a browser preconfigured to safely browse the Internet through Tor, and requires no installation. You download the bundle, extract the archive, and start Tor.</p>
+ <p>There are two different ways to get hold of the Tor software. You can either browse to the <a href="https://www.torproject.org/">Tor Project website</a> and download it there, or you can use GetTor, the email autoresponder.</p>
+ <h3 id="how-to-get-tor-via-email">How to get Tor via email</h3>
+ <p>To receive the English Tor Browser Bundle for Windows, send an email to gettor(a)torproject.org with <strong>windows</strong> in the body of the message. You can leave the subject blank.</p>
+ <p>You can also request the Tor Browser Bundle for Mac OS X (write <strong>macos-i386</strong>), and Linux (write <strong>linux-i386</strong> for 32-bit systems or <strong>linux-x86_64</strong> for 64-bit systems).</p>
+ <p>If you want a translated version of Tor, write <strong>help</strong> instead. You will then receive an email with instructions and a list of available languages.</p>
+ <p><strong>Note</strong>: The Tor Browser Bundles for Linux and Mac OS X are rather large, and you will not be able to receive any of these bundles with a Gmail, Hotmail or Yahoo account. If you cannot receive the bundle you want, send an email to help(a)rt.torproject.org and we will give you a list of website mirrors to use.</p>
+ <h3 id="tor-for-smartphones">Tor for smartphones</h3>
+ <p>You can get Tor on your Android device by installing the package named <em>Orbot</em>. For information about how to download and install Orbot, please see the <a href="https://www.torproject.org/docs/android.html.en">Tor Project website</a>.</p>
+ <p>We also have experimental packages for <a href="https://www.torproject.org/docs/N900.html.en">Nokia Maemo/N900</a> and <a href="http://sid77.slackware.it/iphone/">Apple iOS</a>.</p>
+ <h3 id="how-to-verify-that-you-have-the-right-version">How to verify that you have the right version</h3>
+ <p>Before running the Tor Browser Bundle, you should make sure that you have the right version.</p>
+ <p>The software you receive is accompanied by a file with the same name as the bundle and the extension <strong>.asc</strong>. This .asc file is a GPG signature, and will allow you to verify the file you've downloaded is exactly the one that we intended you to get.</p>
+ <p>Before you can verify the signature, you will have to download and install GnuPG:</p>
+ <p><strong>Windows</strong>: <a href="http://gpg4win.org/download.html">http://gpg4win.org/download.html</a><br/><strong>Mac OS X</strong>: <a href="http://macgpg.sourceforge.net/">http://macgpg.sourceforge.net/</a><br/><strong>Linux</strong>: Most Linux distributions come with GnuPG preinstalled.</p>
+ <p>Please note that you may need to edit the paths and the commands used below to get it to work on your system.</p>
+ <p>Erinn Clark signs the Tor Browser Bundles with key 0x63FEE659. To import Erinn's key, run:</p>
+ <pre>
+ <code>gpg --keyserver hkp://keys.gnupg.net --recv-keys 0x63FEE659
+</code>
+ </pre>
+ <p>After importing the key, verify that the fingerprint is correct:</p>
+ <pre>
+ <code>gpg --fingerprint 0x63FEE659
+</code>
+ </pre>
+ <p>You should see:</p>
+ <pre>
+ <code>pub 2048R/63FEE659 2003-10-16
+ Key fingerprint = 8738 A680 B84B 3031 A630 F2DB 416F 0610 63FE E659
+uid Erinn Clark <erinn(a)torproject.org>
+uid Erinn Clark <erinn(a)debian.org>
+
+uid Erinn Clark <erinn(a)double-helix.org>
+sub 2048R/EB399FD7 2003-10-16
+</code>
+ </pre>
+ <p>To verify the signature of the package you downloaded, run the following command:</p>
+ <pre>
+ <code>gpg --verify tor-browser-2.2.33-2_en-US.exe.asc tor-browser-2.2.33-2_en-US.exe
+</code>
+ </pre>
+ <p>The output should say <em>"Good signature"</em>. A bad signature means that the file may have been tampered with. If you see a bad signature, send details about where you downloaded the package from, how you verified the signature, and the output from GnuPG in an email to help(a)rt.torproject.org.</p>
+ <p>Once you have verified the signature and seen the <em>"Good signature"</em> output, go ahead and extract the package archive. You should then see a directory similar to <strong>tor-browser_en-US</strong>. Inside that directory is another directory called <strong>Docs</strong>, which contains a file called <strong>changelog</strong>. You want to make sure that the version number on the top line of the changelog file matches the version number in the filename.</p>
+ <h3 id="how-to-use-the-tor-browser-bundle">How to use the Tor Browser Bundle</h3>
+ <p>After downloading the Tor Browser Bundle and extracting the package, you should have a directory with a few files in it. One of the files is an executable called "Start Tor Browser" (or "start-tor-browser", depending on your operating system).</p>
+ <p>When you start the Tor Browser Bundle, you will first see Vidalia start up and connect you to the Tor network. After that, you will see a browser confirming that you are now using Tor. This is done by displaying <a href="https://check.torproject.org/">https://check.torproject.org/</a>. You can now browse the Internet through Tor.</p>
+ <p>
+ <em>Please note that it is important that you use the browser that comes with the bundle, and not your own browser.</em>
+ </p>
+ <h3 id="what-to-do-when-tor-does-not-connect">What to do when Tor does not connect</h3>
+ <p>Some users will notice that Vidalia gets stuck when trying to connect to the Tor network. If this happens, make sure that you are connected to the Internet. If you need to connect to a proxy server, see <em>How to use an open proxy</em> below.</p>
+ <p>If your normal Internet connection is working, but Tor still can't connect to the network, try the following; open the Vidalia control panel, click on <em>Message Log</em> and select the <em>Advanced</em> tab. It may be that Tor won't connect because:</p>
+ <p><strong>Your system clock is off</strong>: Make sure that the date and time on your system is correct, and restart Tor. You may need to synchronize your system clock with an Internet time server.</p>
+ <p><strong>You are behind a restrictive firewall</strong>: To tell Tor to only try port 80 and port 443, open the Vidalia control panel, click on <em>Settings</em> and <em>Network</em>, and tick the box that says <em>My firewall only lets me connect to certain ports</em>.</p>
+ <p><strong>Your anti-virus program is blocking Tor</strong>: Make sure that your anti-virus program is not preventing Tor from making network connections.</p>
+ <p>If Tor still doesn't work, it's likely that your Internet Service Provider (ISP) is blocking Tor. Very often this can be worked around with <strong>Tor bridges</strong>, hidden relays that aren't as easy to block.</p>
+ <p>If you need help with figuring out why Tor can't connect, send an email to help(a)rt.torproject.org and include the relevant parts from the log file.</p>
+ <h3 id="how-to-find-a-bridge">How to find a bridge</h3>
+ <p>To use a bridge, you will first have to locate one; you can either browse to <a href="https://bridges.torproject.org/">bridges.torproject.org</a>, or you can send an email to bridges(a)torproject.org. If you do send an email, please make sure that you write <strong>get bridges</strong> in the body of the email. Without this, you will not get a reply. Note that you need to send this email from either a gmail.com or a yahoo.com address.</p>
+ <p>Configuring more than one bridge address will make your Tor connection more stable, in case some of the bridges become unreachable. There is no guarantee that the bridge you are using now will work tomorrow, so you should make a habit of updating your list of bridges every so often.</p>
+ <h3 id="how-to-use-a-bridge">How to use a bridge</h3>
+ <p>Once you have a set of bridges to use, open the Vidalia control panel, click on <em>Settings</em>, <em>Network</em> and tick the box that says <em>My ISP blocks connections to the Tor network</em>. Enter the bridges in the box below, hit <em>OK</em> and start Tor again.</p>
+ <h3 id="how-to-use-an-open-proxy">How to use an open proxy</h3>
+ <p>If using a bridge does not work, try configuring Tor to use any HTTPS or SOCKS proxy to get access to the Tor network. This means even if Tor is blocked by your local network, open proxies can be safely used to connect to the Tor Network and on to the uncensored Internet.</p>
+ <p>The steps below assume you have a functional Tor/Vidalia configuration, and you have found a list of HTTPS, SOCKS4, or SOCKS5 proxies.</p>
+ <ol style="list-style-type: decimal">
+ <li>Open the Vidalia control panel, click on <em>Settings</em>.</li>
+ <li>Click <em>Network</em>. Select <em>I use a proxy to access the Internet</em>.</li>
+ <li>On the <em>Address</em> line, enter the open proxy address. This can be a hostname or an IP Address.</li>
+ <li>Enter the port for the proxy.</li>
+ <li>Generally, you do not need a username and password. If you do, enter the information in the proper fields.</li>
+ <li>Choose the <em>Type</em> of proxy you are using, whether HTTP/HTTPS, SOCKS4, or SOCKS5.</li>
+ <li>Push the <em>OK</em> button. Vidalia and Tor are now configured to use a proxy to access the rest of the Tor network.</li>
+ </ol>
+ <h2 id="frequently-asked-questions">Frequently Asked Questions</h2>
+ <p>This section will answer some of the most common questions. If your question is not mentioned here, please send an email to help(a)rt.torproject.org.</p>
+ <h3 id="unable-to-extract-the-archive">Unable to extract the archive</h3>
+ <p>If you are using Windows and find that you cannot extract the archive, download and install <a href="http://www.7-zip.org/">7-Zip</a>.</p>
+ <p>If you are unable to download 7-Zip, try to rename the file from .z to .zip and use winzip to extract the archive. Before renaming the file, tell Windows to show file extensions:</p>
+ <h4 id="windows-xp">Windows XP</h4>
+ <ol style="list-style-type: decimal">
+ <li>Open <em>My Computer</em></li>
+ <li>Click on <em>Tools</em> and choose <em>Folder Options...</em> in the menu</li>
+ <li>Click on the <em>View</em> tab</li>
+ <li>Uncheck <em>Hide extensions for known file types</em> and click <em>OK</em></li>
+ </ol>
+ <h4 id="windows-vista">Windows Vista</h4>
+ <ol style="list-style-type: decimal">
+ <li>Open <em>Computer</em></li>
+ <li>Click on <em>Organize</em> and choose <em>Folder and search options</em> in the menu</li>
+ <li>Click on the <em>View</em> tab</li>
+ <li>Uncheck <em>Hide extensions for known file types</em> and click <em>OK</em></li>
+ </ol>
+ <h4 id="windows-7">Windows 7</h4>
+ <ol style="list-style-type: decimal">
+ <li>Open <em>Computer</em></li>
+ <li>Click on <em>Organize</em> and choose <em>Folder and search options</em> in the menu</li>
+ <li>Click on the <em>View</em> tab</li>
+ <li>Uncheck <em>Hide extensions for known file types</em> and click <em>OK</em></li>
+ </ol>
+ <h3 id="vidalia-asks-for-a-password">Vidalia asks for a password</h3>
+ <p>You should not have to enter a password when starting Vidalia. If you are prompted for one, you are likely affected by one of these problems:</p>
+ <p><strong>You are already running Vidalia and Tor</strong>: For example, this situation can happen if you installed the Vidalia bundle and now you're trying to run the Tor Browser Bundle. In that case, you will need to close the old Vidalia and Tor before you can run this one.</p>
+ <p><strong>Vidalia crashed, but left Tor running</strong>: If the dialog that prompts you for a control password has a Reset button, you can click the button and Vidalia will restart Tor with a new random control password. If you do not see a Reset button, or if Vidalia is unable to restart Tor for you; go into your process or task manager, and terminate the Tor process. Then use Vidalia to restart Tor.</p>
+ <p>For more information, see the <a href="https://torproject.org/docs/faq.html#VidaliaPassword">FAQ</a> on the Tor Project website.</p>
+ <h3 id="flash-does-not-work">Flash does not work</h3>
+ <p>For security reasons, Flash, Java, and other plugins are currently disabled for Tor. Plugins operate independently from Firefox and can perform activity on your computer that ruins your anonymity.</p>
+ <p>Most YouTube videos work with HTML5, and it is possible to view these videos over Tor. You need to join the <a href="https://www.youtube.com/html5">HTML5 trial</a> on the YouTube website before you can use the HTML5 player.</p>
+ <p>Note that the browser will not remember that you joined the trial once you close it, so you will need to re-join the trial the next time you run the Tor Browser Bundle.</p>
+ <p>Please see the <a href="https://www.torproject.org/torbutton/torbutton-faq.html#noflash">Torbutton FAQ</a> for more information.</p>
+ <h3 id="i-want-to-use-another-browser">I want to use another browser</h3>
+ <p>For security reasons, we recommend that you only browse the web through Tor using the Tor Browser Bundle. It is technically possible to use Tor with other browsers, but by doing so you open yourself up to potential attacks.</p>
+ <h3 id="why-tor-is-slow">Why Tor is slow</h3>
+ <p>Tor can sometimes be a bit slower than your normal Internet connection. After all, your traffic is sent through many different countries, sometimes across oceans around the world!</p>
+ </body>
+</html>
diff --git a/hr_HR/short-user-manual_hr_HR_noimg.xhtml b/hr_HR/short-user-manual_hr_HR_noimg.xhtml
new file mode 100644
index 0000000..e4510a5
--- /dev/null
+++ b/hr_HR/short-user-manual_hr_HR_noimg.xhtml
@@ -0,0 +1,132 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+ <title/>
+ </head>
+ <body>
+ <h1 id="the-short-user-manual">The Short User Manual</h1>
+ <p>Ovaj priručnik za korisnike sadrži informacije o tome kako preuzeti Tor, kako ga koristiti, te što učiniti ukoliko se Tor ne može spojiti na mrežu. Ako ne možete pronaći odgovor na svoje pitanje u ovom dokumentu, pošaljite email na help(a)rt.torproject.org.</p>
+ <p>Napominjemo da pružamo podršku na volonterskoj osnovi, i dobivamo mnogo emailova svaki dan. Nema potrebe za brigom ukoliko vam se ne javimo istog trena.</p>
+ <h2 id="how-tor-works">How Tor works</h2>
+ <p>Tor is a network of virtual tunnels that allows you to improve your privacy and security on the Internet. Tor works by sending your traffic through three random servers (also known as <em>relays</em>) in the Tor network, before the traffic is sent out onto the public Internet.</p>
+ <p>Slika niže ilustrira korisnika koji pretražuje različite web stranice preko Tora. Zeleni monitori predstavljaju releje u Tor mreži, dok tri ključa predstavljaju slojeve šifriranja između korisnika i svakog releja.</p>
+ <p>Tor će anonimizirati podrijetlo vašeg prometa te pritom šifrirati sve između vas i Tor mreže. Tor će ujedno šifrirati i vaš promet unutar Tor mreže, ali ne može šifrirati promet između Tor mreže i njegovog završnog odredišta.</p>
+ <p>If you are communicating sensitive information, for example when logging on to a website with a username and password, make sure that you are using HTTPS (e.g. <strong>https</strong>://torproject.org/, not <strong>http</strong>://torproject.org/).</p>
+ <h2 id="how-to-download-tor">How to download Tor</h2>
+ <p>The bundle we recommend to most users is the <a href="https://www.torproject.org/projects/torbrowser.html">Tor Browser Bundle</a>. This bundle contains a browser preconfigured to safely browse the Internet through Tor, and requires no installation. You download the bundle, extract the archive, and start Tor.</p>
+ <p>There are two different ways to get hold of the Tor software. You can either browse to the <a href="https://www.torproject.org/">Tor Project website</a> and download it there, or you can use GetTor, the email autoresponder.</p>
+ <h3 id="how-to-get-tor-via-email">How to get Tor via email</h3>
+ <p>To receive the English Tor Browser Bundle for Windows, send an email to gettor(a)torproject.org with <strong>windows</strong> in the body of the message. You can leave the subject blank.</p>
+ <p>You can also request the Tor Browser Bundle for Mac OS X (write <strong>macos-i386</strong>), and Linux (write <strong>linux-i386</strong> for 32-bit systems or <strong>linux-x86_64</strong> for 64-bit systems).</p>
+ <p>If you want a translated version of Tor, write <strong>help</strong> instead. You will then receive an email with instructions and a list of available languages.</p>
+ <p><strong>Note</strong>: The Tor Browser Bundles for Linux and Mac OS X are rather large, and you will not be able to receive any of these bundles with a Gmail, Hotmail or Yahoo account. If you cannot receive the bundle you want, send an email to help(a)rt.torproject.org and we will give you a list of website mirrors to use.</p>
+ <h3 id="tor-for-smartphones">Tor for smartphones</h3>
+ <p>You can get Tor on your Android device by installing the package named <em>Orbot</em>. For information about how to download and install Orbot, please see the <a href="https://www.torproject.org/docs/android.html.en">Tor Project website</a>.</p>
+ <p>We also have experimental packages for <a href="https://www.torproject.org/docs/N900.html.en">Nokia Maemo/N900</a> and <a href="http://sid77.slackware.it/iphone/">Apple iOS</a>.</p>
+ <h3 id="how-to-verify-that-you-have-the-right-version">How to verify that you have the right version</h3>
+ <p>Before running the Tor Browser Bundle, you should make sure that you have the right version.</p>
+ <p>The software you receive is accompanied by a file with the same name as the bundle and the extension <strong>.asc</strong>. This .asc file is a GPG signature, and will allow you to verify the file you've downloaded is exactly the one that we intended you to get.</p>
+ <p>Before you can verify the signature, you will have to download and install GnuPG:</p>
+ <p><strong>Windows</strong>: <a href="http://gpg4win.org/download.html">http://gpg4win.org/download.html</a><br/><strong>Mac OS X</strong>: <a href="http://macgpg.sourceforge.net/">http://macgpg.sourceforge.net/</a><br/><strong>Linux</strong>: Most Linux distributions come with GnuPG preinstalled.</p>
+ <p>Napominjemo da će te možda morati izmjeniti putanje i naredbe korištene niže kako bi proradile na vašem sustavu.</p>
+ <p>Erinn Clark potpisuje Tor Browser Bundle sa ključem 0x63FEE659. Za uvoz Erinninog ključa pokrenite:</p>
+ <pre>
+ <code>gpg --keyserver hkp://keys.gnupg.net --recv-keys 0x63FEE659
+</code>
+ </pre>
+ <p>Nakon uvoza ključa, verificirajte da je otisak ispravan:</p>
+ <pre>
+ <code>gpg --fingerprint 0x63FEE659
+</code>
+ </pre>
+ <p>Trebali biste vidjeti:</p>
+ <pre>
+ <code>pub 2048R/63FEE659 2003-10-16
+ Key fingerprint = 8738 A680 B84B 3031 A630 F2DB 416F 0610 63FE E659
+uid Erinn Clark <erinn(a)torproject.org>
+uid Erinn Clark <erinn(a)debian.org>
+
+uid Erinn Clark <erinn(a)double-helix.org>
+sub 2048R/EB399FD7 2003-10-16
+</code>
+ </pre>
+ <p>Da biste verificirali potpis paketa kojeg ste preuzeli, pokrenite sljedeću naredbu:</p>
+ <pre>
+ <code>gpg --verify tor-browser-2.2.33-2_en-US.exe.asc tor-browser-2.2.33-2_en-US.exe
+</code>
+ </pre>
+ <p>The output should say <em>"Good signature"</em>. A bad signature means that the file may have been tampered with. If you see a bad signature, send details about where you downloaded the package from, how you verified the signature, and the output from GnuPG in an email to help(a)rt.torproject.org.</p>
+ <p>Once you have verified the signature and seen the <em>"Good signature"</em> output, go ahead and extract the package archive. You should then see a directory similar to <strong>tor-browser_en-US</strong>. Inside that directory is another directory called <strong>Docs</strong>, which contains a file called <strong>changelog</strong>. You want to make sure that the version number on the top line of the changelog file matches the version number in the filename.</p>
+ <h3 id="how-to-use-the-tor-browser-bundle">How to use the Tor Browser Bundle</h3>
+ <p>After downloading the Tor Browser Bundle and extracting the package, you should have a directory with a few files in it. One of the files is an executable called "Start Tor Browser" (or "start-tor-browser", depending on your operating system).</p>
+ <p>When you start the Tor Browser Bundle, you will first see Vidalia start up and connect you to the Tor network. After that, you will see a browser confirming that you are now using Tor. This is done by displaying <a href="https://check.torproject.org/">https://check.torproject.org/</a>. You can now browse the Internet through Tor.</p>
+ <p>
+ <em>Please note that it is important that you use the browser that comes with the bundle, and not your own browser.</em>
+ </p>
+ <h3 id="what-to-do-when-tor-does-not-connect">What to do when Tor does not connect</h3>
+ <p>Some users will notice that Vidalia gets stuck when trying to connect to the Tor network. If this happens, make sure that you are connected to the Internet. If you need to connect to a proxy server, see <em>How to use an open proxy</em> below.</p>
+ <p>If your normal Internet connection is working, but Tor still can't connect to the network, try the following; open the Vidalia control panel, click on <em>Message Log</em> and select the <em>Advanced</em> tab. It may be that Tor won't connect because:</p>
+ <p><strong>Your system clock is off</strong>: Make sure that the date and time on your system is correct, and restart Tor. You may need to synchronize your system clock with an Internet time server.</p>
+ <p><strong>You are behind a restrictive firewall</strong>: To tell Tor to only try port 80 and port 443, open the Vidalia control panel, click on <em>Settings</em> and <em>Network</em>, and tick the box that says <em>My firewall only lets me connect to certain ports</em>.</p>
+ <p><strong>Your anti-virus program is blocking Tor</strong>: Make sure that your anti-virus program is not preventing Tor from making network connections.</p>
+ <p>If Tor still doesn't work, it's likely that your Internet Service Provider (ISP) is blocking Tor. Very often this can be worked around with <strong>Tor bridges</strong>, hidden relays that aren't as easy to block.</p>
+ <p>Ako trebate pomoć pri razlučivanju zašto se Tor ne može spojiti, pošaljite email na help(a)rt.torproject.org i uključite relevantne dijelove log datoteke.</p>
+ <h3 id="how-to-find-a-bridge">How to find a bridge</h3>
+ <p>To use a bridge, you will first have to locate one; you can either browse to <a href="https://bridges.torproject.org/">bridges.torproject.org</a>, or you can send an email to bridges(a)torproject.org. If you do send an email, please make sure that you write <strong>get bridges</strong> in the body of the email. Without this, you will not get a reply. Note that you need to send this email from either a gmail.com or a yahoo.com address.</p>
+ <p>Postavljanjem više od jedne adrese mosta će učiniti vašu Tor vezu stabilnijom, u nekim slučajevima neki mostovi postanu nedostupni. Ne postoji jamstvo da će most koji koristite trenutno raditi i sutra, pa biste trebali razviti naviku osvježavanja svoje liste mostova svako toliko.</p>
+ <h3 id="how-to-use-a-bridge">How to use a bridge</h3>
+ <p>Once you have a set of bridges to use, open the Vidalia control panel, click on <em>Settings</em>, <em>Network</em> and tick the box that says <em>My ISP blocks connections to the Tor network</em>. Enter the bridges in the box below, hit <em>OK</em> and start Tor again.</p>
+ <h3 id="how-to-use-an-open-proxy">How to use an open proxy</h3>
+ <p>If using a bridge does not work, try configuring Tor to use any HTTPS or SOCKS proxy to get access to the Tor network. This means even if Tor is blocked by your local network, open proxies can be safely used to connect to the Tor Network and on to the uncensored Internet.</p>
+ <p>Sljedeći koraci pretpostavljaju da imate funkcinalnu Tor/Vidalia konfiguraciju, i da ste pronašli listu HTTPS, SOCKS4, ili SOCKS5 proxy-a.</p>
+ <ol style="list-style-type: decimal">
+ <li>Open the Vidalia control panel, click on <em>Settings</em>.</li>
+ <li>Click <em>Network</em>. Select <em>I use a proxy to access the Internet</em>.</li>
+ <li>On the <em>Address</em> line, enter the open proxy address. This can be a hostname or an IP Address.</li>
+ <li>Enter the port for the proxy.</li>
+ <li>Generally, you do not need a username and password. If you do, enter the information in the proper fields.</li>
+ <li>Choose the <em>Type</em> of proxy you are using, whether HTTP/HTTPS, SOCKS4, or SOCKS5.</li>
+ <li>Push the <em>OK</em> button. Vidalia and Tor are now configured to use a proxy to access the rest of the Tor network.</li>
+ </ol>
+ <h2 id="frequently-asked-questions">Frequently Asked Questions</h2>
+ <p>This section will answer some of the most common questions. If your question is not mentioned here, please send an email to help(a)rt.torproject.org.</p>
+ <h3 id="unable-to-extract-the-archive">Unable to extract the archive</h3>
+ <p>If you are using Windows and find that you cannot extract the archive, download and install <a href="http://www.7-zip.org/">7-Zip</a>.</p>
+ <p>Ako niste u mogućnosti preuzeti 7-Zip, pokušajte preimenovati datoteku iz .z u .zip i upotrijebite winzip za otpakiravanje arhive. Prije preimenovanja datoteke, podesite Windowse kako bi vam prikazivali nastavke datoteka:</p>
+ <h4 id="windows-xp">Windows XP</h4>
+ <ol style="list-style-type: decimal">
+ <li>Open <em>My Computer</em></li>
+ <li>Click on <em>Tools</em> and choose <em>Folder Options...</em> in the menu</li>
+ <li>Click on the <em>View</em> tab</li>
+ <li>Uncheck <em>Hide extensions for known file types</em> and click <em>OK</em></li>
+ </ol>
+ <h4 id="windows-vista">Windows Vista</h4>
+ <ol style="list-style-type: decimal">
+ <li>Open <em>Computer</em></li>
+ <li>Click on <em>Organize</em> and choose <em>Folder and search options</em> in the menu</li>
+ <li>Click on the <em>View</em> tab</li>
+ <li>Uncheck <em>Hide extensions for known file types</em> and click <em>OK</em></li>
+ </ol>
+ <h4 id="windows-7">Windows 7</h4>
+ <ol style="list-style-type: decimal">
+ <li>Open <em>Computer</em></li>
+ <li>Click on <em>Organize</em> and choose <em>Folder and search options</em> in the menu</li>
+ <li>Click on the <em>View</em> tab</li>
+ <li>Uncheck <em>Hide extensions for known file types</em> and click <em>OK</em></li>
+ </ol>
+ <h3 id="vidalia-asks-for-a-password">Vidalia asks for a password</h3>
+ <p>You should not have to enter a password when starting Vidalia. If you are prompted for one, you are likely affected by one of these problems:</p>
+ <p><strong>You are already running Vidalia and Tor</strong>: For example, this situation can happen if you installed the Vidalia bundle and now you're trying to run the Tor Browser Bundle. In that case, you will need to close the old Vidalia and Tor before you can run this one.</p>
+ <p><strong>Vidalia crashed, but left Tor running</strong>: If the dialog that prompts you for a control password has a Reset button, you can click the button and Vidalia will restart Tor with a new random control password. If you do not see a Reset button, or if Vidalia is unable to restart Tor for you; go into your process or task manager, and terminate the Tor process. Then use Vidalia to restart Tor.</p>
+ <p>For more information, see the <a href="https://torproject.org/docs/faq.html#VidaliaPassword">FAQ</a> on the Tor Project website.</p>
+ <h3 id="flash-does-not-work">Flash does not work</h3>
+ <p>For security reasons, Flash, Java, and other plugins are currently disabled for Tor. Plugins operate independently from Firefox and can perform activity on your computer that ruins your anonymity.</p>
+ <p>Most YouTube videos work with HTML5, and it is possible to view these videos over Tor. You need to join the <a href="https://www.youtube.com/html5">HTML5 trial</a> on the YouTube website before you can use the HTML5 player.</p>
+ <p>Napominjemo da pretražnik neće zapamtiti da ste se prijavili za testiranje nakon što ga zatvorite, pa ćete morati ponovno se prijaviti sljedeći puta kada pokrenete Tor Browser Bundle.</p>
+ <p>Please see the <a href="https://www.torproject.org/torbutton/torbutton-faq.html#noflash">Torbutton FAQ</a> for more information.</p>
+ <h3 id="i-want-to-use-another-browser">I want to use another browser</h3>
+ <p>For security reasons, we recommend that you only browse the web through Tor using the Tor Browser Bundle. It is technically possible to use Tor with other browsers, but by doing so you open yourself up to potential attacks.</p>
+ <h3 id="why-tor-is-slow">Why Tor is slow</h3>
+ <p>Tor can sometimes be a bit slower than your normal Internet connection. After all, your traffic is sent through many different countries, sometimes across oceans around the world!</p>
+ </body>
+</html>
diff --git a/ms/short-user-manual_ms_noimg.xhtml b/ms/short-user-manual_ms_noimg.xhtml
index 021acf5..8b6b348 100644
--- a/ms/short-user-manual_ms_noimg.xhtml
+++ b/ms/short-user-manual_ms_noimg.xhtml
@@ -5,8 +5,8 @@
</head>
<body>
<h1 id="the-short-user-manual">The Short User Manual</h1>
- <p>This user manual contains information about how to download Tor, how to use it, and what to do if Tor is unable to connect to the network. If you can't find the answer to your question in this document, email help(a)rt.torproject.org.</p>
- <p>Please note that we are providing support on a voluntary basis, and we get a lot of emails every single day. There is no need to worry if we don't get back to you straight away.</p>
+ <p>Manual pengguna ini mengandungi maklumat mengnai bagaimana memuat turun Tor, bagaimana menggunakan dan apakah yang boleh dibuat sekiranya Tor tidak dapat menyambungkan kepada rangkaian. Jika anda tidak dapat mencari jawapan, emailkan kepada help(a)rt.torproject.org.</p>
+ <p>Ambil perharian bahawa kami menyediakan bantuan dengan sukarela, dan kami menerima banyak email setiap hari. Anda tidak perlu risau sekiranya kami tidak dapat melayan anda dengan segera.</p>
<h2 id="how-tor-works">Bagaimana Tor Berfungsi</h2>
<p>Tor ialah rangkaian maya yang membolehkan anda menambahkan privasi dan keselamatan semasa menggunakan internet. Tor akan menghantar trafik kepada tiga server secara raway (<em>relays</em>) dalam rangkaian Tor, sebelum menghantar trafik tersebut kepada talian Internet.</p>
<p>The image above illustrates a user browsing to different websites over Tor. The green monitors represent relays in the Tor network, while the three keys represent the layers of encryption between the user and each relay.</p>
@@ -75,12 +75,12 @@ to certain ports</em>. </p>
<p>If you need help with figuring out why Tor can't connect, send an email to help(a)rt.torproject.org and include the relevant parts from the log file.</p>
<h3 id="how-to-find-a-bridge">How to find a bridge</h3>
<p>To use a bridge, you will first have to locate one; you can either browse to <a href="https://bridges.torproject.org/">bridges.torproject.org</a>, or you can send an email to bridges(a)torproject.org. If you do send an email, please make sure that you write <strong>get bridges</strong> in the body of the email. Without this, you will not get a reply. Note that you need to send this email from either a gmail.com or a yahoo.com address.</p>
- <p>Configuring more than one bridge address will make your Tor connection more stable, in case some of the bridges become unreachable. There is no guarantee that the bridge you are using now will work tomorrow, so you should make a habit of updating your list of bridges every so often.</p>
+ <p>Konfigurasi lebih daripada satu bridge akan membuatkan sambungan Tor lebih stabil, dalam kes di mana bridge tidak dapat dihubungi. Tidak ada jaminan bahawa bridge digunakan hari ini dapat berjalan keesokan hari, jadi anda boleh memastikan senarai bridge sentiasa dikemaskini dengan kerap.</p>
<h3 id="how-to-use-a-bridge">How to use a bridge</h3>
<p>Once you have a set of bridges to use, open the Vidalia control panel, click on <em>Settings</em>, <em>Network</em> and tick the box that says <em>My ISP blocks connections to the Tor network</em>. Enter the bridges in the box below, hit <em>OK</em> and start Tor again.</p>
<h3 id="how-to-use-an-open-proxy">How to use an open proxy</h3>
<p>If using a bridge does not work, try configuring Tor to use any HTTPS or SOCKS proxy to get access to the Tor network. This means even if Tor is blocked by your local network, open proxies can be safely used to connect to the Tor Network and on to the uncensored Internet.</p>
- <p>The steps below assume you have a functional Tor/Vidalia configuration, and you have found a list of HTTPS, SOCKS4, or SOCKS5 proxies.</p>
+ <p>Langkah di bawah menganggap anda sudah ada konfigurasi Tor/Vidalia, dan anda sudah menjumpai senarai HTTPS, SOCKS4, atau SOCKS5 proxy.</p>
<ol style="list-style-type: decimal">
<li>Open the Vidalia control panel, click on <em>Settings</em>.</li>
<li>Click <em>Network</em>. Select <em>I use a proxy to access the Internet</em>.</li>
diff --git a/nb/short-user-manual_nb_noimg.xhtml b/nb/short-user-manual_nb_noimg.xhtml
index 531a89a..4bf00bd 100644
--- a/nb/short-user-manual_nb_noimg.xhtml
+++ b/nb/short-user-manual_nb_noimg.xhtml
@@ -13,23 +13,23 @@
<p>Tor anonymiserer opprinnelsen av trafikken din, og krypterer alt i mellom deg og Tor-nettverket. Tor krypterer også trafikken din innenfor Tor-nettverket, mens trafikken fra Tor-nettverket til det åpne nettet er ikke kryptert.</p>
<p>Hvis du sender sensitiv informasjon, som for eksempel når du logger deg på en nettside med brukernavn og passord, er det derfor viktig at du bruker HTTPS (som i <strong>https</strong>://torproject.org/, ikke <strong>http</strong>://torproject.org). Dette legger til et ekstra lag med kryptering hele veien fra deg til destinasjonen.</p>
<h2 id="how-to-download-tor">Hvordan laste ned Tor:</h2>
- <p>Program-pakken vi anbefaler de fleste brukere er <a href="https://www.torproject.org/projects/torbrowser.html">Tor Nettleser Pakken</a>. Denne ferdiglagde pakken inneholder en nettleser forhåndsinnstilt for sikker surfing på nettet gjennom Tor, og krever ingen installasjon. Du bare laster ned pakken, pakker den ut, og starter Tor.</p>
+ <p>Program-pakken vi anbefaler de fleste brukere er <a href="https://www.torproject.org/projects/torbrowser.html">Tor Browser Bundle</a>. Denne ferdiglagde pakken inneholder en nettleser forhåndsinnstilt for sikker surfing på nettet gjennom Tor, og krever ingen installasjon. Du bare laster ned pakken, pakker den ut, og starter Tor.</p>
<p>Det er to måter å få tak i Tor programmet på. Du kan enten gå til <a href="https://www.torproject.org/">nettsiden Tor Prosjektet</a> og laste det ned der, eller bruke GetTor, vår automatiske besvarte email.</p>
<h3 id="how-to-get-tor-via-email">Hvordan få Tor på email:</h3>
- <p>For å motta den engelske versjonen av Tor Nettleser Pakken til Windows sender du en email til gettor(a)torproject.org med ordet <strong>windows</strong> i emailen. Du trenger ikke fylle inn tittelen.</p>
- <p>Du kan også få Tor Nettleser Pakken til Mac OS X (skriv <strong>macos-i386</strong>), og Linux (skriv <strong>linux-i386</strong> for 32-bit eller <strong>linux-x86_64</strong> for 64-bit systemer). </p>
+ <p>For å motta den engelske versjonen av Tor Browser Bundle til Windows sender du en email til gettor(a)torproject.org med ordet <strong>windows</strong> i emailen. Du trenger ikke fylle inn tittelen.</p>
+ <p>Du kan også få Tor Browser Bundle til Mac OS X (skriv <strong>macos-i386</strong>), og Linux (skriv <strong>linux-i386</strong> for 32-bit eller <strong>linux-x86_64</strong> for 64-bit systemer). </p>
<p>Hvis du ønsker en oversatt versjon av Tor, skriv <strong>help</strong> i stedet. Du vil da motta en email med instruksjoner og en liste over tilgjengelige språk.</p>
- <p><strong>NB:</strong> Tor Nettleser Pakken for Mac OS X og Linux er relativt store, og du kan ikke motta disse på Gmail, Hotmail eller Yahoo. Hvis dette er tilfellet for deg, send oss en email på help(a)rt.torproject.org og vi kan sende deg en liste over alternative nettsider du kan bruke. </p>
+ <p><strong>NB:</strong> Tor Browser Bundle for Mac OS X og Linux er relativt store, og du kan ikke motta disse på Gmail, Hotmail eller Yahoo. Hvis dette er tilfellet for deg, send oss en email på help(a)rt.torproject.org og vi kan sende deg en liste over alternative nettsider du kan bruke. </p>
<h3 id="tor-for-smartphones">Tor for smart-telefoner:</h3>
<p>Du kan få Tor på smart-telefonen din ved å installere en software-pakke som heter <em>Orbot</em>. For informasjon om hvordan du kan laste ned og installere Orbot, vennligst gå til <<a href="https://www.torproject.org/docs/android.html.en">Tor Prosjektets nettside.</a></p>
<p>Vi har også eksperimentelle program-pakker for <a href="https://www.torproject.org/docs/N900.html.en">Nokia Maemo/N900</a> og <a href="http://sid77.slackware.it/ios/">Apple iOS</a>.</p>
<h3 id="how-to-verify-that-you-have-the-right-version">Hvordan sjekke at du har riktig versjon:</h3>
- <p>Før du bruker Tor Nettleser Pakken, burde du forsikre deg om at du har riktig versjon.</p>
+ <p>Før du bruker Tor Browser Bundle, burde du forsikre deg om at du har riktig versjon.</p>
<p>Når du laster ned program-pakken følger det med en fil som har samme navn som program-pakken, men etterfulgt av <.asc> i navnet. Denne .asc filen er en GPG signatur, som gjør at du kan forsikre deg om at programmet du har lastet ned inneholder nøyaktig det vi har laget - med andre ord at ingen har tuklet med programmet uten vår viten.</p>
<p>For å verifisere signaturen må du laste ned programmet GnuPG.</p>
<p><strong>Windows</strong>: <a href="http://gpg4win.org/download.html">http://gpg4win.org/download.html</a><br/><strong>Mac OS X</strong>: <a href="http://www.gpgtools.org/">http://www.gpgtools.org/</a><br/><strong>Linux</strong>: De fleste Linux distribusjoner kommer med GnuPG ferdig installert.</p>
<p>Vær oppmerksom på at du kanskje må forandre på filplasseringen og kommandoene brukt i eksempelet under for at det skal fungere på ditt system.</p>
- <p>Erinn Clark signerer Tor Nettleser Pakken med nøkkelen 0x63FEE659. For å importere Erinns nøkkel, kjør</p>
+ <p>Erinn Clark signerer Tor Browser Bundle med nøkkelen 0x63FEE659. For å importere Erinns nøkkel, kjør</p>
<pre>
<code>gpg --keyserver hkp://keys.gnupg.net --recv-keys 0x63FEE659
</code>
@@ -56,9 +56,9 @@ sub 2048R/EB399FD7 2003-10-16
</pre>
<p>Du skal da få <em>"Good signature"</em> i svar. En falsk signatur ("Bad signature") betyr at det kan ha vært gjort endringer i filen som vi ikke har godkjent. Hvis du ser en falsk signatur, send detaljer om hvor du lastet ned pakken fra, hvordan du verifiserte signaturen, og svaret du fikk fra kommandoen du gjorde i GnuPG i en email til help(a)rt.torproject.org.</p>
<p>Så fort du har verifisert signaturen og fått <em>"Good signature"</em> som svar, kan du pakke ut filene. Det vil da opprettes en filmappe som heter <strong>tor-browser_en-US</strong> eller liknende. Inne i den mappa finner du en annen mappe som heter <strong>Docs</strong>, som inneholder en fil som heter <strong>changelog</strong>. Du bør forsikre deg om at versjonsnummeret på øverste linje i denne changelog-fila stemmer med versjonsnummeret på filnavnet til hoved-pakken du lastet ned.</p>
- <h3 id="how-to-use-the-tor-browser-bundle">Hvordan bruke Tor Nettleser Pakken:</h3>
+ <h3 id="how-to-use-the-tor-browser-bundle">Hvordan bruke Tor Browser Bundle:</h3>
<p>Etter at du har lastet ned Tor Browser Bundle kan du pakke ut program-pakken til skrivebordet eller på en minnepinne. Du skal da få en mappe som inneholder flere filer. En av disse filene heter "Start Tor Browser" (eller "start-tor-browser" avhengig av hvilket operativ system du kjører) og er kjørbar.</p>
- <p>Når du starter Tor Nettleser Pakken vil du først se et program som heter Vidalia starte opp som vil koble deg til Tor nettverket. Når det er gjort, vil nettleseren automatisk starte opp og ta deg til en side som bekrefter at du nå bruker Tor, <a href="https://check.torproject.org/">https://check.torproject.org/</a>, og vise teksten <em>You can now browse the Internet through Tor</em>.</p>
+ <p>Når du starter Tor Browser Bundle vil du først se et program som heter Vidalia starte opp som vil koble deg til Tor nettverket. Når det er gjort, vil nettleseren automatisk starte opp og ta deg til en side som bekrefter at du nå bruker Tor, <a href="https://check.torproject.org/">https://check.torproject.org/</a>, og vise teksten: You can now browse the Internet through Tor.</p>
<p>
<em>Vær oppmerksom på at det er viktig at du bruker nettleseren som følger med pakken, og ikke en annen nettleser.</em>
</p>
@@ -115,16 +115,16 @@ sub 2048R/EB399FD7 2003-10-16
</ol>
<h3 id="vidalia-asks-for-a-password">Vidalia spør etter et passord.</h3>
<p>Det skal ikke være nødvendig å skrive inn passord når du starter Vidalia. Hvis du blir spurt om et passord, er det mest sannsynlig ett av følgende som er problemet:</p>
- <p><strong>Du kjører allerede Vidalia og Tor</strong>: Dette kan for eksempel skje hvis du først installerte Vidalia pakken og nå prøver å kjøre Tor Nettleser Pakken. I så tilfelle må du stenge Vidalia pakken og Tor før du kan kjøre Tor Nettleser Pakken.</p>
+ <p><strong>Du kjører allerede Vidalia og Tor</strong>: Dette kan for eksempel skje hvis du først installerte Vidalia pakken og nå prøver å kjøre Tor Browser Bundle. I så tilfelle må du stenge Vidalia pakken og Tor før du kan kjøre Tor Browser Bundle.</p>
<p><strong>Vidalia krasjet, men Tor fortsatte å kjøre.</strong> Hvis meldingsvinduet som spør deg om et passord har en Reset-knapp, kan du trykke denne og Vidalia vil restarte Tor med et nytt, selv-generert passord. Hvis du ikke ser en Reset-knapp, eller hvis Vidalia ikke klarer å restarte Tor for deg, kan du gå inn i oppgavebehandling (task manager) og manuelt stoppe Tor prosessen. Bruk så Vidalia til å starte Tor igjen.</p>
<p>For mer informasjon, se <a href="https://torproject.org/docs/faq.html#VidaliaPassword">FAQ</a> på Tor Prosjektets nettside.</p>
<h3 id="flash-does-not-work">Flash fungerer ikke</h3>
<p>Av sikkerhetshensyn er Flash, Java og andre tilleggsprogrammer for øyeblikket stengt av for Tor. Tilleggsprogrammer opererer uavhengig av Firefox og kan foreta seg handlinger på din datamaskin som avslører din identitet og dermed ødelegger din anonymitet.</p>
<p>De fleste YouTube videoer fungerer med HTML5, og det er mulig å se disse videoene gjennom Tor. Du må bare melde deg på <a href="https://www.youtube.com/html5">HTML5 prøveordningen</a> på YouTubes nettside før du kan benytte deg av HTML5 spilleren.</p>
- <p>Merk deg forøvrig at nettleseren ikke vil lagre at du meldte deg på HTML5 prøveordningen når du stenger nettleseren, så du må melde deg på nytt neste gang du kjører Tor Nettleser Pakken.</p>
+ <p>Merk deg forøvrig at nettleseren ikke vil lagre at du meldte deg på HTML5 prøveordningen når du stenger nettleseren, så du må melde deg på nytt neste gang du kjører Tor Browser Bundle.</p>
<p>For mer informasjon, se <a href="https://torproject.org/docs/faq.html#noflash">FAQ</a> på Tor Prosjektets nettside.</p>
<h3 id="i-want-to-use-another-browser">Jeg ønsker å bruke en annen nettleser.</h3>
- <p>Av sikkerhetshensyn anbefaler vi at du kun bruker surfer på Tor gjennom Tor Nettleser Pakken. Det er teknisk mulig å bruke Tor med andre nettlesere, men du vil åpne deg opp for mulige angrep.</p>
+ <p>Av sikkerhetshensyn anbefaler vi at du kun bruker surfer på Tor gjennom Tor Browser Bundle. Det er teknisk mulig å bruke Tor med andre nettlesere, men du vil åpne deg opp for mulige angrep.</p>
<h3 id="why-tor-is-slow">Hvorfor det går tregt å surfe med Tor</h3>
<p>Tor kan noen ganger være litt tregere enn din vanlige internett-tilkobling. Trafikken er tross alt send gjennom mange forskjellige land, og noen ganger over verdenshav rundt hele verden!</p>
</body>
diff --git a/pl_PL/short-user-manual_pl_PL_noimg.xhtml b/pl_PL/short-user-manual_pl_PL_noimg.xhtml
index 34a3cf4..7c56d83 100644
--- a/pl_PL/short-user-manual_pl_PL_noimg.xhtml
+++ b/pl_PL/short-user-manual_pl_PL_noimg.xhtml
@@ -59,7 +59,7 @@ sub 2048R/EB399FD7 2003-10-16
<p>Jak tylko zostanie zweryfikowana sygnatura i pojawi się komunikat wynikowy <em>"Good signature"</em>, można wyodrębnić archiwum pakietu. Po rozpakowaniu, powinien pojawić sie katalog o nazwie zbliżonej do tej: <strong>tor-browser_en-US</strong>. Wewnątrz katalogu jest kolejny katalog o nazwie <strong>Docs</strong>, który zawiera plik o nazwie <strong>changelog</strong>. Warto sprawdzić, czy numer wersji w górnej linii pliku changelog zgadza się z numerem wersji w nazwie pliku.</p>
<h3 id="how-to-use-the-tor-browser-bundle">Jak używać Tor Browser Bundle</h3>
<p>After downloading the Tor Browser Bundle and extracting the package, you should have a directory with a few files in it. One of the files is an executable called "Start Tor Browser" (or "start-tor-browser", depending on your operating system).</p>
- <p>When you start the Tor Browser Bundle, you will first see Vidalia start up and connect you to the Tor network. After that, you will see a browser confirming that you are now using Tor. This is done by displaying <a href="https://check.torproject.org/">https://check.torproject.org/</a>. You can now browse the Internet through Tor.</p>
+ <p>Gdy uruchomisz Tor Browser Bundle, najpierw zobaczysz jak startuje Vidalia, która podłączy Cię do sieci Tor. Nastepnie, zobaczysz okno przeglądarki WWW z potwierdzeniem, że aktualnie używasz Tora. Zostanie wyświetlona strona<a href="https://check.torproject.org/">https://check.torproject.org/</a>. Możesz teraz przeglądać Internet za pomocą sieciTor.</p>
<p>
<em>Please note that it is important that you use the browser that comes with the bundle, and not your own browser.</em>
</p>
diff --git a/pt/short-user-manual_pt_noimg.xhtml b/pt/short-user-manual_pt_noimg.xhtml
index d432c5a..25269ab 100644
--- a/pt/short-user-manual_pt_noimg.xhtml
+++ b/pt/short-user-manual_pt_noimg.xhtml
@@ -28,18 +28,18 @@
<p>The software you receive is accompanied by a file with the same name as the bundle and the extension <strong>.asc</strong>. This .asc file is a GPG signature, and will allow you to verify the file you've downloaded is exactly the one that we intended you to get.</p>
<p>Before you can verify the signature, you will have to download and install GnuPG:</p>
<p><strong>Windows</strong>: <a href="http://gpg4win.org/download.html">http://gpg4win.org/download.html</a><br/><strong>Mac OS X</strong>: <a href="http://macgpg.sourceforge.net/">http://macgpg.sourceforge.net/</a><br/><strong>Linux</strong>: Most Linux distributions come with GnuPG preinstalled.</p>
- <p>Please note that you may need to edit the paths and the commands used below to get it to work on your system.</p>
- <p>Erinn Clark signs the Tor Browser Bundles with key 0x63FEE659. To import Erinn's key, run:</p>
+ <p>Por favor observe que você vai precisar editar os paths e os comandos usados abaixo para que isto funcione no seu sistema.</p>
+ <p>Erinn Clark loga-se na rede Tor com a chave 0x63FEE659. Para importar a chave de Erinn, rode os comandos:</p>
<pre>
<code>gpg --keyserver hkp://keys.gnupg.net --recv-keys 0x63FEE659
</code>
</pre>
- <p>After importing the key, verify that the fingerprint is correct:</p>
+ <p>Após importar a chave, verifique se a digital está correta: </p>
<pre>
<code>gpg --fingerprint 0x63FEE659
</code>
</pre>
- <p>You should see:</p>
+ <p>Você deverá ver:</p>
<pre>
<code>pub 2048R/63FEE659 2003-10-16
Key fingerprint = 8738 A680 B84B 3031 A630 F2DB 416F 0610 63FE E659
@@ -50,7 +50,7 @@ uid Erinn Clark <erinn(a)double-helix.org>
sub 2048R/EB399FD7 2003-10-16
</code>
</pre>
- <p>To verify the signature of the package you downloaded, run the following command:</p>
+ <p>Para verificar a assinatura do pacote que você baixou, rode o seguinte comando:</p>
<pre>
<code>gpg --verify tor-browser-2.2.33-2_en-US.exe.asc tor-browser-2.2.33-2_en-US.exe
</code>
diff --git a/si/short-user-manual_si_noimg.xhtml b/si/short-user-manual_si_noimg.xhtml
new file mode 100644
index 0000000..681e5b7
--- /dev/null
+++ b/si/short-user-manual_si_noimg.xhtml
@@ -0,0 +1,132 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+ <title/>
+ </head>
+ <body>
+ <h1 id="the-short-user-manual">The Short User Manual</h1>
+ <p>This user manual contains information about how to download Tor, how to use it, and what to do if Tor is unable to connect to the network. If you can't find the answer to your question in this document, email help(a)rt.torproject.org.</p>
+ <p>Please note that we are providing support on a voluntary basis, and we get a lot of emails every single day. There is no need to worry if we don't get back to you straight away.</p>
+ <h2 id="how-tor-works">How Tor works</h2>
+ <p>Tor is a network of virtual tunnels that allows you to improve your privacy and security on the Internet. Tor works by sending your traffic through three random servers (also known as <em>relays</em>) in the Tor network, before the traffic is sent out onto the public Internet.</p>
+ <p>The image above illustrates a user browsing to different websites over Tor. The green monitors represent relays in the Tor network, while the three keys represent the layers of encryption between the user and each relay.</p>
+ <p>Tor will anonymize the origin of your traffic, and it will encrypt everything between you and the Tor network. Tor will also encrypt your traffic inside the Tor network, but it cannot encrypt your traffic between the Tor network and its final destination.</p>
+ <p>If you are communicating sensitive information, for example when logging on to a website with a username and password, make sure that you are using HTTPS (e.g. <strong>https</strong>://torproject.org/, not <strong>http</strong>://torproject.org/).</p>
+ <h2 id="how-to-download-tor">How to download Tor</h2>
+ <p>The bundle we recommend to most users is the <a href="https://www.torproject.org/projects/torbrowser.html">Tor Browser Bundle</a>. This bundle contains a browser preconfigured to safely browse the Internet through Tor, and requires no installation. You download the bundle, extract the archive, and start Tor.</p>
+ <p>There are two different ways to get hold of the Tor software. You can either browse to the <a href="https://www.torproject.org/">Tor Project website</a> and download it there, or you can use GetTor, the email autoresponder.</p>
+ <h3 id="how-to-get-tor-via-email">How to get Tor via email</h3>
+ <p>To receive the English Tor Browser Bundle for Windows, send an email to gettor(a)torproject.org with <strong>windows</strong> in the body of the message. You can leave the subject blank.</p>
+ <p>You can also request the Tor Browser Bundle for Mac OS X (write <strong>macos-i386</strong>), and Linux (write <strong>linux-i386</strong> for 32-bit systems or <strong>linux-x86_64</strong> for 64-bit systems).</p>
+ <p>If you want a translated version of Tor, write <strong>help</strong> instead. You will then receive an email with instructions and a list of available languages.</p>
+ <p><strong>Note</strong>: The Tor Browser Bundles for Linux and Mac OS X are rather large, and you will not be able to receive any of these bundles with a Gmail, Hotmail or Yahoo account. If you cannot receive the bundle you want, send an email to help(a)rt.torproject.org and we will give you a list of website mirrors to use.</p>
+ <h3 id="tor-for-smartphones">Tor for smartphones</h3>
+ <p>You can get Tor on your Android device by installing the package named <em>Orbot</em>. For information about how to download and install Orbot, please see the <a href="https://www.torproject.org/docs/android.html.en">Tor Project website</a>.</p>
+ <p>We also have experimental packages for <a href="https://www.torproject.org/docs/N900.html.en">Nokia Maemo/N900</a> and <a href="http://sid77.slackware.it/iphone/">Apple iOS</a>.</p>
+ <h3 id="how-to-verify-that-you-have-the-right-version">How to verify that you have the right version</h3>
+ <p>Before running the Tor Browser Bundle, you should make sure that you have the right version.</p>
+ <p>The software you receive is accompanied by a file with the same name as the bundle and the extension <strong>.asc</strong>. This .asc file is a GPG signature, and will allow you to verify the file you've downloaded is exactly the one that we intended you to get.</p>
+ <p>Before you can verify the signature, you will have to download and install GnuPG:</p>
+ <p><strong>Windows</strong>: <a href="http://gpg4win.org/download.html">http://gpg4win.org/download.html</a><br/><strong>Mac OS X</strong>: <a href="http://macgpg.sourceforge.net/">http://macgpg.sourceforge.net/</a><br/><strong>Linux</strong>: Most Linux distributions come with GnuPG preinstalled.</p>
+ <p>Please note that you may need to edit the paths and the commands used below to get it to work on your system.</p>
+ <p>Erinn Clark signs the Tor Browser Bundles with key 0x63FEE659. To import Erinn's key, run:</p>
+ <pre>
+ <code>gpg --keyserver hkp://keys.gnupg.net --recv-keys 0x63FEE659
+</code>
+ </pre>
+ <p>After importing the key, verify that the fingerprint is correct:</p>
+ <pre>
+ <code>gpg --fingerprint 0x63FEE659
+</code>
+ </pre>
+ <p>You should see:</p>
+ <pre>
+ <code>pub 2048R/63FEE659 2003-10-16
+ Key fingerprint = 8738 A680 B84B 3031 A630 F2DB 416F 0610 63FE E659
+uid Erinn Clark <erinn(a)torproject.org>
+uid Erinn Clark <erinn(a)debian.org>
+
+uid Erinn Clark <erinn(a)double-helix.org>
+sub 2048R/EB399FD7 2003-10-16
+</code>
+ </pre>
+ <p>To verify the signature of the package you downloaded, run the following command:</p>
+ <pre>
+ <code>gpg --verify tor-browser-2.2.33-2_en-US.exe.asc tor-browser-2.2.33-2_en-US.exe
+</code>
+ </pre>
+ <p>The output should say <em>"Good signature"</em>. A bad signature means that the file may have been tampered with. If you see a bad signature, send details about where you downloaded the package from, how you verified the signature, and the output from GnuPG in an email to help(a)rt.torproject.org.</p>
+ <p>Once you have verified the signature and seen the <em>"Good signature"</em> output, go ahead and extract the package archive. You should then see a directory similar to <strong>tor-browser_en-US</strong>. Inside that directory is another directory called <strong>Docs</strong>, which contains a file called <strong>changelog</strong>. You want to make sure that the version number on the top line of the changelog file matches the version number in the filename.</p>
+ <h3 id="how-to-use-the-tor-browser-bundle">How to use the Tor Browser Bundle</h3>
+ <p>After downloading the Tor Browser Bundle and extracting the package, you should have a directory with a few files in it. One of the files is an executable called "Start Tor Browser" (or "start-tor-browser", depending on your operating system).</p>
+ <p>When you start the Tor Browser Bundle, you will first see Vidalia start up and connect you to the Tor network. After that, you will see a browser confirming that you are now using Tor. This is done by displaying <a href="https://check.torproject.org/">https://check.torproject.org/</a>. You can now browse the Internet through Tor.</p>
+ <p>
+ <em>Please note that it is important that you use the browser that comes with the bundle, and not your own browser.</em>
+ </p>
+ <h3 id="what-to-do-when-tor-does-not-connect">What to do when Tor does not connect</h3>
+ <p>Some users will notice that Vidalia gets stuck when trying to connect to the Tor network. If this happens, make sure that you are connected to the Internet. If you need to connect to a proxy server, see <em>How to use an open proxy</em> below.</p>
+ <p>If your normal Internet connection is working, but Tor still can't connect to the network, try the following; open the Vidalia control panel, click on <em>Message Log</em> and select the <em>Advanced</em> tab. It may be that Tor won't connect because:</p>
+ <p><strong>Your system clock is off</strong>: Make sure that the date and time on your system is correct, and restart Tor. You may need to synchronize your system clock with an Internet time server.</p>
+ <p><strong>You are behind a restrictive firewall</strong>: To tell Tor to only try port 80 and port 443, open the Vidalia control panel, click on <em>Settings</em> and <em>Network</em>, and tick the box that says <em>My firewall only lets me connect to certain ports</em>.</p>
+ <p><strong>Your anti-virus program is blocking Tor</strong>: Make sure that your anti-virus program is not preventing Tor from making network connections.</p>
+ <p>If Tor still doesn't work, it's likely that your Internet Service Provider (ISP) is blocking Tor. Very often this can be worked around with <strong>Tor bridges</strong>, hidden relays that aren't as easy to block.</p>
+ <p>If you need help with figuring out why Tor can't connect, send an email to help(a)rt.torproject.org and include the relevant parts from the log file.</p>
+ <h3 id="how-to-find-a-bridge">How to find a bridge</h3>
+ <p>To use a bridge, you will first have to locate one; you can either browse to <a href="https://bridges.torproject.org/">bridges.torproject.org</a>, or you can send an email to bridges(a)torproject.org. If you do send an email, please make sure that you write <strong>get bridges</strong> in the body of the email. Without this, you will not get a reply. Note that you need to send this email from either a gmail.com or a yahoo.com address.</p>
+ <p>Configuring more than one bridge address will make your Tor connection more stable, in case some of the bridges become unreachable. There is no guarantee that the bridge you are using now will work tomorrow, so you should make a habit of updating your list of bridges every so often.</p>
+ <h3 id="how-to-use-a-bridge">How to use a bridge</h3>
+ <p>Once you have a set of bridges to use, open the Vidalia control panel, click on <em>Settings</em>, <em>Network</em> and tick the box that says <em>My ISP blocks connections to the Tor network</em>. Enter the bridges in the box below, hit <em>OK</em> and start Tor again.</p>
+ <h3 id="how-to-use-an-open-proxy">How to use an open proxy</h3>
+ <p>If using a bridge does not work, try configuring Tor to use any HTTPS or SOCKS proxy to get access to the Tor network. This means even if Tor is blocked by your local network, open proxies can be safely used to connect to the Tor Network and on to the uncensored Internet.</p>
+ <p>The steps below assume you have a functional Tor/Vidalia configuration, and you have found a list of HTTPS, SOCKS4, or SOCKS5 proxies.</p>
+ <ol style="list-style-type: decimal">
+ <li>Open the Vidalia control panel, click on <em>Settings</em>.</li>
+ <li>Click <em>Network</em>. Select <em>I use a proxy to access the Internet</em>.</li>
+ <li>On the <em>Address</em> line, enter the open proxy address. This can be a hostname or an IP Address.</li>
+ <li>Enter the port for the proxy.</li>
+ <li>Generally, you do not need a username and password. If you do, enter the information in the proper fields.</li>
+ <li>Choose the <em>Type</em> of proxy you are using, whether HTTP/HTTPS, SOCKS4, or SOCKS5.</li>
+ <li>Push the <em>OK</em> button. Vidalia and Tor are now configured to use a proxy to access the rest of the Tor network.</li>
+ </ol>
+ <h2 id="frequently-asked-questions">Frequently Asked Questions</h2>
+ <p>This section will answer some of the most common questions. If your question is not mentioned here, please send an email to help(a)rt.torproject.org.</p>
+ <h3 id="unable-to-extract-the-archive">Unable to extract the archive</h3>
+ <p>If you are using Windows and find that you cannot extract the archive, download and install <a href="http://www.7-zip.org/">7-Zip</a>.</p>
+ <p>If you are unable to download 7-Zip, try to rename the file from .z to .zip and use winzip to extract the archive. Before renaming the file, tell Windows to show file extensions:</p>
+ <h4 id="windows-xp">Windows XP</h4>
+ <ol style="list-style-type: decimal">
+ <li>Open <em>My Computer</em></li>
+ <li>Click on <em>Tools</em> and choose <em>Folder Options...</em> in the menu</li>
+ <li>Click on the <em>View</em> tab</li>
+ <li>Uncheck <em>Hide extensions for known file types</em> and click <em>OK</em></li>
+ </ol>
+ <h4 id="windows-vista">Windows Vista</h4>
+ <ol style="list-style-type: decimal">
+ <li>Open <em>Computer</em></li>
+ <li>Click on <em>Organize</em> and choose <em>Folder and search options</em> in the menu</li>
+ <li>Click on the <em>View</em> tab</li>
+ <li>Uncheck <em>Hide extensions for known file types</em> and click <em>OK</em></li>
+ </ol>
+ <h4 id="windows-7">Windows 7</h4>
+ <ol style="list-style-type: decimal">
+ <li>Open <em>Computer</em></li>
+ <li>Click on <em>Organize</em> and choose <em>Folder and search options</em> in the menu</li>
+ <li>Click on the <em>View</em> tab</li>
+ <li>Uncheck <em>Hide extensions for known file types</em> and click <em>OK</em></li>
+ </ol>
+ <h3 id="vidalia-asks-for-a-password">Vidalia asks for a password</h3>
+ <p>You should not have to enter a password when starting Vidalia. If you are prompted for one, you are likely affected by one of these problems:</p>
+ <p><strong>You are already running Vidalia and Tor</strong>: For example, this situation can happen if you installed the Vidalia bundle and now you're trying to run the Tor Browser Bundle. In that case, you will need to close the old Vidalia and Tor before you can run this one.</p>
+ <p><strong>Vidalia crashed, but left Tor running</strong>: If the dialog that prompts you for a control password has a Reset button, you can click the button and Vidalia will restart Tor with a new random control password. If you do not see a Reset button, or if Vidalia is unable to restart Tor for you; go into your process or task manager, and terminate the Tor process. Then use Vidalia to restart Tor.</p>
+ <p>For more information, see the <a href="https://torproject.org/docs/faq.html#VidaliaPassword">FAQ</a> on the Tor Project website.</p>
+ <h3 id="flash-does-not-work">Flash does not work</h3>
+ <p>For security reasons, Flash, Java, and other plugins are currently disabled for Tor. Plugins operate independently from Firefox and can perform activity on your computer that ruins your anonymity.</p>
+ <p>Most YouTube videos work with HTML5, and it is possible to view these videos over Tor. You need to join the <a href="https://www.youtube.com/html5">HTML5 trial</a> on the YouTube website before you can use the HTML5 player.</p>
+ <p>Note that the browser will not remember that you joined the trial once you close it, so you will need to re-join the trial the next time you run the Tor Browser Bundle.</p>
+ <p>Please see the <a href="https://www.torproject.org/torbutton/torbutton-faq.html#noflash">Torbutton FAQ</a> for more information.</p>
+ <h3 id="i-want-to-use-another-browser">I want to use another browser</h3>
+ <p>For security reasons, we recommend that you only browse the web through Tor using the Tor Browser Bundle. It is technically possible to use Tor with other browsers, but by doing so you open yourself up to potential attacks.</p>
+ <h3 id="why-tor-is-slow">Why Tor is slow</h3>
+ <p>Tor can sometimes be a bit slower than your normal Internet connection. After all, your traffic is sent through many different countries, sometimes across oceans around the world!</p>
+ </body>
+</html>
diff --git a/si_LK/short-user-manual_si_LK_noimg.xhtml b/si_LK/short-user-manual_si_LK_noimg.xhtml
new file mode 100644
index 0000000..681e5b7
--- /dev/null
+++ b/si_LK/short-user-manual_si_LK_noimg.xhtml
@@ -0,0 +1,132 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+ <title/>
+ </head>
+ <body>
+ <h1 id="the-short-user-manual">The Short User Manual</h1>
+ <p>This user manual contains information about how to download Tor, how to use it, and what to do if Tor is unable to connect to the network. If you can't find the answer to your question in this document, email help(a)rt.torproject.org.</p>
+ <p>Please note that we are providing support on a voluntary basis, and we get a lot of emails every single day. There is no need to worry if we don't get back to you straight away.</p>
+ <h2 id="how-tor-works">How Tor works</h2>
+ <p>Tor is a network of virtual tunnels that allows you to improve your privacy and security on the Internet. Tor works by sending your traffic through three random servers (also known as <em>relays</em>) in the Tor network, before the traffic is sent out onto the public Internet.</p>
+ <p>The image above illustrates a user browsing to different websites over Tor. The green monitors represent relays in the Tor network, while the three keys represent the layers of encryption between the user and each relay.</p>
+ <p>Tor will anonymize the origin of your traffic, and it will encrypt everything between you and the Tor network. Tor will also encrypt your traffic inside the Tor network, but it cannot encrypt your traffic between the Tor network and its final destination.</p>
+ <p>If you are communicating sensitive information, for example when logging on to a website with a username and password, make sure that you are using HTTPS (e.g. <strong>https</strong>://torproject.org/, not <strong>http</strong>://torproject.org/).</p>
+ <h2 id="how-to-download-tor">How to download Tor</h2>
+ <p>The bundle we recommend to most users is the <a href="https://www.torproject.org/projects/torbrowser.html">Tor Browser Bundle</a>. This bundle contains a browser preconfigured to safely browse the Internet through Tor, and requires no installation. You download the bundle, extract the archive, and start Tor.</p>
+ <p>There are two different ways to get hold of the Tor software. You can either browse to the <a href="https://www.torproject.org/">Tor Project website</a> and download it there, or you can use GetTor, the email autoresponder.</p>
+ <h3 id="how-to-get-tor-via-email">How to get Tor via email</h3>
+ <p>To receive the English Tor Browser Bundle for Windows, send an email to gettor(a)torproject.org with <strong>windows</strong> in the body of the message. You can leave the subject blank.</p>
+ <p>You can also request the Tor Browser Bundle for Mac OS X (write <strong>macos-i386</strong>), and Linux (write <strong>linux-i386</strong> for 32-bit systems or <strong>linux-x86_64</strong> for 64-bit systems).</p>
+ <p>If you want a translated version of Tor, write <strong>help</strong> instead. You will then receive an email with instructions and a list of available languages.</p>
+ <p><strong>Note</strong>: The Tor Browser Bundles for Linux and Mac OS X are rather large, and you will not be able to receive any of these bundles with a Gmail, Hotmail or Yahoo account. If you cannot receive the bundle you want, send an email to help(a)rt.torproject.org and we will give you a list of website mirrors to use.</p>
+ <h3 id="tor-for-smartphones">Tor for smartphones</h3>
+ <p>You can get Tor on your Android device by installing the package named <em>Orbot</em>. For information about how to download and install Orbot, please see the <a href="https://www.torproject.org/docs/android.html.en">Tor Project website</a>.</p>
+ <p>We also have experimental packages for <a href="https://www.torproject.org/docs/N900.html.en">Nokia Maemo/N900</a> and <a href="http://sid77.slackware.it/iphone/">Apple iOS</a>.</p>
+ <h3 id="how-to-verify-that-you-have-the-right-version">How to verify that you have the right version</h3>
+ <p>Before running the Tor Browser Bundle, you should make sure that you have the right version.</p>
+ <p>The software you receive is accompanied by a file with the same name as the bundle and the extension <strong>.asc</strong>. This .asc file is a GPG signature, and will allow you to verify the file you've downloaded is exactly the one that we intended you to get.</p>
+ <p>Before you can verify the signature, you will have to download and install GnuPG:</p>
+ <p><strong>Windows</strong>: <a href="http://gpg4win.org/download.html">http://gpg4win.org/download.html</a><br/><strong>Mac OS X</strong>: <a href="http://macgpg.sourceforge.net/">http://macgpg.sourceforge.net/</a><br/><strong>Linux</strong>: Most Linux distributions come with GnuPG preinstalled.</p>
+ <p>Please note that you may need to edit the paths and the commands used below to get it to work on your system.</p>
+ <p>Erinn Clark signs the Tor Browser Bundles with key 0x63FEE659. To import Erinn's key, run:</p>
+ <pre>
+ <code>gpg --keyserver hkp://keys.gnupg.net --recv-keys 0x63FEE659
+</code>
+ </pre>
+ <p>After importing the key, verify that the fingerprint is correct:</p>
+ <pre>
+ <code>gpg --fingerprint 0x63FEE659
+</code>
+ </pre>
+ <p>You should see:</p>
+ <pre>
+ <code>pub 2048R/63FEE659 2003-10-16
+ Key fingerprint = 8738 A680 B84B 3031 A630 F2DB 416F 0610 63FE E659
+uid Erinn Clark <erinn(a)torproject.org>
+uid Erinn Clark <erinn(a)debian.org>
+
+uid Erinn Clark <erinn(a)double-helix.org>
+sub 2048R/EB399FD7 2003-10-16
+</code>
+ </pre>
+ <p>To verify the signature of the package you downloaded, run the following command:</p>
+ <pre>
+ <code>gpg --verify tor-browser-2.2.33-2_en-US.exe.asc tor-browser-2.2.33-2_en-US.exe
+</code>
+ </pre>
+ <p>The output should say <em>"Good signature"</em>. A bad signature means that the file may have been tampered with. If you see a bad signature, send details about where you downloaded the package from, how you verified the signature, and the output from GnuPG in an email to help(a)rt.torproject.org.</p>
+ <p>Once you have verified the signature and seen the <em>"Good signature"</em> output, go ahead and extract the package archive. You should then see a directory similar to <strong>tor-browser_en-US</strong>. Inside that directory is another directory called <strong>Docs</strong>, which contains a file called <strong>changelog</strong>. You want to make sure that the version number on the top line of the changelog file matches the version number in the filename.</p>
+ <h3 id="how-to-use-the-tor-browser-bundle">How to use the Tor Browser Bundle</h3>
+ <p>After downloading the Tor Browser Bundle and extracting the package, you should have a directory with a few files in it. One of the files is an executable called "Start Tor Browser" (or "start-tor-browser", depending on your operating system).</p>
+ <p>When you start the Tor Browser Bundle, you will first see Vidalia start up and connect you to the Tor network. After that, you will see a browser confirming that you are now using Tor. This is done by displaying <a href="https://check.torproject.org/">https://check.torproject.org/</a>. You can now browse the Internet through Tor.</p>
+ <p>
+ <em>Please note that it is important that you use the browser that comes with the bundle, and not your own browser.</em>
+ </p>
+ <h3 id="what-to-do-when-tor-does-not-connect">What to do when Tor does not connect</h3>
+ <p>Some users will notice that Vidalia gets stuck when trying to connect to the Tor network. If this happens, make sure that you are connected to the Internet. If you need to connect to a proxy server, see <em>How to use an open proxy</em> below.</p>
+ <p>If your normal Internet connection is working, but Tor still can't connect to the network, try the following; open the Vidalia control panel, click on <em>Message Log</em> and select the <em>Advanced</em> tab. It may be that Tor won't connect because:</p>
+ <p><strong>Your system clock is off</strong>: Make sure that the date and time on your system is correct, and restart Tor. You may need to synchronize your system clock with an Internet time server.</p>
+ <p><strong>You are behind a restrictive firewall</strong>: To tell Tor to only try port 80 and port 443, open the Vidalia control panel, click on <em>Settings</em> and <em>Network</em>, and tick the box that says <em>My firewall only lets me connect to certain ports</em>.</p>
+ <p><strong>Your anti-virus program is blocking Tor</strong>: Make sure that your anti-virus program is not preventing Tor from making network connections.</p>
+ <p>If Tor still doesn't work, it's likely that your Internet Service Provider (ISP) is blocking Tor. Very often this can be worked around with <strong>Tor bridges</strong>, hidden relays that aren't as easy to block.</p>
+ <p>If you need help with figuring out why Tor can't connect, send an email to help(a)rt.torproject.org and include the relevant parts from the log file.</p>
+ <h3 id="how-to-find-a-bridge">How to find a bridge</h3>
+ <p>To use a bridge, you will first have to locate one; you can either browse to <a href="https://bridges.torproject.org/">bridges.torproject.org</a>, or you can send an email to bridges(a)torproject.org. If you do send an email, please make sure that you write <strong>get bridges</strong> in the body of the email. Without this, you will not get a reply. Note that you need to send this email from either a gmail.com or a yahoo.com address.</p>
+ <p>Configuring more than one bridge address will make your Tor connection more stable, in case some of the bridges become unreachable. There is no guarantee that the bridge you are using now will work tomorrow, so you should make a habit of updating your list of bridges every so often.</p>
+ <h3 id="how-to-use-a-bridge">How to use a bridge</h3>
+ <p>Once you have a set of bridges to use, open the Vidalia control panel, click on <em>Settings</em>, <em>Network</em> and tick the box that says <em>My ISP blocks connections to the Tor network</em>. Enter the bridges in the box below, hit <em>OK</em> and start Tor again.</p>
+ <h3 id="how-to-use-an-open-proxy">How to use an open proxy</h3>
+ <p>If using a bridge does not work, try configuring Tor to use any HTTPS or SOCKS proxy to get access to the Tor network. This means even if Tor is blocked by your local network, open proxies can be safely used to connect to the Tor Network and on to the uncensored Internet.</p>
+ <p>The steps below assume you have a functional Tor/Vidalia configuration, and you have found a list of HTTPS, SOCKS4, or SOCKS5 proxies.</p>
+ <ol style="list-style-type: decimal">
+ <li>Open the Vidalia control panel, click on <em>Settings</em>.</li>
+ <li>Click <em>Network</em>. Select <em>I use a proxy to access the Internet</em>.</li>
+ <li>On the <em>Address</em> line, enter the open proxy address. This can be a hostname or an IP Address.</li>
+ <li>Enter the port for the proxy.</li>
+ <li>Generally, you do not need a username and password. If you do, enter the information in the proper fields.</li>
+ <li>Choose the <em>Type</em> of proxy you are using, whether HTTP/HTTPS, SOCKS4, or SOCKS5.</li>
+ <li>Push the <em>OK</em> button. Vidalia and Tor are now configured to use a proxy to access the rest of the Tor network.</li>
+ </ol>
+ <h2 id="frequently-asked-questions">Frequently Asked Questions</h2>
+ <p>This section will answer some of the most common questions. If your question is not mentioned here, please send an email to help(a)rt.torproject.org.</p>
+ <h3 id="unable-to-extract-the-archive">Unable to extract the archive</h3>
+ <p>If you are using Windows and find that you cannot extract the archive, download and install <a href="http://www.7-zip.org/">7-Zip</a>.</p>
+ <p>If you are unable to download 7-Zip, try to rename the file from .z to .zip and use winzip to extract the archive. Before renaming the file, tell Windows to show file extensions:</p>
+ <h4 id="windows-xp">Windows XP</h4>
+ <ol style="list-style-type: decimal">
+ <li>Open <em>My Computer</em></li>
+ <li>Click on <em>Tools</em> and choose <em>Folder Options...</em> in the menu</li>
+ <li>Click on the <em>View</em> tab</li>
+ <li>Uncheck <em>Hide extensions for known file types</em> and click <em>OK</em></li>
+ </ol>
+ <h4 id="windows-vista">Windows Vista</h4>
+ <ol style="list-style-type: decimal">
+ <li>Open <em>Computer</em></li>
+ <li>Click on <em>Organize</em> and choose <em>Folder and search options</em> in the menu</li>
+ <li>Click on the <em>View</em> tab</li>
+ <li>Uncheck <em>Hide extensions for known file types</em> and click <em>OK</em></li>
+ </ol>
+ <h4 id="windows-7">Windows 7</h4>
+ <ol style="list-style-type: decimal">
+ <li>Open <em>Computer</em></li>
+ <li>Click on <em>Organize</em> and choose <em>Folder and search options</em> in the menu</li>
+ <li>Click on the <em>View</em> tab</li>
+ <li>Uncheck <em>Hide extensions for known file types</em> and click <em>OK</em></li>
+ </ol>
+ <h3 id="vidalia-asks-for-a-password">Vidalia asks for a password</h3>
+ <p>You should not have to enter a password when starting Vidalia. If you are prompted for one, you are likely affected by one of these problems:</p>
+ <p><strong>You are already running Vidalia and Tor</strong>: For example, this situation can happen if you installed the Vidalia bundle and now you're trying to run the Tor Browser Bundle. In that case, you will need to close the old Vidalia and Tor before you can run this one.</p>
+ <p><strong>Vidalia crashed, but left Tor running</strong>: If the dialog that prompts you for a control password has a Reset button, you can click the button and Vidalia will restart Tor with a new random control password. If you do not see a Reset button, or if Vidalia is unable to restart Tor for you; go into your process or task manager, and terminate the Tor process. Then use Vidalia to restart Tor.</p>
+ <p>For more information, see the <a href="https://torproject.org/docs/faq.html#VidaliaPassword">FAQ</a> on the Tor Project website.</p>
+ <h3 id="flash-does-not-work">Flash does not work</h3>
+ <p>For security reasons, Flash, Java, and other plugins are currently disabled for Tor. Plugins operate independently from Firefox and can perform activity on your computer that ruins your anonymity.</p>
+ <p>Most YouTube videos work with HTML5, and it is possible to view these videos over Tor. You need to join the <a href="https://www.youtube.com/html5">HTML5 trial</a> on the YouTube website before you can use the HTML5 player.</p>
+ <p>Note that the browser will not remember that you joined the trial once you close it, so you will need to re-join the trial the next time you run the Tor Browser Bundle.</p>
+ <p>Please see the <a href="https://www.torproject.org/torbutton/torbutton-faq.html#noflash">Torbutton FAQ</a> for more information.</p>
+ <h3 id="i-want-to-use-another-browser">I want to use another browser</h3>
+ <p>For security reasons, we recommend that you only browse the web through Tor using the Tor Browser Bundle. It is technically possible to use Tor with other browsers, but by doing so you open yourself up to potential attacks.</p>
+ <h3 id="why-tor-is-slow">Why Tor is slow</h3>
+ <p>Tor can sometimes be a bit slower than your normal Internet connection. After all, your traffic is sent through many different countries, sometimes across oceans around the world!</p>
+ </body>
+</html>
diff --git a/te_IN/short-user-manual_te_IN_noimg.xhtml b/te_IN/short-user-manual_te_IN_noimg.xhtml
new file mode 100644
index 0000000..681e5b7
--- /dev/null
+++ b/te_IN/short-user-manual_te_IN_noimg.xhtml
@@ -0,0 +1,132 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+ <title/>
+ </head>
+ <body>
+ <h1 id="the-short-user-manual">The Short User Manual</h1>
+ <p>This user manual contains information about how to download Tor, how to use it, and what to do if Tor is unable to connect to the network. If you can't find the answer to your question in this document, email help(a)rt.torproject.org.</p>
+ <p>Please note that we are providing support on a voluntary basis, and we get a lot of emails every single day. There is no need to worry if we don't get back to you straight away.</p>
+ <h2 id="how-tor-works">How Tor works</h2>
+ <p>Tor is a network of virtual tunnels that allows you to improve your privacy and security on the Internet. Tor works by sending your traffic through three random servers (also known as <em>relays</em>) in the Tor network, before the traffic is sent out onto the public Internet.</p>
+ <p>The image above illustrates a user browsing to different websites over Tor. The green monitors represent relays in the Tor network, while the three keys represent the layers of encryption between the user and each relay.</p>
+ <p>Tor will anonymize the origin of your traffic, and it will encrypt everything between you and the Tor network. Tor will also encrypt your traffic inside the Tor network, but it cannot encrypt your traffic between the Tor network and its final destination.</p>
+ <p>If you are communicating sensitive information, for example when logging on to a website with a username and password, make sure that you are using HTTPS (e.g. <strong>https</strong>://torproject.org/, not <strong>http</strong>://torproject.org/).</p>
+ <h2 id="how-to-download-tor">How to download Tor</h2>
+ <p>The bundle we recommend to most users is the <a href="https://www.torproject.org/projects/torbrowser.html">Tor Browser Bundle</a>. This bundle contains a browser preconfigured to safely browse the Internet through Tor, and requires no installation. You download the bundle, extract the archive, and start Tor.</p>
+ <p>There are two different ways to get hold of the Tor software. You can either browse to the <a href="https://www.torproject.org/">Tor Project website</a> and download it there, or you can use GetTor, the email autoresponder.</p>
+ <h3 id="how-to-get-tor-via-email">How to get Tor via email</h3>
+ <p>To receive the English Tor Browser Bundle for Windows, send an email to gettor(a)torproject.org with <strong>windows</strong> in the body of the message. You can leave the subject blank.</p>
+ <p>You can also request the Tor Browser Bundle for Mac OS X (write <strong>macos-i386</strong>), and Linux (write <strong>linux-i386</strong> for 32-bit systems or <strong>linux-x86_64</strong> for 64-bit systems).</p>
+ <p>If you want a translated version of Tor, write <strong>help</strong> instead. You will then receive an email with instructions and a list of available languages.</p>
+ <p><strong>Note</strong>: The Tor Browser Bundles for Linux and Mac OS X are rather large, and you will not be able to receive any of these bundles with a Gmail, Hotmail or Yahoo account. If you cannot receive the bundle you want, send an email to help(a)rt.torproject.org and we will give you a list of website mirrors to use.</p>
+ <h3 id="tor-for-smartphones">Tor for smartphones</h3>
+ <p>You can get Tor on your Android device by installing the package named <em>Orbot</em>. For information about how to download and install Orbot, please see the <a href="https://www.torproject.org/docs/android.html.en">Tor Project website</a>.</p>
+ <p>We also have experimental packages for <a href="https://www.torproject.org/docs/N900.html.en">Nokia Maemo/N900</a> and <a href="http://sid77.slackware.it/iphone/">Apple iOS</a>.</p>
+ <h3 id="how-to-verify-that-you-have-the-right-version">How to verify that you have the right version</h3>
+ <p>Before running the Tor Browser Bundle, you should make sure that you have the right version.</p>
+ <p>The software you receive is accompanied by a file with the same name as the bundle and the extension <strong>.asc</strong>. This .asc file is a GPG signature, and will allow you to verify the file you've downloaded is exactly the one that we intended you to get.</p>
+ <p>Before you can verify the signature, you will have to download and install GnuPG:</p>
+ <p><strong>Windows</strong>: <a href="http://gpg4win.org/download.html">http://gpg4win.org/download.html</a><br/><strong>Mac OS X</strong>: <a href="http://macgpg.sourceforge.net/">http://macgpg.sourceforge.net/</a><br/><strong>Linux</strong>: Most Linux distributions come with GnuPG preinstalled.</p>
+ <p>Please note that you may need to edit the paths and the commands used below to get it to work on your system.</p>
+ <p>Erinn Clark signs the Tor Browser Bundles with key 0x63FEE659. To import Erinn's key, run:</p>
+ <pre>
+ <code>gpg --keyserver hkp://keys.gnupg.net --recv-keys 0x63FEE659
+</code>
+ </pre>
+ <p>After importing the key, verify that the fingerprint is correct:</p>
+ <pre>
+ <code>gpg --fingerprint 0x63FEE659
+</code>
+ </pre>
+ <p>You should see:</p>
+ <pre>
+ <code>pub 2048R/63FEE659 2003-10-16
+ Key fingerprint = 8738 A680 B84B 3031 A630 F2DB 416F 0610 63FE E659
+uid Erinn Clark <erinn(a)torproject.org>
+uid Erinn Clark <erinn(a)debian.org>
+
+uid Erinn Clark <erinn(a)double-helix.org>
+sub 2048R/EB399FD7 2003-10-16
+</code>
+ </pre>
+ <p>To verify the signature of the package you downloaded, run the following command:</p>
+ <pre>
+ <code>gpg --verify tor-browser-2.2.33-2_en-US.exe.asc tor-browser-2.2.33-2_en-US.exe
+</code>
+ </pre>
+ <p>The output should say <em>"Good signature"</em>. A bad signature means that the file may have been tampered with. If you see a bad signature, send details about where you downloaded the package from, how you verified the signature, and the output from GnuPG in an email to help(a)rt.torproject.org.</p>
+ <p>Once you have verified the signature and seen the <em>"Good signature"</em> output, go ahead and extract the package archive. You should then see a directory similar to <strong>tor-browser_en-US</strong>. Inside that directory is another directory called <strong>Docs</strong>, which contains a file called <strong>changelog</strong>. You want to make sure that the version number on the top line of the changelog file matches the version number in the filename.</p>
+ <h3 id="how-to-use-the-tor-browser-bundle">How to use the Tor Browser Bundle</h3>
+ <p>After downloading the Tor Browser Bundle and extracting the package, you should have a directory with a few files in it. One of the files is an executable called "Start Tor Browser" (or "start-tor-browser", depending on your operating system).</p>
+ <p>When you start the Tor Browser Bundle, you will first see Vidalia start up and connect you to the Tor network. After that, you will see a browser confirming that you are now using Tor. This is done by displaying <a href="https://check.torproject.org/">https://check.torproject.org/</a>. You can now browse the Internet through Tor.</p>
+ <p>
+ <em>Please note that it is important that you use the browser that comes with the bundle, and not your own browser.</em>
+ </p>
+ <h3 id="what-to-do-when-tor-does-not-connect">What to do when Tor does not connect</h3>
+ <p>Some users will notice that Vidalia gets stuck when trying to connect to the Tor network. If this happens, make sure that you are connected to the Internet. If you need to connect to a proxy server, see <em>How to use an open proxy</em> below.</p>
+ <p>If your normal Internet connection is working, but Tor still can't connect to the network, try the following; open the Vidalia control panel, click on <em>Message Log</em> and select the <em>Advanced</em> tab. It may be that Tor won't connect because:</p>
+ <p><strong>Your system clock is off</strong>: Make sure that the date and time on your system is correct, and restart Tor. You may need to synchronize your system clock with an Internet time server.</p>
+ <p><strong>You are behind a restrictive firewall</strong>: To tell Tor to only try port 80 and port 443, open the Vidalia control panel, click on <em>Settings</em> and <em>Network</em>, and tick the box that says <em>My firewall only lets me connect to certain ports</em>.</p>
+ <p><strong>Your anti-virus program is blocking Tor</strong>: Make sure that your anti-virus program is not preventing Tor from making network connections.</p>
+ <p>If Tor still doesn't work, it's likely that your Internet Service Provider (ISP) is blocking Tor. Very often this can be worked around with <strong>Tor bridges</strong>, hidden relays that aren't as easy to block.</p>
+ <p>If you need help with figuring out why Tor can't connect, send an email to help(a)rt.torproject.org and include the relevant parts from the log file.</p>
+ <h3 id="how-to-find-a-bridge">How to find a bridge</h3>
+ <p>To use a bridge, you will first have to locate one; you can either browse to <a href="https://bridges.torproject.org/">bridges.torproject.org</a>, or you can send an email to bridges(a)torproject.org. If you do send an email, please make sure that you write <strong>get bridges</strong> in the body of the email. Without this, you will not get a reply. Note that you need to send this email from either a gmail.com or a yahoo.com address.</p>
+ <p>Configuring more than one bridge address will make your Tor connection more stable, in case some of the bridges become unreachable. There is no guarantee that the bridge you are using now will work tomorrow, so you should make a habit of updating your list of bridges every so often.</p>
+ <h3 id="how-to-use-a-bridge">How to use a bridge</h3>
+ <p>Once you have a set of bridges to use, open the Vidalia control panel, click on <em>Settings</em>, <em>Network</em> and tick the box that says <em>My ISP blocks connections to the Tor network</em>. Enter the bridges in the box below, hit <em>OK</em> and start Tor again.</p>
+ <h3 id="how-to-use-an-open-proxy">How to use an open proxy</h3>
+ <p>If using a bridge does not work, try configuring Tor to use any HTTPS or SOCKS proxy to get access to the Tor network. This means even if Tor is blocked by your local network, open proxies can be safely used to connect to the Tor Network and on to the uncensored Internet.</p>
+ <p>The steps below assume you have a functional Tor/Vidalia configuration, and you have found a list of HTTPS, SOCKS4, or SOCKS5 proxies.</p>
+ <ol style="list-style-type: decimal">
+ <li>Open the Vidalia control panel, click on <em>Settings</em>.</li>
+ <li>Click <em>Network</em>. Select <em>I use a proxy to access the Internet</em>.</li>
+ <li>On the <em>Address</em> line, enter the open proxy address. This can be a hostname or an IP Address.</li>
+ <li>Enter the port for the proxy.</li>
+ <li>Generally, you do not need a username and password. If you do, enter the information in the proper fields.</li>
+ <li>Choose the <em>Type</em> of proxy you are using, whether HTTP/HTTPS, SOCKS4, or SOCKS5.</li>
+ <li>Push the <em>OK</em> button. Vidalia and Tor are now configured to use a proxy to access the rest of the Tor network.</li>
+ </ol>
+ <h2 id="frequently-asked-questions">Frequently Asked Questions</h2>
+ <p>This section will answer some of the most common questions. If your question is not mentioned here, please send an email to help(a)rt.torproject.org.</p>
+ <h3 id="unable-to-extract-the-archive">Unable to extract the archive</h3>
+ <p>If you are using Windows and find that you cannot extract the archive, download and install <a href="http://www.7-zip.org/">7-Zip</a>.</p>
+ <p>If you are unable to download 7-Zip, try to rename the file from .z to .zip and use winzip to extract the archive. Before renaming the file, tell Windows to show file extensions:</p>
+ <h4 id="windows-xp">Windows XP</h4>
+ <ol style="list-style-type: decimal">
+ <li>Open <em>My Computer</em></li>
+ <li>Click on <em>Tools</em> and choose <em>Folder Options...</em> in the menu</li>
+ <li>Click on the <em>View</em> tab</li>
+ <li>Uncheck <em>Hide extensions for known file types</em> and click <em>OK</em></li>
+ </ol>
+ <h4 id="windows-vista">Windows Vista</h4>
+ <ol style="list-style-type: decimal">
+ <li>Open <em>Computer</em></li>
+ <li>Click on <em>Organize</em> and choose <em>Folder and search options</em> in the menu</li>
+ <li>Click on the <em>View</em> tab</li>
+ <li>Uncheck <em>Hide extensions for known file types</em> and click <em>OK</em></li>
+ </ol>
+ <h4 id="windows-7">Windows 7</h4>
+ <ol style="list-style-type: decimal">
+ <li>Open <em>Computer</em></li>
+ <li>Click on <em>Organize</em> and choose <em>Folder and search options</em> in the menu</li>
+ <li>Click on the <em>View</em> tab</li>
+ <li>Uncheck <em>Hide extensions for known file types</em> and click <em>OK</em></li>
+ </ol>
+ <h3 id="vidalia-asks-for-a-password">Vidalia asks for a password</h3>
+ <p>You should not have to enter a password when starting Vidalia. If you are prompted for one, you are likely affected by one of these problems:</p>
+ <p><strong>You are already running Vidalia and Tor</strong>: For example, this situation can happen if you installed the Vidalia bundle and now you're trying to run the Tor Browser Bundle. In that case, you will need to close the old Vidalia and Tor before you can run this one.</p>
+ <p><strong>Vidalia crashed, but left Tor running</strong>: If the dialog that prompts you for a control password has a Reset button, you can click the button and Vidalia will restart Tor with a new random control password. If you do not see a Reset button, or if Vidalia is unable to restart Tor for you; go into your process or task manager, and terminate the Tor process. Then use Vidalia to restart Tor.</p>
+ <p>For more information, see the <a href="https://torproject.org/docs/faq.html#VidaliaPassword">FAQ</a> on the Tor Project website.</p>
+ <h3 id="flash-does-not-work">Flash does not work</h3>
+ <p>For security reasons, Flash, Java, and other plugins are currently disabled for Tor. Plugins operate independently from Firefox and can perform activity on your computer that ruins your anonymity.</p>
+ <p>Most YouTube videos work with HTML5, and it is possible to view these videos over Tor. You need to join the <a href="https://www.youtube.com/html5">HTML5 trial</a> on the YouTube website before you can use the HTML5 player.</p>
+ <p>Note that the browser will not remember that you joined the trial once you close it, so you will need to re-join the trial the next time you run the Tor Browser Bundle.</p>
+ <p>Please see the <a href="https://www.torproject.org/torbutton/torbutton-faq.html#noflash">Torbutton FAQ</a> for more information.</p>
+ <h3 id="i-want-to-use-another-browser">I want to use another browser</h3>
+ <p>For security reasons, we recommend that you only browse the web through Tor using the Tor Browser Bundle. It is technically possible to use Tor with other browsers, but by doing so you open yourself up to potential attacks.</p>
+ <h3 id="why-tor-is-slow">Why Tor is slow</h3>
+ <p>Tor can sometimes be a bit slower than your normal Internet connection. After all, your traffic is sent through many different countries, sometimes across oceans around the world!</p>
+ </body>
+</html>
diff --git a/uk/short-user-manual_uk_noimg.xhtml b/uk/short-user-manual_uk_noimg.xhtml
index 6466530..2e03054 100644
--- a/uk/short-user-manual_uk_noimg.xhtml
+++ b/uk/short-user-manual_uk_noimg.xhtml
@@ -39,7 +39,7 @@
<code>gpg --fingerprint 0x63FEE659
</code>
</pre>
- <p>You should see:</p>
+ <p>Ви повинні побачити:</p>
<pre>
<code>pub 2048R/63FEE659 2003-10-16
Key fingerprint = 8738 A680 B84B 3031 A630 F2DB 416F 0610 63FE E659
@@ -50,7 +50,7 @@ uid Erinn Clark <erinn(a)double-helix.org>
sub 2048R/EB399FD7 2003-10-16
</code>
</pre>
- <p>To verify the signature of the package you downloaded, run the following command:</p>
+ <p>Для того, щоб перевірити сигнатуру пакунку, який ви завантажили, виконайте наступну команду:</p>
<pre>
<code>gpg --verify tor-browser-2.2.33-2_en-US.exe.asc tor-browser-2.2.33-2_en-US.exe
</code>
diff --git a/zh_CN/short-user-manual_zh_CN_noimg.xhtml b/zh_CN/short-user-manual_zh_CN_noimg.xhtml
index dcc2932..34750e0 100644
--- a/zh_CN/short-user-manual_zh_CN_noimg.xhtml
+++ b/zh_CN/short-user-manual_zh_CN_noimg.xhtml
@@ -6,12 +6,12 @@
<body>
<h1 id="the-short-user-manual">简明用户手册</h1>
<p>本用户手册所含内容:如何下载与使用 Tor,以及 Tor 无法连接到网络时该怎么办。如果本手册未提供你所需的答案,请发送电子邮件至 help-zh(a)rt.torproject.xn--org()-8n1h080l.</p>
- <p>请注意:由于每天收到大量的电子邮件,而我们提供的支持服务是志愿性的,因此,如未能及时回复,请勿着急。</p>
+ <p>请注意:由于每天收到大量的电子邮件,同时支持服务是志愿性的,如未能及时收到回复,请耐心等待。</p>
<h2 id="how-tor-works">Tor 是如何工作的</h2>
<p>Tor 是一个由虚拟通道组成的网络,用于提高用户的互联网安全和隐私。用户的网络数据发送到公用的互联网之前,Tor 将通过三台随机的服务器(也称为“中继”)来传输这些数据。</p>
<p>上图展示了用户如何通过 Tor 网络来浏览不同的网站。绿色显示器表示 Tor 网络中的中继服务器;三把钥匙表示用户与每个中继之间的加密层。</p>
- <p>Tor 将隐去用户网络通信的来源,并将对用户与 Tor 网络之间的所有数据进行加密。另外,Tor 对于 Tor 网络内部的用户通信也将进行加密,但对于 Tor 网络与最终目的站点之间的通信,Tor 并未进行加密。</p>
- <p>如果你的通信涉及敏感信息,例如使用用户名和密码登录网站,请务必使用 HTTPS(例如,使用 <strong>https</strong>://torproject.org/,而不是 <strong>http</strong>://torproject.org/)。</p>
+ <p>Tor 将隐去用户网络通信的来源,并对用户与 Tor 网络之间的所有数据进行加密。另外,Tor 对于 Tor 网络内部的用户通信也将进行加密,但对于 Tor 网络与最终目的站点之间的通信,Tor 并未进行加密。</p>
+ <p>如果你的通信涉及敏感信息,例如需使用用户名和密码登录网站,请务必使用 HTTPS(例如,使用 <strong>https</strong>://torproject.org/,而不是 <strong>http</strong>://torproject.org/)。</p>
<h2 id="how-to-download-tor">如何下载 Tor</h2>
<p>对于大多数用户,我们推荐使用 <a href="https://www.torproject.org/projects/torbrowser.html">Tor Browser Bundle</a>。该软件包含一个预先配置好的浏览器,可通过 Tor 网络安全地浏览互联网,而且无需安装。只需下载软件包,然后解压文档即可运行 Tor。</p>
<p>获取到 Tor 软件有两种方法。通过 <a href="https://www.torproject.org/">Tor Project 网站</a> 下载,或者使用电子邮件自动回复服务 GetTor。</p>
@@ -19,12 +19,12 @@
<p>如需获取 Windows 版英文 Tor Browser Bundle,请发送电子邮件至 gettor(a)torproject.org ,正文内包含 <strong>windows</strong> 即可。标题部分可不填。</p>
<p>另外,还可以获取 Mac OS X 版本的 Tor Browser Bundle(正文内包含 <strong>macos-i386</strong>),以及 Linux 版本(正文内包含 <strong>linux-i386</strong>,或 <strong>linux-x86_64</strong>,前者用于 32 位系统,后者用于 64 位系统)。</p>
<p>如需其他语言版本的 Tor,请在邮件正文内包含 <strong>help</strong>。你将收到一封电子邮件,内含可用语言版本的列表以及相关的指示说明。</p>
- <p><strong>注意</strong>:Linux 和 Mac OS X 的 Tor 浏览器软件包相当大,Gmail、Hotmail 或雅虎邮箱无法接收。 如果无法获取所需的软件包,请发送邮件至 help-zh(a)rt.torproject.xn--org(),-gn7i1ll1d5erm22ahx18ku4fr34fghgvjihu3i8yqfic188f9i0d.</p>
- <h3 id="tor-for-smartphones">智能手机版的 Tor</h3>
+ <p><strong>注意</strong>:Linux 和 Mac OS X 的 Tor 浏览器软件包相当大,Gmail、Hotmail 或雅虎邮箱无法接收。 如果无法获取所需的软件包,请发送邮件至 help-zh(a)rt.torproject.xn--org(),-gn7i1ll1d5e08rqqec6gnp7a79t7umjl2gl2qlp3bi05azrx.</p>
+ <h3 id="tor-for-smartphones">用于智能手机的 Tor</h3>
<p>在 Android 设备上安装 <em>Orbot</em> 软件包即可使用 Tor 网络。如何下载和安装 Orbot,请参阅 <a href="https://www.torproject.org/docs/android.html.en">Tor Project 网站</a>。</p>
<p>另外,还提供用于 <a href="https://www.torproject.org/docs/N900.html.en">Nokia Maemo/N900</a> 和 <a href="http://sid77.slackware.it/iphone/">Apple iOS</a> 的体验软件包。</p>
- <h3 id="how-to-verify-that-you-have-the-right-version">如何验证你已拥有正确的版本</h3>
- <p>在运行 Tor 浏览器软件包之前,你应该确保你持有正确的版本。</p>
+ <h3 id="how-to-verify-that-you-have-the-right-version">如何验证你获得了正确的版本</h3>
+ <p>在运行 Tor 浏览器软件包之前,应确保你获得了正确的版本。</p>
<p>与你所收到的软件相对应,还有一个与该软件包文件名相同而扩展名为 <strong>.asc</strong> 的文件。这个 .asc 文件即 GPG 签名,用于验证是否下载了你想要的文件。</p>
<p>在验证签名之前,需下载并安装 GnuPG:</p>
<p><strong>Windows</strong>: <a href="http://gpg4win.org/download.html">http://gpg4win.org/download.html</a><br/><strong>Mac OS X</strong>: <a href="http://macgpg.sourceforge.net/">http://macgpg.sourceforge.net/</a><br/><strong>Linux</strong>: 大多数 Linux 发行版已预装 GnuPG 程序。</p>
@@ -39,7 +39,7 @@
<code>gpg --fingerprint 0x63FEE659
</code>
</pre>
- <p>你应该会看到:</p>
+ <p>你将看到:</p>
<pre>
<code>pub 2048R/63FEE659 2003-10-16
Key fingerprint = 8738 A680 B84B 3031 A630 F2DB 416F 0610 63FE E659
@@ -56,9 +56,9 @@ sub 2048R/EB399FD7 2003-10-16
</code>
</pre>
<p>输出的结果应为 <em>Good signature</em>。错误签名表示该文件可能受到篡改。如果遇到错误签名,请把该软件包的下载地址、签名验证方式,以及 GunPG 的输出结果一并发送到 help(a)rt.torproject.org 或 help-zh(a)rt.torproject.xn--org()-8n1h080l.</p>
- <p>当你已完成验证并且输出结果是 <em>Good signature</em>,请把软件包解压缩,然后你应该会看到一个名称类似于 <strong>tor-browser_en-US</strong> 的文件夹。此文件夹包含一个名为 <strong>Docs</strong> 的文件夹,其中有一个 <strong>changelog</strong> 文件。请确保 changelog 里第一行的版本号与文件名中的版本号相符。</p>
+ <p>如果完成验证并且输出结果是 <em>Good signature</em>,请将软件包解压缩,然后将生成一个名称类似于 <strong>tor-browser_en-US</strong> 的文件夹。此文件夹包含一个名为 <strong>Docs</strong> 的文件夹,其中有一个 <strong>changelog</strong> 文件。请确保 changelog 里第一行的版本号与文件名中的版本号相符。</p>
<h3 id="how-to-use-the-tor-browser-bundle">如何使用 Tor Browser Bundle</h3>
- <p>下载 Tor Browser Bundle 并提取文件之后,将会出现一个包含几个文件的文件夹。其中包含一个可执行文件,文件名为“Start Tor Browser“(或”start-tor-browser“,这取决于你的操作系统)。</p>
+ <p>下载 Tor Browser Bundle 并提取文件之后,将会出现一个包含几个文件的文件夹。其中包含一个可执行文件,文件名为“Start Tor Browser”(或“start-tor-browser”,这取决于你的操作系统)。</p>
<p>运行 Tor Browser Bundle 时,首先启动 Vidalia 与 Tor 网络建立连接,成功连接之后将打开 <a href="https://check.torproject.org/">https://check.torproject.org/</a> 页面,以确认用户正在使用 Tor 网络。至此,用户即可开始通过 Tor 访问互联网。</p>
<p>
<em>请注意:务必使用该软件包附带的浏览器,而不是用户自己安装的浏览器。这点至关重要。</em>
@@ -67,13 +67,13 @@ sub 2048R/EB399FD7 2003-10-16
<p>有时,在尝试连接 Tor 网络时 Vidalia 会停滞不前。如果出现这种情况,请确保你已连接到互联网。如需通过代理服务器连接,请参阅下面的 “如何使用代理服务器”。</p>
<p>如果互联网连接正常但 Tor 无法连接到网络,请尝试以下操作:打开 Vidalia 控制面板,点击“消息日志”,然后选择“高级”标签页。Tor 网络无法连接的原因可能在于:</p>
<p><strong>你的系统时钟不准确</strong>:请确保你系统中的日期和时间正确,然后重启 Tor。可能需要把系统时钟与网络时间服务器进行同步。</p>
- <p><strong>防火墙限制</strong>:为了让 Tor 仅使用 80 和 443 端口,请打开 Vidalia 控制面板,点击 <strong>设置</strong> > <strong>网络</strong>,然后选中<strong>防火墙仅允许连接某些端口</strong>。</p>
+ <p><strong>防火墙限制</strong>:为了让 Tor 仅使用 80 和 443 端口,请打开 Vidalia 控制面板,点击<em>设置</em> 和 <em>网络</em>,然后选中<em>防火墙仅允许连接某些端口</em>。</p>
<p><strong>杀毒软件封锁 Tor</strong>:请确保杀毒软件没有封锁 Tor 网络连接。</p>
<p>如果 Tor 仍然无法正常运行,可能是互联网服务提供商 (ISP) 封锁了 Tor。很多时候,可使用不易被封锁的隐藏中继 <strong>Tor 网桥</strong>来突破封锁。</p>
<p>如果因 Tor 无法连接需要帮助,请发送电子邮件到 help-zh(a)rt.torproject.org ,并附上日志文件中相关部分的内容。</p>
<h3 id="how-to-find-a-bridge">如何查找网桥</h3>
<p>如需使用网桥,首先需要获得一个网桥地址:浏览页面 <a href="https://bridges.torproject.org/">bridges.torproject.org</a>,或者发送电子邮件到 bridges(a)torproject.org 。发送电子邮件的方式需确保邮件正文含有 <strong>get bridges</strong> 字样,否则将不会收到回复。请注意:需使用 gmail.com 或 yahoo.com 邮箱来发送该邮件。</p>
- <p>配置一个以上的网桥地址,能让 Tor 的连接在某些网桥无法访问时更加稳定。无法保证当前所用的网桥明天仍然能用,所以应养成时常更新网桥列表的习惯。</p>
+ <p>配置一个以上的网桥地址,能让 Tor 的连接在某些网桥无法访问时更加稳定。无法保证当前所用的网桥以后仍然能用,所以应养成时常更新网桥列表的习惯。</p>
<h3 id="how-to-use-a-bridge">如何使用网桥</h3>
<p>找到可用的网桥后,打开 Vidalia 控制面板,点击 <em>设置</em>,<em>网络</em>,然后勾选 <em>我的 ISP 阻挡了对 Tor 网络的连接</em> 的选项框。在下面的方框里填上网桥地址,点击 <em>确定</em> 并再次启动 Tor。</p>
<h3 id="how-to-use-an-open-proxy">如何使用开放代理</h3>
@@ -81,15 +81,15 @@ sub 2048R/EB399FD7 2003-10-16
<p>如果已对 Tor/Vidalia 进行正确的配置,并获得了 HTTPS、SOCKS4 或 SOCKS5 代理列表,请按照以下步骤进行:</p>
<ol style="list-style-type: decimal">
<li>打开 Vidalia 控制面板,点击 <em>设置</em>。</li>
- <li>点击 <em>网络</em>,选择 <em>使用代理服务器连接互联网</em>。</li>
+ <li>点击 <em>网络</em>,选择<em>使用代理服务器连接互联网</em>。</li>
<li>在 <em>地址</em> 栏输入开放代理地址,可以是主机名或 IP 地址。</li>
<li>输入代理端口。</li>
<li>通常,无需输入用户名和密码。如果需要,请在相应字段填写。</li>
- <li>选择所用代理的 <em>类型</em>,可以是 HTTP/HTTPS、SOCKS4 或 SOCKS5。</li>
- <li>点击 <em>确定</em> 按钮。现在,已将 Vidalia 和 Tor 配置为使用代理连接 Tor 网络。</li>
+ <li>选择所用代理的<em>类型</em>,可以是 HTTP/HTTPS、SOCKS4 或 SOCKS5。</li>
+ <li>点击<em>确定</em>按钮。现在,已将 Vidalia 和 Tor 配置为使用代理连接 Tor 网络。</li>
</ol>
<h2 id="frequently-asked-questions">常见问题</h2>
- <p>本节会回答一些常见的问题。如果这里没有你问题的答案,请发送电子邮件至 help(a)rt.torproject.org 或 help-zh(a)rt.torproject.xn--org()-8n1h080l.</p>
+ <p>本节会回答一些常见的问题。如果这里没有你需要的答案,请发送电子邮件至 help(a)rt.torproject.org 或 help-zh(a)rt.torproject.xn--org()-8n1h080l.</p>
<h3 id="unable-to-extract-the-archive">无法解压文档</h3>
<p>如果你的系统为 Windows 且无法解压文档,请下载并安装 <a href="http://www.7-zip.org/">7-Zip</a>。</p>
<p>如果无法下载 7-Zip,请尝试将 .z 文件重命名为 .zip,然后用 WinZip 解压文档。在重命名之前,需将 Windows 设置为可显示文件扩展名:</p>
@@ -102,14 +102,14 @@ sub 2048R/EB399FD7 2003-10-16
</ol>
<h4 id="windows-vista">Windows Vista</h4>
<ol style="list-style-type: decimal">
- <li>打 <em>我的电脑</em></li>
+ <li>打开<em>我的电脑</em></li>
<li>点击<em>组织</em>,在菜单里选择<em>文件夹和搜索选项</em></li>
<li>点击<em>查看</em>选项卡</li>
<li>取消选中<em>隐藏已知文件类型的扩展名</em>,然后点击<em>确定</em></li>
</ol>
<h4 id="windows-7">Windows 7</h4>
<ol style="list-style-type: decimal">
- <li>打 <em>我的电脑</em></li>
+ <li>打开<em>我的电脑</em></li>
<li>点击<em>组织</em>,在菜单里选择<em>文件夹和搜索选项</em></li>
<li>点击<em>查看</em>选项卡</li>
<li>取消选中<em>隐藏已知文件类型的扩展名</em>,然后点击<em>确定</em></li>
@@ -117,16 +117,16 @@ sub 2048R/EB399FD7 2003-10-16
<h3 id="vidalia-asks-for-a-password">Vidalia 要求输入密码</h3>
<p>启动 Vidalia 时无需输入密码。如果出现密码输入提升,可能存在以下问题:</p>
<p><strong>Vidalia 和 Tor 已在运行</strong>:例如,如果已安装 Vidalia 软件包,在尝试运行 Tor Browser Bundle 时可能出现这种情况。这时需关闭旧版的 Vidalia 和 Tor,然后运行当前版本。</p>
- <p><strong>Vidalia 崩溃了,但 Tor 仍在运行</strong>: 如果控制密码提示框有”重置“按钮, 可点击该按钮。Vidalia 将使用新的随机控制密码重启 Tor。 如果没有”重置“按钮,或者 Vidalia 无法重启 Tor, 请打开进程或任务管理器,结束 Tor 进程,然后再用 Vidalia 来重启 Tor。</p>
+ <p><strong>Vidalia 崩溃了,但 Tor 仍在运行</strong>: 如果控制密码提示框有“重置”按钮, 可点击该按钮。Vidalia 将使用新的随机控制密码重启 Tor。 如果没有“重置”按钮,或者 Vidalia 无法重启 Tor, 请打开进程或任务管理器,结束 Tor 进程,然后再用 Vidalia 来重启 Tor。</p>
<p>更多信息,请参阅 Tor Project 网站上的<a href="https://torproject.org/docs/faq.html#VidaliaPassword">常见问题</a>。</p>
<h3 id="flash-does-not-work">Flash 无法运行</h3>
- <p>出于安全考虑,当前 Tor 禁用了 Flash、Java 和其他插件。插件的运行独立于 Firefox,并且在计算机上某些活动可对你的匿名性造成危害。</p>
- <p>大多数 YouTube 视频兼容 HTML5,通过 Tor 网络可以观看这些视频。需在 YouTube 网站上加入 <a href="https://www.youtube.com/html5">HTML5 体验计划</a> 才能使用 HTML5 播放器。</p>
- <p>请注意:Tor Browser Bundle 中浏览器在关闭后不会记住你已加入体验计划,所以下次运行该软件时需重新加入体验计划。</p>
+ <p>出于安全考虑,当前 Tor 禁用了 Flash、Java 和其他插件。插件的运行独立于 Firefox,并且这些插件在计算机上某些活动可对你的匿名性造成危害。</p>
+ <p>大多数 YouTube 视频兼容 HTML5,通过 Tor 网络可以观看这些视频。在 YouTube 网站上加入 <a href="https://www.youtube.com/html5">HTML5 体验计划</a> 即可使用 HTML5 播放器。</p>
+ <p>请注意:Tor Browser Bundle 中集成的浏览器在关闭后不会记住你已加入体验计划,所以下次运行该软件时需重新加入。</p>
<p>更多信息,请参阅 <a href="https://www.torproject.org/torbutton/torbutton-faq.html#noflash">Torbutton 常见问题</a> 。</p>
<h3 id="i-want-to-use-another-browser">我想使用其它浏览器</h3>
- <p>基于安全理由,我们推荐使用 Tor Browser Bundle 来浏览互联网。在技术上 Tor 可与其它浏览器一起使用,但这样做存在遭受潜在攻击的风险。</p>
+ <p>出于安全考虑,我们建议使用 Tor Browser Bundle 来浏览互联网。在技术上 Tor 可与其它浏览器一起使用,但这样做用户将承担遭受攻击的潜在风险。</p>
<h3 id="why-tor-is-slow">为什么 Tor 这么慢</h3>
- <p>Tor 有时比正常互联网连接慢一些。要知道,你发送的数据需通过多个国家,甚至需跨越海洋大陆才能抵达目的地。</p>
+ <p>Tor 有时比正常互联网连接慢一些。因为你发送的数据需经过多个国家,甚至跨越海洋大陆才能抵达目的地。</p>
</body>
</html>
diff --git a/zh_TW/short-user-manual_zh_TW_noimg.xhtml b/zh_TW/short-user-manual_zh_TW_noimg.xhtml
new file mode 100644
index 0000000..681e5b7
--- /dev/null
+++ b/zh_TW/short-user-manual_zh_TW_noimg.xhtml
@@ -0,0 +1,132 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+ <title/>
+ </head>
+ <body>
+ <h1 id="the-short-user-manual">The Short User Manual</h1>
+ <p>This user manual contains information about how to download Tor, how to use it, and what to do if Tor is unable to connect to the network. If you can't find the answer to your question in this document, email help(a)rt.torproject.org.</p>
+ <p>Please note that we are providing support on a voluntary basis, and we get a lot of emails every single day. There is no need to worry if we don't get back to you straight away.</p>
+ <h2 id="how-tor-works">How Tor works</h2>
+ <p>Tor is a network of virtual tunnels that allows you to improve your privacy and security on the Internet. Tor works by sending your traffic through three random servers (also known as <em>relays</em>) in the Tor network, before the traffic is sent out onto the public Internet.</p>
+ <p>The image above illustrates a user browsing to different websites over Tor. The green monitors represent relays in the Tor network, while the three keys represent the layers of encryption between the user and each relay.</p>
+ <p>Tor will anonymize the origin of your traffic, and it will encrypt everything between you and the Tor network. Tor will also encrypt your traffic inside the Tor network, but it cannot encrypt your traffic between the Tor network and its final destination.</p>
+ <p>If you are communicating sensitive information, for example when logging on to a website with a username and password, make sure that you are using HTTPS (e.g. <strong>https</strong>://torproject.org/, not <strong>http</strong>://torproject.org/).</p>
+ <h2 id="how-to-download-tor">How to download Tor</h2>
+ <p>The bundle we recommend to most users is the <a href="https://www.torproject.org/projects/torbrowser.html">Tor Browser Bundle</a>. This bundle contains a browser preconfigured to safely browse the Internet through Tor, and requires no installation. You download the bundle, extract the archive, and start Tor.</p>
+ <p>There are two different ways to get hold of the Tor software. You can either browse to the <a href="https://www.torproject.org/">Tor Project website</a> and download it there, or you can use GetTor, the email autoresponder.</p>
+ <h3 id="how-to-get-tor-via-email">How to get Tor via email</h3>
+ <p>To receive the English Tor Browser Bundle for Windows, send an email to gettor(a)torproject.org with <strong>windows</strong> in the body of the message. You can leave the subject blank.</p>
+ <p>You can also request the Tor Browser Bundle for Mac OS X (write <strong>macos-i386</strong>), and Linux (write <strong>linux-i386</strong> for 32-bit systems or <strong>linux-x86_64</strong> for 64-bit systems).</p>
+ <p>If you want a translated version of Tor, write <strong>help</strong> instead. You will then receive an email with instructions and a list of available languages.</p>
+ <p><strong>Note</strong>: The Tor Browser Bundles for Linux and Mac OS X are rather large, and you will not be able to receive any of these bundles with a Gmail, Hotmail or Yahoo account. If you cannot receive the bundle you want, send an email to help(a)rt.torproject.org and we will give you a list of website mirrors to use.</p>
+ <h3 id="tor-for-smartphones">Tor for smartphones</h3>
+ <p>You can get Tor on your Android device by installing the package named <em>Orbot</em>. For information about how to download and install Orbot, please see the <a href="https://www.torproject.org/docs/android.html.en">Tor Project website</a>.</p>
+ <p>We also have experimental packages for <a href="https://www.torproject.org/docs/N900.html.en">Nokia Maemo/N900</a> and <a href="http://sid77.slackware.it/iphone/">Apple iOS</a>.</p>
+ <h3 id="how-to-verify-that-you-have-the-right-version">How to verify that you have the right version</h3>
+ <p>Before running the Tor Browser Bundle, you should make sure that you have the right version.</p>
+ <p>The software you receive is accompanied by a file with the same name as the bundle and the extension <strong>.asc</strong>. This .asc file is a GPG signature, and will allow you to verify the file you've downloaded is exactly the one that we intended you to get.</p>
+ <p>Before you can verify the signature, you will have to download and install GnuPG:</p>
+ <p><strong>Windows</strong>: <a href="http://gpg4win.org/download.html">http://gpg4win.org/download.html</a><br/><strong>Mac OS X</strong>: <a href="http://macgpg.sourceforge.net/">http://macgpg.sourceforge.net/</a><br/><strong>Linux</strong>: Most Linux distributions come with GnuPG preinstalled.</p>
+ <p>Please note that you may need to edit the paths and the commands used below to get it to work on your system.</p>
+ <p>Erinn Clark signs the Tor Browser Bundles with key 0x63FEE659. To import Erinn's key, run:</p>
+ <pre>
+ <code>gpg --keyserver hkp://keys.gnupg.net --recv-keys 0x63FEE659
+</code>
+ </pre>
+ <p>After importing the key, verify that the fingerprint is correct:</p>
+ <pre>
+ <code>gpg --fingerprint 0x63FEE659
+</code>
+ </pre>
+ <p>You should see:</p>
+ <pre>
+ <code>pub 2048R/63FEE659 2003-10-16
+ Key fingerprint = 8738 A680 B84B 3031 A630 F2DB 416F 0610 63FE E659
+uid Erinn Clark <erinn(a)torproject.org>
+uid Erinn Clark <erinn(a)debian.org>
+
+uid Erinn Clark <erinn(a)double-helix.org>
+sub 2048R/EB399FD7 2003-10-16
+</code>
+ </pre>
+ <p>To verify the signature of the package you downloaded, run the following command:</p>
+ <pre>
+ <code>gpg --verify tor-browser-2.2.33-2_en-US.exe.asc tor-browser-2.2.33-2_en-US.exe
+</code>
+ </pre>
+ <p>The output should say <em>"Good signature"</em>. A bad signature means that the file may have been tampered with. If you see a bad signature, send details about where you downloaded the package from, how you verified the signature, and the output from GnuPG in an email to help(a)rt.torproject.org.</p>
+ <p>Once you have verified the signature and seen the <em>"Good signature"</em> output, go ahead and extract the package archive. You should then see a directory similar to <strong>tor-browser_en-US</strong>. Inside that directory is another directory called <strong>Docs</strong>, which contains a file called <strong>changelog</strong>. You want to make sure that the version number on the top line of the changelog file matches the version number in the filename.</p>
+ <h3 id="how-to-use-the-tor-browser-bundle">How to use the Tor Browser Bundle</h3>
+ <p>After downloading the Tor Browser Bundle and extracting the package, you should have a directory with a few files in it. One of the files is an executable called "Start Tor Browser" (or "start-tor-browser", depending on your operating system).</p>
+ <p>When you start the Tor Browser Bundle, you will first see Vidalia start up and connect you to the Tor network. After that, you will see a browser confirming that you are now using Tor. This is done by displaying <a href="https://check.torproject.org/">https://check.torproject.org/</a>. You can now browse the Internet through Tor.</p>
+ <p>
+ <em>Please note that it is important that you use the browser that comes with the bundle, and not your own browser.</em>
+ </p>
+ <h3 id="what-to-do-when-tor-does-not-connect">What to do when Tor does not connect</h3>
+ <p>Some users will notice that Vidalia gets stuck when trying to connect to the Tor network. If this happens, make sure that you are connected to the Internet. If you need to connect to a proxy server, see <em>How to use an open proxy</em> below.</p>
+ <p>If your normal Internet connection is working, but Tor still can't connect to the network, try the following; open the Vidalia control panel, click on <em>Message Log</em> and select the <em>Advanced</em> tab. It may be that Tor won't connect because:</p>
+ <p><strong>Your system clock is off</strong>: Make sure that the date and time on your system is correct, and restart Tor. You may need to synchronize your system clock with an Internet time server.</p>
+ <p><strong>You are behind a restrictive firewall</strong>: To tell Tor to only try port 80 and port 443, open the Vidalia control panel, click on <em>Settings</em> and <em>Network</em>, and tick the box that says <em>My firewall only lets me connect to certain ports</em>.</p>
+ <p><strong>Your anti-virus program is blocking Tor</strong>: Make sure that your anti-virus program is not preventing Tor from making network connections.</p>
+ <p>If Tor still doesn't work, it's likely that your Internet Service Provider (ISP) is blocking Tor. Very often this can be worked around with <strong>Tor bridges</strong>, hidden relays that aren't as easy to block.</p>
+ <p>If you need help with figuring out why Tor can't connect, send an email to help(a)rt.torproject.org and include the relevant parts from the log file.</p>
+ <h3 id="how-to-find-a-bridge">How to find a bridge</h3>
+ <p>To use a bridge, you will first have to locate one; you can either browse to <a href="https://bridges.torproject.org/">bridges.torproject.org</a>, or you can send an email to bridges(a)torproject.org. If you do send an email, please make sure that you write <strong>get bridges</strong> in the body of the email. Without this, you will not get a reply. Note that you need to send this email from either a gmail.com or a yahoo.com address.</p>
+ <p>Configuring more than one bridge address will make your Tor connection more stable, in case some of the bridges become unreachable. There is no guarantee that the bridge you are using now will work tomorrow, so you should make a habit of updating your list of bridges every so often.</p>
+ <h3 id="how-to-use-a-bridge">How to use a bridge</h3>
+ <p>Once you have a set of bridges to use, open the Vidalia control panel, click on <em>Settings</em>, <em>Network</em> and tick the box that says <em>My ISP blocks connections to the Tor network</em>. Enter the bridges in the box below, hit <em>OK</em> and start Tor again.</p>
+ <h3 id="how-to-use-an-open-proxy">How to use an open proxy</h3>
+ <p>If using a bridge does not work, try configuring Tor to use any HTTPS or SOCKS proxy to get access to the Tor network. This means even if Tor is blocked by your local network, open proxies can be safely used to connect to the Tor Network and on to the uncensored Internet.</p>
+ <p>The steps below assume you have a functional Tor/Vidalia configuration, and you have found a list of HTTPS, SOCKS4, or SOCKS5 proxies.</p>
+ <ol style="list-style-type: decimal">
+ <li>Open the Vidalia control panel, click on <em>Settings</em>.</li>
+ <li>Click <em>Network</em>. Select <em>I use a proxy to access the Internet</em>.</li>
+ <li>On the <em>Address</em> line, enter the open proxy address. This can be a hostname or an IP Address.</li>
+ <li>Enter the port for the proxy.</li>
+ <li>Generally, you do not need a username and password. If you do, enter the information in the proper fields.</li>
+ <li>Choose the <em>Type</em> of proxy you are using, whether HTTP/HTTPS, SOCKS4, or SOCKS5.</li>
+ <li>Push the <em>OK</em> button. Vidalia and Tor are now configured to use a proxy to access the rest of the Tor network.</li>
+ </ol>
+ <h2 id="frequently-asked-questions">Frequently Asked Questions</h2>
+ <p>This section will answer some of the most common questions. If your question is not mentioned here, please send an email to help(a)rt.torproject.org.</p>
+ <h3 id="unable-to-extract-the-archive">Unable to extract the archive</h3>
+ <p>If you are using Windows and find that you cannot extract the archive, download and install <a href="http://www.7-zip.org/">7-Zip</a>.</p>
+ <p>If you are unable to download 7-Zip, try to rename the file from .z to .zip and use winzip to extract the archive. Before renaming the file, tell Windows to show file extensions:</p>
+ <h4 id="windows-xp">Windows XP</h4>
+ <ol style="list-style-type: decimal">
+ <li>Open <em>My Computer</em></li>
+ <li>Click on <em>Tools</em> and choose <em>Folder Options...</em> in the menu</li>
+ <li>Click on the <em>View</em> tab</li>
+ <li>Uncheck <em>Hide extensions for known file types</em> and click <em>OK</em></li>
+ </ol>
+ <h4 id="windows-vista">Windows Vista</h4>
+ <ol style="list-style-type: decimal">
+ <li>Open <em>Computer</em></li>
+ <li>Click on <em>Organize</em> and choose <em>Folder and search options</em> in the menu</li>
+ <li>Click on the <em>View</em> tab</li>
+ <li>Uncheck <em>Hide extensions for known file types</em> and click <em>OK</em></li>
+ </ol>
+ <h4 id="windows-7">Windows 7</h4>
+ <ol style="list-style-type: decimal">
+ <li>Open <em>Computer</em></li>
+ <li>Click on <em>Organize</em> and choose <em>Folder and search options</em> in the menu</li>
+ <li>Click on the <em>View</em> tab</li>
+ <li>Uncheck <em>Hide extensions for known file types</em> and click <em>OK</em></li>
+ </ol>
+ <h3 id="vidalia-asks-for-a-password">Vidalia asks for a password</h3>
+ <p>You should not have to enter a password when starting Vidalia. If you are prompted for one, you are likely affected by one of these problems:</p>
+ <p><strong>You are already running Vidalia and Tor</strong>: For example, this situation can happen if you installed the Vidalia bundle and now you're trying to run the Tor Browser Bundle. In that case, you will need to close the old Vidalia and Tor before you can run this one.</p>
+ <p><strong>Vidalia crashed, but left Tor running</strong>: If the dialog that prompts you for a control password has a Reset button, you can click the button and Vidalia will restart Tor with a new random control password. If you do not see a Reset button, or if Vidalia is unable to restart Tor for you; go into your process or task manager, and terminate the Tor process. Then use Vidalia to restart Tor.</p>
+ <p>For more information, see the <a href="https://torproject.org/docs/faq.html#VidaliaPassword">FAQ</a> on the Tor Project website.</p>
+ <h3 id="flash-does-not-work">Flash does not work</h3>
+ <p>For security reasons, Flash, Java, and other plugins are currently disabled for Tor. Plugins operate independently from Firefox and can perform activity on your computer that ruins your anonymity.</p>
+ <p>Most YouTube videos work with HTML5, and it is possible to view these videos over Tor. You need to join the <a href="https://www.youtube.com/html5">HTML5 trial</a> on the YouTube website before you can use the HTML5 player.</p>
+ <p>Note that the browser will not remember that you joined the trial once you close it, so you will need to re-join the trial the next time you run the Tor Browser Bundle.</p>
+ <p>Please see the <a href="https://www.torproject.org/torbutton/torbutton-faq.html#noflash">Torbutton FAQ</a> for more information.</p>
+ <h3 id="i-want-to-use-another-browser">I want to use another browser</h3>
+ <p>For security reasons, we recommend that you only browse the web through Tor using the Tor Browser Bundle. It is technically possible to use Tor with other browsers, but by doing so you open yourself up to potential attacks.</p>
+ <h3 id="why-tor-is-slow">Why Tor is slow</h3>
+ <p>Tor can sometimes be a bit slower than your normal Internet connection. After all, your traffic is sent through many different countries, sometimes across oceans around the world!</p>
+ </body>
+</html>
commit e1e35adb7f481a18f0947a20a497ed4b7f544488
Author: Translation commit bot <translation(a)torproject.org>
Date: Thu May 23 13:16:37 2013 +0000
Update translations for orbot_completed
---
values-ar/strings.xml | 98 +++++++++++-----------
values-ja/strings.xml | 12 ++-
values-nb/strings.xml | 224 +++++++++++++++++++++++++++++++++++++++++++++++++
values-zh/strings.xml | 74 ++++++++--------
4 files changed, 321 insertions(+), 87 deletions(-)
diff --git a/values-ar/strings.xml b/values-ar/strings.xml
index 418eedb..3e5b8d3 100644
--- a/values-ar/strings.xml
+++ b/values-ar/strings.xml
@@ -14,15 +14,15 @@
<string name="tor_process_starting">جاري تشغيل تور...</string>
<string name="tor_process_complete">كامل.</string>
<string name="tor_process_waiting">انتظار.</string>
- <string name="not_anonymous_yet">تحذير: حركة مرورك ليست خفية الى الآن! من فضلك قم بتكوين التطبيقات الخاصة بك لإستخدام HTTP proxy 127.0.0.1:8118 أو SOCK4A أو SOKS5 127.0.0.1:9050</string>
- <string name="menu_home">الصفحة الرئيسية</string>
+ <string name="not_anonymous_yet">تحذير: حركة مرورك ليست خفية حتي الآن! من فضلك قم بتكوين التطبيقات الخاصة بك لإستخدام بروكسي HTTP 127.0.0.1:8118 أو SOCK4A أو SOKS5 127.0.0.1:9050</string>
+ <string name="menu_home">القائمة الرئيسية</string>
<string name="menu_browse">تصفّح</string>
<string name="menu_settings">إعدادات</string>
<string name="menu_log">السجل</string>
<string name="menu_info">مساعدة</string>
<string name="menu_apps">تطبيقات</string>
<string name="menu_start">بدء</string>
- <string name="menu_stop">إيقاف</string>
+ <string name="menu_stop">توقف</string>
<string name="menu_about">حول</string>
<string name="menu_wizard">Wizard</string>
<string name="main_layout_download">تحميل</string>
@@ -31,23 +31,23 @@
<string name="button_close">إغلاق</string>
<string name="button_about">حول</string>
<string name="button_clear_log">مسح السجل</string>
- <string name="menu_verify">فحص</string>
+ <string name="menu_verify">تحقق</string>
<string name="menu_exit">خروج</string>
<string name="press_to_start">- اضغط لفترة طويلة للبدء -</string>
- <string name="pref_trans_proxy_group">بروكسي ضمني (يتطلب اذن حساب رووت Root)</string>
+ <string name="pref_trans_proxy_group">بروكسي ضمني (يتطلب اذن حساب رووت)</string>
<string name="pref_trans_proxy_title">بروكسي ضمني</string>
<string name="pref_trans_proxy_summary">عملية توريفاي أوتوماتيكية للتطبيقات</string>
- <string name="pref_transparent_all_title">تور كل شيء</string>
- <string name="pref_transparent_all_summary">حركة مرور الوكيل لجميع التطبيقات عبر تور</string>
+ <string name="pref_transparent_all_title">استخدم تور مع جميع التطبيقات</string>
+ <string name="pref_transparent_all_summary">مرر كل بيانات المرور الخاصة بالتطبيقات عبر تور</string>
<string name="pref_transparent_port_fallback_title">تراجع منفذ البروكسي</string>
- <string name="pref_transparent_port_fallback_summary">WARNING: Circumvents common ports (80, 443, etc). *USE ONLY* if \'All\' or \'App\' mode doesn\'t work.</string>
+ <string name="pref_transparent_port_fallback_summary">تحذير: تتحايل علي المنافذ الشائعة (80, 443, إلى آخره) *استخدم فقط* إذا كان وضع \'كل\' أو \'التطبيق\' لا يعمل.</string>
<string name="pref_transparent_port_title">قائمة المنافذ</string>
- <string name="pref_transparent_port_summary">List of ports to proxy. *USE ONLY* if \'All\' or \'App\' mode doesn\'t work</string>
+ <string name="pref_transparent_port_summary">قائمة بجميع المنافذ إلي البروكسي. *استخدم فقط* إذا كان وضع \'كل\' أو \'التطبيق\' لا يعمل.</string>
<string name="pref_transparent_port_dialog">ادخل المناقذ للبروكسي</string>
<string name="pref_has_root">اطلب إذن رووت</string>
<string name="pref_has_root_summary">اطلب إذن رووت لتفعيل البروكسي الضمني</string>
<string name="status_install_success">تم تثبيت تور بنجاح!</string>
- <string name="status_install_fail">غير قادر على تثبيت ملفات تور. يرجى التحقق من السجل وإعلامنا على البريد الإلكتروني tor-assistants(a)torproject.org</string>
+ <string name="status_install_fail">غير قادر على تثبيت ملفات تور. يرجى مراجعة السجل وإعلامنا على البريد الإلكتروني tor-assistants(a)torproject.org</string>
<string name="title_error">خطأ في التطبيق</string>
<string name="wizard_title">اوربوت</string>
<string name="wizard_btn_tell_me_more">عن اوربوت</string>
@@ -57,20 +57,20 @@
<string name="btn_okay">موافق</string>
<string name="btn_cancel">إلغاء</string>
<!--Welcome Wizard strings (DJH)-->
- <string name="wizard_details">بعض التفاصيل عن أوربوت</string>
- <string name="wizard_details_msg">أوربوت هو تطبيق مفتوح المصدر ويضم تور, LibEvent وPrixovy. يعمل على توفير وكيل HTTP محلي (8118) ووكيل SOCKS (9050) إلى شبكة تور. يتوفر لدى اوربوت القدرة على إرسال جميع حركات مرور الانترنت من خلال تور على الجهاز ذات إذن حساب رووت (root). </string>
+ <string name="wizard_details">بعض التفاصيل عن اوربوت</string>
+ <string name="wizard_details_msg">اوربوت هو تطبيق مفتوح المصدر ويضم تور, LibEvent وPrixovy. يعمل على توفير بروكسي HTTP محلي (8118) وبروكسي SOCKS (9050) إلى شبكة تور. و يتوفر لدى اوربوت ايضاً - علي الاجهزة ذات حساب رووت - القدرة على إرسال جميع حركات مرور التطبيقات إلي تور.</string>
<string name="wizard_permissions_root">تم منح الإذن</string>
- <string name="wizard_permissions_stock">أذونات أوربوت</string>
- <string name="wizard_premissions_msg_root">ممتاز! لقد وجدنا بأنه لديك صلاحية حساب رووت لتمكين أوربوت. سوف نستخدم هذه السلطة بحكمة.</string>
- <string name="wizard_permissions_msg_stock">رغم أنه ليس ضروريا، يمكن ان يصبح أوربوت أداة قوية إذا كان لدى جهازك صلاحية حساب رووت. استخدم الزر بالأسفل لمنح أوربوت قوة أكبر!</string>
- <string name="wizard_permissions_no_root">إذا لم يكن لديك صلاحية حساب رووت أو ليست لديك أدنى فكرة عما نتحدث عنه، تأكد فقط من استخدام تطبيقات تعمل مع أوربوت.</string>
+ <string name="wizard_permissions_stock">أذونات اوربوت</string>
+ <string name="wizard_premissions_msg_root">ممتاز! لقد وجدنا بأنه لديك صلاحية حساب رووت لتمكين اوربوت. سوف نستخدم هذه السلطة بحكمة.</string>
+ <string name="wizard_permissions_msg_stock">رغم أنه ليس ضروريا، يمكن ان يصبح أوربوت أداة قوية إذا كان لدى جهازك صلاحية حساب رووت. استخدم الزر بالأسفل لمنح اوربوت قوة أكبر!</string>
+ <string name="wizard_permissions_no_root">إذا لم يكن لديك صلاحية حساب رووت أو ليست لديك أدنى فكرة عما نتحدث عنه، تأكد فقط من استخدام تطبيقات تعمل مع اوربوت.</string>
<string name="wizard_permissions_consent">أفهم ذلك وأود أن أستمر بدون صلاحيات حساب رووت</string>
- <string name="wizard_permission_enable_root">منح اوربوت صلاحية حساب رووت</string>
+ <string name="wizard_permission_enable_root">امنح اوربوت صلاحية حساب رووت</string>
<string name="wizard_configure">تكوين توريفاي</string>
- <string name="wizard_configure_msg">أوربوت يعطيك الخيار لتوجيه جميع حركات مرور التطبيقات عبر تور او لإختيار التطبيقات بشكل فردي.</string>
- <string name="wizard_configure_all">مرر جميع التطبيقات عبر بروكسي تور</string>
+ <string name="wizard_configure_msg">اوربوت يعطيك الخيار لتوجيه جميع حركات مرور التطبيقات عبر تور او لإختيار التطبيقات بشكل فردي.</string>
+ <string name="wizard_configure_all">مرر جميع التطبيقات عبر تور</string>
<string name="wizard_configure_select_apps">اختر التطبيقات الفردية لتور</string>
- <string name="wizard_tips_tricks">تطبيقات مهيئة لأوربوت</string>
+ <string name="wizard_tips_tricks">تطبيقات مهيئة لاوربوت</string>
<string name="wizard_tips_msg">التطبيقات التالية تم تطويرها حتي تعمل مع اوربوت. اضغط علي ما تريد تثبيتة علي جهازك الأن, أو يمكنك ان تجدهم لاحقاً علي جوجل بلاي, أو علي موقعنا GuardianProject.info أو من خلال F-Droid.org.</string>
<string name="wizard_tips_otrchat">Gibberbot - تطبيق أمن للمراسلة الفورية للأندرويد.</string>
<string name="wizard_tips_proxy">إعدادات البروكسي - تعلم كيفية تكوين التطبيقات لتعمل مع اوربوت</string>
@@ -81,26 +81,26 @@
<string name="wizard_tips_twitter">اضبط البروكسي الخاص بتويتر إلي مستضيف \"localhost\" و المنفذ إلي 8118</string>
<string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
<string name="wizard_proxy_help_info">إعدادات البروكسي</string>
- <string name="wizard_proxy_help_msg">إذا كان تطبيق أندرويد الذي تستخدمه يمكن ان يدعم استخدام بروكسي HTTP او SOCKS , عندها يمكنك تكوينه للإتصال بأوربوت واستخدام تور.\n\n\nإعدادات المستضيف هي 127.0.0.1 او \"المستضيف المحلي\". بالنسبة إلى HTTP, فإن المنفذ هو 8118. أما بالنسبة إلى SOCKS, فإن المنفذ هو 9050. من الأفضل استخدام SOCKS4A او SOCKS5 إذا أمكن.\n \n\n\nيمكنك معرفة المزيد عن استخدام البروكسي علي أندرويد عن طريق زيارة صفحة الأسئلة المتداولة: http://tinyurl.com/proxyandroid\n </string>
+ <string name="wizard_proxy_help_msg">إذا كان تطبيق الأندرويد الذي تستخدمه يمكن ان يدعم استخدام بروكسي HTTP او SOCKS , عندها يمكنك تكوينه للإتصال باوربوت واستخدام تور.\n\n\nإعدادات المستضيف هي 127.0.0.1 او \"المستضيف المحلي\". بالنسبة إلى HTTP, فإن المنفذ هو 8118. أما بالنسبة إلى SOCKS, فإن المنفذ هو 9050. من الأفضل استخدام SOCKS4A او SOCKS5 إذا أمكن.\n \n\n\nيمكنك معرفة المزيد عن استخدام البروكسي علي أندرويد عن طريق زيارة صفحة الأسئلة المتداولة: http://tinyurl.com/proxyandroid\n </string>
<string name="wizard_final">اوربوت جاهز للاستخدام!</string>
<string name="wizard_final_msg">مئات الآلاف من الناس في جميع أنحاء العالم يستخدمون تور لأسباب عديدة.\n\nالصحفيين والمدونين، والمدافعين عن حقوق الإنسان، والضباط والجنود والشركات والمواطنين تحت الأنظمة القمعية، والمواطنين العاديين ... والآن أنت مستعد لتستخدمه مثلهم!</string>
<!--END Welcome Wizard strings (DJH)-->
- <string name="connect_first_time">أنت الأن متصل شبكة تور - لكن هذا لا يعني بأن جهازك في مأمن. يمكنك استخدام خيار \'تحقق\' من القائمة لإختبار المتصفح الخاص بك. \n\n قم بزيارتنا على https://guardianproject.info/apps/orbot او ارسل رسالة إلكترونية الى help(a)guardianproject.info لمعرفة المزيد.</string>
- <string name="tor_check">سيؤدي هذا إلى فتح المتصفح الخاص بك على العنوان https://check.torproject.org من اجل التحقق إذا كان تكوين أوربوت يعمل بشكل صحيح ام لا وبأنك متصل بتور.</string>
+ <string name="connect_first_time">أنت الأن متصل شبكة تور - لكن هذا لا يعني بأن جهازك في مأمن. يمكنك استخدام خيار \'تحقق\' من القائمة لإختبار المتصفح الخاص بك. \n\n قم بزيارتنا على https://guardianproject.info/apps/orbot او ارسل رسالة إلكترونية إلى help(a)guardianproject.info لمعرفة المزيد.</string>
+ <string name="tor_check">سيؤدي هذا إلى فتح المتصفح الخاص بك لزيارة عنوان https://check.torproject.org من اجل التحقق إذا كان تكوين اوربوت يعمل بشكل صحيح ام لا وبأنك متصل بتور.</string>
<string name="pref_hs_group">استضافة الخدمة المخفية</string>
<string name="pref_general_group">عام</string>
<string name="pref_start_boot_title">شغل اوربوت عند فتح الجهاز</string>
<string name="pref_start_boot_summary">فعل اوربوت و اتصل بتور تلقائياً عندما يبدء جهاز الأندرويد الخاص بك بالعمل</string>
<!--New Wizard Strings-->
<!--Title Screen-->
- <string name="wizard_title_msg">اوربوت يجلب شبكة تور للأندرويد!\nتور يساعدك في التغلب على تصفية المحتوى، فحص الاتصال و الرقابة على الشبكات التي تهدد خصوصيتك، و علاقاتك الشخصية و معلوماتك السرية.\nستقوم هذه النافذة بمساعدتك علي ضبط تكوين اوربوت و تور على جهازك.</string>
+ <string name="wizard_title_msg">اوربوت يجلب شبكة تور للأندرويد!\n\nتور يساعدك في التغلب على تصفية المحتوى، فحص الاتصال و الرقابة على الشبكات التي تهدد خصوصيتك، و علاقاتك الشخصية و معلوماتك السرية.\n\nستقوم هذه النافذة بمساعدتك علي ضبط تكوين اوربوت و تور على جهازك.</string>
<!--Warning screen-->
<string name="wizard_warning_title">تحذير</string>
- <string name="wizard_warning_msg">أن تثبيت اوربوت فقط لن يمنحك الخصوصية .\nيجب عليك تكوين اوربوت بشكل صحيح ، و جهازك ، و البرامج الاخري التي تريدها ان تستخدم تور.</string>
+ <string name="wizard_warning_msg">أن تثبيت اوربوت فقط لن يمنحك الخصوصية تلقائياً.\n\nيجب عليك تكوين اوربوت بشكل صحيح ، و جهازك ، و البرامج الاخري التي تريدها ان تستخدم تور.</string>
<!--Permissions screen-->
<string name="wizard_permissions_title">الصلاحيات</string>
- <string name="wizard_permissions_root_msg1">يمكنك اعطاء أوربوت صلاحيات حساب رووت لتشغيل المميزات المتقدمة مثل البروكسي الضمني.</string>
- <string name="wizard_permissions_root_msg2">إن كنت لا تريد فعل ذلك, الرجاء إستخدام برامج معدة للعمل مع اوربوت</string>
+ <string name="wizard_permissions_root_msg1">يمكنك اعطاء اوربوت صلاحيات حساب رووت لتشغيل المميزات المتقدمة مثل البروكسي الضمني.</string>
+ <string name="wizard_permissions_root_msg2">إذا كنت لا تريد أن تفعل هذا, الرجاء إستخدام برامج معدة للعمل مع اوربوت</string>
<string name="wizard_permissions_no_root_msg">يبدو أن جهازك لا يتمتع بصلاحيات حساب رووت.\n\nولتستفيد من من تور عليك استخدام برامج صممت لتعمل مع اوربوت أو التي تدعم بروكسي HTTP أو SOCKS .\n\n</string>
<!--TipsAndTricks screen-->
<string name="wizard_tips_title"> برامج معدة للعمل مع اوربوت</string>
@@ -133,27 +133,27 @@
<string name="pref_use_whispercore_summary">Use the proprietary NetFilter APIs provided by WhisperSystems (required device with WhisperCore installed)</string>-->
<string name="pref_proxy_title">بروكسي الشبكة الصادرة</string>
<string name="pref_proxy_type_title">نوع البروكسي الصادر</string>
- <string name="pref_proxy_type_summary">البروتوكول ليستخدم مع خادم البروكسي: HTTP, HTTPS, Socks4, Socks5</string>
+ <string name="pref_proxy_type_summary">البروتوكول المستخدم لخادم البروكسي: HTTP, HTTPS, Socks4, Socks5</string>
<string name="pref_proxy_type_dialog">أدخل نوع البروكسي</string>
<string name="pref_proxy_host_title">عنوان البروكسي الصادر</string>
- <string name="pref_proxy_host_summary">عنوان خادم البروكسي</string>
- <string name="pref_proxy_host_dialog">أدخل عنوان البروكسي</string>
+ <string name="pref_proxy_host_summary">اسم المضيف خادم البروكسي</string>
+ <string name="pref_proxy_host_dialog">أدخل مضيف البروكسي</string>
<string name="pref_proxy_port_title">منفذ البروكسي الصادر</string>
<string name="pref_proxy_port_summary">منفذ خادم البروكسي</string>
<string name="pref_proxy_port_dialog">أدخل منفذ البروكسي</string>
<string name="status">الحالة</string>
<string name="setting_up_full_transparent_proxying_">يتم إعداد بروكسي ضمني كامل...</string>
- <string name="setting_up_app_based_transparent_proxying_">يتم إعداد البروكسي الشفاف حسب البرامج...</string>
- <string name="transparent_proxying_enabled">البروكسي الضمني مفعل</string>
+ <string name="setting_up_app_based_transparent_proxying_">يتم إعداد البروكسي الضمني حسب البرامج...</string>
+ <string name="transparent_proxying_enabled">البروكسي الضمني مُفعل</string>
<string name="transproxy_enabled_for_tethering_">البروكسي الضمني جاهز للربط!</string>
<string name="warning_error_starting_transparent_proxying_">تحذير: حصل خطأ بتشغيل البروكسي الضمني!</string>
<string name="transproxy_rules_cleared">تم مسح قواعد البروكسي الضمني</string>
<string name="couldn_t_start_tor_process_">لقد تعذر بدء تشغيل تور:</string>
<string name="privoxy_is_running_on_port_">Privoxy يعمل على منفذ:</string>
- <string name="setting_up_port_based_transparent_proxying_">يتم إعداد البروكسي الضمني حسب المنفذ</string>
+ <string name="setting_up_port_based_transparent_proxying_">يتم إعداد البروكسي الضمني حسب المنفذ...</string>
<string name="bridge_error">خطأ بالجسر</string>
- <string name="bridge_requires_ip">لتستخدم ميزة الجسور، يجب عليك ادخال عنوان انترنت لجسر واحد علي الأقل.</string>
- <string name="send_email_for_bridges">أرسل رسالة بريد إلكتروني إلى bridges(a)torproject.org مع عبارة \"get bridges\" بداخل الرسالة من حساب بريد gmail.</string>
+ <string name="bridge_requires_ip">حتي تستطيع إستخدم ميزة الجسور، يجب عليك ادخال عنوان انترنت لجسر واحد علي الأقل.</string>
+ <string name="send_email_for_bridges">أرسل بريد إلكتروني إلى bridges(a)torproject.org مع عبارة \"get bridges\" بداخل الرسالة من حساب بريد gmail.</string>
<string name="error">خطأ</string>
<string name="your_reachableaddresses_settings_caused_an_exception_">إعدادات العنوان القابل للاتصال لديك تسببت بخطأ!</string>
<string name="your_relay_settings_caused_an_exception_">إعدادات المرحلات لديك تسببت بخطأ!</string>
@@ -164,26 +164,26 @@
<string name="fingerprints_nicks_countries_and_addresses_to_exclude">بصمات، الأسماء المستعارة، البلدان و العناوين ليتم استثنائها</string>
<string name="enter_exclude_nodes">أدخل النقاط المستثناه</string>
<string name="strict_nodes">النقاط المشددة</string>
- <string name="use_only_these_specified_nodes">استخدم فقط هذه النقاط المحددة</string>
+ <string name="use_only_these_specified_nodes">استخدم فقط تلك النقاط المحددة</string>
<string name="bridges">الجسور</string>
<string name="use_bridges">استخدم الجسور</string>
<string name="bridges_obfuscated">الجسور الغامضة</string>
<string name="enable_alternate_entrance_nodes_into_the_tor_network">اسمح باستخدام نقاط دخول بديلة إلي شبكة تور</string>
<string name="enable_if_configured_bridges_are_obfuscated_bridges">فعل هذا الخيار إذا كانت الجسور المحددة جسور غامضة</string>
- <string name="ip_address_and_port_of_bridges">عناوين الانترنت و منافذ الجسور</string>
- <string name="enter_bridge_addresses">أدخل عنوان الجسر</string>
+ <string name="ip_address_and_port_of_bridges">عنوان الانترنت و المنفذ للجسور</string>
+ <string name="enter_bridge_addresses">أدخل عناوين الجسور</string>
<string name="relays">المرحلات</string>
<string name="relaying">يرحل</string>
<string name="enable_your_device_to_be_a_non_exit_relay">اسمح لجهازك ليكون مرحل غير نهائي</string>
- <string name="relay_port">منافذ التحويل</string>
+ <string name="relay_port">منفذ المرحل</string>
<string name="listening_port_for_your_tor_relay">المنفذ المصغي لمُرحل تور الخاص بك</string>
- <string name="enter_or_port">أدخل أو منفذ</string>
+ <string name="enter_or_port">أدخل منفذ OR</string>
<string name="relay_nickname">الاسم المستعار للمُرحل</string>
<string name="the_nickname_for_your_tor_relay">الاسم المستعار لمُرحل تور الخاص بك</string>
<string name="enter_a_custom_relay_nickname">أدخل اسم مستعار للمُرحل</string>
<string name="reachable_addresses">العناوين التي يمكن الوصول إليها</string>
<string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">العمل كخدمة من وراء جدار ناري بسياسات تقيدية</string>
- <string name="reachable_ports">المنافذ القابلة للاتصال</string>
+ <string name="reachable_ports">المنافذ التي يمكن الوصول إليها</string>
<string name="ports_reachable_behind_a_restrictive_firewall">منافذ مفتوحة عبر جدار ناري تقيدي</string>
<string name="enter_ports">أدخل المنافذ</string>
<string name="enable_hidden_services">استضافة الخدمة المخفية</string>
@@ -191,12 +191,12 @@
<string name="enter_localhost_ports_for_hidden_services">أدخل المنافذ المحلية للخدمات المخفية</string>
<string name="hidden_service_ports">منافذ الخدمات المخفية</string>
<string name="the_addressable_name_for_your_hidden_service_generated_automatically_">اسم العنوان لخدمتك المخفية (يتم انشائه تلقائياً)</string>
- <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">شغل سجل المعالجة debug</string>
- <string name="project_home">الموقع الرسمي للمشروع(المشاريع):</string>
+ <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">شغل سجل الـdebug ( للمراجعة يجب استخدام adb أو LogCat)</string>
+ <string name="project_home">الموقع الرسمي للمشروع (المشاريع):</string>
<string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/…</string>
<string name="the_tor_license">رخصة استخدام تور</string>
<string name="https_torproject_org">https://torproject.org</string>
- <string name="third_party_software">برامج من جهات أخرى:</string>
+ <string name="third_party_software">برامج من الطرف الثالث:</string>
<string name="tor_version">Tor v0.2.4.3-alpha: https://www.torproject.org</string>
<string name="libevent_version">LibEvent v2.1.1-alpha: http://www.monkey.org/~provos/libevent/</string>
<string name="privoxy_version">Privoxy v3.0.12: http://www.privoxy.org</string>
@@ -205,12 +205,12 @@
<string name="hidden_service_request">هناك برنامج يحاول فتح منفذ لخادم مخفي %S إلي شبكة تور. هذا السلوك آمن إذا كنت تثق بهذا البرنامج.</string>
<string name="found_existing_tor_process">عُثر علي عملية تور سابقة تعمل...</string>
<string name="something_bad_happened">حصل خطأ ما. افحص السجل</string>
- <string name="hidden_service_on">خدمة مخفية تعمل:</string>
+ <string name="hidden_service_on">الخدمات المخفية التي تعمل حالياً:</string>
<string name="unable_to_read_hidden_service_name">غير قادر على قراءة اسم الخدمة المخفية</string>
- <string name="unable_to_start_tor">غير قادر على تشغيل تور:</string>
- <string name="pref_use_sys_iptables_title">استخدم iptables التلقائي</string>
- <string name="pref_use_sys_iptables_summary">استخدم مكونات iptables الموجودة ضمناً بالجهاز بدل النسخة المرفقة مع اوربوت</string>
- <string name="error_installing_binares">لم يتم تثبيت أو تحديث مكونات تور</string>
+ <string name="unable_to_start_tor">غير قادر على بدء تور:</string>
+ <string name="pref_use_sys_iptables_title">استخدم الـiptables التلقائية</string>
+ <string name="pref_use_sys_iptables_summary">استخدم مكونات الـiptables الموجودة ضمناً بالجهاز بدل النسخة المرفقة مع اوربوت</string>
+ <string name="error_installing_binares">غير قادرة على تثبيت أو تحديث تور</string>
<string name="pref_use_persistent_notifications">دائما ضع الأيقونة في شريط الأدوات عندما يكون اوربوت متصلاً</string>
<string name="pref_use_persistent_notifications_title">تنبيهات دائمة</string>
<string name="notification_using_bridges">تم تفعيل الجسور!</string>
diff --git a/values-ja/strings.xml b/values-ja/strings.xml
index 9ebb63f..a859789 100644
--- a/values-ja/strings.xml
+++ b/values-ja/strings.xml
@@ -25,6 +25,8 @@
<string name="menu_stop">停止</string>
<string name="menu_about">情報</string>
<string name="menu_wizard">ウィザード</string>
+ <string name="main_layout_download">ダウンロード</string>
+ <string name="main_layout_upload">アップロード</string>
<string name="button_help">ヘルプ</string>
<string name="button_close">閉じる</string>
<string name="button_about">について</string>
@@ -72,6 +74,12 @@
<string name="wizard_tips_msg">以下のアプリはOrbot用に作られています。それぞれのボタンを押すと今すぐインストールできます。Google Playからも同じものが探せます。</string>
<string name="wizard_tips_otrchat">Gibberbot - 安全なインスタントメッセージアプリ</string>
<string name="wizard_tips_proxy">Proxy Settings - Orbotでアプリを動かすための手順書</string>
+ <string name="wizard_tips_duckgo">DuckDuckGo 検索エンジンアプリ</string>
+ <string name="duckgo_apk_url">https://duckduckgo.com/android/latest.apk</string>
+ <string name="wizard_tips_firefox">Proxy Mobile add-on for Firefox (http://tinyurl.com/getproxymob)</string>
+ <string name="proxymob_setup_url">https://guardianproject.info/releases/proxymob-latest.xpi</string>
+ <string name="wizard_tips_twitter">Twitter proxyを「localhost」と8118番ポートに合わせる</string>
+ <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
<string name="wizard_proxy_help_info">プロキシ設定</string>
<string name="wizard_proxy_help_msg">AndroidアプリがHTTPかSOCKSプロキシを利用できる場合、Orbotを使ってTor接続をすることが可能です。\n\n\n ホスト設定は127.0.0.1またはlocalhostです。HTTPでは使用ポートは8118です。SOCKSでは9050です。可能であればSOCKS4AかSOCKS5の利用を推奨します。\n \n\n\n Android上のプロキシについて学びたい場合は http://tinyurl.com/proxyandroid のFAQを参照してください。\n </string>
<string name="wizard_final">Orbotの準備が完了しました</string>
@@ -100,6 +108,8 @@
<string name="gibberbot_apk_url">https://market.android.com/details?id=info.guardianproject.otr.app.im</string>
<string name="wizard_tips_orweb">Orweb: Torを使う匿名インターネットブラウザ</string>
<string name="orweb_apk_url">https://market.android.com/details?id=info.guardianproject.browser</string>
+ <string name="wizard_tips_play">Google Playで全てのGuardian Projectのアプリを見つける</string>
+ <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject</string>
<!--<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string>
<string name="wizard_tips_proxymob">ProxyMob - Simple Firefox Add-on for setting HTTP, SOCKS and SSL proxy settings</string>
<string name="firefox_apk_url">https://market.android.com/details?id=org.mozilla.firefox</string>
@@ -204,7 +214,7 @@
<string name="pref_use_persistent_notifications">Orbotが接続中はアイコンを常にツールバーに表示</string>
<string name="pref_use_persistent_notifications_title">通知を常に有効化</string>
<string name="notification_using_bridges">ブリッジが有効です!</string>
- <string name="default_bridges"/>
+ <string name="default_bridges"></string>
<string name="set_locale_title">地域を選択</string>
<string name="set_locale_summary">Orbotの地域と言語を選択</string>
<string name="wizard_locale_title">言語を選択</string>
diff --git a/values-nb/strings.xml b/values-nb/strings.xml
new file mode 100644
index 0000000..af9438f
--- /dev/null
+++ b/values-nb/strings.xml
@@ -0,0 +1,224 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+ <string name="app_name">Orbot</string>
+ <string name="internal_web_url">http://orbot/</string>
+ <string name="default_web_url">http://check.torproject.org</string>
+ <string name="secure_default_web_url">https://check.torproject.org</string>
+ <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
+ <string name="control_permission_label">start og stopp Tor</string>
+ <string name="tor_proxy_service_process">torproxyservice</string>
+ <string name="status_starting_up">Orbot starter...</string>
+ <string name="status_activated">Tilkoblet Tor-nettverket</string>
+ <string name="status_disabled">\"Orbot er deaktivert</string>
+ <string name="status_shutting_down">Orbot skrur seg av</string>
+ <string name="tor_process_starting">Starter Tor...</string>
+ <string name="tor_process_complete">ferdig.</string>
+ <string name="tor_process_waiting">venter.</string>
+ <string name="not_anonymous_yet">ADVARSEL: Trafikken din er ikke anonym helt enda! Vær vennlig og konfigurer applikasjonene dine til å bruke HTTP proxy 127.0.0.1:8118 eller SOCKS4A eller SOCKS5 proxy 127.0.0.1:9050</string>
+ <string name="menu_home">Hjem</string>
+ <string name="menu_browse">Gå til</string>
+ <string name="menu_settings">Innstillinger</string>
+ <string name="menu_log">Logg</string>
+ <string name="menu_info">Hjelp</string>
+ <string name="menu_apps">Applikasjoner</string>
+ <string name="menu_start">Start</string>
+ <string name="menu_stop">Stopp</string>
+ <string name="menu_about">About</string>
+ <string name="menu_wizard">Wizard</string>
+ <string name="main_layout_download">Last ned</string>
+ <string name="main_layout_upload">Last opp</string>
+ <string name="button_help">Hjelp</string>
+ <string name="button_close">Avslutt</string>
+ <string name="button_about">Om</string>
+ <string name="button_clear_log">Slett Logg</string>
+ <string name="menu_verify">Check</string>
+ <string name="menu_exit">Exit</string>
+ <string name="press_to_start">- trykk lenge for å starte -</string>
+ <string name="pref_trans_proxy_group">Transparent Proxy (Krever Root)</string>
+ <string name="pref_trans_proxy_title">Transparent Proxy</string>
+ <string name="pref_trans_proxy_summary">Automatisk Torifisering av apps</string>
+ <string name="pref_transparent_all_title">Tor All Trafikk</string>
+ <string name="pref_transparent_all_summary">Proxytrafikk for alle apper gjennom Tor</string>
+ <string name="pref_transparent_port_fallback_title">Proxyport fallback</string>
+ <string name="pref_transparent_port_fallback_summary">ADVARSEL: Omgår vanlige porter (80, 443, etc). *KUN BRUK* hvis \'Alle\'- eller \'App\'-modus ikke virker.</string>
+ <string name="pref_transparent_port_title">Port Liste</string>
+ <string name="pref_transparent_port_summary">Liste over porter som skal gjennom proxy. *KUN BRUK* hvis \'Alle\'- eller \'App\'-modus ikke virker.</string>
+ <string name="pref_transparent_port_dialog">Angi porter som skal gjennom proxy</string>
+ <string name="pref_has_root">Request Root Access</string>
+ <string name="pref_has_root_summary">>Request root access for transparent proxying</string>
+ <string name="status_install_success">Suksess! Tor-binærene ble installert.</string>
+ <string name="status_install_fail">Tors binærfiler kunne ikke installeres. Vennligst sjekk loggen og informer tor-assistants(a)torproject.org</string>
+ <string name="title_error">Applikasjonsfeil</string>
+ <string name="wizard_title">Orbot</string>
+ <string name="wizard_btn_tell_me_more">Om Orbot</string>
+ <string name="btn_next">Neste</string>
+ <string name="btn_back">Tilbake</string>
+ <string name="btn_finish">Ferdig</string>
+ <string name="btn_okay">Ok</string>
+ <string name="btn_cancel">Avbryt</string>
+ <!--Welcome Wizard strings (DJH)-->
+ <string name="wizard_details">Informasjon om Orbot</string>
+ <string name="wizard_details_msg">Orbot er åpen programvare som inneholder Tor, LibEvent og Privoxy. Det leverer en lokal HTTP proxy (8118) og en SOCKS proxy (9050) tilkobling til Tor nettverket. Orbot kan også, med rot-tilgang, sende all internett-trafikk gjennom Tor.</string>
+ <string name="wizard_permissions_root">Tilgang Innvilget</string>
+ <string name="wizard_permissions_stock">Orbot Tilgangsnivåer</string>
+ <string name="wizard_premissions_msg_root">Glimrende! Vi ser du har aktivert rot-tilgang for Orbot. Vi skal bruke disse kreftene klokt.</string>
+ <string name="wizard_permissions_msg_stock">Selv om det ikke er påkrevd, vil Orbot være et kraftigere verktøy hvis du har rot-tilgang på apparatet ditt. Bruk knappen under for å gi Orbot superkrefter!</string>
+ <string name="wizard_permissions_no_root">Hvis du ikke har rot-tilgang (eller ikke aner hva vi snakker om), sørg ihvertfall for å bruke programmer som er kompatible med Orbot.</string>
+ <string name="wizard_permissions_consent">Jeg forstår og ønsker å fortsette uten Superbruker.</string>
+ <string name="wizard_permission_enable_root">Gi Orbot tilgang.</string>
+ <string name="wizard_configure">Konfigurer Torification</string>
+ <string name="wizard_configure_msg">Orbot gir deg muligheten til å sende all applikasjons-trafikk gjennom Tor ELLER å velge applikasjonene individuelt.</string>
+ <string name="wizard_configure_all">Proxytrafikk for alle apper gjennom Tor</string>
+ <string name="wizard_configure_select_apps">Velg individuelle apps som skal brukes med Tor</string>
+ <string name="wizard_tips_tricks">Orbot-aktiverte apps</string>
+ <string name="wizard_tips_msg">Appene under er utviklet for å fungere sammen med Orbot. Klikk på hver enkelt for å installere nå, eller du kan finne dem senere på Google Play, på nettsiden GuardianProject.info eller via F-Droid.org</string>
+ <string name="wizard_tips_otrchat">Gibberbot - Sikker lynmeldingsklient til Android</string>
+ <string name="wizard_tips_proxy">Proxy-innstillinger - Lær hvordan du konfigurerer apper til å fungere med Orbot</string>
+ <string name="wizard_tips_duckgo">DuckDuckGo søkemotor app</string>
+ <string name="duckgo_apk_url">https://duckduckgo.com/android/latest.apk</string>
+ <string name="wizard_tips_firefox">Proxy Mobile tillegg til Firefox (http://tinyurl.com/getproxymob)</string>
+ <string name="proxymob_setup_url">https://guardianproject.info/releases/proxymob-latest.xpi</string>
+ <string name="wizard_tips_twitter">Sett Twitters proxy til \"localhost\" og port 8118</string>
+ <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
+ <string name="wizard_proxy_help_info">Proxyinnstillinger</string>
+ <string name="wizard_proxy_help_msg">Hvis Android-appen du bruker støtter bruken av en HTTP- eller SOCKS-proxy, så kan du konfigurere den til å koble til Orbot og bruke Tor.\n\n\nVertens innstillinger er 127.0.0.1 eller \"localhost\". For HTTP er porten 8118. For SOCKS er proxyen 9050. Du kan bruke SOCKS4A eller SOCKS5 om mulig.\n\n\n\nDu kan lære mer om proxyer på Android i FAQ på: http://tinyurl.com/proxyandroid\n </string>
+ <string name="wizard_final">Orbot er klar!</string>
+ <string name="wizard_final_msg">Hundretusener av mennesker over hele verden bruker Tor til en lang rekke forskjellige formål.\n\nJournalister og bloggere, menneskerettighetsforkjempere, politietterforskere, militære, bedrifter, mennesker i undertrykkende regimer, og vanlige borgere...og nå er du klar til å bruke det også!</string>
+ <!--END Welcome Wizard strings (DJH)-->
+ <string name="connect_first_time">Du er nå tilkoblet Tor-nettverket - men det betyr IKKE at ditt apparat er sikret. Du kan bruke \"Sjekk\" valget fra menyen for å sjekke din nettleser.\n\nBesøk oss på https://guardianproject.info/apps/orbot eller send en email til help(a)guardianproject.info for å få vite mer.</string>
+ <string name="tor_check">Dette vil åpne din nettleser på https://check.torproject.org og sjekke om Orbot er riktig innstilt og om du er koblet til Tor.</string>
+ <string name="pref_hs_group">Hidden service hosting</string>
+ <string name="pref_general_group">Generelt</string>
+ <string name="pref_start_boot_title">Start Orbot ved oppstart</string>
+ <string name="pref_start_boot_summary">Start Orbot og Tor automatisk når din Android starter opp.</string>
+ <!--New Wizard Strings-->
+ <!--Title Screen-->
+ <string name="wizard_title_msg">Orbot bringer Tor til Android!\n\nTor hjelper deg med å forsvare deg mot innholdsfiltrering, trafikkanalyse og nettverksovervåkning som kan true ditt personvern, din konfidensielle informasjon og dine personlige forhold.\n\nDenne steg-for-steg guiden hjelper deg med å konfigurere Orbot og Tor på ditt apparat.</string>
+ <!--Warning screen-->
+ <string name="wizard_warning_title">Advarsel</string>
+ <string name="wizard_warning_msg">Installering av Orbot vil ikke automatisk anonymisere mobiltrafikken din.\n\nDu må konfigurere Orbot skikkelig for å bruke enheten og andre apper med Tor.</string>
+ <!--Permissions screen-->
+ <string name="wizard_permissions_title">Tillatelser</string>
+ <string name="wizard_permissions_root_msg1">Du kan velge å gi Orbot \'Superuser\'-tilgang for å aktivere avanserte instillinger, som Transparent Proxy.</string>
+ <string name="wizard_permissions_root_msg2">Hvis du ikke vil dette, sørg for å bruke appene som er lagd for å virke med Orbot</string>
+ <string name="wizard_permissions_no_root_msg">Enheten din ser ikke ut til ha root eller gi \'Superuser\'-tilgang.\n\nFor å utnytte Tor fullt ut, må du bruke apper som er lagd for å fungere med Orbot, eller som støtter HTTP eller SOCKS-proxy innstillinger.\n\n\n</string>
+ <!--TipsAndTricks screen-->
+ <string name="wizard_tips_title">Orbot-aktiverte apps</string>
+ <string name="wizard_tips_gibberbot">Gibberbot: Sikker chat app med Off-The-Record kryptering</string>
+ <string name="gibberbot_apk_url">https://guardianproject.info/releases/gibberbot-latest.apk</string>
+ <string name="wizard_tips_orweb">Orweb: Personverns-forsterket nettleser som virker gjennom Tor</string>
+ <string name="orweb_apk_url">https://market.android.com/details?id=info.guardianproject.browser</string>
+ <string name="wizard_tips_play">Finn alle apps fra Guardian Project på Google Play</string>
+ <string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject</string>
+ <!--<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string>
+ <string name="wizard_tips_proxymob">ProxyMob - Simple Firefox Add-on for setting HTTP, SOCKS and SSL proxy settings</string>
+ <string name="firefox_apk_url">https://market.android.com/details?id=org.mozilla.firefox</string>
+ <string name="proxymob_url">https://addons.mozilla.org/mobile/downloads/latest/251558/type:attachment/a…</string>-->
+ <!--Transparent Proxy screen-->
+ <string name="wizard_transproxy_title">Transparent Proxy</string>
+ <string name="wizard_transproxy_msg">Dette tillater appene dine å automatisk kjøre gjennom Tor-nettverket uten konfigurasjon</string>
+ <string name="wizard_transproxy_hint">(Kryss av i denne boksen hvis du ikke har peiling på hva vi snakker om)</string>
+ <string name="wizard_transproxy_none">Ingen</string>
+ <string name="pref_transparent_tethering_title">Tor Tethering</string>
+ <string name="pref_transparent_tethering_summary">Aktiver Tor Transparent Proxy for Wifi og USB Tethered enheter (krever omstart)</string>
+ <string name="button_grant_superuser">Krev superbruker tilgang</string>
+ <string name="pref_select_apps">Velg apps</string>
+ <string name="pref_select_apps_summary">Velg apper som skal sendes gjennom Tor</string>
+ <string name="pref_node_configuration">Node konfigurering</string>
+ <string name="pref_node_configuration_summary">Dette er avanserte innstillinger som kan redusere anonymiteten din</string>
+ <string name="pref_entrance_node">Inngangsnoder</string>
+ <string name="pref_entrance_node_summary">Fingeravtrykk, kallenavn, land og adresser til første hoppet</string>
+ <string name="pref_entrance_node_dialog">Angi inngangsnoder</string>
+ <!--<string name="pref_use_whispercore">Use WhisperCore</string>
+<string name="pref_use_whispercore_summary">Use the proprietary NetFilter APIs provided by WhisperSystems (required device with WhisperCore installed)</string>-->
+ <string name="pref_proxy_title">Utgående nettverksproxy</string>
+ <string name="pref_proxy_type_title">Utgående proxytype</string>
+ <string name="pref_proxy_type_summary">Protokoller som skal brukes med proxyserver: HTTP, HTTPS, Socks4, Socks5</string>
+ <string name="pref_proxy_type_dialog">Angi proxytype</string>
+ <string name="pref_proxy_host_title">Utgående proxyvert</string>
+ <string name="pref_proxy_host_summary">Proxyserverens vertsnavn</string>
+ <string name="pref_proxy_host_dialog">Angi proxyvert</string>
+ <string name="pref_proxy_port_title">Utgående proxyport</string>
+ <string name="pref_proxy_port_summary">Proxyserverens port</string>
+ <string name="pref_proxy_port_dialog">Angi proxyport</string>
+ <string name="status">Status</string>
+ <string name="setting_up_full_transparent_proxying_">Konfigurerer full transparent proxy...</string>
+ <string name="setting_up_app_based_transparent_proxying_">Konfigurerer app-basert transparent proxy...</string>
+ <string name="transparent_proxying_enabled">Transparent proxy AKTIVERT</string>
+ <string name="transproxy_enabled_for_tethering_">TransProxy aktivert for Tethering!</string>
+ <string name="warning_error_starting_transparent_proxying_">ADVARSEL: Feil under oppstart av transparent proxy!</string>
+ <string name="transproxy_rules_cleared">TransProxy reglene fjernet</string>
+ <string name="couldn_t_start_tor_process_">Kunne ikke starte Tor-prosess:</string>
+ <string name="privoxy_is_running_on_port_">Privoxy kjører på port:</string>
+ <string name="setting_up_port_based_transparent_proxying_">Konfigurerer portbasert transparent proxy...</string>
+ <string name="bridge_error">Brofeil</string>
+ <string name="bridge_requires_ip">For å bruke disse brofunksjonene, må du angi minst en broadresse.</string>
+ <string name="send_email_for_bridges">Send en e-post til bridges(a)torproject.org med tekstlinjen \"get bridges\" som eneste innhold i en e-post fra en gmail-konto.</string>
+ <string name="error">Feil</string>
+ <string name="your_reachableaddresses_settings_caused_an_exception_">Dine \"adresser som kan nås\"-innstillinger forårsaket et unntak!</string>
+ <string name="your_relay_settings_caused_an_exception_">Relé-innstillingene dine forårsaket et unntak!</string>
+ <string name="exit_nodes">Utgående noder</string>
+ <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Fingeravtrykk, kallenavn, land og adresser for siste hopp</string>
+ <string name="enter_exit_nodes">Angi utgående noder</string>
+ <string name="exclude_nodes">Ekskluder noder</string>
+ <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Fineravtrykk, kallenavn, land og adresser som skal ekskluderes</string>
+ <string name="enter_exclude_nodes">Angi ekskluderte noder</string>
+ <string name="strict_nodes">Strikte noder</string>
+ <string name="use_only_these_specified_nodes">Bruk *bare* disse spesifiserte nodene</string>
+ <string name="bridges">Broer</string>
+ <string name="use_bridges">Bruk broer</string>
+ <string name="bridges_obfuscated">Maskerte broer</string>
+ <string name="enable_alternate_entrance_nodes_into_the_tor_network">Aktiver alternative inngangsnoder til Tor-nettverket</string>
+ <string name="enable_if_configured_bridges_are_obfuscated_bridges">Aktiver hvis de konfigurerte broene er maskerte broer</string>
+ <string name="ip_address_and_port_of_bridges">IPadresser og broporter</string>
+ <string name="enter_bridge_addresses">Angi broadresser</string>
+ <string name="relays">Reléer</string>
+ <string name="relaying">Videresending</string>
+ <string name="enable_your_device_to_be_a_non_exit_relay">Aktiver enheten din som et relé uten utgående trafikk</string>
+ <string name="relay_port">Relé-port</string>
+ <string name="listening_port_for_your_tor_relay">Porten Tor-reléet ditt lytter på</string>
+ <string name="enter_or_port">Angi OR-port</string>
+ <string name="relay_nickname">Reléets kallenavn</string>
+ <string name="the_nickname_for_your_tor_relay">Kallenavnet på ditt Tor-relé</string>
+ <string name="enter_a_custom_relay_nickname">Angi et egendefinert kallenavn på reléet</string>
+ <string name="reachable_addresses">Adresser som kan nås</string>
+ <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Kjør som en klient bak en brannmur med restriktive regler</string>
+ <string name="reachable_ports">Porter som kan nås</string>
+ <string name="ports_reachable_behind_a_restrictive_firewall">Porter som kan nås bak en restriktiv brannmur</string>
+ <string name="enter_ports">Angi porter</string>
+ <string name="enable_hidden_services">Hidden service hosting</string>
+ <string name="run_servers_accessible_via_the_tor_network">Tillatt at server på enheten er tilgjengelig via Tor-nettverket</string>
+ <string name="enter_localhost_ports_for_hidden_services">angi localhost-portene til hidden services</string>
+ <string name="hidden_service_ports">Hidden service porter</string>
+ <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">det adresserbare navnet på din hidden service (generert automatisk)</string>
+ <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">aktiver feilsøkingslogg for output (må bruke adb eller aLogCat for å vise)</string>
+ <string name="project_home">Prosjektets nettside(r):</string>
+ <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/…</string>
+ <string name="the_tor_license">Tor-lisensen</string>
+ <string name="https_torproject_org">https://torproject.org</string>
+ <string name="third_party_software">Tredjepartsprogramvare:</string>
+ <string name="tor_version">Tor v0.2.4.3-alpha: https://www.torproject.org</string>
+ <string name="libevent_version">LibEvent v2.1.1-alpha: http://www.monkey.org/~provos/libevent/</string>
+ <string name="privoxy_version">Privoxy v3.0.12: http://www.privoxy.org</string>
+ <string name="iptables_version">Iptables v1.4.7: http://www.netfilter.org</string>
+ <string name="openssl_version">OpenSSL v0.9.8h: http://www.openssl.org</string>
+ <string name="hidden_service_request">En app vil åpne den skjulte tjenesteporten %S til Tor-nettverket. Dette er trygt hvis du stoler på appen. </string>
+ <string name="found_existing_tor_process">fant eksisterende Tor-prosess</string>
+ <string name="something_bad_happened">Noe alvorlig skjedde. Sjekk loggen.</string>
+ <string name="hidden_service_on">hidden service på:</string>
+ <string name="unable_to_read_hidden_service_name">kunne ikke lese hidden service navnet</string>
+ <string name="unable_to_start_tor">Kunne ikke starte Tor:</string>
+ <string name="pref_use_sys_iptables_title">Bruk standard Iptables</string>
+ <string name="pref_use_sys_iptables_summary">bruk de innebygde iptables-binærene istedenfor de som kommer med Orbot</string>
+ <string name="error_installing_binares">Tor-binærene kunne ikke installeres eller oppgraderes.</string>
+ <string name="pref_use_persistent_notifications">Behold ikonet i verktøylinjen mens Orbot er tilkoblet</string>
+ <string name="pref_use_persistent_notifications_title">Alltid-På Varslinger</string>
+ <string name="notification_using_bridges">Broer aktivert!</string>
+ <string name="default_bridges"></string>
+ <string name="set_locale_title">Angi land</string>
+ <string name="set_locale_summary">Velg landet og språket til Orbot</string>
+ <string name="wizard_locale_title">Velg språk</string>
+ <string name="wizard_locale_msg">Fortsett med standard eller endre til gjeldende språk</string>
+ <string name="powered_by">driftet av Tor-prosjektet</string>
+ <string name="btn_save_settings">Lagre Inntillinger</string>
+</resources>
diff --git a/values-zh/strings.xml b/values-zh/strings.xml
index 2a7ed48..38db494 100644
--- a/values-zh/strings.xml
+++ b/values-zh/strings.xml
@@ -37,14 +37,14 @@
<string name="pref_trans_proxy_group">透明代理(需要 Root 权限)</string>
<string name="pref_trans_proxy_title">透明代理</string>
<string name="pref_trans_proxy_summary">应用程序自动使用 Tor</string>
- <string name="pref_transparent_all_title">所有应用程序使用 T</string>
+ <string name="pref_transparent_all_title">所有应用程序使用 Tor</string>
<string name="pref_transparent_all_summary">所有应用程序都通过 Tor 连接网络</string>
<string name="pref_transparent_port_fallback_title">备用代理端口</string>
<string name="pref_transparent_port_fallback_summary">警告:避免使用常用端口(80、443 等)。仅在“应用程序”或“应用程序”模式无法工作时使用。</string>
<string name="pref_transparent_port_title">端口列表</string>
<string name="pref_transparent_port_summary">代理端口列表。仅在“应用程序”或“应用程序”模式无法工作时使用。</string>
<string name="pref_transparent_port_dialog">输入代理端口</string>
- <string name="pref_has_root">请求 Root 权限</string>
+ <string name="pref_has_root">请求 Root 访问权限</string>
<string name="pref_has_root_summary">为透明代理请求获取 Root 访问权限</string>
<string name="status_install_success">Tor 程序安装成功!</string>
<string name="status_install_fail">Tor 程序无法安装。请查看日志并将其发送到 tor-assistants(a)torproject.org</string>
@@ -61,33 +61,33 @@
<string name="wizard_details_msg">Orbot 是一个包含 Tor、LibEvent 和 Privoxy 的开源程序。它使用本地 HTTP 代理 (8118) 和 SOCKS 代理 (9050) 来接入到 Tor 网络。对于已获得 ROOT 权限的设备,利用 Orbot,所有应用程序都可通过 Tor 来进行网络通讯。</string>
<string name="wizard_permissions_root">已获取权限</string>
<string name="wizard_permissions_stock">Orbot 权限</string>
- <string name="wizard_premissions_msg_root">好极了!我们检测到您已获取 ROOT 权限并可用于 Orbot 。在需要的时候我们将可以使用这个强大的功能。</string>
- <string name="wizard_permissions_msg_stock">虽然并非必须,但如果您的设备拥有 ROOT 权限将使 Orbot 成为更强大的工具。使用下面的按钮来让 Orbot 获得超强的能力吧!</string>
- <string name="wizard_permissions_no_root">如果您没有 ROOT 权限或不明白我们谈论的内容,那只能使用那些 Orbot 能支持的应用程序了。</string>
+ <string name="wizard_premissions_msg_root">好极了!我们检测到 Orbot 已获取 Root 权限 。我们会谨慎地使用这一权限。</string>
+ <string name="wizard_permissions_msg_stock">虽非必须,但是具有 Root 访问权限的设备可以让 Orbot 变得更强大。请使用下面的按钮授予 Orbot 这一强大的能力!</string>
+ <string name="wizard_permissions_no_root">如果没有 Root 访问权限或不明白此处所说的内容,只需确保 Orbot 支持所用的应用即可。</string>
<string name="wizard_permissions_consent">我明白并愿意在未获取 Root 权限的情况下继续操作</string>
- <string name="wizard_permission_enable_root">为 Orbot 获取 ROOT 权限</string>
- <string name="wizard_configure">Tor 强化配置</string>
- <string name="wizard_configure_msg">Orbot 可以让您设定所有的应用程序都通过 Tor 进行网络通讯或选择使用 Tor 进行网络通讯的单独应用程序。</string>
- <string name="wizard_configure_all">通过 Tor 代理所有应用程序</string>
- <string name="wizard_configure_select_apps">选择需要使用 Tor 的应用程序</string>
+ <string name="wizard_permission_enable_root">为 Orbot 获取 Root 权限</string>
+ <string name="wizard_configure">配置 Tor 网络</string>
+ <string name="wizard_configure_msg">Orbot 提供了选项,可指定所有应用程序使用 Tor 网络或指定某些应用通过 Tor 网络进行通讯。</string>
+ <string name="wizard_configure_all">所有应用程序都使用 Tor</string>
+ <string name="wizard_configure_select_apps">选择使用 Tor 的应用程序</string>
<string name="wizard_tips_tricks">Orbot 支持的应用</string>
- <string name="wizard_tips_msg">下面的应用程序是针对 Orbot 开发的。您可以点击下面的按钮进行安装或到 Google Play 商店、\nGuardianProject.info 网站和通过 F-Droid.org 进行查找。</string>
- <string name="wizard_tips_otrchat">Gibberbot - Android 上安全的即时通讯客户端</string>
- <string name="wizard_tips_proxy">代理设置 - 学习如何配置应用程序来使之与 Orbot 协同工作</string>
- <string name="wizard_tips_duckgo">DuckDuckGo 搜索引擎:着重隐私保护,不会记录用户的个人信息。</string>
+ <string name="wizard_tips_msg">以下应用可与 Orbot 一起使用。点击下面的按钮安装,也可以通过 Google Play 商店、GuardianProject.info 网站或 F-Droid.org 查找。</string>
+ <string name="wizard_tips_otrchat">Gibberbot - Android 设置上的安全即时通讯客户端</string>
+ <string name="wizard_tips_proxy">代理设置 - 学习如何配置应用程序使用 Orbot</string>
+ <string name="wizard_tips_duckgo">DuckDuckGo 搜索引擎应用程序</string>
<string name="duckgo_apk_url">https://duckduckgo.com/android/latest.apk</string>
- <string name="wizard_tips_firefox">Firefox 移动客户端代理插件</string>
+ <string name="wizard_tips_firefox">用于 Firefox 的 Proxy Mobile 扩展 (http://tinyurl.com/getproxymob)</string>
<string name="proxymob_setup_url">https://guardianproject.info/releases/proxymob-latest.xpi</string>
- <string name="wizard_tips_twitter">Twitter 的代理设置为主机:localhost ,端口:8118 。</string>
+ <string name="wizard_tips_twitter">将 Twitter 代理的主机设置 localhost 并将端口设置为 8118</string>
<string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
<string name="wizard_proxy_help_info">代理设置</string>
- <string name="wizard_proxy_help_msg">如果您正在使用的 Android 应用程序支持使用 HTTP 或 SOCKS 代理,那么您可以将它与 Orbot 进行关联配置后再使用 Tor。\n\n 主机设置为 127.0.0.1 或 localhost。对于 HTTP,端口应设置为 8118;对于 SOCKS,端口应设置为 9050。如果有可能您应该尽量使用 SOCKS4A 或 SOCKS5 代理。\n\n 您可以在 http://tinyurl.com/proxyandroid 的 FAQ(常见问题)中了解更多在 Android 上使用代理的知识。</string>
+ <string name="wizard_proxy_help_msg">如果 Android 应用程序支持 HTTP 或 SOCKS 代理,那么可其进行配置以连接 Orbot 并使用 Tor 网络。\n\n主机设置为 127.0.0.1 或 localhost。对于 HTTP,端口设置为 8118;对于 SOCKS,端口设置为 9050。如果可以,请尽量使用 SOCKS4A 或 SOCKS5 代理。\n\n更多有关 Android 代理信息,请参阅 http://tinyurl.com/proxyandroid 中的常见问题</string>
<string name="wizard_final">Orbot 已就绪!</string>
- <string name="wizard_final_msg">由于各种原因全世界有数以万计的人在使用 Tor:\n 记者和博客、人权工作者、法律工作者、军人、企业、专制政权下的人民,以及像你我一样的普通公民...\n 现在您亦已准备就绪,欢迎您!</string>
+ <string name="wizard_final_msg">在世界各地成有千上万的人出于各种各样的原因需要使用 Tor:\n\n记者和博客、人权工作者、法律工作者、军人、企业、专制国家的人民,以及像你我一样的普通公民...\n 现在你已准备就绪,欢迎加入!</string>
<!--END Welcome Wizard strings (DJH)-->
- <string name="connect_first_time">您已成功连接到 Tor 网络\n- 但这并不意味着您的设备是安全的,您可以使用菜单中的【检查】选项来测试您的浏览器。\n\n了解更多信息请访问:\nhttps://guardianproject.info/apps/orbot \n或发送邮件到:\nhelp(a)guardianproject.info 。</string>
+ <string name="connect_first_time">已成功连接 Tor 网络。不过,这并不表示你的设备是安全的。通过菜单中的“检查”选项可对浏览器进行测试。\n\n更多信息,请访问 https://guardianproject.info/apps/orbot 或发送邮件到 help(a)guardianproject.info.</string>
<string name="tor_check">浏览器将启动并访问:https://check.torproject.org,以便检查 Orbot 配置是否正确以及是否可连接 Tor 网络。</string>
- <string name="pref_hs_group">〖隐藏服务〗主机</string>
+ <string name="pref_hs_group">隐藏服务主机</string>
<string name="pref_general_group">常规</string>
<string name="pref_start_boot_title">开机时启动 Orbot</string>
<string name="pref_start_boot_summary">Android 设备开机时自动启动 Orbot 并连接 Tor 网络</string>
@@ -101,14 +101,14 @@
<string name="wizard_permissions_title">权限</string>
<string name="wizard_permissions_root_msg1">可选择授予 Orbot “Superuser”访问权限,以便启用高级功能,例如透明代理。</string>
<string name="wizard_permissions_root_msg2">如果不愿授予 Orbot 该权限,请确保应用程序可使用 Orbot。</string>
- <string name="wizard_permissions_no_root_msg">您的设备似乎没有 ROOT 权限或未让【Superuser】允许 Tor 获取 ROOT 权限。\n\n要让 Tor 为您提供帮助,您必须使应用程序能和 Orbot 一起协同工作或设置好它们的 HTTP 和 SOCKS 代理。\n</string>
+ <string name="wizard_permissions_no_root_msg">设备未获取 Root 权限或未提供 Superuser 访问权限。\n\n为了使用 Tor 网络,所用的应用程序需支持 Orbot 或支持 HTTP 或 SOCKS 代理设置。\n</string>
<!--TipsAndTricks screen-->
- <string name="wizard_tips_title">可用 Orbot 的应用程序</string>
- <string name="wizard_tips_gibberbot">Gibberbot:加密无记录的安全聊天应用程序</string>
+ <string name="wizard_tips_title">使用 Orbot 的应用程序</string>
+ <string name="wizard_tips_gibberbot">Gibberbot:加密且不会留下记录的安全聊天应用程序</string>
<string name="gibberbot_apk_url">https://guardianproject.info/releases/gibberbot-latest.apk</string>
<string name="wizard_tips_orweb">Orweb:使用 Tor 网络的隐私保护浏览器</string>
<string name="orweb_apk_url">https://guardianproject.info/releases/orweb-latest.xpi</string>
- <string name="wizard_tips_play">在 Google Play 商店查找所有基于 Guardian Project 的应用程序</string>
+ <string name="wizard_tips_play">在 Google Play 商店查找所有 Guardian Project 的应用程序</string>
<string name="wizard_tips_play_url">https://play.google.com/store/search?q=guardianproject</string>
<!--<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string>
<string name="wizard_tips_proxymob">ProxyMob - Simple Firefox Add-on for setting HTTP, SOCKS and SSL proxy settings</string>
@@ -150,7 +150,7 @@
<string name="transproxy_rules_cleared">已清除 TransProxy 规则</string>
<string name="couldn_t_start_tor_process_">无法启动 Tor 进程:</string>
<string name="privoxy_is_running_on_port_">Privoxy 当前所用的端口:</string>
- <string name="setting_up_port_based_transparent_proxying_">正在对所选应用程序进行透明代理设置...</string>
+ <string name="setting_up_port_based_transparent_proxying_">正在对基于端口的透明代理进行设置...</string>
<string name="bridge_error">网桥错误</string>
<string name="bridge_requires_ip">为了需使用网桥,必须至少输入一个网桥 IP 地址。</string>
<string name="send_email_for_bridges">如需获取网桥地址,请使用 gmail 发送电子邮件至 bridges(a)torproject.org 并在正文内填上“ get bridges”。</string>
@@ -163,7 +163,7 @@
<string name="exclude_nodes">排除节点</string>
<string name="fingerprints_nicks_countries_and_addresses_to_exclude">排除的密钥指纹、昵称、国家与地址</string>
<string name="enter_exclude_nodes">输入排除节点</string>
- <string name="strict_nodes">锁定节点</string>
+ <string name="strict_nodes">限制节点</string>
<string name="use_only_these_specified_nodes">仅使用这些指定节点</string>
<string name="bridges">网桥</string>
<string name="use_bridges">使用网桥</string>
@@ -179,15 +179,15 @@
<string name="listening_port_for_your_tor_relay">Tor 中继的侦听端口</string>
<string name="enter_or_port">输入 OR 端口</string>
<string name="relay_nickname">中继昵称</string>
- <string name="the_nickname_for_your_tor_relay">Tor 中继的昵称</string>
+ <string name="the_nickname_for_your_tor_relay">Tor 中继昵称</string>
<string name="enter_a_custom_relay_nickname">输入自定义中继昵称</string>
<string name="reachable_addresses">可访问地址</string>
- <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">防火墙对运行的客户端使用了限制策略</string>
+ <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">在具有限制策略防火墙内,作为客户端运行</string>
<string name="reachable_ports">可访问端口</string>
<string name="ports_reachable_behind_a_restrictive_firewall">防火墙限定的可访问端口</string>
<string name="enter_ports">输入端口</string>
- <string name="enable_hidden_services">〖隐藏服务〗主机</string>
- <string name="run_servers_accessible_via_the_tor_network">允许打开的设备作为服务器接入 Tor 网络</string>
+ <string name="enable_hidden_services">隐藏服务主机</string>
+ <string name="run_servers_accessible_via_the_tor_network">允许设备上的服务器可通过 Tor 网络访问</string>
<string name="enter_localhost_ports_for_hidden_services">输入隐藏服务的本地主机端口</string>
<string name="hidden_service_ports">隐藏服务端口</string>
<string name="the_addressable_name_for_your_hidden_service_generated_automatically_">隐藏服务的地址(自动生成)</string>
@@ -197,19 +197,19 @@
<string name="the_tor_license">Tor 许可证</string>
<string name="https_torproject_org">https://torproject.org</string>
<string name="third_party_software">第三方软件:</string>
- <string name="tor_version">Tor v0.2.4.3-alpha: https://www.torproject.org</string>
- <string name="libevent_version">LibEvent v2.1.1-alpha: http://www.monkey.org/~provos/libevent/</string>
+ <string name="tor_version">Tor v0.2.4.3-alpha:https://www.torproject.org</string>
+ <string name="libevent_version">LibEvent v2.1.1-alpha:http://www.monkey.org/~provos/libevent/</string>
<string name="privoxy_version">Privoxy v3.0.12: http://www.privoxy.org</string>
<string name="iptables_version">Iptables v1.4.7:http://www.netfilter.org</string>
- <string name="openssl_version">OpenSSL v0.9.8h: http://www.openssl.org</string>
+ <string name="openssl_version">OpenSSL v0.9.8h:http://www.openssl.org</string>
<string name="hidden_service_request">应用程序试图打开隐藏服务主机端口 %S 连接 Tor 网络。对于可信应用这是安全的。</string>
- <string name="found_existing_tor_process">查找当前 Tor 进程...</string>
+ <string name="found_existing_tor_process">发现当前已存在 Tor 进程...</string>
<string name="something_bad_happened">发生错误,请检查日志</string>
- <string name="hidden_service_on">隐藏服务打开:</string>
+ <string name="hidden_service_on">隐藏服务位于:</string>
<string name="unable_to_read_hidden_service_name">无法读取隐藏服务名称</string>
<string name="unable_to_start_tor">无法启动 Tor:</string>
<string name="pref_use_sys_iptables_title">使用默认 iptables </string>
- <string name="pref_use_sys_iptables_summary">使用内置的 iptables 程序替代 Orbot 的绑定 iptables </string>
+ <string name="pref_use_sys_iptables_summary">使用内置的 iptables 程序替代 Orbot 绑定的 iptables </string>
<string name="error_installing_binares">无法安装或更新 Tor 程序。</string>
<string name="pref_use_persistent_notifications">Orbot 连接后始终在通知栏显示图标</string>
<string name="pref_use_persistent_notifications_title">始终显示通知</string>
@@ -219,6 +219,6 @@
<string name="set_locale_summary">选择 Orbot 的区域设置与语言</string>
<string name="wizard_locale_title">选择语言</string>
<string name="wizard_locale_msg">保持默认或切换为当前所用语言</string>
- <string name="powered_by">由 Tor 项目强力驱动</string>
+ <string name="powered_by">由 Tor Project 提供技术支持</string>
<string name="btn_save_settings">保存设置</string>
</resources>