tor-commits June 2014

tor-commits@lists.torproject.org

21 participants
1212 discussions

[translation/tails-greeter_completed] Update translations for tails-greeter_completed
by translation＠torproject.org 03 Jun '14

03 Jun '14

commit b7d604516601006eb07a00ffc702c5def07b770d Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jun 3 15:45:32 2014 +0000 Update translations for tails-greeter_completed --- ja/ja.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ja/ja.po b/ja/ja.po index f820c3e..410c531 100644 --- a/ja/ja.po +++ b/ja/ja.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-05-28 22:33+0200\n" -"PO-Revision-Date: 2014-06-03 15:12+0000\n" +"PO-Revision-Date: 2014-06-03 15:22+0000\n" "Last-Translator: plazmism <gomidori(a)live.jp>\n" "Language-Team: Japanese (http://www.transifex.com/projects/p/torproject/language/ja/)\n" "MIME-Version: 1.0\n"

1 0

[translation/tails-greeter] Update translations for tails-greeter
by translation＠torproject.org 03 Jun '14

03 Jun '14

commit 44f1f55a9070931b531d0ac14384835da6529f5a Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jun 3 15:45:29 2014 +0000 Update translations for tails-greeter --- ja/ja.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ja/ja.po b/ja/ja.po index f820c3e..410c531 100644 --- a/ja/ja.po +++ b/ja/ja.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-05-28 22:33+0200\n" -"PO-Revision-Date: 2014-06-03 15:12+0000\n" +"PO-Revision-Date: 2014-06-03 15:22+0000\n" "Last-Translator: plazmism <gomidori(a)live.jp>\n" "Language-Team: Japanese (http://www.transifex.com/projects/p/torproject/language/ja/)\n" "MIME-Version: 1.0\n"

1 0

[translation/liveusb-creator_completed] Update translations for liveusb-creator_completed
by translation＠torproject.org 03 Jun '14

03 Jun '14

commit fe012a8bd395b28f14be267cbe1e8759ee770657 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jun 3 15:45:25 2014 +0000 Update translations for liveusb-creator_completed --- ja/ja.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ja/ja.po b/ja/ja.po index 858d79b..206beef 100644 --- a/ja/ja.po +++ b/ja/ja.po @@ -13,7 +13,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-05-28 16:00+0200\n" -"PO-Revision-Date: 2014-06-03 15:10+0000\n" +"PO-Revision-Date: 2014-06-03 15:22+0000\n" "Last-Translator: plazmism <gomidori(a)live.jp>\n" "Language-Team: Japanese (http://www.transifex.com/projects/p/torproject/language/ja/)\n" "MIME-Version: 1.0\n"

1 0

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 03 Jun '14

03 Jun '14

commit 83ea876527a429cd40728e30d2fa6b7f9663ba49 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jun 3 15:45:22 2014 +0000 Update translations for liveusb-creator --- ja/ja.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ja/ja.po b/ja/ja.po index 858d79b..206beef 100644 --- a/ja/ja.po +++ b/ja/ja.po @@ -13,7 +13,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-05-28 16:00+0200\n" -"PO-Revision-Date: 2014-06-03 15:10+0000\n" +"PO-Revision-Date: 2014-06-03 15:22+0000\n" "Last-Translator: plazmism <gomidori(a)live.jp>\n" "Language-Team: Japanese (http://www.transifex.com/projects/p/torproject/language/ja/)\n" "MIME-Version: 1.0\n"

1 0

[translation/bridgedb_completed] Update translations for bridgedb_completed
by translation＠torproject.org 03 Jun '14

03 Jun '14

commit f33c51fc102c2911b71bd6084b7da3bf79f386e3 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jun 3 15:45:06 2014 +0000 Update translations for bridgedb_completed --- ja/LC_MESSAGES/bridgedb.po | 339 +++++++++++++++++++++++++++++++++++++------- 1 file changed, 286 insertions(+), 53 deletions(-) diff --git a/ja/LC_MESSAGES/bridgedb.po b/ja/LC_MESSAGES/bridgedb.po index cdb16cb..76232ac 100644 --- a/ja/LC_MESSAGES/bridgedb.po +++ b/ja/LC_MESSAGES/bridgedb.po @@ -1,19 +1,19 @@ # Translations template for BridgeDB. -# Copyright (C) 2013 ORGANIZATION +# Copyright (C) 2014 'The Tor Project, Inc.' # This file is distributed under the same license as the BridgeDB project. # # Translators: -# Translators: # brt <87(a)itokei.info>, 2013 # plazmism <gomidori(a)live.jp>, 2013 -# msaito <rezoolab(a)gmail.com>, 2013 +# plazmism <gomidori(a)live.jp>, 2014 +# Masaki Saito <rezoolab(a)gmail.com>, 2013 msgid "" 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-11-04 14:40+0000\n" -"Last-Translator: msaito <rezoolab(a)gmail.com>\n" +"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" +"POT-Creation-Date: 2014-05-16 18:39+0000\n" +"PO-Revision-Date: 2014-06-03 15:41+0000\n" +"Last-Translator: plazmism <gomidori(a)live.jp>\n" "Language-Team: Japanese (http://www.transifex.com/projects/p/torproject/language/ja/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -22,82 +22,315 @@ msgstr "" "Language: ja\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: lib/bridgedb/templates/base.html:33 +#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in +#. any string (regardless of capitalization and/or punctuation): +#. "bridge" +#. "bridges" +#. "BridgeDB" +#. "pluggable transport" +#. "pluggable transports" +#. "obfs2" +#. "obfs3" +#. "scramblesuit" +#. "fte" +#. "Tor" +#. "Tor Browser" +#. "TBB" +#: lib/bridgedb/HTTPServer.py:124 +msgid "Sorry! Something went wrong with your request." +msgstr "申し訳ありませんが、リクエストに問題がありました。" + +#: lib/bridgedb/strings.py:18 +msgid "[This is an automated message; please do not reply.]" +msgstr "[このメールは自動送信されたメッセージです。返信しないでください。]" + +#: lib/bridgedb/strings.py:20 +msgid "Here are your bridges:" +msgstr "あなたのブリッジはこちら:" + +#: lib/bridgedb/strings.py:22 +#, python-format +msgid "" +"You have exceeded the rate limit. Please slow down! The minimum time between\n" +"emails is %s hours. All further emails during this time period will be ignored." +msgstr "レート制限を超過しました。メール間の最小時間は %s 時間です。この期間中にさらに送信したメールは全て無視されます。" + +#: lib/bridgedb/strings.py:25 +msgid "" +"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)" +msgstr "コマンド: (コマンドを組み合わせて、同時に複数のオプションを指定する)" + +#: lib/bridgedb/strings.py:27 +msgid "Welcome to BridgeDB!" +msgstr "BridgeDB へようこそ！" + +#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE". +#: lib/bridgedb/strings.py:29 +msgid "Currently supported transport TYPEs:" +msgstr "現在サポートされているトランスポートタイプ:" + +#: lib/bridgedb/strings.py:30 +#, python-format +msgid "Hey, %s!" +msgstr "どうも %s さん！" + +#: lib/bridgedb/strings.py:31 +msgid "Hello, friend!" +msgstr "どうもこんにちは！" + +#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100 +msgid "Public Keys" +msgstr "公開鍵" + +#. TRANSLATORS: This string will end up saying something like: +#. "This email was generated with rainbows, unicorns, and sparkles +#. for alice(a)example.com on Friday, 09 May, 2014 at 18:59:39." +#: lib/bridgedb/strings.py:36 +#, python-format +msgid "" +"This email was generated with rainbows, unicorns, and sparkles\n" +"for %s on %s at %s." +msgstr "このメールは %s に %s %s に rainbow 及び unicorn 、 sparkle で生成されました。" + +#: lib/bridgedb/strings.py:42 +#, python-format +msgid "" +"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n" +"which can help obfuscate your connections to the Tor Network, making it more\n" +"difficult for anyone watching your internet traffic to determine that you are\n" +"using Tor.\n" +"\n" +msgstr "BridgeDB は、%sタイプの Pluggable Transports%s でブリッジを提供します。\nTor ネットワークへの接続を悟られづらくすることに役立ち、あなたの\nインターネットトラフィックを監視している誰かがあなたが Tor を使用していることを判別することがさらに難しくなります。\n\n" + +#: lib/bridgedb/strings.py:48 +msgid "" +"Some bridges with IPv6 addresses are also available, though some Pluggable\n" +"Transports aren't IPv6 compatible.\n" +"\n" +msgstr "IPv6 のアドレスのブリッジも利用できるものがありますが、 Pluggable Transports には IPv6 に互換性がないものもあります。\n\n" + +#: lib/bridgedb/strings.py:52 +#, python-format +msgid "" +"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n" +"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n" +"help to circumvent internet censorship in many cases.\n" +"\n" +msgstr "加えて、 BridgeDB は、 %s Pluggable Transport %s のない多くの何の変哲もない\n通常のブリッジを持ち、それはクールには思えないかもしれません。しかし、多くの場合、インターネット検閲を回避するのになお有効です。\n" + +#: lib/bridgedb/strings.py:65 msgid "What are bridges?" msgstr "ブリッジとは？" -#: lib/bridgedb/templates/base.html:34 +#: lib/bridgedb/strings.py:66 #, python-format -msgid "" -"%s Bridge relays %s are Tor relays that help you circumvent censorship." -msgstr "%s ブリッジリレー %sは検閲を回避することを助けるTorリレーです。" +msgid "%s Bridges %s are Tor relays that help you circumvent censorship." +msgstr "%s ブリッジ %s は、インターネット検閲を回避する助けとなる Tor リレーです。" -#: lib/bridgedb/templates/base.html:39 +#: lib/bridgedb/strings.py:71 msgid "I need an alternative way of getting bridges!" msgstr "ブリッジを得る他の方法が必要です!" -#: lib/bridgedb/templates/base.html:40 +#: lib/bridgedb/strings.py:72 #, python-format 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 "パブリックブリッジのアドレスを探す他の方法は、(%sか%sのアドレスから) メールの文面に「get bridges」の行をつけて%sにメールを送ることです。" +"Another way to get bridges is to send an email to %s. Please note that you must\n" +"send the email using an address from one of the following email providers:\n" +"%s or %s." +msgstr "ブリッジを入手する別のやり方は %s までメールを送ることです。以下のメールプロバイダのうちの1つのアドレスを使用してメールを送信しなければならないことにご注意ください: %s または %s" -#: lib/bridgedb/templates/base.html:48 +#: lib/bridgedb/strings.py:79 msgid "My bridges don't work! I need help!" msgstr "私のブリッジが動きません! 助けてください!" -#: lib/bridgedb/templates/base.html:49 +#: lib/bridgedb/strings.py:80 #, python-format +msgid "If your Tor doesn't work, you should email %s." +msgstr "Tor がうまく動作しない場合、 %s までメールを下さい。" + +#: lib/bridgedb/strings.py:81 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 "あなたのTorが動作しないなら、%sにメールするべきです。使っていたブリッジのリスト、使っていたバンドルのファイル名/バージョン、Torが出したメッセージなど、できるだけ問題についての情報を多く含めるようにしてください。" +"Try including as much info about your case as you can, including the list of\n" +"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n" +"and any messages which Tor gave out, etc." +msgstr "あなたが使おうとしたブリッジや Pluggable Transports 、ご利用の Tor Browser バージョン、そして Tor が出力したメッセージ等などを含み、出来る限りあなたのケースに関する多くの情報を含めてみてください。" + +#: lib/bridgedb/strings.py:88 +msgid "Here are your bridge lines:" +msgstr "あなたのブリッジラインはこちらです:" + +#: lib/bridgedb/strings.py:89 +msgid "Get Bridges!" +msgstr "ブリッジを入手！" + +#: lib/bridgedb/strings.py:93 +msgid "Please select options for bridge type:" +msgstr "ブリッジタイプのオプションを選択してください:" + +#: lib/bridgedb/strings.py:94 +msgid "Do you need IPv6 addresses?" +msgstr "IPv6 アドレスが必要ですか？" + +#: lib/bridgedb/strings.py:95 +#, python-format +msgid "Do you need a %s?" +msgstr "%s が必要ですか？" -#: lib/bridgedb/templates/bridges.html:10 +#: lib/bridgedb/strings.py:99 +msgid "Your browser is not displaying images properly." +msgstr "ご利用のブラウザは適切に画像を表示していません。" + +#: lib/bridgedb/strings.py:100 +msgid "Enter the characters from the image above..." +msgstr "上記の画像から文字を入力してください..." + +#: lib/bridgedb/strings.py:104 +msgid "How to start using your bridges" +msgstr "ブリッジ使用の始め方" + +#: lib/bridgedb/strings.py:105 +#, python-format 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 "以上の記述を使用するには、Vidaliaのネットワーク設定ページに行き、「私のISPはTorネットワークへの接続をブロックしています」をクリックしてください。その後、各ブリッジアドレスが1つずつ追加されます。" +"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n" +"Browser download page %s to start Tor Browser." +msgstr "Tor Browser にブリッジ情報を入力するには、 %s Tor Browser のダウンロードページ %s の指示に従って Tor Browser を起動してください。" + +#: lib/bridgedb/strings.py:108 +msgid "" +"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n" +"the wizard until it asks:" +msgstr "「Tor ネットワーク設定」ダイアログがポップアップした際、設定をクリックして\n聞かれるまでウィザードに従ってください。" + +#: lib/bridgedb/strings.py:111 +msgid "" +"Does your Internet Service Provider (ISP) block or otherwise censor connections\n" +"to the Tor network?" +msgstr "ご利用のインターネットサービスプロバイダー (ISP) は Tor ネットワークへの接続をブロックないし\n別のやり方で検閲していますか？" + +#: lib/bridgedb/strings.py:114 +msgid "" +"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n" +"paste the bridge lines into the text input box. Finally, click 'Connect', and\n" +"you should be good to go! If you experience trouble, try clicking the 'Help'\n" +"button in the 'Tor Network Settings' wizard for further assistance." +msgstr "「はい」を選択して、「次」をクリックしてください。新しいブリッジを構成するために、テキスト\n入力ボックスにブリッジラインをコピーペーストしてください。最後に、「接続」をクリックして、\nさあ準備が出来たはずです！何か問題があったら、さらなる助けを得るために「Tor\nネットワーク設定」ウィザード内「ヘルプ」ボタンをクリックしてください。" + +#: lib/bridgedb/strings.py:122 +msgid "Displays this message." +msgstr "この画像を表示" + +#: lib/bridgedb/strings.py:123 +msgid "Request vanilla bridges." +msgstr "vanilla ブリッジをリクエスト" + +#: lib/bridgedb/strings.py:124 +msgid "Request IPv6 bridges." +msgstr "IPv6 ブリッジをリクエスト" + +#. TRANSLATORS: Please DO NOT translate the word the word "TYPE". +#: lib/bridgedb/strings.py:126 +msgid "Request a Pluggable Transport by TYPE." +msgstr "タイプごとに Pluggable Transport をリクエスト" + +#: lib/bridgedb/strings.py:127 +msgid "Get a copy of BridgeDB's public GnuPG key." +msgstr "BridgeDB の GnuPG 公開鍵のコピーを手に入れましょう。" + +#: lib/bridgedb/templates/base.html:91 +msgid "Report a Bug" +msgstr "バグを報告する" + +#: lib/bridgedb/templates/base.html:93 +msgid "Source Code" +msgstr "ソースコード" -#: lib/bridgedb/templates/bridges.html:13 -msgid "No bridges currently available" -msgstr "現在利用できるブリッジがありません" +#: lib/bridgedb/templates/base.html:96 +msgid "Changelog" +msgstr "変更履歴" -#: lib/bridgedb/templates/captcha.html:6 -msgid "Upgrade your browser to Firefox" -msgstr "ブラウザをFirefoxにアップグレード" +#: lib/bridgedb/templates/base.html:98 +msgid "Contact" +msgstr "お問い合わせ" -#: lib/bridgedb/templates/captcha.html:8 -msgid "Type the two words" -msgstr "2つの単語をタイプしてください" +#: lib/bridgedb/templates/bridges.html:65 +msgid "Uh oh, spaghettios!" +msgstr "おっとスパゲッティ！" -#: lib/bridgedb/templates/index.html:6 -msgid "Step 1" -msgstr "ステップ 1" +#: lib/bridgedb/templates/bridges.html:70 +msgid "There currently aren't any bridges available..." +msgstr "今の時点では利用できるブリッジがありません..." -#: lib/bridgedb/templates/index.html:8 +#: lib/bridgedb/templates/bridges.html:71 #, python-format -msgid "Get %s Tor Browser Bundle %s" -msgstr "Tor %s Browser Bundle %sを手に入れる" +msgid "" +" Perhaps you should try %s going back %s and choosing a different bridge " +"type!" +msgstr "おそらく、 %s 戻って %s 異なるブリッジタイプを選択してみるべきでしょう。" + +#: lib/bridgedb/templates/index.html:11 +#, python-format +msgid "Step %s1%s" +msgstr "ステップ %s1%s" #: lib/bridgedb/templates/index.html:13 -msgid "Step 2" -msgstr "ステップ 2" +#, python-format +msgid "Download %s Tor Browser %s" +msgstr "%s Tor Browser %s をダウンロード" -#: lib/bridgedb/templates/index.html:15 +#: lib/bridgedb/templates/index.html:25 +#, python-format +msgid "Step %s2%s" +msgstr "ステップ %s2%s" + +#: lib/bridgedb/templates/index.html:27 #, python-format msgid "Get %s bridges %s" msgstr "%s ブリッジ %s を手に入れる" -#: lib/bridgedb/templates/index.html:19 -msgid "Step 3" -msgstr "ステップ 3" +#: lib/bridgedb/templates/index.html:36 +#, python-format +msgid "Step %s3%s" +msgstr "ステップ %s3%s" + +#: lib/bridgedb/templates/index.html:38 +#, python-format +msgid "Now %s add the bridges to Tor Browser %s" +msgstr "%s Tor Browser にブリッジを追加します %s" + +#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the +#. beginning of words are present in your final translation. Thanks! +#. (These are used to insert HTML5 underlining tags, to mark accesskeys +#. for disabled users.) +#. TRANSLATORS: Please do NOT translate the word "bridges"! +#: lib/bridgedb/templates/options.html:39 +#, python-format +msgid "%sJ%sust give me bridges!" +msgstr "%sあ%sの、ください、 bridges!" + +#: lib/bridgedb/templates/options.html:53 +msgid "Advanced Options" +msgstr "高度な設定" + +#: lib/bridgedb/templates/options.html:89 +msgid "No" +msgstr "いいえ" + +#: lib/bridgedb/templates/options.html:90 +msgid "none" +msgstr "なし" + +#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the +#. beginning of words are present in your final translation. Thanks! +#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses." +#: lib/bridgedb/templates/options.html:131 +#, python-format +msgid "%sY%ses!" +msgstr "%sは%sい！" -#: lib/bridgedb/templates/index.html:21 +#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the +#. beginning of words are present in your final translation. Thanks! +#. TRANSLATORS: Please do NOT translate the word "bridge"! +#: lib/bridgedb/templates/options.html:155 #, python-format -msgid "Now %s add the bridges to Tor %s" -msgstr "すぐに%s Torにブリッジを追加 %s" +msgid "%sG%set Bridges" +msgstr "%sG%set Bridges"

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 03 Jun '14

03 Jun '14

commit 62b70a03654e88aa5ead270efc0df9671367b390 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jun 3 15:45:02 2014 +0000 Update translations for bridgedb --- ja/LC_MESSAGES/bridgedb.po | 78 ++++++++++++++++++++++---------------------- 1 file changed, 39 insertions(+), 39 deletions(-) diff --git a/ja/LC_MESSAGES/bridgedb.po b/ja/LC_MESSAGES/bridgedb.po index 8f46d7a..76232ac 100644 --- a/ja/LC_MESSAGES/bridgedb.po +++ b/ja/LC_MESSAGES/bridgedb.po @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2014-05-16 18:39+0000\n" -"PO-Revision-Date: 2014-05-25 21:39+0000\n" +"PO-Revision-Date: 2014-06-03 15:41+0000\n" "Last-Translator: plazmism <gomidori(a)live.jp>\n" "Language-Team: Japanese (http://www.transifex.com/projects/p/torproject/language/ja/)\n" "MIME-Version: 1.0\n" @@ -116,7 +116,7 @@ msgid "" "Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n" "help to circumvent internet censorship in many cases.\n" "\n" -msgstr "" +msgstr "加えて、 BridgeDB は、 %s Pluggable Transport %s のない多くの何の変哲もない\n通常のブリッジを持ち、それはクールには思えないかもしれません。しかし、多くの場合、インターネット検閲を回避するのになお有効です。\n" #: lib/bridgedb/strings.py:65 msgid "What are bridges?" @@ -125,7 +125,7 @@ msgstr "ブリッジとは？" #: lib/bridgedb/strings.py:66 #, python-format msgid "%s Bridges %s are Tor relays that help you circumvent censorship." -msgstr "" +msgstr "%s ブリッジ %s は、インターネット検閲を回避する助けとなる Tor リレーです。" #: lib/bridgedb/strings.py:71 msgid "I need an alternative way of getting bridges!" @@ -137,7 +137,7 @@ msgid "" "Another way to get bridges is to send an email to %s. Please note that you must\n" "send the email using an address from one of the following email providers:\n" "%s or %s." -msgstr "" +msgstr "ブリッジを入手する別のやり方は %s までメールを送ることです。以下のメールプロバイダのうちの1つのアドレスを使用してメールを送信しなければならないことにご注意ください: %s または %s" #: lib/bridgedb/strings.py:79 msgid "My bridges don't work! I need help!" @@ -146,66 +146,66 @@ msgstr "私のブリッジが動きません! 助けてください!" #: lib/bridgedb/strings.py:80 #, python-format msgid "If your Tor doesn't work, you should email %s." -msgstr "" +msgstr "Tor がうまく動作しない場合、 %s までメールを下さい。" #: lib/bridgedb/strings.py:81 msgid "" "Try including as much info about your case as you can, including the list of\n" "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n" "and any messages which Tor gave out, etc." -msgstr "" +msgstr "あなたが使おうとしたブリッジや Pluggable Transports 、ご利用の Tor Browser バージョン、そして Tor が出力したメッセージ等などを含み、出来る限りあなたのケースに関する多くの情報を含めてみてください。" #: lib/bridgedb/strings.py:88 msgid "Here are your bridge lines:" -msgstr "" +msgstr "あなたのブリッジラインはこちらです:" #: lib/bridgedb/strings.py:89 msgid "Get Bridges!" -msgstr "" +msgstr "ブリッジを入手！" #: lib/bridgedb/strings.py:93 msgid "Please select options for bridge type:" -msgstr "" +msgstr "ブリッジタイプのオプションを選択してください:" #: lib/bridgedb/strings.py:94 msgid "Do you need IPv6 addresses?" -msgstr "" +msgstr "IPv6 アドレスが必要ですか？" #: lib/bridgedb/strings.py:95 #, python-format msgid "Do you need a %s?" -msgstr "" +msgstr "%s が必要ですか？" #: lib/bridgedb/strings.py:99 msgid "Your browser is not displaying images properly." -msgstr "" +msgstr "ご利用のブラウザは適切に画像を表示していません。" #: lib/bridgedb/strings.py:100 msgid "Enter the characters from the image above..." -msgstr "" +msgstr "上記の画像から文字を入力してください..." #: lib/bridgedb/strings.py:104 msgid "How to start using your bridges" -msgstr "" +msgstr "ブリッジ使用の始め方" #: lib/bridgedb/strings.py:105 #, python-format msgid "" "To enter bridges into Tor Browser, follow the instructions on the %s Tor\n" "Browser download page %s to start Tor Browser." -msgstr "" +msgstr "Tor Browser にブリッジ情報を入力するには、 %s Tor Browser のダウンロードページ %s の指示に従って Tor Browser を起動してください。" #: lib/bridgedb/strings.py:108 msgid "" "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n" "the wizard until it asks:" -msgstr "" +msgstr "「Tor ネットワーク設定」ダイアログがポップアップした際、設定をクリックして\n聞かれるまでウィザードに従ってください。" #: lib/bridgedb/strings.py:111 msgid "" "Does your Internet Service Provider (ISP) block or otherwise censor connections\n" "to the Tor network?" -msgstr "" +msgstr "ご利用のインターネットサービスプロバイダー (ISP) は Tor ネットワークへの接続をブロックないし\n別のやり方で検閲していますか？" #: lib/bridgedb/strings.py:114 msgid "" @@ -213,28 +213,28 @@ msgid "" "paste the bridge lines into the text input box. Finally, click 'Connect', and\n" "you should be good to go! If you experience trouble, try clicking the 'Help'\n" "button in the 'Tor Network Settings' wizard for further assistance." -msgstr "" +msgstr "「はい」を選択して、「次」をクリックしてください。新しいブリッジを構成するために、テキスト\n入力ボックスにブリッジラインをコピーペーストしてください。最後に、「接続」をクリックして、\nさあ準備が出来たはずです！何か問題があったら、さらなる助けを得るために「Tor\nネットワーク設定」ウィザード内「ヘルプ」ボタンをクリックしてください。" #: lib/bridgedb/strings.py:122 msgid "Displays this message." -msgstr "" +msgstr "この画像を表示" #: lib/bridgedb/strings.py:123 msgid "Request vanilla bridges." -msgstr "" +msgstr "vanilla ブリッジをリクエスト" #: lib/bridgedb/strings.py:124 msgid "Request IPv6 bridges." -msgstr "" +msgstr "IPv6 ブリッジをリクエスト" #. TRANSLATORS: Please DO NOT translate the word the word "TYPE". #: lib/bridgedb/strings.py:126 msgid "Request a Pluggable Transport by TYPE." -msgstr "" +msgstr "タイプごとに Pluggable Transport をリクエスト" #: lib/bridgedb/strings.py:127 msgid "Get a copy of BridgeDB's public GnuPG key." -msgstr "" +msgstr "BridgeDB の GnuPG 公開鍵のコピーを手に入れましょう。" #: lib/bridgedb/templates/base.html:91 msgid "Report a Bug" @@ -242,45 +242,45 @@ msgstr "バグを報告する" #: lib/bridgedb/templates/base.html:93 msgid "Source Code" -msgstr "" +msgstr "ソースコード" #: lib/bridgedb/templates/base.html:96 msgid "Changelog" -msgstr "" +msgstr "変更履歴" #: lib/bridgedb/templates/base.html:98 msgid "Contact" -msgstr "" +msgstr "お問い合わせ" #: lib/bridgedb/templates/bridges.html:65 msgid "Uh oh, spaghettios!" -msgstr "" +msgstr "おっとスパゲッティ！" #: lib/bridgedb/templates/bridges.html:70 msgid "There currently aren't any bridges available..." -msgstr "" +msgstr "今の時点では利用できるブリッジがありません..." #: lib/bridgedb/templates/bridges.html:71 #, python-format msgid "" " Perhaps you should try %s going back %s and choosing a different bridge " "type!" -msgstr "" +msgstr "おそらく、 %s 戻って %s 異なるブリッジタイプを選択してみるべきでしょう。" #: lib/bridgedb/templates/index.html:11 #, python-format msgid "Step %s1%s" -msgstr "" +msgstr "ステップ %s1%s" #: lib/bridgedb/templates/index.html:13 #, python-format msgid "Download %s Tor Browser %s" -msgstr "" +msgstr "%s Tor Browser %s をダウンロード" #: lib/bridgedb/templates/index.html:25 #, python-format msgid "Step %s2%s" -msgstr "" +msgstr "ステップ %s2%s" #: lib/bridgedb/templates/index.html:27 #, python-format @@ -290,12 +290,12 @@ msgstr "%s ブリッジ %s を手に入れる" #: lib/bridgedb/templates/index.html:36 #, python-format msgid "Step %s3%s" -msgstr "" +msgstr "ステップ %s3%s" #: lib/bridgedb/templates/index.html:38 #, python-format msgid "Now %s add the bridges to Tor Browser %s" -msgstr "" +msgstr "%s Tor Browser にブリッジを追加します %s" #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the #. beginning of words are present in your final translation. Thanks! @@ -305,11 +305,11 @@ msgstr "" #: lib/bridgedb/templates/options.html:39 #, python-format msgid "%sJ%sust give me bridges!" -msgstr "" +msgstr "%sあ%sの、ください、 bridges!" #: lib/bridgedb/templates/options.html:53 msgid "Advanced Options" -msgstr "" +msgstr "高度な設定" #: lib/bridgedb/templates/options.html:89 msgid "No" @@ -317,7 +317,7 @@ msgstr "いいえ" #: lib/bridgedb/templates/options.html:90 msgid "none" -msgstr "" +msgstr "なし" #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the #. beginning of words are present in your final translation. Thanks! @@ -325,7 +325,7 @@ msgstr "" #: lib/bridgedb/templates/options.html:131 #, python-format msgid "%sY%ses!" -msgstr "" +msgstr "%sは%sい！" #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the #. beginning of words are present in your final translation. Thanks! @@ -333,4 +333,4 @@ msgstr "" #: lib/bridgedb/templates/options.html:155 #, python-format msgid "%sG%set Bridges" -msgstr "" +msgstr "%sG%set Bridges"

1 0

[stem/master] Stem release 1.2.1
by atagar＠torproject.org 03 Jun '14

03 Jun '14

commit c2541bd9695fc371fe8ad75e2ebdcba15bcd2aa8 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Jun 3 08:16:54 2014 -0700 Stem release 1.2.1 Hotfix release for our Python 3.x for... https://trac.torproject.org/projects/tor/ticket/12185 --- docs/index.rst | 2 +- stem/__init__.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/index.rst b/docs/index.rst index 1925920..05ee23f 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -1,7 +1,7 @@ Welcome to Stem! ================ -Stem is a Python controller library for `Tor <https://www.torproject.org/>`_. Like its predecessor, `TorCtl <https://gitweb.torproject.org/pytorctl.git>`_, it uses Tor's `control protocol <https://gitweb.torproject.org/torspec.git/blob/HEAD:/control-spec.txt>`_ to help developers program against the Tor process, enabling them to build things similar to `Vidalia <https://www.torproject.org/getinvolved/volunteer.html.en#project-vidalia>`_ and `arm <https://www.atagar.com/arm/>`_. Stem's latest version is **1.2.0** (released June 1st, 2014). +Stem is a Python controller library for `Tor <https://www.torproject.org/>`_. Like its predecessor, `TorCtl <https://gitweb.torproject.org/pytorctl.git>`_, it uses Tor's `control protocol <https://gitweb.torproject.org/torspec.git/blob/HEAD:/control-spec.txt>`_ to help developers program against the Tor process, enabling them to build things similar to `Vidalia <https://www.torproject.org/getinvolved/volunteer.html.en#project-vidalia>`_ and `arm <https://www.atagar.com/arm/>`_. Stem's latest version is **1.2.1** (released June 3rd, 2014). .. Main Stem Logo Source: http://www.wpclipart.com/plants/assorted/P/plant_stem.png.html diff --git a/stem/__init__.py b/stem/__init__.py index c61b982..1ec50ab 100644 --- a/stem/__init__.py +++ b/stem/__init__.py @@ -421,7 +421,7 @@ Library for working with the tor process. ================= =========== """ -__version__ = '1.2.0' +__version__ = '1.2.1' __author__ = 'Damian Johnson' __contact__ = 'atagar(a)torproject.org' __url__ = 'https://stem.torproject.org/'

1 0

[stem/master] Fixing /info for python3
by atagar＠torproject.org 03 Jun '14

03 Jun '14

commit 4e458ee979569f2be2cf1cacd1f653b5bb8a9667 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Jun 3 08:10:22 2014 -0700 Fixing /info for python3 On irc zoltan reported that the /info command balks under python3... >>> /info moria1 Traceback (most recent call last): File "/usr/local/bin/tor-prompt", line 8, in <module> stem.interpreter.main() File "/usr/local/lib/python3.2/dist-packages/stem/interpreter/__init__.py", line 116, in main response = interpreter.run_command(user_input) File "/usr/local/lib/python3.2/dist-packages/stem/util/conf.py", line 276, in wrapped return func(*args, config = config, **kwargs) File "/usr/local/lib/python3.2/dist-packages/stem/interpreter/commands.py", line 317, in run_command output = self.do_info(arg) File "/usr/local/lib/python3.2/dist-packages/stem/interpreter/commands.py", line 184, in do_info for desc in server_desc_query: File "/usr/local/lib/python3.2/dist-packages/stem/descriptor/remote.py", line 328, in __iter__ for desc in self._run(True): File "/usr/local/lib/python3.2/dist-packages/stem/descriptor/remote.py", line 317, in _run for desc in results: File "/usr/local/lib/python3.2/dist-packages/stem/descriptor/__init__.py", line 211, in parse_file for desc in file_parser(descriptor_file): File "/usr/local/lib/python3.2/dist-packages/stem/descriptor/__init__.py", line 261, in _parse_metrics_file for desc in stem.descriptor.server_descriptor._parse_file(descriptor_file, is_bridge = False, validate = validate, **kwargs): File "/usr/local/lib/python3.2/dist-packages/stem/descriptor/server_descriptor.py", line 146, in _parse_file if descriptor_content[0].startswith('@type'): TypeError: startswith first arg must be bytes or a tuple of bytes, not str https://trac.torproject.org/projects/tor/ticket/12185 There's a couple issues here. First is a last minute change I added to strip @type annotations. It ran into the normal bytes/unicode python3 gotcha resulting in the stacktrace above. The other is that our contact field is bytes, so it needs to be converted to unicode before mingling with the other lines. --- stem/descriptor/extrainfo_descriptor.py | 2 +- stem/descriptor/microdescriptor.py | 2 +- stem/descriptor/networkstatus.py | 2 +- stem/descriptor/server_descriptor.py | 2 +- stem/interpreter/commands.py | 3 ++- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/stem/descriptor/extrainfo_descriptor.py b/stem/descriptor/extrainfo_descriptor.py index 000b4ec..da81567 100644 --- a/stem/descriptor/extrainfo_descriptor.py +++ b/stem/descriptor/extrainfo_descriptor.py @@ -175,7 +175,7 @@ def _parse_file(descriptor_file, is_bridge = False, validate = True, **kwargs): extrainfo_content += _read_until_keywords(block_end_prefix, descriptor_file, True) if extrainfo_content: - if extrainfo_content[0].startswith('@type'): + if extrainfo_content[0].startswith(b'@type'): extrainfo_content = extrainfo_content[1:] if is_bridge: diff --git a/stem/descriptor/microdescriptor.py b/stem/descriptor/microdescriptor.py index 33ad4e0..3c92aca 100644 --- a/stem/descriptor/microdescriptor.py +++ b/stem/descriptor/microdescriptor.py @@ -138,7 +138,7 @@ def _parse_file(descriptor_file, validate = True, **kwargs): descriptor_lines.append(line) if descriptor_lines: - if descriptor_lines[0].startswith('@type'): + if descriptor_lines[0].startswith(b'@type'): descriptor_lines = descriptor_lines[1:] # strip newlines from annotations diff --git a/stem/descriptor/networkstatus.py b/stem/descriptor/networkstatus.py index fbe96fb..6cf0880 100644 --- a/stem/descriptor/networkstatus.py +++ b/stem/descriptor/networkstatus.py @@ -198,7 +198,7 @@ def _parse_file(document_file, document_type = None, validate = True, is_microde header = _read_until_keywords((ROUTERS_START, FOOTER_START, V2_FOOTER_START), document_file) - if header and header[0].startswith('@type'): + if header and header[0].startswith(b'@type'): header = header[1:] routers_start = document_file.tell() diff --git a/stem/descriptor/server_descriptor.py b/stem/descriptor/server_descriptor.py index 97781da..9416582 100644 --- a/stem/descriptor/server_descriptor.py +++ b/stem/descriptor/server_descriptor.py @@ -143,7 +143,7 @@ def _parse_file(descriptor_file, is_bridge = False, validate = True, **kwargs): descriptor_content += _read_until_keywords(block_end_prefix, descriptor_file, True) if descriptor_content: - if descriptor_content[0].startswith('@type'): + if descriptor_content[0].startswith(b'@type'): descriptor_content = descriptor_content[1:] # strip newlines from annotations diff --git a/stem/interpreter/commands.py b/stem/interpreter/commands.py index f7de765..5473628 100644 --- a/stem/interpreter/commands.py +++ b/stem/interpreter/commands.py @@ -10,6 +10,7 @@ import stem.control import stem.descriptor.remote import stem.interpreter.help import stem.util.connection +import stem.util.str_tools import stem.util.tor_tools from stem.interpreter import STANDARD_OUTPUT, BOLD_OUTPUT, ERROR_OUTPUT, uses_settings, msg @@ -220,7 +221,7 @@ class ControlInterpretor(code.InteractiveConsole): lines.append(format('exit policy: ', *BOLD_OUTPUT) + exit_policy_label) if server_desc: - contact = server_desc.contact + contact = stem.util.str_tools._to_unicode(server_desc.contact) # clears up some highly common obscuring

1 0

[stem/master] Merge version 1.2.1 hotfix
by atagar＠torproject.org 03 Jun '14

03 Jun '14

commit ff36ce755731a53edb0ff6644eb5606b0344bf7b Merge: c29f21c c2541bd Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Jun 3 08:18:58 2014 -0700 Merge version 1.2.1 hotfix docs/index.rst | 2 +- stem/__init__.py | 2 +- stem/descriptor/extrainfo_descriptor.py | 2 +- stem/descriptor/microdescriptor.py | 2 +- stem/descriptor/networkstatus.py | 2 +- stem/descriptor/server_descriptor.py | 2 +- stem/interpreter/commands.py | 3 ++- 7 files changed, 8 insertions(+), 7 deletions(-) diff --cc stem/__init__.py index 5418059,1ec50ab..9362e7b --- a/stem/__init__.py +++ b/stem/__init__.py @@@ -421,7 -421,7 +421,7 @@@ Library for working with the tor proces ================= =========== """ - __version__ = '1.2.0-dev' -__version__ = '1.2.1' ++__version__ = '1.2.1-dev' __author__ = 'Damian Johnson' __contact__ = 'atagar(a)torproject.org' __url__ = 'https://stem.torproject.org/'

1 0

[stem/master] Updating our download link for the 1.2.1 release
by atagar＠torproject.org 03 Jun '14

03 Jun '14

commit 3ced0872d55c153f17a487eb2835cb359de59c13 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Jun 3 08:23:58 2014 -0700 Updating our download link for the 1.2.1 release Bumping our PyPI download links for the hotfix release. --- docs/download.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/download.rst b/docs/download.rst index b2ed0a9..05d0248 100644 --- a/docs/download.rst +++ b/docs/download.rst @@ -63,9 +63,9 @@ Download Signed releases and instructions for both Python 2.x and 3.x. You can install from its `tarball - <https://pypi.python.org/packages/source/s/stem/stem-1.2.0.tar.bz2>`_ + <https://pypi.python.org/packages/source/s/stem/stem-1.2.1.tar.bz2>`_ (`sig - <https://pypi.python.org/packages/source/s/stem/stem-1.2.0.tar.bz2.asc>`_), + <https://pypi.python.org/packages/source/s/stem/stem-1.2.1.tar.bz2.asc>`_), or if you have **pip** installed then getting stem can be as simple as...

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits June 2014