April 2013 - tor-commits - lists.torproject.org

[tor-launcher/master] Ensure that control connection I/O is unbuffered (see bug 8642).
by brade＠torproject.org 29 Apr '13

29 Apr '13

commit bded277453e87892eca5a2834ecce079accf88a9 Author: Kathy Brade <brade(a)torproject.org> Date: Mon Apr 29 14:42:48 2013 -0400 Ensure that control connection I/O is unbuffered (see bug 8642). Also added a 15 second socket read/write timeout and fixed a problem where the main control port connection was closed by mistake after an authentication error occurred on the event monitor connection. --- src/components/tl-protocol.js | 40 ++++++++++++++++++++++++++++++++++++++-- 1 files changed, 38 insertions(+), 2 deletions(-) diff --git a/src/components/tl-protocol.js b/src/components/tl-protocol.js index d1a8f84..2ff5ab7 100644 --- a/src/components/tl-protocol.js +++ b/src/components/tl-protocol.js @@ -392,6 +392,13 @@ TorProtocolService.prototype = return; var conn = this._openAuthenticatedConnection(true); + if (!conn) + { + TorLauncherLogger.log(4, + "TorStartEventMonitor failed to create control port connection"); + return; + } + // TODO: optionally monitor INFO and DEBUG log messages. var events = "STATUS_CLIENT NOTICE WARN ERR"; var reply = this._sendCommand(conn, "SETEVENTS", events); @@ -506,10 +513,21 @@ TorProtocolService.prototype = this.mControlHost + ":" + this.mControlPort); var socket = sts.createTransport(null, 0, this.mControlHost, this.mControlPort, null); + + // Our event monitor connection is non-blocking and unbuffered (an + // asyncWait() call is used so we only read data when we know that + // some is available). + // Our main control connection is blocking and unbuffered (using + // buffering may prevent data from being sent before we enter a + // blocking readBytes() call. var flags = (aIsEventConnection) ? 0 : socket.OPEN_BLOCKING | socket.OPEN_UNBUFFERED; - var inStream = socket.openInputStream(flags, 0, 0); - var outStream = socket.openOutputStream(flags, 0, 0); + // If using a blocking socket, we set segment size and count to 1 to + // avoid buffering inside the Mozilla code. See Tor ticket # 8642. + var segSize = (aIsEventConnection) ? 0 : 1; + var segCount = (aIsEventConnection) ? 0 : 1; + var inStream = socket.openInputStream(flags, segSize, segCount); + var outStream = socket.openOutputStream(flags, segSize, segCount); var binInStream = Cc["@mozilla.org/binaryinputstream;1"] .createInstance(Ci.nsIBinaryInputStream); @@ -574,6 +592,21 @@ TorProtocolService.prototype = this.mControlConnection = null; }, + _setSocketTimeout: function(aConn) + { + if (aConn && aConn.socket) + aConn.socket.setTimeout(Ci.nsISocketTransport.TIMEOUT_READ_WRITE, 15); + }, + + _clearSocketTimeout: function(aConn) + { + if (aConn && aConn.socket) + { + var secs = Math.pow(2,32) - 1; // UINT32_MAX + aConn.socket.setTimeout(Ci.nsISocketTransport.TIMEOUT_READ_WRITE, secs); + } + }, + _sendCommand: function(aConn, aCmd, aArgs) { var reply; @@ -586,8 +619,11 @@ TorProtocolService.prototype = cmd += "\r\n"; ++aConn.useCount; + this._setSocketTimeout(aConn); + // TODO: should handle NS_BASE_STREAM_WOULD_BLOCK here. aConn.binOutStream.writeBytes(cmd, cmd.length); reply = this._torReadReply(aConn.binInStream); + this._clearSocketTimeout(aConn); } return reply;

1 0

r26174: {website} stop linking to google code, for torsocks, since it's genera (website/trunk/getinvolved/en)
by Roger Dingledine 29 Apr '13

29 Apr '13

Author: arma Date: 2013-04-29 17:38:35 +0000 (Mon, 29 Apr 2013) New Revision: 26174 Modified: website/trunk/getinvolved/en/volunteer.wml Log: stop linking to google code, for torsocks, since it's generating tickets on google code and that's bad Modified: website/trunk/getinvolved/en/volunteer.wml =================================================================== --- website/trunk/getinvolved/en/volunteer.wml 2013-04-29 02:23:36 UTC (rev 26173) +++ website/trunk/getinvolved/en/volunteer.wml 2013-04-29 17:38:35 UTC (rev 26174) @@ -569,7 +569,7 @@ <a id="project-torsocks"></a> - <h3><a href="http://code.google.com/p/torsocks/">Torsocks</a> (<a + <h3>Torsocks (<a href="https://gitweb.torproject.org/torsocks.git">code</a>, <a href="https://trac.torproject.org/projects/tor/query?status=accepted&status=assig…">bug tracker</a>)</h3>

1 0

[translation/bridgedb_completed] Update translations for bridgedb_completed
by translation＠torproject.org 29 Apr '13

29 Apr '13

commit 0850b1c1fa4f693b784526748e04ba9566f65a41 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Apr 29 17:15:05 2013 +0000 Update translations for bridgedb_completed --- pt_BR/bridgedb.po | 134 ++++++++++++++++++++++++++++++++--------------------- 1 files changed, 81 insertions(+), 53 deletions(-) diff --git a/pt_BR/bridgedb.po b/pt_BR/bridgedb.po index dc70b51..f3be4fa 100644 --- a/pt_BR/bridgedb.po +++ b/pt_BR/bridgedb.po @@ -1,73 +1,101 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. +# Translations template for BridgeDB. +# Copyright (C) 2013 ORGANIZATION +# This file is distributed under the same license as the BridgeDB project. # # Translators: -# n3t0 <>, 2012. +# Augustine <evandro(a)geocities.com>, 2013 +# m4lqu1570 <>, 2012 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" -"POT-Creation-Date: 2011-01-01 07:48-0800\n" -"PO-Revision-Date: 2012-02-14 10:04+0000\n" -"Last-Translator: n3t0 <>\n" +"POT-Creation-Date: 2013-03-27 21:41+0000\n" +"PO-Revision-Date: 2013-04-29 16:57+0000\n" +"Last-Translator: Augustine <evandro(a)geocities.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Generated-By: Babel 0.9.6\n" "Language: pt_BR\n" -"Plural-Forms: nplurals=2; plural=(n > 1)\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: lib/bridgedb/I18n.py:21 -msgid "Here are your bridge relays: " -msgstr "Aqui estão suas pontes retransmissoras: " +#: lib/bridgedb/templates/base.html:33 +msgid "What are bridges?" +msgstr "O que são pontes?" -#: lib/bridgedb/I18n.py:23 +#: lib/bridgedb/templates/base.html:34 +#, python-format msgid "" -"Bridge relays (or \"bridges\" for short) are Tor relays that aren't listed\n" -"in the main directory. Since there is no complete public list of them,\n" -"even if your ISP is filtering connections to all the known Tor relays,\n" -"they probably won't be able to block all the bridges." -msgstr "Pontes retransmissores (ou \"pontes\" para encurtar) ao retransmissores Tor\nque não estão listados no diretório principal. Já que não há uma lista \ncompleta pública delas, mesmo que seu ISP filtre todas as conexões \nconhecidas de retransmissores Tor, eles provavelmente não estão \nhabilitados para bloquear todas as pontes." +"%s Bridge relays %s are Tor relays that help you circumvent censorship." +msgstr "%s roteadores ponte %s são roteadores Tor que ajudam a lograr censura." -#: lib/bridgedb/I18n.py:28 -msgid "" -"To use the above lines, go to Vidalia's Network settings page, and click\n" -"\"My ISP blocks connections to the Tor network\". Then add each bridge\n" -"address one at a time." -msgstr "Para usar as linhas abaixo, vá até a página de configurações de rede do\nVidalia, e clique em \"Meu ISP bloqueia conexões para a rede Tor\". Daí,\nadicione cada ponte uma a uma." +#: lib/bridgedb/templates/base.html:39 +msgid "I need an alternative way of getting bridges!" +msgstr "Preciso de um caminho alternativo para obter pontes!" -#: lib/bridgedb/I18n.py:32 +#: lib/bridgedb/templates/base.html:40 +#, python-format msgid "" -"Configuring more than one bridge address will make your Tor connection\n" -"more stable, in case some of the bridges become unreachable." -msgstr "Configurar mais do que uma ponte tornará sua conexão Tor mais estável,\nno caso de alguma das pontes tornar-se inacessível." +"Another way to find public bridge addresses is to send an email (from a %s " +"or a %s address) to %s with the line 'get bridges' by itself in the body of " +"the mail." +msgstr "Outra maneira de se achar endereços de pontes públicas é se enviando um email (de um endereço %s ou %s) para %s com apenas 'get bridges' no corpo do email." -#: lib/bridgedb/I18n.py:35 +#: lib/bridgedb/templates/base.html:48 +msgid "My bridges don't work! I need help!" +msgstr "Minhas pontes não funcionam! Preciso de ajuda!" + +#: lib/bridgedb/templates/base.html:49 +#, python-format msgid "" -"Another way to find public bridge addresses is to send mail to\n" -"bridges(a)torproject.org with the line \"get bridges\" by itself in the body\n" -"of the mail. However, so we can make it harder for an attacker to learn\n" -"lots of bridge addresses, you must send this request from an email address at\n" -"one of the following domains:" -msgstr "Outro meio de encontrar endereços de pontes públicas é enviar um e-mail\npara bridges(a)torproject.org com a linha \"get bridges\" sozinha no corpo da\nmensagem. Contudo, para tornar mais difícil de um atacante aprender\nsobre vários endereços de pontes, você deve enviar seu e-mail de um dos\ndomínios abaixo:" - -#: lib/bridgedb/I18n.py:41 -msgid "[This is an automated message; please do not reply.]" -msgstr "[This is an automated message; please do not reply.]" - -#: lib/bridgedb/I18n.py:43 +"If your Tor doesn't work, you should email %s. Try including as much info " +"about your case as you can, including the list of bridges you used, the " +"bundle filename/version you used, the messages that Tor gave out, etc." +msgstr "Se seu Tor nao funciona, envie um email para %s. Inclua tantas informações sobre seu caso quanto puder, tais como a lista de pontes que usou, a versão ou o nome do arquivo do pacote Tor que usou, as mensagens que o Tor mostrou, etc." + +#: lib/bridgedb/templates/bridges.html:10 msgid "" -"Another way to find public bridge addresses is to visit\n" -"https://bridges.torproject.org/. The answers you get from that page\n" -"will change every few days, so check back periodically if you need more\n" -"bridge addresses." -msgstr "Outro meio de encontrar endereços de pontes públicas é visitar\nhttps://bridges.torproject.org/. As respostas que você obter nessa página\nmudam a cada poucos dias, então cheque periodicamente se você\nprecisar de mais pontes." - -#: lib/bridgedb/I18n.py:48 -msgid "(no bridges currently available)" -msgstr "(nenhuma ponte disponível atualmente)" - -#: lib/bridgedb/I18n.py:50 -msgid "(e-mail requests not currently supported)" -msgstr "(requisições por e-mail não são suportadas atualmente)" +"To use the above lines, go to Vidalia's Network settings page, and click " +"\"My ISP blocks connections to the Tor network\". Then add each bridge " +"address one at a time." +msgstr "Para se usar a informação acima, vá para a pagina de configuração da rede do Vidalia e selecione \"Meu provedor bloqueia conexões à rede Tor\". Então adicione um endereço de ponte por vez." + +#: lib/bridgedb/templates/bridges.html:13 +msgid "No bridges currently available" +msgstr "Nenhuma ponte disponível no momento" + +#: lib/bridgedb/templates/captcha.html:6 +msgid "Upgrade your browser to Firefox" +msgstr "Atualize seu navegador para Firefox" + +#: lib/bridgedb/templates/captcha.html:8 +msgid "Type the two words" +msgstr "Entre ambas palavras" + +#: lib/bridgedb/templates/index.html:6 +msgid "Step 1" +msgstr "1º Passo" + +#: lib/bridgedb/templates/index.html:8 +#, python-format +msgid "Get %s Tor Browser Bundle %s" +msgstr "Obtenha %s o pacote de navegador Tor %s" + +#: lib/bridgedb/templates/index.html:13 +msgid "Step 2" +msgstr "2º Passo" + +#: lib/bridgedb/templates/index.html:15 +#, python-format +msgid "Get %s bridges %s" +msgstr "Obter %s as pontes %s" + +#: lib/bridgedb/templates/index.html:19 +msgid "Step 3" +msgstr "3º Passo" + +#: lib/bridgedb/templates/index.html:21 +#, python-format +msgid "Now %s add the bridges to Tor %s" +msgstr "Agora, %s adicione as pontes ao Tor %s"

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 29 Apr '13

29 Apr '13

commit 8cfa75b616efb9ee6bad70bc8701e61e54dd8188 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Apr 29 17:15:03 2013 +0000 Update translations for bridgedb --- pt_BR/bridgedb.po | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/pt_BR/bridgedb.po b/pt_BR/bridgedb.po index ad28a8d..f3be4fa 100644 --- a/pt_BR/bridgedb.po +++ b/pt_BR/bridgedb.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-03-27 21:41+0000\n" -"PO-Revision-Date: 2013-04-29 16:43+0000\n" +"PO-Revision-Date: 2013-04-29 16:57+0000\n" "Last-Translator: Augustine <evandro(a)geocities.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -59,43 +59,43 @@ msgid "" "To use the above lines, go to Vidalia's Network settings page, and click " "\"My ISP blocks connections to the Tor network\". Then add each bridge " "address one at a time." -msgstr "" +msgstr "Para se usar a informação acima, vá para a pagina de configuração da rede do Vidalia e selecione \"Meu provedor bloqueia conexões à rede Tor\". Então adicione um endereço de ponte por vez." #: lib/bridgedb/templates/bridges.html:13 msgid "No bridges currently available" -msgstr "" +msgstr "Nenhuma ponte disponível no momento" #: lib/bridgedb/templates/captcha.html:6 msgid "Upgrade your browser to Firefox" -msgstr "" +msgstr "Atualize seu navegador para Firefox" #: lib/bridgedb/templates/captcha.html:8 msgid "Type the two words" -msgstr "" +msgstr "Entre ambas palavras" #: lib/bridgedb/templates/index.html:6 msgid "Step 1" -msgstr "" +msgstr "1º Passo" #: lib/bridgedb/templates/index.html:8 #, python-format msgid "Get %s Tor Browser Bundle %s" -msgstr "" +msgstr "Obtenha %s o pacote de navegador Tor %s" #: lib/bridgedb/templates/index.html:13 msgid "Step 2" -msgstr "" +msgstr "2º Passo" #: lib/bridgedb/templates/index.html:15 #, python-format msgid "Get %s bridges %s" -msgstr "" +msgstr "Obter %s as pontes %s" #: lib/bridgedb/templates/index.html:19 msgid "Step 3" -msgstr "" +msgstr "3º Passo" #: lib/bridgedb/templates/index.html:21 #, python-format msgid "Now %s add the bridges to Tor %s" -msgstr "" +msgstr "Agora, %s adicione as pontes ao Tor %s"

1 0

[translation/vidalia_installer_completed] Update translations for vidalia_installer_completed
by translation＠torproject.org 29 Apr '13

29 Apr '13

commit d3ede682111e338e1bff92e7fb7f585bfdcdcd44 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Apr 29 16:45:56 2013 +0000 Update translations for vidalia_installer_completed --- ja/vidalia_ja.po | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ja/vidalia_ja.po b/ja/vidalia_ja.po index ba27f6e..616fcb6 100644 --- a/ja/vidalia_ja.po +++ b/ja/vidalia_ja.po @@ -4,14 +4,15 @@ # Nastuko Toda <m2330880989(a)shibuya-center.com>, 2012 # pentive <pentive(a)gmail.com>, 2012 # runasand <runa.sandvik(a)gmail.com>, 2011 +# Shinji Yamane <s-yamane(a)computer.org>, 2013 # siomiz <>, 2012 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2008-07-12 05:29+0000\n" -"PO-Revision-Date: 2013-04-29 09:24+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2013-04-29 16:33+0000\n" +"Last-Translator: Shinji Yamane <s-yamane(a)computer.org>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -44,7 +45,7 @@ msgstr "${BUNDLE_NAME} セットアップウィザードへようこそ" msgctxt "BundleLinkText" msgid "${TOR_NAME} installation documentation" -msgstr "${TOR_NAME} インストール仕方の文書化" +msgstr "${TOR_NAME} インストールについての文書" msgctxt "BundleFinishText" msgid ""

1 0

[translation/vidalia_installer] Update translations for vidalia_installer
by translation＠torproject.org 29 Apr '13

29 Apr '13

commit b5c3ea3e525d11a5c1b96b8b68aa468711763131 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Apr 29 16:45:53 2013 +0000 Update translations for vidalia_installer --- ja/vidalia_ja.po | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ja/vidalia_ja.po b/ja/vidalia_ja.po index ba27f6e..616fcb6 100755 --- a/ja/vidalia_ja.po +++ b/ja/vidalia_ja.po @@ -4,14 +4,15 @@ # Nastuko Toda <m2330880989(a)shibuya-center.com>, 2012 # pentive <pentive(a)gmail.com>, 2012 # runasand <runa.sandvik(a)gmail.com>, 2011 +# Shinji Yamane <s-yamane(a)computer.org>, 2013 # siomiz <>, 2012 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2008-07-12 05:29+0000\n" -"PO-Revision-Date: 2013-04-29 09:24+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2013-04-29 16:33+0000\n" +"Last-Translator: Shinji Yamane <s-yamane(a)computer.org>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -44,7 +45,7 @@ msgstr "${BUNDLE_NAME} セットアップウィザードへようこそ" msgctxt "BundleLinkText" msgid "${TOR_NAME} installation documentation" -msgstr "${TOR_NAME} インストール仕方の文書化" +msgstr "${TOR_NAME} インストールについての文書" msgctxt "BundleFinishText" msgid ""

1 0

[translation/tsum_completed] Update translations for tsum_completed
by translation＠torproject.org 29 Apr '13

29 Apr '13

commit 9494a9d1a4626e8e55297d0c880f215cecc05145 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Apr 29 16:45:18 2013 +0000 Update translations for tsum_completed --- ja/short-user-manual_ja_noimg.xhtml | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/ja/short-user-manual_ja_noimg.xhtml b/ja/short-user-manual_ja_noimg.xhtml index debf35b..5960966 100644 --- a/ja/short-user-manual_ja_noimg.xhtml +++ b/ja/short-user-manual_ja_noimg.xhtml @@ -22,12 +22,12 @@ 注: Linux用とMac OS X用のTor Browser Bundleはやや大きいので、GmailやHotmail、Yahooアカウントでは受けとることが出来ないでしょう。もしあなたが欲しいバンドルを受け取れない時は、help(a)rt.torproject.xn--org-u63b4bub2ewa1ai6wri11b9dyk4310l.xn--88j7am8dxc4b0huf8g1i3d4jq096a0fmuog8n3mjbvb7u6azhza. <h3 id="tor-for-smartphones">スマートフォンのためのTor</h3> Orbotという名前のパッケージをインストールすることでAndroid端末用のTorを入手出来ます。Orbotのダウンロードとインストールの方法は<a href="https://www.torproject.org/docs/android.html.en">Tor Project website</a>を見てください。 - また、実験的なパッケージとして<a href="https://www.torproject.org/docs/N900.html.en">Nokia Maemo/N900</a>と<a href="http://sid77.slackware.it/ios/">Apple iOS</a>があります。 + また、 <a href="https://www.torproject.org/docs/N900.html.en">Nokia Maemo/N900</a> と<a href="http://sid77.slackware.it/iphone/">Apple iOS</a>用の実験的なパッケージもあります。 <h3 id="how-to-verify-that-you-have-the-right-version">正しいバージョンか検証する方法</h3> Tor Browser Bundleを実行する前に、正しいバージョンを持っていることを確認するべきです。 あなたが受け取ったソフトウェアにはバンドルの名前の後に.ascの拡張子がついたファイルが付属しています。この.ascファイルはGPGの署名で、あなたがダウンロードしたファイルが私たちがあなたが受けとることを意図したものと正確に一致するかを検証出来ます。 署名を検証する前に、GnuPGをダウンロードしインストールしなければいけません。 - Windows: <a href="http://gpg4win.org/download.html">http://gpg4win.org/download.html</a> Mac OS X: <a href="http://www.gpgtools.org/">http://www.gpgtools.org/</a> Linux: ほとんどのLinuxディストリビューションにはGnuPGがプリインストールされています。 + Windows: <a href="http://gpg4win.org/download.html">http://gpg4win.org/download.html</a> Mac OS X: <a href="http://macgpg.sourceforge.net/">http://macgpg.sourceforge.net/</a> Linux: ほとんどのLinuxディストリビューションにはGnuPGがプリインストールされています。 あなたのシステムで以下を動作させるためパスやコマンドを変更する必要があるかもしれないことに注意してください。 Erinn Clarkが鍵0x63FEE659でTor Browser Bundleに署名しています。Erinnの鍵をインポートするため、次を実行します: <pre> @@ -42,9 +42,10 @@ 以下のように表示されるはずです: <pre> <code>pub 2048R/63FEE659 2003-10-16 - 指紋 = 8738 A680 B84B 3031 A630 F2DB 416F 0610 63FE E659 +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> @@ -57,7 +58,7 @@ sub 2048R/EB399FD7 2003-10-16 出力は"正しい署名"になるはずです。不正な署名はファイルが改竄されているかもしれないことを意味します。もしあなたが不正な署名を確認したら、パッケージをどこからダウンロードしたか、どのように署名を検証したか、それにGnuPGの出力をhelp(a)rt.torproject.xn--org-u63b4bub2ewa1ai7bz1izd4j0726k. 署名を検証して"正しい署名"の出力が得られたら、先に進みパッケージアーカイブを展開します。tor-browser_en-USのようなディレクトリができるはずです。このディレクトリにはDocsという名前のディレクトリがあり、その下にchangelogという名前のファイルがあります。changelogファイルの先頭行のバージョン番号がファイル名のバージョン番号と一致することを確認してください。 <h3 id="how-to-use-the-tor-browser-bundle">Tor Browser Bundleの使い方</h3> - Tor Browser Bunldeをダウンロードした後、パッケージをデスクトップかUSBメモリに展開します。いくつかのファイルを含むディレクトリが出来るはずです。ファイルの一つは実行可能な"Start Tor Browser"(または"start-tor-browser"、オペレーティングシステムに依存します)になります。 + Tor Browser Bunldeをダウンロードした後、パッケージをデスクトップかUSBメモリに展開します。いくつかのファイルを含むディレクトリが出来るはずです。ファイルの一つは実行可能な"Start Tor Browser"(またはオペレーティングシステムによっては"start-tor-browser")です。 Tor Browser Bundleを開始すると、まずVidaliaが起動しTorネットワークへ接続されます。その後、Torを使っていることを確認する画面が表示されます。これは<a href="https://check.torproject.org/">https://check.torproject.org/</a>を表示することで行われます。これでインターネットをTor経由で利用する準備が整いました。 あなたのブラウザーではなく、バンドルに付属するブラウザーを利用することが重要であるということに注意してください。

1 0

[translation/tsum] Update translations for tsum
by translation＠torproject.org 29 Apr '13

29 Apr '13

commit b7c750edf2ed189f9047d4abfbdc6a0e60724a92 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Apr 29 16:45:15 2013 +0000 Update translations for tsum --- ja/short-user-manual_ja_noimg.xhtml | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ja/short-user-manual_ja_noimg.xhtml b/ja/short-user-manual_ja_noimg.xhtml index 70511ac..5960966 100644 --- a/ja/short-user-manual_ja_noimg.xhtml +++ b/ja/short-user-manual_ja_noimg.xhtml @@ -22,7 +22,7 @@ 注: Linux用とMac OS X用のTor Browser Bundleはやや大きいので、GmailやHotmail、Yahooアカウントでは受けとることが出来ないでしょう。もしあなたが欲しいバンドルを受け取れない時は、help(a)rt.torproject.xn--org-u63b4bub2ewa1ai6wri11b9dyk4310l.xn--88j7am8dxc4b0huf8g1i3d4jq096a0fmuog8n3mjbvb7u6azhza. <h3 id="tor-for-smartphones">スマートフォンのためのTor</h3> Orbotという名前のパッケージをインストールすることでAndroid端末用のTorを入手出来ます。Orbotのダウンロードとインストールの方法は<a href="https://www.torproject.org/docs/android.html.en">Tor Project website</a>を見てください。 - 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>. + また、 <a href="https://www.torproject.org/docs/N900.html.en">Nokia Maemo/N900</a> と<a href="http://sid77.slackware.it/iphone/">Apple iOS</a>用の実験的なパッケージもあります。 <h3 id="how-to-verify-that-you-have-the-right-version">正しいバージョンか検証する方法</h3> Tor Browser Bundleを実行する前に、正しいバージョンを持っていることを確認するべきです。 あなたが受け取ったソフトウェアにはバンドルの名前の後に.ascの拡張子がついたファイルが付属しています。この.ascファイルはGPGの署名で、あなたがダウンロードしたファイルが私たちがあなたが受けとることを意図したものと正確に一致するかを検証出来ます。 @@ -42,7 +42,7 @@ 以下のように表示されるはずです: <pre> <code>pub 2048R/63FEE659 2003-10-16 - Key fingerprint = 8738 A680 B84B 3031 A630 F2DB 416F 0610 63FE E659 +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> @@ -58,7 +58,7 @@ sub 2048R/EB399FD7 2003-10-16 出力は"正しい署名"になるはずです。不正な署名はファイルが改竄されているかもしれないことを意味します。もしあなたが不正な署名を確認したら、パッケージをどこからダウンロードしたか、どのように署名を検証したか、それにGnuPGの出力をhelp(a)rt.torproject.xn--org-u63b4bub2ewa1ai7bz1izd4j0726k. 署名を検証して"正しい署名"の出力が得られたら、先に進みパッケージアーカイブを展開します。tor-browser_en-USのようなディレクトリができるはずです。このディレクトリにはDocsという名前のディレクトリがあり、その下にchangelogという名前のファイルがあります。changelogファイルの先頭行のバージョン番号がファイル名のバージョン番号と一致することを確認してください。 <h3 id="how-to-use-the-tor-browser-bundle">Tor Browser Bundleの使い方</h3> - 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). + Tor Browser Bunldeをダウンロードした後、パッケージをデスクトップかUSBメモリに展開します。いくつかのファイルを含むディレクトリが出来るはずです。ファイルの一つは実行可能な"Start Tor Browser"(またはオペレーティングシステムによっては"start-tor-browser")です。 Tor Browser Bundleを開始すると、まずVidaliaが起動しTorネットワークへ接続されます。その後、Torを使っていることを確認する画面が表示されます。これは<a href="https://check.torproject.org/">https://check.torproject.org/</a>を表示することで行われます。これでインターネットをTor経由で利用する準備が整いました。 あなたのブラウザーではなく、バンドルに付属するブラウザーを利用することが重要であるということに注意してください。

1 0

[translation/gettor] Update translations for gettor
by translation＠torproject.org 29 Apr '13

29 Apr '13

commit 377e476ba2769075d4f27bbb1e96bd8c9b96b092 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Apr 29 16:45:06 2013 +0000 Update translations for gettor --- ja/gettor.po | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ja/gettor.po b/ja/gettor.po index e2545e1..97d601e 100644 --- a/ja/gettor.po +++ b/ja/gettor.po @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-01-19 13:40+0100\n" -"PO-Revision-Date: 2013-04-29 16:14+0000\n" +"PO-Revision-Date: 2013-04-29 16:24+0000\n" "Last-Translator: Shinji Yamane <s-yamane(a)computer.org>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -41,7 +41,7 @@ msgid "" "We only process requests from email services that support \"DKIM\",\n" "which is an email feature that lets us verify that the address in the\n" "\"From\" line is actually the one who sent the mail." -msgstr "" +msgstr "私たちは\"DKIM\"をサポートするメールだけを処理します。これは\"From\" 行のメールアドレスが本当にメールを送った本人かどうかを確認する仕組みです。" #: lib/gettor/i18n.py:39 msgid "" @@ -103,11 +103,11 @@ msgstr "" #: lib/gettor/i18n.py:76 msgid " List of supported locales:" -msgstr "支援されているロケールリスト:" +msgstr "サポートしているロケールのリスト: " #: lib/gettor/i18n.py:78 msgid "Here is a list of all available languages:" -msgstr "利用可能なすべての言語のリスト:" +msgstr "以下は利用可能な言語のリストです: " #: lib/gettor/i18n.py:80 msgid "" @@ -126,7 +126,7 @@ msgstr "" #: lib/gettor/i18n.py:92 msgid "If you select no language, you will receive the English version." -msgstr "言語を選択しない場合に英語がデフォルトにしてしまいます" +msgstr "もしも言語を指定しない場合は、英語バージョンを受け取ることになります。" #: lib/gettor/i18n.py:94 msgid "" @@ -164,7 +164,7 @@ msgstr "" #: lib/gettor/i18n.py:113 msgid "1.) Save all received attachments into one folder on your disk." -msgstr "1).全部の添付ファイルをハードディスクに保存してください" +msgstr "1).全ての添付ファイルをハードディスクに保存してください" #: lib/gettor/i18n.py:115 msgid "" @@ -278,7 +278,7 @@ msgid "" "all split files to be received by you before you can save them all\n" "into the same directory and unpack them by double-clicking the\n" "first file." -msgstr "" +msgstr "【注意事項】\nSince this is part of a split-file request, you need to wait for all split files to be received by you before you can save them all into the same directory and unpack them by double-clicking the first file." #: lib/gettor/i18n.py:185 msgid "" @@ -460,7 +460,7 @@ msgstr "" #: lib/gettor/i18n.py:286 msgid "What is the Tor Browser Bundle?" -msgstr "" +msgstr "Tor Browser Bundle とは何ですか?" #: lib/gettor/i18n.py:288 msgid ""

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 29 Apr '13

29 Apr '13

commit f96dde777917e3fc1f2c95418981353ef9b5e07e Author: Translation commit bot <translation(a)torproject.org> Date: Mon Apr 29 16:45:02 2013 +0000 Update translations for bridgedb --- pt_BR/bridgedb.po | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pt_BR/bridgedb.po b/pt_BR/bridgedb.po index 1d24911..ad28a8d 100644 --- a/pt_BR/bridgedb.po +++ b/pt_BR/bridgedb.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-03-27 21:41+0000\n" -"PO-Revision-Date: 2013-04-29 16:12+0000\n" +"PO-Revision-Date: 2013-04-29 16:43+0000\n" "Last-Translator: Augustine <evandro(a)geocities.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -28,11 +28,11 @@ msgstr "O que são pontes?" #, python-format msgid "" "%s Bridge relays %s are Tor relays that help you circumvent censorship." -msgstr "" +msgstr "%s roteadores ponte %s são roteadores Tor que ajudam a lograr censura." #: lib/bridgedb/templates/base.html:39 msgid "I need an alternative way of getting bridges!" -msgstr "" +msgstr "Preciso de um caminho alternativo para obter pontes!" #: lib/bridgedb/templates/base.html:40 #, python-format @@ -40,11 +40,11 @@ msgid "" "Another way to find public bridge addresses is to send an email (from a %s " "or a %s address) to %s with the line 'get bridges' by itself in the body of " "the mail." -msgstr "" +msgstr "Outra maneira de se achar endereços de pontes públicas é se enviando um email (de um endereço %s ou %s) para %s com apenas 'get bridges' no corpo do email." #: lib/bridgedb/templates/base.html:48 msgid "My bridges don't work! I need help!" -msgstr "" +msgstr "Minhas pontes não funcionam! Preciso de ajuda!" #: lib/bridgedb/templates/base.html:49 #, python-format @@ -52,7 +52,7 @@ msgid "" "If your Tor doesn't work, you should email %s. Try including as much info " "about your case as you can, including the list of bridges you used, the " "bundle filename/version you used, the messages that Tor gave out, etc." -msgstr "" +msgstr "Se seu Tor nao funciona, envie um email para %s. Inclua tantas informações sobre seu caso quanto puder, tais como a lista de pontes que usou, a versão ou o nome do arquivo do pacote Tor que usou, as mensagens que o Tor mostrou, etc." #: lib/bridgedb/templates/bridges.html:10 msgid ""

1 0