March 2016 - tor-commits - lists.torproject.org

[translation/tails-openpgp-applet] Update translations for tails-openpgp-applet
by translation＠torproject.org 18 Mar '16

18 Mar '16

commit 7c4f835288a9c7a3d595b4ae53db60703de0ac9b Author: Translation commit bot <translation(a)torproject.org> Date: Fri Mar 18 20:46:51 2016 +0000 Update translations for tails-openpgp-applet --- ja/openpgp-applet.pot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ja/openpgp-applet.pot b/ja/openpgp-applet.pot index b98480f..b38d81e 100644 --- a/ja/openpgp-applet.pot +++ b/ja/openpgp-applet.pot @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: tails(a)boum.org\n" "POT-Creation-Date: 2015-08-10 15:55+0200\n" -"PO-Revision-Date: 2015-12-19 16:41+0000\n" +"PO-Revision-Date: 2016-03-18 20:46+0000\n" "Last-Translator: Tokumei Nanashi\n" "Language-Team: Japanese (http://www.transifex.com/otf/torproject/language/ja/)\n" "MIME-Version: 1.0\n"

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 18 Mar '16

18 Mar '16

commit 1165986d9e8d782fafe36d060bc166445572a83b Author: Translation commit bot <translation(a)torproject.org> Date: Fri Mar 18 20:45:45 2016 +0000 Update translations for tails-misc --- ja.po | 82 +++++++++++++++++++++++++++++++++---------------------------------- 1 file changed, 41 insertions(+), 41 deletions(-) diff --git a/ja.po b/ja.po index fdf21d2..16be1c0 100644 --- a/ja.po +++ b/ja.po @@ -16,8 +16,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-01-04 11:56+0100\n" -"PO-Revision-Date: 2016-01-06 09:25+0000\n" +"POT-Creation-Date: 2016-03-07 18:07+0100\n" +"PO-Revision-Date: 2016-03-18 20:44+0000\n" "Last-Translator: carolyn <carolyn(a)anhalt.org>\n" "Language-Team: Japanese (http://www.transifex.com/otf/torproject/language/ja/)\n" "MIME-Version: 1.0\n" @@ -51,30 +51,30 @@ msgid "" "</p>\n" msgstr "<h1>バグ修正に協力してください！</h1>\n<p><a href=\"%s\">バグの報告方法</a>を読んでください。</p>\n<p><strong>不必要な個人情報を含めないでください！</strong></p>\n<h2>メールアドレスの提供について</h2>\n<p>\n我々が問題を特定するために連絡できるよう、あなたのメールアドレスを教えてください。\n我々に届く情報の大半は、追加情報なしでは役に立たないためです。\n一方で、これはメール機能の提供者やプロバイダーなどの盗聴者に、あなたが Tails を利用していることを知られる機械を与える事にもなります。\n</p>\n" -#: config/chroot_local-includes/usr/local/bin/electrum:14 +#: config/chroot_local-includes/usr/local/bin/electrum:17 msgid "Persistence is disabled for Electrum" msgstr "Electrum の保存機能が無効です" -#: config/chroot_local-includes/usr/local/bin/electrum:16 +#: config/chroot_local-includes/usr/local/bin/electrum:19 msgid "" "When you reboot Tails, all of Electrum's data will be lost, including your " "Bitcoin wallet. It is strongly recommended to only run Electrum when its " "persistence feature is activated." msgstr "Tails を再起動すると、Bitcoin ウォレットを含む全ての Electrum のデータは失われます。保存機能が有効なときのみ Electrum を実行させることを強くおすすめします。" -#: config/chroot_local-includes/usr/local/bin/electrum:18 +#: config/chroot_local-includes/usr/local/bin/electrum:21 msgid "Do you want to start Electrum anyway?" msgstr "それでも Electrum を起動しますか？" -#: config/chroot_local-includes/usr/local/bin/electrum:20 -#: config/chroot_local-includes/usr/local/bin/icedove:22 -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:36 +#: config/chroot_local-includes/usr/local/bin/electrum:23 +#: config/chroot_local-includes/usr/local/bin/icedove:23 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41 msgid "_Launch" msgstr "起動 (_L)" -#: config/chroot_local-includes/usr/local/bin/electrum:21 -#: config/chroot_local-includes/usr/local/bin/icedove:23 -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:37 +#: config/chroot_local-includes/usr/local/bin/electrum:24 +#: config/chroot_local-includes/usr/local/bin/icedove:24 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42 msgid "_Exit" msgstr "終了 (_E)" @@ -232,11 +232,11 @@ msgstr "GnuPGの出力:" msgid "Other messages provided by GnuPG:" msgstr "GnuPGからのそのほかのメッセージ:" -#: config/chroot_local-includes/usr/local/bin/icedove:18 +#: config/chroot_local-includes/usr/local/bin/icedove:19 msgid "The <b>Claws Mail</b> persistence feature is activated." msgstr "" -#: config/chroot_local-includes/usr/local/bin/icedove:20 +#: config/chroot_local-includes/usr/local/bin/icedove:21 msgid "" "If you have emails saved in <b>Claws Mail</b>, you should <a " "href='https://tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove'>migrate" @@ -317,40 +317,40 @@ msgstr "Tailsのこのバージョンには、既知のセキュリティ問題 msgid "Known security issues" msgstr "既知のセキュリティー問題" -#: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:51 +#: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:52 #, sh-format msgid "Network card ${nic} disabled" msgstr "ネットワークカード ${nic} が無効になりました" -#: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:52 +#: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:53 #, sh-format msgid "" "MAC spoofing failed for network card ${nic_name} (${nic}) so it is temporarily disabled.\n" "You might prefer to restart Tails and disable MAC spoofing." msgstr "MAC スプーフィングが、ネットワークカード ${nic_name} (${nic}) のために失敗したので、一時的に無効化されます。\nTails を再起動して、 MAC スプーフィーングを無効化したいかもしれません。" -#: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:61 +#: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:62 msgid "All networking disabled" msgstr "全ネットワーク機能無効" -#: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:62 +#: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:63 #, sh-format msgid "" "MAC spoofing failed for network card ${nic_name} (${nic}). The error recovery also failed so all networking is disabled.\n" "You might prefer to restart Tails and disable MAC spoofing." msgstr "MAC スプーフィングが、ネットワークカード ${nic_name} (${nic}) のために失敗しました。エラー回復も失敗したので、ネットワーク能力は全て無効化されます。\nTails を再起動して、 MAC スプーフィーングを無効化したいかもしれません。" -#: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:18 -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:22 +#: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:24 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:27 msgid "error:" msgstr "エラー:" -#: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:19 -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:23 +#: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:25 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:28 msgid "Error" msgstr "エラー" -#: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:39 +#: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:45 msgid "" "<b>Not enough memory available to check for upgrades.</b>\n" "\n" @@ -389,52 +389,52 @@ msgstr "ホストオペレーティングシステムと仮想化ソフトウェ msgid "Learn more" msgstr "詳細を見る" -#: config/chroot_local-includes/usr/local/bin/tor-browser:29 +#: config/chroot_local-includes/usr/local/bin/tor-browser:40 msgid "Tor is not ready" msgstr "Tor は準備出来ていません" -#: config/chroot_local-includes/usr/local/bin/tor-browser:30 +#: config/chroot_local-includes/usr/local/bin/tor-browser:41 msgid "Tor is not ready. Start Tor Browser anyway?" msgstr "Tor は準備出来ていません。とにかく Tor Browser を起動しますか？" -#: config/chroot_local-includes/usr/local/bin/tor-browser:31 +#: config/chroot_local-includes/usr/local/bin/tor-browser:42 msgid "Start Tor Browser" msgstr "Tor Browser を起動" -#: config/chroot_local-includes/usr/local/bin/tor-browser:32 +#: config/chroot_local-includes/usr/local/bin/tor-browser:43 msgid "Cancel" msgstr "キャンセル" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:33 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38 msgid "Do you really want to launch the Unsafe Browser?" msgstr "本当に安全ではないブラウザを起動しますか？" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:35 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:40 msgid "" "Network activity within the Unsafe Browser is <b>not anonymous</b>.\\nOnly " "use the Unsafe Browser if necessary, for example\\nif you have to login or " "register to activate your Internet connection." msgstr "安全でないブラウザ内でのネットワークの活動状況は、<b>匿名ではありません</b>。\\n必要な場合のみ、例えば、\\nインターネット接続を有効化するためにログインまたは登録しなければならないような場合のみ、安全でないブラウザを使用してください。" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:47 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:52 msgid "Starting the Unsafe Browser..." msgstr "安全でないブラウザを起動中..." -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:48 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:53 msgid "This may take a while, so please be patient." msgstr "しばらくかかる場合がありますので、お待ちください。" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:53 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:58 msgid "Shutting down the Unsafe Browser..." msgstr "安全でないブラウザをシャットダウン中..." -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:54 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:59 msgid "" "This may take a while, and you may not restart the Unsafe Browser until it " "is properly shut down." msgstr "暫く時間がかかる恐れがあり、適切にシャットダウンされるまで、安全でないブラウザを再起動できません。" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:66 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:71 msgid "Failed to restart Tor." msgstr "Torを再起動できませんでした。" @@ -473,40 +473,40 @@ msgstr "ブラウザーの設定に失敗しました。" msgid "Failed to run browser." msgstr "ブラウザーを起動できませんでした。" -#: config/chroot_local-includes/usr/local/sbin/tails-i2p:35 +#: config/chroot_local-includes/usr/local/sbin/tails-i2p:34 msgid "I2P failed to start" msgstr "I2Pは起動できませんでした" -#: config/chroot_local-includes/usr/local/sbin/tails-i2p:36 +#: config/chroot_local-includes/usr/local/sbin/tails-i2p:35 msgid "" "Something went wrong when I2P was starting. Check the logs in /var/log/i2p " "for more information." msgstr "I2Pの開始時になにかエラーが起きたようです。/var/log/i2p にあるログファイルを覗いてみてください。何か手がかりがあるかもしれません。" -#: config/chroot_local-includes/usr/local/sbin/tails-i2p:53 +#: config/chroot_local-includes/usr/local/sbin/tails-i2p:52 msgid "I2P's router console is ready" msgstr "I2Pルータコンソールは準備完了" -#: config/chroot_local-includes/usr/local/sbin/tails-i2p:54 +#: config/chroot_local-includes/usr/local/sbin/tails-i2p:53 msgid "You can now access I2P's router console in the I2P Browser." msgstr "I2Pのルータ・コンソールにI2Pブラウザからアクセスできます" -#: config/chroot_local-includes/usr/local/sbin/tails-i2p:59 +#: config/chroot_local-includes/usr/local/sbin/tails-i2p:58 msgid "I2P is not ready" msgstr "I2Pは準備できていません" -#: config/chroot_local-includes/usr/local/sbin/tails-i2p:60 +#: config/chroot_local-includes/usr/local/sbin/tails-i2p:59 msgid "" "Eepsite tunnel not built within six minutes. Check the router console in the" " I2P Browser or the logs in /var/log/i2p for more information. Reconnect to " "the network to try again." msgstr "Eepsite tunnelは6分以内に構築されませんでした。I2Pブラウザーにルータ・コンソールの/var/log/i2pのログを確認してください。再トライするにはネットワークに再接続してください" -#: config/chroot_local-includes/usr/local/sbin/tails-i2p:72 +#: config/chroot_local-includes/usr/local/sbin/tails-i2p:71 msgid "I2P is ready" msgstr "I2Pは準備完了" -#: config/chroot_local-includes/usr/local/sbin/tails-i2p:73 +#: config/chroot_local-includes/usr/local/sbin/tails-i2p:72 msgid "You can now access services on I2P." msgstr "I2Pサービスにアクセスできます"

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 18 Mar '16

18 Mar '16

commit 33cb647efe35093f730093440d46fd3cac388760 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Mar 18 20:45:16 2016 +0000 Update translations for https_everywhere --- ja/https-everywhere.dtd | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/ja/https-everywhere.dtd b/ja/https-everywhere.dtd index b73709e..1ddd984 100644 --- a/ja/https-everywhere.dtd +++ b/ja/https-everywhere.dtd @@ -14,7 +14,7 @@ <!ENTITY https-everywhere.about.or "または"> <!ENTITY https-everywhere.about.donate_eff "EFFに寄付する"> -<!ENTITY https-everywhere.menu.donate_eff_imperative "Donate to EFF"> +<!ENTITY https-everywhere.menu.donate_eff_imperative "EFFに寄付する"> <!ENTITY https-everywhere.menu.about "HTTPS Everywhereについて"> <!ENTITY https-everywhere.menu.observatory "ssl Observatoryの設定"> <!ENTITY https-everywhere.menu.globalEnable "HTTPS Everywhereを有効化"> @@ -44,13 +44,13 @@ <!ENTITY https-everywhere.chrome.experimental_rules_description "May cause warnings or breakage. Disabled by default."> <!ENTITY https-everywhere.chrome.add_rule "Add a rule for this site"> <!ENTITY https-everywhere.chrome.add_new_rule "Add a new rule for this site"> -<!ENTITY https-everywhere.chrome.always_https_for_host "Always use https for this host"> -<!ENTITY https-everywhere.chrome.host "Host:"> -<!ENTITY https-everywhere.chrome.show_advanced "Show advanced"> -<!ENTITY https-everywhere.chrome.hide_advanced "Hide advanced"> +<!ENTITY https-everywhere.chrome.always_https_for_host "このホストでは常にhttpsを使用する"> +<!ENTITY https-everywhere.chrome.host "ホスト:"> +<!ENTITY https-everywhere.chrome.show_advanced "高度な設定を表示する"> +<!ENTITY https-everywhere.chrome.hide_advanced "高度な設定を隠す"> <!ENTITY https-everywhere.chrome.rule_name "Rule name"> <!ENTITY https-everywhere.chrome.regex "Matching regex"> -<!ENTITY https-everywhere.chrome.redirect_to "Redirect to"> -<!ENTITY https-everywhere.chrome.status_cancel_button "Cancel"> +<!ENTITY https-everywhere.chrome.redirect_to "リダイレクト先"> +<!ENTITY https-everywhere.chrome.status_cancel_button "キャンセル">

1 0

[snowflake/master] Fix receiving cp/paste offer
by arlo＠torproject.org 18 Mar '16

18 Mar '16

commit 2ac12c5b8d48ffeb2472069e5b893abc6950e9ce Author: Arlo Breault <arlolra(a)gmail.com> Date: Fri Mar 18 13:11:45 2016 -0700 Fix receiving cp/paste offer --- proxy/snowflake.coffee | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/proxy/snowflake.coffee b/proxy/snowflake.coffee index 1cdccda..eff96de 100644 --- a/proxy/snowflake.coffee +++ b/proxy/snowflake.coffee @@ -191,7 +191,11 @@ Signalling = if !desc log 'Invalid SDP.' return false - snowflake.receiveOffer recv if desc + pair = snowflake.nextAvailableProxyPair() + if !pair + log 'At client capacity.' + return false + snowflake.receiveOffer pair, msg # Log to both console and UI if applicable. log = (msg) ->

1 0

[webwml/master] Add new Tor Browser versions: 5.5.4, 6.0a4
by boklm＠torproject.org 18 Mar '16

18 Mar '16

commit 60091053c7e0eebecdd596a45e7f195ff88b729b Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Mar 18 20:43:13 2016 +0100 Add new Tor Browser versions: 5.5.4, 6.0a4 --- include/versions.wmi | 46 +++++++++++++++--------------- projects/torbrowser/RecommendedTBBVersions | 12 +++++++- 2 files changed, 34 insertions(+), 24 deletions(-) diff --git a/include/versions.wmi b/include/versions.wmi index 88ddb98..2f1c042 100644 --- a/include/versions.wmi +++ b/include/versions.wmi @@ -4,29 +4,29 @@ <define-tag version-win32-stable whitespace=delete>0.2.7.6</define-tag> <define-tag version-torbrowserdevelopbranch whitespace=delete>maint-5.5</define-tag> -<define-tag version-torbrowserbundledir whitespace=delete>5.5.3</define-tag> -<define-tag version-torbrowserbundlebetadir whitespace=delete>6.0a3</define-tag> - -<define-tag version-torbrowserbundle whitespace=delete>5.5.3</define-tag> -<define-tag releasedate-torbrowserbundle whitespace=delete>2016-03-08</define-tag> -<define-tag version-torbrowserbundlebeta whitespace=delete>6.0a3</define-tag> -<define-tag releasedate-torbrowserbundlebeta whitespace=delete>2016-03-08</define-tag> - -<define-tag version-torbrowserbundlelinux32 whitespace=delete>5.5.3</define-tag> -<define-tag releasedate-torbrowserbundlelinux32 whitespace=delete>2016-03-08</define-tag> -<define-tag version-torbrowserbundlelinux64 whitespace=delete>5.5.3</define-tag> -<define-tag releasedate-torbrowserbundlelinux64 whitespace=delete>2016-03-08</define-tag> -<define-tag version-torbrowserbundlelinux32beta whitespace=delete>6.0a3</define-tag> -<define-tag releasedate-torbrowserbundlelinux32beta whitespace=delete>2016-03-08</define-tag> -<define-tag version-torbrowserbundlelinux64beta whitespace=delete>6.0a3</define-tag> -<define-tag releasedate-torbrowserbundlelinux64beta whitespace=delete>2016-03-08</define-tag> - -<define-tag version-torbrowserbundleosx32 whitespace=delete>5.5.3</define-tag> -<define-tag releasedate-torbrowserbundleosx32 whitespace=delete>2016-03-08</define-tag> -<define-tag version-torbrowserbundleosx64 whitespace=delete>5.5.3</define-tag> -<define-tag releasedate-torbrowserbundleosx64 whitespace=delete>2016-03-08</define-tag> -<define-tag version-torbrowserbundleosx64beta whitespace=delete>6.0a3</define-tag> -<define-tag releasedate-torbrowserbundleosx64beta whitespace=delete>2016-03-08</define-tag> +<define-tag version-torbrowserbundledir whitespace=delete>5.5.4</define-tag> +<define-tag version-torbrowserbundlebetadir whitespace=delete>6.0a4</define-tag> + +<define-tag version-torbrowserbundle whitespace=delete>5.5.4</define-tag> +<define-tag releasedate-torbrowserbundle whitespace=delete>2016-03-18</define-tag> +<define-tag version-torbrowserbundlebeta whitespace=delete>6.0a4</define-tag> +<define-tag releasedate-torbrowserbundlebeta whitespace=delete>2016-03-18</define-tag> + +<define-tag version-torbrowserbundlelinux32 whitespace=delete>5.5.4</define-tag> +<define-tag releasedate-torbrowserbundlelinux32 whitespace=delete>2016-03-18</define-tag> +<define-tag version-torbrowserbundlelinux64 whitespace=delete>5.5.4</define-tag> +<define-tag releasedate-torbrowserbundlelinux64 whitespace=delete>2016-03-18</define-tag> +<define-tag version-torbrowserbundlelinux32beta whitespace=delete>6.0a4</define-tag> +<define-tag releasedate-torbrowserbundlelinux32beta whitespace=delete>2016-03-18</define-tag> +<define-tag version-torbrowserbundlelinux64beta whitespace=delete>6.0a4</define-tag> +<define-tag releasedate-torbrowserbundlelinux64beta whitespace=delete>2016-03-18</define-tag> + +<define-tag version-torbrowserbundleosx32 whitespace=delete>5.5.4</define-tag> +<define-tag releasedate-torbrowserbundleosx32 whitespace=delete>2016-03-18</define-tag> +<define-tag version-torbrowserbundleosx64 whitespace=delete>5.5.4</define-tag> +<define-tag releasedate-torbrowserbundleosx64 whitespace=delete>2016-03-18</define-tag> +<define-tag version-torbrowserbundleosx64beta whitespace=delete>6.0a4</define-tag> +<define-tag releasedate-torbrowserbundleosx64beta whitespace=delete>2016-03-18</define-tag> <define-tag package-win32-stable whitespace=delete>../dist/torbrowser/<version-torbrowserbundledir>/tor-win32-<version-win32-stable>.zip</define-tag> diff --git a/projects/torbrowser/RecommendedTBBVersions b/projects/torbrowser/RecommendedTBBVersions index 1382c17..b18a5b6 100644 --- a/projects/torbrowser/RecommendedTBBVersions +++ b/projects/torbrowser/RecommendedTBBVersions @@ -3,10 +3,20 @@ "5.5.3-Linux", "5.5.3-MacOS", "5.5.3-Windows", +"5.5.4", +"5.5.4-Linux", +"5.5.4-MacOS", +"5.5.4-Windows", "6.0a3", "6.0a3-Linux", "6.0a3-MacOS", "6.0a3-Windows", +"6.0a4", +"6.0a4-Linux", +"6.0a4-MacOS", +"6.0a4-Windows", "6.0a3-hardened", -"6.0a3-hardened-Linux" +"6.0a3-hardened-Linux", +"6.0a4-hardened", +"6.0a4-hardened-Linux" ]

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 18 Mar '16

18 Mar '16

commit 121375690846f7a85dc050f6636a9b891f2b88ce Author: Translation commit bot <translation(a)torproject.org> Date: Fri Mar 18 19:15:04 2016 +0000 Update translations for bridgedb --- es_MX/LC_MESSAGES/bridgedb.po | 39 ++++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/es_MX/LC_MESSAGES/bridgedb.po b/es_MX/LC_MESSAGES/bridgedb.po index 09acfc8..bf3fcd4 100644 --- a/es_MX/LC_MESSAGES/bridgedb.po +++ b/es_MX/LC_MESSAGES/bridgedb.po @@ -5,14 +5,15 @@ # Translators: # manuelglz <cglzmtzg(a)gmail.com>, 2014 # Javier Flores Topete <javierflorestopete789(a)gmail.com>, 2015 +# Luis Gerardo Flores Ortiz <luisgflores(a)hotmail.com>, 2016 # TheFreeman <maurocarrizales(a)outlook.com>, 2014 msgid "" 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: 2015-07-25 03:40+0000\n" -"PO-Revision-Date: 2015-10-07 20:02+0000\n" -"Last-Translator: Javier Flores Topete <javierflorestopete789(a)gmail.com>\n" +"PO-Revision-Date: 2016-03-18 19:02+0000\n" +"Last-Translator: Luis Gerardo Flores Ortiz <luisgflores(a)hotmail.com>\n" "Language-Team: Spanish (Mexico) (http://www.transifex.com/otf/torproject/language/es_MX/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -34,31 +35,31 @@ msgstr "" #. "Tor Browser" #: bridgedb/https/server.py:167 msgid "Sorry! Something went wrong with your request." -msgstr "Perdón!Algo salió mal con tu cuestionario" +msgstr "Perdón! Algo salió mal con tu petición." #: bridgedb/https/templates/base.html:79 msgid "Report a Bug" -msgstr "" +msgstr "Reportar un error" #: bridgedb/https/templates/base.html:82 msgid "Source Code" -msgstr "" +msgstr "Código fuente" #: bridgedb/https/templates/base.html:85 msgid "Changelog" -msgstr "" +msgstr "Registro de cambios" #: bridgedb/https/templates/base.html:88 msgid "Contact" -msgstr "" +msgstr "Contacto" #: bridgedb/https/templates/bridges.html:35 msgid "Select All" -msgstr "" +msgstr "Seleccionar todo" #: bridgedb/https/templates/bridges.html:40 msgid "Show QRCode" -msgstr "" +msgstr "Mostrar código QR" #: bridgedb/https/templates/bridges.html:52 msgid "QRCode for your bridge lines" @@ -75,7 +76,7 @@ msgstr "" #: bridgedb/https/templates/bridges.html:68 msgid "It seems there was an error getting your QRCode." -msgstr "" +msgstr "Parece que hubo un error al obtener tu código QR." #: bridgedb/https/templates/bridges.html:73 msgid "" @@ -97,17 +98,17 @@ msgstr "" #: bridgedb/https/templates/index.html:11 #, python-format msgid "Step %s1%s" -msgstr "" +msgstr "Paso %s1%s" #: bridgedb/https/templates/index.html:13 #, python-format msgid "Download %s Tor Browser %s" -msgstr "" +msgstr "Descargar %s Tor Browser %s" #: bridgedb/https/templates/index.html:25 #, python-format msgid "Step %s2%s" -msgstr "" +msgstr "Paso %s2%s" #: bridgedb/https/templates/index.html:27 #, python-format @@ -117,7 +118,7 @@ msgstr "" #: bridgedb/https/templates/index.html:36 #, python-format msgid "Step %s3%s" -msgstr "" +msgstr "Paso %s3%s" #: bridgedb/https/templates/index.html:38 #, python-format @@ -135,7 +136,7 @@ msgstr "" #: bridgedb/https/templates/options.html:51 msgid "Advanced Options" -msgstr "" +msgstr "Opciones avanzadas" #: bridgedb/https/templates/options.html:86 msgid "No" @@ -163,7 +164,7 @@ msgstr "" #: bridgedb/strings.py:43 msgid "[This is an automated message; please do not reply.]" -msgstr "{Este es un mensage automático;por favor no lo conteste.]" +msgstr "{Este es un mensage automático; por favor no lo conteste.]" #: bridgedb/strings.py:45 msgid "Here are your bridges:" @@ -174,7 +175,7 @@ msgstr "Aquí están tus puentes:" 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 "Has excedido el limite de tu porcentage. ¡Por favor pausa! El tiempo minimo entre\ncorreos electrónicos es %s horas. Todos los demás correos electrónicos durante este período serán ignorados." +msgstr "Has excedido el limite de envío. ¡Por favor pausa! El tiempo minimo entre\ncorreos electrónicos es %s horas. Todos los demás correos electrónicos durante este período serán ignorados." #: bridgedb/strings.py:50 msgid "" @@ -189,7 +190,7 @@ msgstr "¡Bienvenido a BridgeDB!" #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE". #: bridgedb/strings.py:55 msgid "Currently supported transport TYPEs:" -msgstr "En este momento los TYPEs para tranporte apoyados:" +msgstr "TYPEs de transporte soportados actualmente:" #: bridgedb/strings.py:56 #, python-format @@ -212,7 +213,7 @@ msgstr "Claves Públicas" msgid "" "This email was generated with rainbows, unicorns, and sparkles\n" "for %s on %s at %s." -msgstr "Este correo electrónico fue creado con arcoiris, unicornios y chispas\npara %s encima de %s en %s" +msgstr "Este correo electrónico fue creado con arcoiris, unicornios y chispas\npara %s en %s en %s" #. TRANSLATORS: Please DO NOT translate "BridgeDB". #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".

1 0

[snowflake/master] Fix input handler
by arlo＠torproject.org 18 Mar '16

18 Mar '16

commit df2ea126c84d301e58f59ea08cc42662ed0a9f9a Author: Arlo Breault <arlolra(a)gmail.com> Date: Fri Mar 18 11:58:01 2016 -0700 Fix input handler --- proxy/package.json | 3 ++- proxy/snowflake.coffee | 2 +- proxy/ui.coffee | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/proxy/package.json b/proxy/package.json index 0a23eb4..b7e44df 100644 --- a/proxy/package.json +++ b/proxy/package.json @@ -8,7 +8,8 @@ }, "scripts": { "test": "cake test", - "lint": "cake lint" + "lint": "cake lint", + "build": "cake build" }, "author": "Serene Han", "license": "BSD-3-Clause", diff --git a/proxy/snowflake.coffee b/proxy/snowflake.coffee index 9686f30..1cdccda 100644 --- a/proxy/snowflake.coffee +++ b/proxy/snowflake.coffee @@ -207,9 +207,9 @@ init = -> broker = new Broker brokerUrl snowflake = new Snowflake broker, ui - dbg 'Contacting Broker at ' + broker.url log '== snowflake proxy ==' log 'Copy-Paste mode detected.' if COPY_PASTE_ENABLED + dbg 'Contacting Broker at ' + broker.url if not COPY_PASTE_ENABLED relayAddr = Params.getAddress(query, 'relay', DEFAULT_RELAY) snowflake.setRelayAddr relayAddr diff --git a/proxy/ui.coffee b/proxy/ui.coffee index cb25216..c2f898f 100644 --- a/proxy/ui.coffee +++ b/proxy/ui.coffee @@ -22,7 +22,7 @@ class UI @$msglog.value = '' @$send = document.getElementById('send') - @$send.onclick = => { @acceptInput } + @$send.onclick = @acceptInput @$input = document.getElementById('input') @$input.focus()

1 0

[snowflake/master] per-proxypair Snowflake ID generation instead of just one for the Broker (#11)
by arlo＠torproject.org 18 Mar '16

18 Mar '16

commit b1e76420bd7c3838d128407c9822b089c0296bc2 Author: Serene Han <keroserene+git(a)gmail.com> Date: Mon Mar 14 22:12:28 2016 -0700 per-proxypair Snowflake ID generation instead of just one for the Broker (#11) --- proxy/broker.coffee | 19 +++++++------------ proxy/proxypair.coffee | 8 ++++++-- proxy/snowflake.coffee | 30 ++++++++++++++++++++++++------ proxy/spec/broker.spec.coffee | 6 +++--- proxy/util.coffee | 4 ++++ 5 files changed, 44 insertions(+), 23 deletions(-) diff --git a/proxy/broker.coffee b/proxy/broker.coffee index 78577e7..9eb378c 100644 --- a/proxy/broker.coffee +++ b/proxy/broker.coffee @@ -12,21 +12,16 @@ STATUS_GATEWAY_TIMEOUT = 504 MESSAGE_TIMEOUT = 'Timed out waiting for a client offer.' MESSAGE_UNEXPECTED = 'Unexpected status.' -genSnowflakeID = -> - Math.random().toString(36).substring(2) - # Represents a broker running remotely. class Broker clients: 0 - id: null # When interacting with the Broker, snowflake must generate a unique session # ID so the Broker can keep track of which signalling channel it's speaking # to. constructor: (@url) -> @clients = 0 - @id = genSnowflakeID() # Ensure url has the right protocol + trailing slash. @url = 'http://' + @url if 0 == @url.indexOf('localhost', 0) @url = 'https://' + @url if 0 != @url.indexOf('http', 0) @@ -37,7 +32,7 @@ class Broker # waits for a response containing some client offer that the Broker chooses # for this proxy.. # TODO: Actually support multiple clients. - getClientOffer: => + getClientOffer: (id) => new Promise (fulfill, reject) => xhr = new XMLHttpRequest() xhr.onreadystatechange = -> @@ -53,12 +48,12 @@ class Broker snowflake.ui.setStatus ' failure. Please refresh.' reject MESSAGE_UNEXPECTED @_xhr = xhr # Used by spec to fake async Broker interaction - @_postRequest xhr, 'proxy', @id + @_postRequest id, xhr, 'proxy', id # Assumes getClientOffer happened, and a WebRTC SDP answer has been generated. # Sends it back to the broker, which passes it to back to the original client. - sendAnswer: (answer) -> - dbg @id + ' - Sending answer back to broker...\n' + sendAnswer: (id, answer) -> + dbg id + ' - Sending answer back to broker...\n' dbg answer.sdp xhr = new XMLHttpRequest() xhr.onreadystatechange = -> @@ -73,14 +68,14 @@ class Broker dbg 'Broker ERROR: Unexpected ' + xhr.status + ' - ' + xhr.statusText snowflake.ui.setStatus ' failure. Please refresh.' - @_postRequest xhr, 'answer', JSON.stringify(answer) + @_postRequest id, xhr, 'answer', JSON.stringify(answer) # urlSuffix for the broker is different depending on what action # is desired. - _postRequest: (xhr, urlSuffix, payload) => + _postRequest: (id, xhr, urlSuffix, payload) => try xhr.open 'POST', @url + urlSuffix - xhr.setRequestHeader('X-Session-ID', @id) + xhr.setRequestHeader('X-Session-ID', id) catch err ### An exception happens here when, for example, NoScript allows the domain diff --git a/proxy/proxypair.coffee b/proxy/proxypair.coffee index db53612..3a3fb01 100644 --- a/proxy/proxypair.coffee +++ b/proxy/proxypair.coffee @@ -3,6 +3,8 @@ Represents a single: client <-- webrtc --> snowflake <-- websocket --> relay +Every ProxyPair has a Snowflake ID, which is necessary when responding to the +Broker with an WebRTC answer. ### class ProxyPair @@ -16,10 +18,12 @@ class ProxyPair running: true active: false # Whether serving a client. flush_timeout_id: null - onCleanup: null + onCleanup: null + id: null constructor: (@clientAddr, @relayAddr, @rateLimit) -> @active = false + @id = genSnowflakeID() # Prepare a WebRTC PeerConnection and await for an SDP offer. begin: -> @@ -38,7 +42,7 @@ class ProxyPair if COPY_PASTE_ENABLED Signalling.send @pc.localDescription else - snowflake.broker.sendAnswer @pc.localDescription + snowflake.broker.sendAnswer @id, @pc.localDescription # OnDataChannel triggered remotely from the client when connection succeeds. @pc.ondatachannel = (dc) => channel = dc.channel diff --git a/proxy/snowflake.coffee b/proxy/snowflake.coffee index e8c00aa..7cc01c9 100644 --- a/proxy/snowflake.coffee +++ b/proxy/snowflake.coffee @@ -84,6 +84,9 @@ class Snowflake for i in [1..CONNECTIONS_PER_CLIENT] @makeProxyPair @relayAddr return if COPY_PASTE_ENABLED + log 'ProxyPair Slots: ' + @proxyPairs.length + log 'Snowflake IDs: ' + (@proxyPairs.map (p) -> p.id).join ' | ' + timer = null # Temporary countdown. countdown = (msg, sec) => @@ -99,22 +102,37 @@ class Snowflake msg = 'polling for client... ' msg += '[retries: ' + @retries + ']' if @retries > 0 @ui.setStatus msg - recv = @broker.getClientOffer() - @retries++ + # Pick an available ProxyPair to poll with. + pair = @nextAvailableProxyPair() + if !pair + log 'No more available ProxyPair slots.' + countdown(err, DEFAULT_BROKER_POLL_INTERVAL / 1000) + return + log 'Polling for ' + pair.id + recv = @broker.getClientOffer pair.id recv.then (desc) => offer = JSON.parse desc dbg 'Received:\n\n' + offer.sdp + '\n' - @receiveOffer offer + console.log desc + sdp = new RTCSessionDescription offer + # @receiveOffer offer + if pair.receiveWebRTCOffer sdp + @sendAnswer pair if 'offer' == sdp.type , (err) -> countdown(err, DEFAULT_BROKER_POLL_INTERVAL / 1000) + @retries++ findClients() + # Returns the first ProxyPair that's available to connect. + nextAvailableProxyPair: -> + return @proxyPairs.find (pp, i, arr) -> return !pp.active + # Receive an SDP offer from some client assigned by the Broker, + # TODO: remove receiveOffer: (desc) => sdp = new RTCSessionDescription desc - # Use the first proxyPair that's available. - pair = @proxyPairs.find (pp, i, arr) -> return !pp.active + pair = @nextAvailableProxyPair() if pair.receiveWebRTCOffer sdp @sendAnswer pair if 'offer' == sdp.type @@ -190,7 +208,7 @@ init = -> broker = new Broker brokerUrl snowflake = new Snowflake broker, ui - dbg 'Contacting Broker at ' + broker.url + '\nSnowflake ID: ' + broker.id + dbg 'Contacting Broker at ' + broker.url log '== snowflake proxy ==' log 'Copy-Paste mode detected.' if COPY_PASTE_ENABLED diff --git a/proxy/spec/broker.spec.coffee b/proxy/spec/broker.spec.coffee index db936c1..aef115f 100644 --- a/proxy/spec/broker.spec.coffee +++ b/proxy/spec/broker.spec.coffee @@ -76,9 +76,9 @@ describe 'Broker', -> it 'responds to the broker with answer', -> b = new Broker 'fake' spyOn(b, '_postRequest') - b.sendAnswer 123 + b.sendAnswer 'fake id', 123 expect(b._postRequest).toHaveBeenCalledWith( - jasmine.any(Object), 'answer', '123') + 'fake id', jasmine.any(Object), 'answer', '123') it 'POST XMLHttpRequests to the broker', -> b = new Broker 'fake' @@ -86,7 +86,7 @@ describe 'Broker', -> spyOn(b._xhr, 'open') spyOn(b._xhr, 'setRequestHeader') spyOn(b._xhr, 'send') - b._postRequest b._xhr, 'test', 'data' + b._postRequest 0, b._xhr, 'test', 'data' expect(b._xhr.open).toHaveBeenCalled() expect(b._xhr.setRequestHeader).toHaveBeenCalled() expect(b._xhr.send).toHaveBeenCalled() diff --git a/proxy/util.coffee b/proxy/util.coffee index ea65e63..a5b247c 100644 --- a/proxy/util.coffee +++ b/proxy/util.coffee @@ -5,6 +5,10 @@ Contains helpers for parsing query strings and other utilities. ### +genSnowflakeID = -> + Math.random().toString(36).substring(2) + + Query = ### Parse a URL query string or application/x-www-form-urlencoded body. The

1 0

[snowflake/master] better checks on receiveOffer (#11)
by arlo＠torproject.org 18 Mar '16

18 Mar '16

commit 490b8b33b78e318267088d79e362a44d88cc8228 Author: Serene Han <keroserene+git(a)gmail.com> Date: Tue Mar 15 20:13:39 2016 -0700 better checks on receiveOffer (#11) --- proxy/proxypair.coffee | 4 +++- proxy/snowflake.coffee | 35 +++++++++++++++-------------------- proxy/spec/snowflake.spec.coffee | 16 ++++++++++++---- 3 files changed, 30 insertions(+), 25 deletions(-) diff --git a/proxy/proxypair.coffee b/proxy/proxypair.coffee index 3a3fb01..3ed6c6c 100644 --- a/proxy/proxypair.coffee +++ b/proxy/proxypair.coffee @@ -51,7 +51,9 @@ class ProxyPair @client = channel receiveWebRTCOffer: (offer) -> - console.assert 'offer' == offer.type + if 'offer' != offer.type + log 'Invalid SDP received -- was not an offer.' + return false try err = @pc.setRemoteDescription offer catch e diff --git a/proxy/snowflake.coffee b/proxy/snowflake.coffee index 7cc01c9..4f38029 100644 --- a/proxy/snowflake.coffee +++ b/proxy/snowflake.coffee @@ -50,12 +50,11 @@ CONFIRMATION_MESSAGE = "You're currently serving a Tor user via Snowflake." # Minimum viable snowflake for now - just 1 client. class Snowflake - relayAddr: null + relayAddr: null proxyPairs: [] - - rateLimit: null - state: MODE.INIT - retries: 0 + rateLimit: null + state: MODE.INIT + retries: 0 constructor: (@broker, @ui) -> rateLimitBytes = undefined @@ -108,16 +107,8 @@ class Snowflake log 'No more available ProxyPair slots.' countdown(err, DEFAULT_BROKER_POLL_INTERVAL / 1000) return - log 'Polling for ' + pair.id recv = @broker.getClientOffer pair.id - recv.then (desc) => - offer = JSON.parse desc - dbg 'Received:\n\n' + offer.sdp + '\n' - console.log desc - sdp = new RTCSessionDescription offer - # @receiveOffer offer - if pair.receiveWebRTCOffer sdp - @sendAnswer pair if 'offer' == sdp.type + recv.then (desc) => @receiveOffer pair, desc , (err) -> countdown(err, DEFAULT_BROKER_POLL_INTERVAL / 1000) @retries++ @@ -129,12 +120,16 @@ class Snowflake return @proxyPairs.find (pp, i, arr) -> return !pp.active # Receive an SDP offer from some client assigned by the Broker, - # TODO: remove - receiveOffer: (desc) => - sdp = new RTCSessionDescription desc - pair = @nextAvailableProxyPair() - if pair.receiveWebRTCOffer sdp - @sendAnswer pair if 'offer' == sdp.type + # |pair| - an available ProxyPair. + receiveOffer: (pair, desc) => + console.assert !pair.active + try + offer = JSON.parse desc + dbg 'Received:\n\n' + offer.sdp + '\n' + sdp = new RTCSessionDescription offer + @sendAnswer pair if pair.receiveWebRTCOffer sdp + catch e + log 'ERROR: Unable to receive Offer: ' + e sendAnswer: (pair) -> next = (sdp) -> diff --git a/proxy/spec/snowflake.spec.coffee b/proxy/spec/snowflake.spec.coffee index ca7661b..417b6e6 100644 --- a/proxy/spec/snowflake.spec.coffee +++ b/proxy/spec/snowflake.spec.coffee @@ -47,14 +47,22 @@ describe 'Snowflake', -> expect(s.retries).toBe 1 expect(s.broker.getClientOffer).toHaveBeenCalled() - it 'receives SDP offer', -> + it 'receives SDP offer and sends answer', -> s = new Snowflake(new FakeBroker(), fakeUI) - s.proxyPairs[0] = { receiveWebRTCOffer: -> } - spyOn(s.proxyPairs[0], 'receiveWebRTCOffer').and.returnValue true + pair = { receiveWebRTCOffer: -> } + spyOn(pair, 'receiveWebRTCOffer').and.returnValue true spyOn(s, 'sendAnswer') - s.receiveOffer { 'type': 'offer', 'sdp': 'foo' } + s.receiveOffer pair, '{"type":"offer","sdp":"foo"}' expect(s.sendAnswer).toHaveBeenCalled() + it 'does not send answer when receiving invalid offer', -> + s = new Snowflake(new FakeBroker(), fakeUI) + pair = { receiveWebRTCOffer: -> } + spyOn(pair, 'receiveWebRTCOffer').and.returnValue false + spyOn(s, 'sendAnswer') + s.receiveOffer pair, '{"type":"not a good offer","sdp":"foo"}' + expect(s.sendAnswer).not.toHaveBeenCalled() + it 'can make a proxypair', -> s = new Snowflake(new FakeBroker(), fakeUI) s.makeProxyPair()

1 0

[snowflake/master] snowflake proxy continues to poll broker until at capacity (#11)
by arlo＠torproject.org 18 Mar '16

18 Mar '16

commit afd814773ac8cdc4ad4f3d2eac05b0e41ff6f964 Author: Serene Han <keroserene+git(a)gmail.com> Date: Thu Mar 17 15:57:38 2016 -0700 snowflake proxy continues to poll broker until at capacity (#11) --- proxy/snowflake.coffee | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/proxy/snowflake.coffee b/proxy/snowflake.coffee index 4f38029..9686f30 100644 --- a/proxy/snowflake.coffee +++ b/proxy/snowflake.coffee @@ -85,11 +85,14 @@ class Snowflake return if COPY_PASTE_ENABLED log 'ProxyPair Slots: ' + @proxyPairs.length log 'Snowflake IDs: ' + (@proxyPairs.map (p) -> p.id).join ' | ' + @pollBroker() - timer = null - # Temporary countdown. + # Regularly poll Broker for clients to serve until this snowflake is + # serving at capacity, at which point stop polling. + pollBroker: -> + # Temporary countdown. TODO: Simplify countdown = (msg, sec) => - @ui.setStatus msg + ' (Retrying in ' + sec + ' seconds...)' + @ui.setStatus msg + ' (Polling in ' + sec + ' seconds...)' sec-- if sec >= 0 setTimeout((-> countdown(msg, sec)), 1000) @@ -97,18 +100,18 @@ class Snowflake findClients() # Poll broker for clients. findClients = => - clearTimeout timer - msg = 'polling for client... ' - msg += '[retries: ' + @retries + ']' if @retries > 0 - @ui.setStatus msg - # Pick an available ProxyPair to poll with. pair = @nextAvailableProxyPair() if !pair - log 'No more available ProxyPair slots.' - countdown(err, DEFAULT_BROKER_POLL_INTERVAL / 1000) + log 'At client capacity.' + # Do nothing until a new proxyPair is available. return + msg = 'polling for client... ' + msg += '[retries: ' + @retries + ']' if @retries > 0 + @ui.setStatus msg recv = @broker.getClientOffer pair.id - recv.then (desc) => @receiveOffer pair, desc + recv.then (desc) => + @receiveOffer pair, desc + countdown('Serving 1 new client.', DEFAULT_BROKER_POLL_INTERVAL / 1000) , (err) -> countdown(err, DEFAULT_BROKER_POLL_INTERVAL / 1000) @retries++ @@ -144,6 +147,7 @@ class Snowflake pair.onCleanup = (event) => # Delete from the list of active proxy pairs. @proxyPairs.splice(@proxyPairs.indexOf(pair), 1) + @pollBroker() pair.begin() # Stop all proxypairs.

1 0