- tor-commits - lists.torproject.org

[translation/vidalia_help] Update translations for vidalia_help
by translation＠torproject.org 01 Jul '12

01 Jul '12

commit a89455249fb220e6436d68ce60b30e90bdcabeac Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jul 1 17:15:17 2012 +0000 Update translations for vidalia_help --- ja/log.po | 9 ++++----- ja/troubleshooting.po | 13 +++++++------ 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/ja/log.po b/ja/log.po index 6e56e3a..a879973 100644 --- a/ja/log.po +++ b/ja/log.po @@ -1,12 +1,13 @@ # # Translators: +# <twitter816(a)hotmail.co.jp>, 2012. msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2010-06-26 17:00+0200\n" -"PO-Revision-Date: 2010-11-30 05:03+0000\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"PO-Revision-Date: 2012-07-01 17:07+0000\n" +"Last-Translator: 816daijin <twitter816(a)hotmail.co.jp>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -17,7 +18,7 @@ msgstr "" #. type: Content of: <html><body><h1> #: en/log.html:16 msgid "Message Log" -msgstr "" +msgstr "メッセージのログ" #. type: Content of: <html><body> #: en/log.html:19 @@ -157,5 +158,3 @@ msgstr "" #: en/log.html:100 msgid "Click <i>Save Settings</i> to save your log destination." msgstr "" - - diff --git a/ja/troubleshooting.po b/ja/troubleshooting.po index 5bb93fa..67f700c 100644 --- a/ja/troubleshooting.po +++ b/ja/troubleshooting.po @@ -1,12 +1,13 @@ # # Translators: +# <twitter816(a)hotmail.co.jp>, 2012. msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2010-08-03 15:49-0300\n" -"PO-Revision-Date: 2010-11-30 05:04+0000\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"PO-Revision-Date: 2012-07-01 17:09+0000\n" +"Last-Translator: 816daijin <twitter816(a)hotmail.co.jp>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -17,7 +18,7 @@ msgstr "" # type: Content of: <html><body><h1> #: en/troubleshooting.html:16 msgid "Troubleshooting" -msgstr "" +msgstr "問題の解決" # type: Content of: <html><body> #: en/troubleshooting.html:19 @@ -31,7 +32,7 @@ msgstr "" # type: Content of: <html><body><h3> #: en/troubleshooting.html:25 msgid "I Can't Start Tor" -msgstr "" +msgstr "Torが開始できない" # type: Content of: <html><body><p> #: en/troubleshooting.html:27 @@ -66,7 +67,7 @@ msgstr "" # type: Content of: <html><body><h3> #: en/troubleshooting.html:44 msgid "Vidalia Can't Connect to Tor" -msgstr "" +msgstr "VidaliaがTorに接続できない" # type: Content of: <html><body><p> #: en/troubleshooting.html:46 @@ -232,7 +233,7 @@ msgstr "" # type: Content of: <html><body><h3> #: en/troubleshooting.html:148 msgid "Vidalia Can't Stop Tor" -msgstr "" +msgstr "VidaliaでTorを停止できない" # type: Content of: <html><body><p> #: en/troubleshooting.html:150

1 0

[translation/orbot] Update translations for orbot
by translation＠torproject.org 01 Jul '12

01 Jul '12

commit 3039da5cef396d3129ec329d2ee97b2e54e86b93 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jul 1 17:15:05 2012 +0000 Update translations for orbot --- values-ja/strings.xml | 80 ++++++++++++++++++++++++------------------------ 1 files changed, 40 insertions(+), 40 deletions(-) diff --git a/values-ja/strings.xml b/values-ja/strings.xml index 91d8fbb..be5f15b 100644 --- a/values-ja/strings.xml +++ b/values-ja/strings.xml @@ -14,7 +14,7 @@ <string name="tor_process_starting">Torクライエントを開始しています...</string> <string name="tor_process_complete">完了</string> <string name="tor_process_waiting">お待ちください</string> - <string name="not_anonymous_yet">警告:この通信はまだ匿名化されていません。HTTP proxy 127.0.0.1:8118　か、 SOCKS4A か SOCKS5 proxy 127.0.0.1:9050　を利用するようにアプリケーション側で設定してください。</string> + <string name="not_anonymous_yet">警告:この通信はまだ匿名化されていません！　HTTP proxy 127.0.0.1:8118　か、 SOCKS4A または SOCKS5 proxy 127.0.0.1:9050　を利用するようにアプリケーション側で設定してください</string> <string name="menu_home">ホーム</string> <string name="menu_browse">閲覧</string> <string name="menu_settings">設定</string> @@ -35,8 +35,8 @@ <string name="pref_trans_proxy_group">透過プロキシ (要root)</string> <string name="pref_trans_proxy_title">透過プロキシ</string> <string name="pref_trans_proxy_summary">アプリの自動Tor化中</string> - <string name="pref_transparent_all_title">Tor Everything</string> - <string name="pref_transparent_all_summary">Proxy traffic for all apps through Tor</string> + <string name="pref_transparent_all_title">全てをTor化</string> + <string name="pref_transparent_all_summary">全てのアプリをTor経由で使う</string> <string name="pref_transparent_port_fallback_title">Port Proxy Fallback</string> <string name="pref_transparent_port_fallback_summary">WARNING: Circumvents common ports (80, 443, etc). *USE ONLY* if \'All\' or \'App\' mode doesn\'t work.</string> <string name="pref_transparent_port_title">ポート一覧</string> @@ -56,25 +56,25 @@ <string name="btn_cancel">キャンセル</string>  <string name="wizard_details">Orbot詳細</string> - <string name="wizard_details_msg">Orbot is an open-source application that contains Tor, LibEvent and Privoxy. It provides a local HTTP proxy (8118) and a SOCKS proxy (9050) into the Tor network. Orbot also has the ability, on rooted device, to send all internet traffic through Tor.</string> - <string name="wizard_permissions_root">Permission Granted</string> - <string name="wizard_permissions_stock">Orbot Permissions</string> - <string name="wizard_premissions_msg_root">Excellent! We\'ve detected that you have root permissions enabled for Orbot. We will use this power wisely.</string> - <string name="wizard_permissions_msg_stock"> While it is not required, Orbot can become a more powerful tool if your device has root access. Use the button below to grant Orbot superpowers! </string> - <string name="wizard_permissions_no_root">If you don\'t have root access or have no idea what we\'re talking about, just be sure to use apps made to work with Orbot.</string> - <string name="wizard_permissions_consent">I understand and would like to continue without Superuser</string> - <string name="wizard_permission_enable_root">Grant Root for Orbot</string> + <string name="wizard_details_msg">Orbot はTor、LibEvent 、Privoxyを含むオープンソースアプリです。 local HTTP proxy (8118) と SOCKS proxy (9050) をTor接続します。root化された端末ではOrbotは全ての通信をTorを通して行うこともできます。</string> + <string name="wizard_permissions_root">権限を取得完了</string> + <string name="wizard_permissions_stock">Orbotの権限</string> + <string name="wizard_premissions_msg_root">Orbotがroot権限を取得したことを確認しました。全ての機能が利用できます。</string> + <string name="wizard_permissions_msg_stock">Orbotはroot化された端末では全ての機能を活用できます。下のボタンを押してOrbotに管理者権限を与えてください。</string> + <string name="wizard_permissions_no_root">root化していなかったり、そもそもroot化が何のことだかわからない方は、Orbot上で動作確認が取れているアプリだけを使用してください。</string> + <string name="wizard_permissions_consent">Superuserを利用せずに続行</string> + <string name="wizard_permission_enable_root">Orbotにroot権限を与える</string> <string name="wizard_configure">Torをソフトウェアに使用する設定</string> - <string name="wizard_configure_msg">Orbot gives you the option to route all application traffic through Tor OR to choose your applications individually.</string> - <string name="wizard_configure_all">Proxy All Apps Through Tor</string> - <string name="wizard_configure_select_apps">Select Individual Apps for Tor</string> - <string name="wizard_tips_tricks">Orbot-enabled Apps</string> - <string name="wizard_tips_msg">The apps below were developed to work with Orbot. Click each button to install now, or you can find them later in the Android Market.</string> - <string name="wizard_tips_otrchat">Gibberbot - Secure instant messaging client for Android</string> - <string name="wizard_tips_proxy">Proxy Settings - Learn how to configure apps to work with Orbot</string> + <string name="wizard_configure_msg">Orbotでは全てのアプリにTorプロキシを通すか、Torアプリを使う個々のアプリを指定できます。</string> + <string name="wizard_configure_all">全てのアプリにTorプロキシを通す</string> + <string name="wizard_configure_select_apps">指定したアプリだけにTorプロキシを通す</string> + <string name="wizard_tips_tricks">Orbotが有効化されたアプリ</string> + <string name="wizard_tips_msg">以下のアプリはOrbot用に作られています。それぞれのボタンを押すと今すぐインストールできます。Google Playからも同じものが探せます。</string> + <string name="wizard_tips_otrchat">Gibberbot - 安全なインスタントメッセージアプリ</string> + <string name="wizard_tips_proxy">Proxy Settings - Orbotでアプリを動かすための手順書</string> <string name="wizard_proxy_help_info">プロキシ設定</string> <string name="wizard_proxy_help_msg">If the Android app you are using can support the use of an HTTP or SOCKS proxy, then you can configure it to connect to Orbot and use Tor.\n\n\n The host settings is 127.0.0.1 or \"localhost\". For HTTP, the port setting is 8118. For SOCKS, the proxy is 9050. You should use SOCKS4A or SOCKS5 if possible.\n \n\n\n You can learn more about proxying on Android via the FAQ at: http://tinyurl.com/proxyandroid\n </string> - <string name="wizard_final">Orbot is ready!</string> + <string name="wizard_final">Orbotの準備が完了しました</string> <string name="wizard_final_msg">Hundreds of thousands of people around the world use Tor for a wide variety of reasons.\n\nJournalists and bloggers, human rights defenders, law enforcement officers, soldiers, corporations, citizens of repressive regimes, and just ordinary citizens... and now you are ready to, as well!</string>  <string name="connect_first_time">You\'ve successfully connected to the Tor network - but this does NOT mean your device is secure. You can use the \'Check\' option from the menu to test your browser. \n\nVisit us at https://guardianproject.info/apps/orbot or send an email to help(a)guardianproject.info to learn more.</string> @@ -82,7 +82,7 @@ <string name="pref_hs_group">Hidden Services</string> <string name="pref_general_group">一般</string> <string name="pref_start_boot_title">起動時にOrbotを実行する</string> - <string name="pref_start_boot_summary">Automatically start Orbot and connect Tor when your Android device boots</string> + <string name="pref_start_boot_summary">Android端末の起動時にOrbotを自動実行</string>   <string name="wizard_title_msg">Orbot brings Tor to Android!\n\nTor helps you defend against content filtering, traffic analysis and network surveillance that threatens privacy, confidential information and personal relationships.\n\nThis wizard will help you configure Orbot and Tor on your device.</string> @@ -95,10 +95,10 @@ <string name="wizard_permissions_root_msg2">If you do not want to do this, please make sure to use apps made to work with Orbot</string> <string name="wizard_permissions_no_root_msg">Your device does not appear to be rooted or provide \'Superuser\' access.\n\nIn order to you to benefit from Tor, you will need to use apps built to work with Orbot, or that support HTTP or SOCKS proxy settings.\n\n</string>  - <string name="wizard_tips_title">Orbot-Enabled Apps</string> + <string name="wizard_tips_title">Orbotが有効化されたアプリ</string> <string name="wizard_tips_gibberbot">Gibberbot: Secure chat app with Off-the-Record Encryption</string> <string name="gibberbot_apk_url">https://market.android.com/details?id=info.guardianproject.otr.app.im</string> - <string name="wizard_tips_orweb">Orweb: Privacy-enhanced browser that works through Tor</string> + <string name="wizard_tips_orweb">Orweb: Torを使う匿名インターネットブラウザ</string> <string name="orweb_apk_url">https://market.android.com/details?id=info.guardianproject.browser</string>  <string name="wizard_transproxy_title">透過プロキシ</string> <string name="wizard_transproxy_msg">This allows your apps to automatically run through the Tor network without any configuration.</string> - <string name="wizard_transproxy_hint">(Check this box if you have no idea what we are talking about)</string> - <string name="wizard_transproxy_none">None</string> + <string name="wizard_transproxy_hint">(何を言っているのかわからないときはここをチェックしてください)</string> + <string name="wizard_transproxy_none">無し</string> <string name="pref_transparent_tethering_title">Tor Tethering</string> <string name="pref_transparent_tethering_summary">Enable Tor Transparent Proxying for Wifi and USB Tethered Devices (requires restart)</string> <string name="button_grant_superuser">管理許可アクセスを要求します</string> @@ -124,14 +124,14 @@ <string name="pref_proxy_title">Outbound Network Proxy</string> <string name="pref_proxy_type_title">Outbound Proxy Type</string> <string name="pref_proxy_type_summary">Protocol to use for proxy server: HTTP, HTTPS, Socks4, Socks5</string> - <string name="pref_proxy_type_dialog">Enter Proxy Type</string> + <string name="pref_proxy_type_dialog">プロキシの種類を入力してください</string> <string name="pref_proxy_host_title">Outbound Proxy Host</string> <string name="pref_proxy_host_summary">Proxy server hostname</string> <string name="pref_proxy_host_dialog">Enter Proxy Host</string> <string name="pref_proxy_port_title">Outbound Proxy Port</string> - <string name="pref_proxy_port_summary">Proxy server port</string> - <string name="pref_proxy_port_dialog">Enter Proxy port</string> - <string name="status">Status</string> + <string name="pref_proxy_port_summary">プロキシサーバ　ポート</string> + <string name="pref_proxy_port_dialog">プロキシのポートを入力してください</string> + <string name="status">状態</string> <string name="setting_up_full_transparent_proxying_">Setting up full transparent proxying...</string> <string name="setting_up_app_based_transparent_proxying_">Setting up app-based transparent proxying...</string> <string name="transparent_proxying_enabled">Transparent proxying ENABLED</string> @@ -141,10 +141,10 @@ <string name="couldn_t_start_tor_process_">Couldn\'t start Tor process: </string> <string name="privoxy_is_running_on_port_">Privoxy is running on port: </string> <string name="setting_up_port_based_transparent_proxying_">Setting up port-based transparent proxying...</string> - <string name="bridge_error">Bridge Error</string> + <string name="bridge_error">ブリッジ　エラー</string> <string name="bridge_requires_ip">In order to use the bridge feature, you must enter at least one bridge IP address.</string> <string name="send_email_for_bridges">Send an email to bridges(a)torproject.org with the line \"get bridges\" by itself in the body of the mail from a gmail account.</string> - <string name="error">Error</string> + <string name="error">エラー</string> <string name="your_reachableaddresses_settings_caused_an_exception_">Your ReachableAddresses settings caused an exception!</string> <string name="your_relay_settings_caused_an_exception_">Your relay settings caused an exception!</string> <string name="exit_nodes">Exit Nodes</string> @@ -162,10 +162,10 @@ <string name="enable_if_configured_bridges_are_obfuscated_bridges">Enable if configured bridges are obfuscated bridges</string> <string name="ip_address_and_port_of_bridges">IP address and port of bridges</string> <string name="enter_bridge_addresses">Enter Bridge Addresses</string> - <string name="relays">Relays</string> + <string name="relays">リレー</string> <string name="relaying">Relaying</string> <string name="enable_your_device_to_be_a_non_exit_relay">Enable your device to be a non-exit relay</string> - <string name="relay_port">Relay Port</string> + <string name="relay_port">リレー　ポート</string> <string name="listening_port_for_your_tor_relay">Listening port for your Tor relay</string> <string name="enter_or_port">Enter OR port</string> <string name="relay_nickname">Relay nickname</string> @@ -184,17 +184,17 @@ <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">enable debug log to output (must use adb or aLogCat to view)</string> <string name="project_home">Project Home(s): </string> <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/…</string> - <string name="the_tor_license">The Tor License</string> + <string name="the_tor_license">Tor ライセンス文書</string> <string name="https_torproject_org">https://torproject.org</string> - <string name="third_party_software">3rd-Party-Software: </string> + <string name="third_party_software">第三者製のソフトウェア</string> <string name="tor_version">Tor v0.2.3.10: https://www.torproject.org</string> <string name="libevent_version">LibEvent v1.4.13: http://www.monkey.org/~provos/libevent/</string> <string name="privoxy_version">Privoxy v3.0.12: http://www.privoxy.org</string> <string name="iptables_version">Iptables v1.4.7: http://www.netfilter.org</string> <string name="openssl_version">OpenSSL v0.9.8h: http://www.openssl.org</string> <string name="hidden_service_request">An app wants to open hidden server port %S to the Tor network. This is safe if you trust the app.</string> - <string name="found_existing_tor_process">found existing Tor process...</string> - <string name="something_bad_happened">Something bad happened. Check the log</string> + <string name="found_existing_tor_process">Torプロセスを発見</string> + <string name="something_bad_happened">何かが起こりました。ログを確認してください。</string> <string name="hidden_service_on">hidden service on:</string> <string name="unable_to_read_hidden_service_name">unable to read hidden service name</string> <string name="unable_to_start_tor">Torを実行できませんでした</string> @@ -205,10 +205,10 @@ <string name="pref_use_persistent_notifications_title">Always-On Notifications</string> <string name="notification_using_bridges">Bridges enabled!</string> <string name="default_bridges"/> - <string name="set_locale_title">Set Locale</string> - <string name="set_locale_summary">Choose the locale and language for Orbot</string> - <string name="wizard_locale_title">Choose Language</string> + <string name="set_locale_title">地域を選択</string> + <string name="set_locale_summary">Orbotの地域と言語を選択</string> + <string name="wizard_locale_title">言語を選択</string> <string name="wizard_locale_msg">Leave default or switch the current language</string> <string name="powered_by">powered by the Tor Project</string> - <string name="btn_save_settings">Save Settings</string> + <string name="btn_save_settings">設定を保存</string> </resources>

1 0

[translation/orbot] Update translations for orbot
by translation＠torproject.org 01 Jul '12

01 Jul '12

commit e91c415cce78aec9152ac0690f589c8f72d38cc7 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jul 1 16:45:06 2012 +0000 Update translations for orbot --- values-ja/strings.xml | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/values-ja/strings.xml b/values-ja/strings.xml index b42ecf2..91d8fbb 100644 --- a/values-ja/strings.xml +++ b/values-ja/strings.xml @@ -14,7 +14,7 @@ <string name="tor_process_starting">Torクライエントを開始しています...</string> <string name="tor_process_complete">完了</string> <string name="tor_process_waiting">お待ちください</string> - <string name="not_anonymous_yet">WARNING: Your traffic is not anonymous yet! Please configure your applications to use HTTP proxy 127.0.0.1:8118 or SOCKS4A or SOCKS5 proxy 127.0.0.1:9050</string> + <string name="not_anonymous_yet">警告:この通信はまだ匿名化されていません。HTTP proxy 127.0.0.1:8118　か、 SOCKS4A か SOCKS5 proxy 127.0.0.1:9050　を利用するようにアプリケーション側で設定してください。</string> <string name="menu_home">ホーム</string> <string name="menu_browse">閲覧</string> <string name="menu_settings">設定</string> @@ -34,7 +34,7 @@ <string name="press_to_start">- 長押しして起動 -</string> <string name="pref_trans_proxy_group">透過プロキシ (要root)</string> <string name="pref_trans_proxy_title">透過プロキシ</string> - <string name="pref_trans_proxy_summary">Automatic Torifying of Apps</string> + <string name="pref_trans_proxy_summary">アプリの自動Tor化中</string> <string name="pref_transparent_all_title">Tor Everything</string> <string name="pref_transparent_all_summary">Proxy traffic for all apps through Tor</string> <string name="pref_transparent_port_fallback_title">Port Proxy Fallback</string>

1 0

[translation/whisperback] Update translations for whisperback
by translation＠torproject.org 01 Jul '12

01 Jul '12

commit 5f44eb2715c43b03dd7eae3c435b2f654b10f4dd Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jul 1 14:15:28 2012 +0000 Update translations for whisperback --- uk/uk.po | 246 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 246 insertions(+), 0 deletions(-) diff --git a/uk/uk.po b/uk/uk.po new file mode 100644 index 0000000..baa7cf7 --- /dev/null +++ b/uk/uk.po @@ -0,0 +1,246 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: The Tor Project\n" +"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" +"POT-Creation-Date: 2012-02-16 22:33+0100\n" +"PO-Revision-Date: 2012-02-26 16:11+0000\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: LANGUAGE <LL(a)li.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: uk\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n" + +#. XXX use a better exception +#: ../whisperBack/whisperback.py:63 +#, python-format +msgid "Invalid contact email: %s" +msgstr "" + +#: ../whisperBack/whisperback.py:80 +#, python-format +msgid "Invalid contact OpenPGP key: %s" +msgstr "" + +#: ../whisperBack/whisperback.py:82 +msgid "Invalid contact OpenPGP public key block" +msgstr "" + +#: ../whisperBack/encryption.py:126 +msgid "No keys found." +msgstr "" + +#: ../whisperBack/exceptions.py:41 +#, python-format +msgid "" +"The variable %s was not found in any of the configuation " +"files/etc/whisperback/config.py, ~/.whisperback/config.py, ./config.py" +msgstr "" + +#: ../whisperBack/gui.py:114 +msgid "Name of the affected software" +msgstr "" + +#: ../whisperBack/gui.py:115 +msgid "Exact steps to reproduce the problem" +msgstr "" + +#: ../whisperBack/gui.py:116 +msgid "Actual result / the problem" +msgstr "" + +#: ../whisperBack/gui.py:117 +msgid "Desired result" +msgstr "" + +#: ../whisperBack/gui.py:155 +msgid "Unable to load a valid configuration." +msgstr "" + +#: ../whisperBack/gui.py:177 +#, python-format +msgid "" +"<h1>Help us fix your bug!</h1>\n" +"<p>Read <a href=\"%s\">our bug reporting instructions</a>.</p>\n" +"<p><strong>Do not include more personal information than\n" +"needed!</strong></p>\n" +"<h2>About giving us an email address</h2>\n" +"<p>If you don't mind disclosing some bits of your identity\n" +"to Tails developers, you can provide an email address to\n" +"let us ask more details about the bug. Additionally entering\n" +"a public PGP key enables us to encrypt such future\n" +"communication.</p>\n" +"<p>Anyone who can see this reply will probably infer you are\n" +"a Tails user. Time to wonder how much you trust your\n" +"Internet and mailbox providers?</p>\n" +msgstr "" + +#: ../whisperBack/gui.py:229 +msgid "Sending mail..." +msgstr "" + +#: ../whisperBack/gui.py:230 +msgid "Sending mail" +msgstr "" + +#. pylint: disable=C0301 +#: ../whisperBack/gui.py:232 +msgid "This could take a while..." +msgstr "" + +#: ../whisperBack/gui.py:246 +msgid "The contact email adress doesn't seem valid." +msgstr "" + +#: ../whisperBack/gui.py:263 +msgid "Unable to send the mail: SMTP error." +msgstr "" + +#: ../whisperBack/gui.py:265 +msgid "Unable to connect to the server." +msgstr "" + +#: ../whisperBack/gui.py:267 +msgid "Unable to create or to send the mail." +msgstr "" + +#: ../whisperBack/gui.py:270 +msgid "" +"\n" +"\n" +"The bug report could not be sent, likely due to network problems. Please try to reconnect to the network and click send again.\n" +"\n" +"If it does not work, you will be offered to save the bug report." +msgstr "" + +#: ../whisperBack/gui.py:283 +msgid "Your message has been sent." +msgstr "" + +#: ../whisperBack/gui.py:289 +msgid "Unable to find encryption key." +msgstr "" + +#: ../whisperBack/gui.py:293 +msgid "An error occured during encryption." +msgstr "" + +#: ../whisperBack/gui.py:313 +#, python-format +msgid "Unable to save %s." +msgstr "" + +#. XXX: fix string +#: ../whisperBack/gui.py:337 +#, python-format +msgid "" +"The bug report could not be sent, likely due to network problems.\n" +"\n" +"As a work-around you can save the bug report as a file on a USB drive and try to send it to us at %s from your email account using another system. Note that your bug report will not be anonymous when doing so unless you take further steps yourself (e.g. using Tor with a throw-away email account).\n" +"\n" +"Do you want to save the bug report to a file?" +msgstr "" + +#: ../whisperBack/gui.py:401 ../data/whisperback.ui.h:11 +msgid "WhisperBack" +msgstr "" + +#: ../whisperBack/gui.py:402 ../data/whisperback.ui.h:8 +msgid "Send feedback in an encrypted mail." +msgstr "" + +#: ../whisperBack/gui.py:405 +msgid "Copyright © 2009-2011 Tails developpers (tails(a)boum.org)" +msgstr "" + +#: ../whisperBack/gui.py:406 +msgid "Tails developers <tails(a)boum.org>" +msgstr "" + +#: ../whisperBack/gui.py:407 +msgid "translator-credits" +msgstr "" + +#: ../whisperBack/gui.py:434 +msgid "This doesn's seem to be a valid URL or OpenPGP key." +msgstr "" + +#: ../data/whisperback.ui.h:1 +msgid "" +"Add a PGP key if you want us to encrypt messages when we respond to you." +msgstr "" + +#: ../data/whisperback.ui.h:2 +msgid "Bug description" +msgstr "" + +#: ../data/whisperback.ui.h:3 +msgid "Copyright © 2009-2011 tails(a)boum.org" +msgstr "" + +#: ../data/whisperback.ui.h:4 +msgid "Help" +msgstr "" + +#: ../data/whisperback.ui.h:5 +msgid "" +"If you want us to encrypt messages when we respond to you, add your key ID, " +"a link to your key, or the key as a public key block:" +msgstr "" + +#: ../data/whisperback.ui.h:6 +msgid "Optional email address to contact you" +msgstr "" + +#: ../data/whisperback.ui.h:7 +msgid "Send" +msgstr "" + +#: ../data/whisperback.ui.h:9 +msgid "Summary" +msgstr "" + +#: ../data/whisperback.ui.h:10 +msgid "Technical details to include" +msgstr "" + +#: ../data/whisperback.ui.h:12 +msgid "" +"WhisperBack - Send feedback in an encrypted mail\n" +"Copyright (C) 2009-2011 Tails developers <tails(a)boum.org>\n" +"\n" +"This program is free software; you can redistribute it and/or modify\n" +"it under the terms of the GNU General Public License as published by\n" +"the Free Software Foundation; either version 3 of the License, or (at\n" +"your option) any later version.\n" +"\n" +"This program is distributed in the hope that it will be useful, but\n" +"WITHOUT ANY WARRANTY; without even the implied warranty of\n" +"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n" +"General Public License for more details.\n" +"\n" +"You should have received a copy of the GNU General Public License\n" +"along with this program. If not, see <http://www.gnu.org/licenses/>.\n" +msgstr "" + +#: ../data/whisperback.ui.h:28 +msgid "debugging info" +msgstr "" + +#: ../data/whisperback.ui.h:29 +msgid "headers" +msgstr "" + +#: ../data/whisperback.ui.h:30 +msgid "https://tails.boum.org/" +msgstr "" + +#: ../data/whisperback.ui.h:31 +msgid "optional PGP key" +msgstr ""

1 0

[translation/vidalia_help] Update translations for vidalia_help
by translation＠torproject.org 01 Jul '12

01 Jul '12

commit f8461f671a97902881b8f68d916441d0209f7cc2 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jul 1 14:15:18 2012 +0000 Update translations for vidalia_help --- uk/config.po | 14 ++++---------- 1 files changed, 4 insertions(+), 10 deletions(-) diff --git a/uk/config.po b/uk/config.po index 5f4ceb9..a19f256 100644 --- a/uk/config.po +++ b/uk/config.po @@ -135,14 +135,10 @@ msgstr "" #. type: Content of: <html><body><ul><li> #: en/config.html:89 msgid "" -"Even if you do not know any bridge relay addresses, checking this checkbox " -"may still be helpful. Tor will encrypt its directory requests, which can " -"defeat blocking mechanisms that try to filter Tor's requests for information" -" about other relays. If connections to normal Tor relays are also blocked, " -"then you will need to learn a bridge relay address somehow and add it here. " -"See the help topic on <a href=\"bridges.html#finding\">finding bridge " -"relays</a> for more information on how to learn new bridge relay addresses " -"and fingerprints." +"If connections to normal Tor relays are blocked, then you will need to learn" +" a bridge relay address somehow and add it here. See the help topic on <a " +"href=\"bridges.html#finding\">finding bridge relays</a> for more information" +" on how to learn new bridge relay addresses and fingerprints." msgstr "" #. type: Content of: <html><body> @@ -302,5 +298,3 @@ msgid "" "Hidden services allow you to provide any kind of TCP-based service, e.g. an" " HTTP service, to others without revealing your IP address." msgstr "" - -

1 0

[doctor/master] Print out diffs of recommended version sets.
by karsten＠torproject.org 01 Jul '12

01 Jul '12

commit 9d1e6e1f64b549116e824ab3c686533428d59fcc Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Sun Jul 1 16:04:29 2012 +0200 Print out diffs of recommended version sets. Implements #6261 as suggested by rransom. --- src/org/torproject/doctor/Checker.java | 30 ++++++++++++++++++++++++++---- 1 files changed, 26 insertions(+), 4 deletions(-) diff --git a/src/org/torproject/doctor/Checker.java b/src/org/torproject/doctor/Checker.java index ec3c020..b562e57 100644 --- a/src/org/torproject/doctor/Checker.java +++ b/src/org/torproject/doctor/Checker.java @@ -205,8 +205,19 @@ public class Checker { vote.getRecommendedClientVersions())) { StringBuilder message = new StringBuilder(); message.append(vote.getNickname()); - for (String version : vote.getRecommendedClientVersions()) { - message.append(" " + version); + SortedSet<String> addedVersions = new TreeSet<String>( + vote.getRecommendedClientVersions()); + addedVersions.removeAll( + downloadedConsensus.getRecommendedClientVersions()); + for (String version : addedVersions) { + message.append(" +" + version); + } + SortedSet<String> removedVersions = new TreeSet<String>( + downloadedConsensus.getRecommendedClientVersions()); + removedVersions.removeAll( + vote.getRecommendedClientVersions()); + for (String version : removedVersions) { + message.append(" -" + version); } unrecommendedClientVersions.add(message.toString()); } @@ -215,8 +226,19 @@ public class Checker { vote.getRecommendedServerVersions())) { StringBuilder message = new StringBuilder(); message.append(vote.getNickname()); - for (String version : vote.getRecommendedServerVersions()) { - message.append(" " + version); + SortedSet<String> addedVersions = new TreeSet<String>( + vote.getRecommendedServerVersions()); + addedVersions.removeAll( + downloadedConsensus.getRecommendedServerVersions()); + for (String version : addedVersions) { + message.append(" +" + version); + } + SortedSet<String> removedVersions = new TreeSet<String>( + downloadedConsensus.getRecommendedServerVersions()); + removedVersions.removeAll( + vote.getRecommendedServerVersions()); + for (String version : removedVersions) { + message.append(" -" + version); } unrecommendedServerVersions.add(message.toString()); }

1 0

[tor/master] Detect bug 6252 (unexpected sendme cell)
by arma＠torproject.org 01 Jul '12

01 Jul '12

commit c32ec9c425e9539bcc8ede95612e2d331c2cc2dd Author: Roger Dingledine <arma(a)torproject.org> Date: Thu Jun 28 14:00:01 2012 -0400 Detect bug 6252 (unexpected sendme cell) I only check on circuits, not streams, since bloating your stream window past the initial circuit window can't help you much. Also, I compare to CIRCWINDOW_START_MAX so we don't have surprising races if we lower CIRCWINDOW_START for an experiment. --- changes/bug6252 | 8 ++++++++ src/or/relay.c | 14 ++++++++++++++ 2 files changed, 22 insertions(+), 0 deletions(-) diff --git a/changes/bug6252 b/changes/bug6252 new file mode 100644 index 0000000..0d29203 --- /dev/null +++ b/changes/bug6252 @@ -0,0 +1,8 @@ + o Security fixes: + - Tear down the circuit if we get an unexpected SENDME cell. Clients + could use this trick to make their circuits receive cells faster + than our flow control would have allowed, or to gum up the network, + or possibly to do targeted memory denial-of-service attacks on + entry nodes. Fixes bug 6252. Bugfix on the 54th commit on Tor -- + from July 2002, before the release of Tor 0.0.0. + diff --git a/src/or/relay.c b/src/or/relay.c index 3f894bf..4ab4403 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -1265,11 +1265,25 @@ connection_edge_process_relay_cell(cell_t *cell, circuit_t *circ, case RELAY_COMMAND_SENDME: if (!conn) { if (layer_hint) { + if (layer_hint->package_window + CIRCWINDOW_INCREMENT > + CIRCWINDOW_START_MAX) { + log_fn(LOG_PROTOCOL_WARN, LD_PROTOCOL, + "Bug/attack: unexpected sendme cell from exit relay. " + "Closing circ."); + return -END_CIRC_REASON_TORPROTOCOL; + } layer_hint->package_window += CIRCWINDOW_INCREMENT; log_debug(LD_APP,"circ-level sendme at origin, packagewindow %d.", layer_hint->package_window); circuit_resume_edge_reading(circ, layer_hint); } else { + if (circ->package_window + CIRCWINDOW_INCREMENT > + CIRCWINDOW_START_MAX) { + log_fn(LOG_PROTOCOL_WARN, LD_PROTOCOL, + "Bug/attack: unexpected sendme cell from client. " + "Closing circ."); + return -END_CIRC_REASON_TORPROTOCOL; + } circ->package_window += CIRCWINDOW_INCREMENT; log_debug(LD_APP, "circ-level sendme at non-origin, packagewindow %d.",

1 0

[tor/master] Merge branch 'maint-0.2.3'
by arma＠torproject.org 01 Jul '12

01 Jul '12

commit 6061cd584c129eb8b5ed24fb5ce686a0236913e4 Merge: ed2601f c32ec9c Author: Roger Dingledine <arma(a)torproject.org> Date: Sun Jul 1 05:32:37 2012 -0400 Merge branch 'maint-0.2.3' changes/bug6252 | 8 ++++++++ src/or/relay.c | 14 ++++++++++++++ 2 files changed, 22 insertions(+), 0 deletions(-)

1 0

[tor/maint-0.2.3] Detect bug 6252 (unexpected sendme cell)
by arma＠torproject.org 01 Jul '12

01 Jul '12

commit c32ec9c425e9539bcc8ede95612e2d331c2cc2dd Author: Roger Dingledine <arma(a)torproject.org> Date: Thu Jun 28 14:00:01 2012 -0400 Detect bug 6252 (unexpected sendme cell) I only check on circuits, not streams, since bloating your stream window past the initial circuit window can't help you much. Also, I compare to CIRCWINDOW_START_MAX so we don't have surprising races if we lower CIRCWINDOW_START for an experiment. --- changes/bug6252 | 8 ++++++++ src/or/relay.c | 14 ++++++++++++++ 2 files changed, 22 insertions(+), 0 deletions(-) diff --git a/changes/bug6252 b/changes/bug6252 new file mode 100644 index 0000000..0d29203 --- /dev/null +++ b/changes/bug6252 @@ -0,0 +1,8 @@ + o Security fixes: + - Tear down the circuit if we get an unexpected SENDME cell. Clients + could use this trick to make their circuits receive cells faster + than our flow control would have allowed, or to gum up the network, + or possibly to do targeted memory denial-of-service attacks on + entry nodes. Fixes bug 6252. Bugfix on the 54th commit on Tor -- + from July 2002, before the release of Tor 0.0.0. + diff --git a/src/or/relay.c b/src/or/relay.c index 3f894bf..4ab4403 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -1265,11 +1265,25 @@ connection_edge_process_relay_cell(cell_t *cell, circuit_t *circ, case RELAY_COMMAND_SENDME: if (!conn) { if (layer_hint) { + if (layer_hint->package_window + CIRCWINDOW_INCREMENT > + CIRCWINDOW_START_MAX) { + log_fn(LOG_PROTOCOL_WARN, LD_PROTOCOL, + "Bug/attack: unexpected sendme cell from exit relay. " + "Closing circ."); + return -END_CIRC_REASON_TORPROTOCOL; + } layer_hint->package_window += CIRCWINDOW_INCREMENT; log_debug(LD_APP,"circ-level sendme at origin, packagewindow %d.", layer_hint->package_window); circuit_resume_edge_reading(circ, layer_hint); } else { + if (circ->package_window + CIRCWINDOW_INCREMENT > + CIRCWINDOW_START_MAX) { + log_fn(LOG_PROTOCOL_WARN, LD_PROTOCOL, + "Bug/attack: unexpected sendme cell from client. " + "Closing circ."); + return -END_CIRC_REASON_TORPROTOCOL; + } circ->package_window += CIRCWINDOW_INCREMENT; log_debug(LD_APP, "circ-level sendme at non-origin, packagewindow %d.",

1 0

[stem/master] Minor formatting tweaks
by atagar＠torproject.org 30 Jun '12

30 Jun '12

commit c0434646354a6031fd8fb0750af4700f1a450f1a Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jun 30 15:50:14 2012 -0700 Minor formatting tweaks --- test/integ/util/system.py | 13 +++++++------ test/unit/util/system.py | 2 +- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/test/integ/util/system.py b/test/integ/util/system.py index 8293120..968b920 100644 --- a/test/integ/util/system.py +++ b/test/integ/util/system.py @@ -4,7 +4,6 @@ that we're running. """ import os -import platform import getpass import unittest @@ -79,6 +78,7 @@ class TestSystem(unittest.TestCase): if not stem.util.system.is_available("ps"): test.runner.skip(self, "(ps unavailable)") return + self.assertTrue(stem.util.system.is_running("tor")) self.assertFalse(stem.util.system.is_running("blarg_and_stuff")) @@ -91,7 +91,7 @@ class TestSystem(unittest.TestCase): if stem.util.system.is_windows(): test.runner.skip(self, "(unavailable on windows)") return - if self.is_extra_tor_running: + elif self.is_extra_tor_running: test.runner.skip(self, "(multiple tor instances)") return @@ -203,11 +203,12 @@ class TestSystem(unittest.TestCase): """ Checks general usage of the stem.util.system.get_pid_by_port function. """ + + runner = test.runner.get_runner() if stem.util.system.is_windows(): test.runner.skip(self, "(unavailable on windows)") return - runner = test.runner.get_runner() - if not _has_port(): + elif not _has_port(): test.runner.skip(self, "(test instance has no port)") return elif stem.util.system.is_mac(): @@ -302,7 +303,7 @@ class TestSystem(unittest.TestCase): """ # on macs this test is unreliable because Quicklook sometimes claims '/tmp' - if platform.system() == "Darwin": + if stem.util.system.is_mac(): test.runner.skip(self, "(unreliable due to Quicklook)") return @@ -322,7 +323,7 @@ class TestSystem(unittest.TestCase): if stem.util.system.is_windows(): test.runner.skip(self, "(unavailable on windows)") return - if not runner.is_ptraceable(): + elif not runner.is_ptraceable(): test.runner.skip(self, "(DisableDebuggerAttachment is set)") return diff --git a/test/unit/util/system.py b/test/unit/util/system.py index 2fee30d..5609917 100644 --- a/test/unit/util/system.py +++ b/test/unit/util/system.py @@ -321,4 +321,4 @@ class TestSystem(unittest.TestCase): self.assertEquals("C:\\tmp", system.expand_path(".\\", "C:\\tmp")) self.assertEquals("C:\\tmp\\foo", system.expand_path("foo", "C:\\tmp")) self.assertEquals("C:\\tmp\\foo", system.expand_path(".\\foo", "C:\\tmp")) - \ No newline at end of file +

1 0