February 2012 - tor-commits - lists.torproject.org

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 21 Feb '12

21 Feb '12

commit 6848d07d13ec15d8759ac07e3e6f2cc63bf1da73 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Feb 21 01:15:10 2012 +0000 Update translations for vidalia --- ja/vidalia_ja.po | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ja/vidalia_ja.po b/ja/vidalia_ja.po index d9484a4..61c36f1 100644 --- a/ja/vidalia_ja.po +++ b/ja/vidalia_ja.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-09-07 14:40+0000\n" -"PO-Revision-Date: 2012-02-21 00:45+0000\n" +"PO-Revision-Date: 2012-02-21 00:47+0000\n" "Last-Translator: Chris Harris <praisebe4him(a)gmail.com>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -890,19 +890,19 @@ msgstr "ニジェール" msgctxt "CountryInfo" msgid "Nigeria" -msgstr "" +msgstr "ナイジェリア" msgctxt "CountryInfo" msgid "Norway" -msgstr "" +msgstr "ノルウェー" msgctxt "CountryInfo" msgid "Oman" -msgstr "" +msgstr "オマーン" msgctxt "CountryInfo" msgid "Pakistan" -msgstr "" +msgstr "パキスタン" msgctxt "CountryInfo" msgid "Palau" @@ -926,7 +926,7 @@ msgstr "" msgctxt "CountryInfo" msgid "Peru" -msgstr "" +msgstr "ペルー" msgctxt "CountryInfo" msgid "Philippines"

1 0

[translation/orbot] Update translations for orbot
by translation＠torproject.org 21 Feb '12

21 Feb '12

commit ba6eb592fc0f94d8d2b78301167f39e4e3ac177d Author: Translation commit bot <translation(a)torproject.org> Date: Tue Feb 21 01:15:05 2012 +0000 Update translations for orbot --- values-ja/strings.xml | 196 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 196 insertions(+), 0 deletions(-) diff --git a/values-ja/strings.xml b/values-ja/strings.xml new file mode 100644 index 0000000..144db09 --- /dev/null +++ b/values-ja/strings.xml @@ -0,0 +1,196 @@ +<?xml version='1.0' encoding='UTF-8'?> +<resources> + <string name="app_name">Orbot</string> + <string name="internal_web_url">http://orbot/</string> + <string name="default_web_url">http://check.torproject.org</string> + <string name="secure_default_web_url">https://check.torproject.org</string> + <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string> + <string name="control_permission_label">start and stop Tor</string> + <string name="tor_proxy_service_process">torproxyservice</string> + <string name="status_starting_up">Orbot is starting...</string> + <string name="status_activated">Connected to the Tor network</string> + <string name="status_disabled">\"Orbot is Deactivated</string> + <string name="status_shutting_down">Orbot is shutting down</string> + <string name="tor_process_starting">Starting Tor client...</string> + <string name="tor_process_complete">complete.</string> + <string name="tor_process_waiting">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="menu_home">Home</string> + <string name="menu_browse">Browse</string> + <string name="menu_settings">Settings</string> + <string name="menu_log">Log</string> + <string name="menu_info">Help</string> + <string name="menu_apps">Apps</string> + <string name="menu_start">Start</string> + <string name="menu_stop">Stop</string> + <string name="menu_about">About</string> + <string name="menu_wizard">Wizard</string> + <string name="button_help">Help</string> + <string name="button_close">Close</string> + <string name="button_about">About</string> + <string name="button_clear_log">Clear Log</string> + <string name="menu_verify">Check</string> + <string name="menu_exit">Exit</string> + <string name="powered_by">powered by the Tor Project</string> + <string name="press_to_start">- long press to start -</string> + <string name="pref_trans_proxy_group">Transparent Proxying (Requires Root)</string> + <string name="pref_trans_proxy_title">Transparent Proxying</string> + <string name="pref_trans_proxy_summary">Automatic Torifying of Apps</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> + <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">Port List</string> + <string name="pref_transparent_port_summary">List of ports to proxy. *USE ONLY* if \'All\' or \'App\' mode doesn\'t work</string> + <string name="pref_transparent_port_dialog">Enter ports to proxy</string> + <string name="pref_has_root">Request Root Access</string> + <string name="pref_has_root_summary">Request root access for transparent proxying</string> + <string name="status_install_success">Tor binaries successfully installed!</string> + <string name="status_install_fail">The Tor binary files were unable to be installed. Please check the log and notify tor-assistants(a)torproject.org</string> + <string name="title_error">Application Error</string> + <string name="wizard_title">Orbot</string> + <string name="wizard_btn_tell_me_more">About Orbot</string> + <string name="btn_next">Next</string> + <string name="btn_back">Back</string> + <string name="btn_finish">Finish</string> + <string name="btn_okay">Okay</string> + <string name="btn_cancel">Cancel</string> + <string name="wizard_details">Some Orbot Details</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_configure">Configure Torification</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_proxy_help_info">Proxy Settings</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 + 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 + You can learn more about proxying on Android via the FAQ at: http://tinyurl.com/proxyandroid + </string> + <string name="wizard_final">Orbot is ready!</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> + <string name="tor_check">This will open your web browser to https://check.torproject.org in order to see if Orbot is probably configured and you are connected to Tor.</string> + <string name="pref_hs_group">Hidden Services</string> + <string name="pref_general_group">General</string> + <string name="pref_start_boot_title">Start Orbot on Boot</string> + <string name="pref_start_boot_summary">Automatically start Orbot and connect Tor when your Android device boots</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> + <string name="wizard_warning_title">Warning</string> + <string name="wizard_warning_msg">Simply installing Orbot will not automatically anonymize your mobile traffic.\n\nYou must properly configure Orbot, your device and other apps to successfully use Tor.</string> + <string name="wizard_permissions_title">Permissions</string> + <string name="wizard_permissions_root_msg1">You can optionally grant Orbot \'Superuser\' access to enable advanced features, such as Transparent Proxying.</string> + <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_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="orweb_apk_url">https://market.android.com/details?id=info.guardianproject.browser</string> + <string name="wizard_transproxy_title">Transparent Proxying</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="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">Request Superuser Access</string> + <string name="pref_select_apps">Select Apps</string> + <string name="pref_select_apps_summary">Choose Apps to Route Through Tor</string> + <string name="pref_node_configuration">Node Configuration</string> + <string name="pref_node_configuration_summary">These are advanced settings that can reduce your anonymity</string> + <string name="pref_entrance_node">Entrance Nodes</string> + <string name="pref_entrance_node_summary">Fingerprints, nicks, countries and addresses for the first hop</string> + <string name="pref_entrance_node_dialog">Enter Entrance Nodes</string> + <string name="pref_use_whispercore">Use WhisperCore</string> + <string name="pref_use_whispercore_summary">Use the proprietary NetFilter APIs provided by WhisperSystems (required device with WhisperCore installed)</string> + <string name="pref_proxy_type_title">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_host_title">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">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="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> + <string name="transproxy_enabled_for_tethering_">TransProxy enabled for Tethering!</string> + <string name="warning_error_starting_transparent_proxying_">WARNING: error starting transparent proxying!</string> + <string name="transproxy_rules_cleared">TransProxy rules cleared</string> + <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_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="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> + <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Fingerprints, nicks, countries and addresses for the last hop</string> + <string name="enter_exit_nodes">Enter Exit Nodes</string> + <string name="exclude_nodes">Exclude Nodes</string> + <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Fingerprints, nicks, countries and addresses to exclude</string> + <string name="enter_exclude_nodes">Enter Exclude Nodes</string> + <string name="strict_nodes">Strict Nodes</string> + <string name="use_only_these_specified_nodes">Use *only* these specified nodes</string> + <string name="bridges">Bridges</string> + <string name="use_bridges">Use Bridges</string> + <string name="enable_alternate_entrance_nodes_into_the_tor_network">Enable alternate entrance nodes into the Tor Network</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="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="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> + <string name="the_nickname_for_your_tor_relay">The nickname for your Tor relay</string> + <string name="enter_a_custom_relay_nickname">Enter a custom relay nickname</string> + <string name="reachable_addresses">Reachable Addresses</string> + <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Run as a client behind a firewall with restrictive policies</string> + <string name="reachable_ports">Reachable ports</string> + <string name="ports_reachable_behind_a_restrictive_firewall">Ports reachable behind a restrictive firewall</string> + <string name="enter_ports">Enter ports</string> + <string name="enable_hidden_services">Enable Hidden Services</string> + <string name="run_servers_accessible_via_the_tor_network">run servers accessible via the Tor network</string> + <string name="enter_localhost_ports_for_hidden_services">enter localhost ports for hidden services</string> + <string name="hidden_service_ports">Hidden Service Ports</string> + <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">the addressable name for your hidden service (generated automatically)</string> + <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="https_torproject_org">https://torproject.org</string> + <string name="third_party_software">3rd-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 v1.0.0f: 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="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">Unable to start Tor:</string> + <string name="pref_use_sys_iptables_title">Use Default Iptables</string> + <string name="pref_use_sys_iptables_summary">use the built-in iptables binary instead of the one bundled with Orbot</string> + <string name="error_installing_binares">The Tor binaries were not able to be installed or upgraded.</string> + <string name="pref_use_persistent_notifications">Always keep the icon in toolbar when Orbot is connected</string> + <string name="pref_use_persistent_notifications_title">Always-On Notifications</string> +</resources>

1 0

[translation/vidalia_installer] Update translations for vidalia_installer
by translation＠torproject.org 21 Feb '12

21 Feb '12

commit e8b33016e6e036edca8d77d922ea8a21f2ba2bc3 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Feb 21 00:45:25 2012 +0000 Update translations for vidalia_installer --- ja/vidalia_ja.po | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ja/vidalia_ja.po b/ja/vidalia_ja.po index 0644a5d..47728db 100755 --- a/ja/vidalia_ja.po +++ b/ja/vidalia_ja.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2008-07-12 05:29+0000\n" -"PO-Revision-Date: 2012-02-21 00:07+0000\n" +"PO-Revision-Date: 2012-02-21 00:25+0000\n" "Last-Translator: Chris Harris <praisebe4him(a)gmail.com>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -42,7 +42,7 @@ msgstr "${BUNDLE_NAME} セットアップウィザードへようこそ" msgctxt "BundleLinkText" msgid "${TOR_NAME} installation documentation" -msgstr "" +msgstr "${TOR_NAME} インストール仕方の文書化" msgctxt "BundleFinishText" msgid "" @@ -130,11 +130,11 @@ msgstr "" msgctxt "TorDocumentation" msgid "Documentation" -msgstr "" +msgstr "文書化" msgctxt "TorDocumentationDesc" msgid "Install ${TOR_NAME} documentation." -msgstr "" +msgstr "${TOR_NAME} 文書化をインストールする" msgctxt "TorShortcuts" msgid "Add to Start Menu" @@ -239,4 +239,4 @@ msgid "" "\n" "Or, if you would prefer to install Tor without Firefox, simply\n" "press Next to continue." -msgstr "" +msgstr "Firefoxがインストールの終了後、Torインストーラを再実行してください。"

1 0

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 21 Feb '12

21 Feb '12

commit b3723c25e91500cbcb1f9deebab34e97972a7a74 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Feb 21 00:45:10 2012 +0000 Update translations for vidalia --- ja/vidalia_ja.po | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/ja/vidalia_ja.po b/ja/vidalia_ja.po index 5981df3..d9484a4 100644 --- a/ja/vidalia_ja.po +++ b/ja/vidalia_ja.po @@ -1,5 +1,6 @@ # Translators: # Translators: +# Chris Harris <praisebe4him(a)gmail.com>, 2012. # runasand <runa.sandvik(a)gmail.com>, 2011. # siomiz <>, 2012. msgid "" @@ -7,8 +8,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-09-07 14:40+0000\n" -"PO-Revision-Date: 2012-02-15 23:54+0000\n" -"Last-Translator: siomiz <>\n" +"PO-Revision-Date: 2012-02-21 00:45+0000\n" +"Last-Translator: Chris Harris <praisebe4him(a)gmail.com>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -497,7 +498,7 @@ msgstr "アゼルバイジャン" msgctxt "CountryInfo" msgid "Bahamas" -msgstr "" +msgstr "バハマ国" msgctxt "CountryInfo" msgid "Bangladesh" @@ -885,7 +886,7 @@ msgstr "" msgctxt "CountryInfo" msgid "Niger" -msgstr "" +msgstr "ニジェール" msgctxt "CountryInfo" msgid "Nigeria"

1 0

[translation/gettor] Update translations for gettor
by translation＠torproject.org 21 Feb '12

21 Feb '12

commit 181d2c2061e1ce3e491d94f6e25270c289d3f4ad Author: Translation commit bot <translation(a)torproject.org> Date: Tue Feb 21 00:45:04 2012 +0000 Update translations for gettor --- ja/gettor.po | 455 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 455 insertions(+), 0 deletions(-) diff --git a/ja/gettor.po b/ja/gettor.po new file mode 100644 index 0000000..8565a43 --- /dev/null +++ b/ja/gettor.po @@ -0,0 +1,455 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# Chris Harris <praisebe4him(a)gmail.com>, 2012. +# Jacob Appelbaum <jacob(a)appelbaum.net>, 2009. +msgid "" +msgstr "" +"Project-Id-Version: The Tor Project\n" +"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" +"POT-Creation-Date: 2011-11-13 22:01+0100\n" +"PO-Revision-Date: 2012-02-21 00:34+0000\n" +"Last-Translator: Chris Harris <praisebe4him(a)gmail.com>\n" +"Language-Team: LANGUAGE <LL(a)li.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: ja\n" +"Plural-Forms: nplurals=1; plural=0\n" + +#: lib/gettor/i18n.py:27 +msgid "Hello, This is the \"GetTor\" robot." +msgstr "" + +#: lib/gettor/i18n.py:29 +msgid "Thank you for your request." +msgstr "" + +#: lib/gettor/i18n.py:31 +msgid "" +"Unfortunately, we won't answer you at this address. You should make\n" +"an account with GMAIL.COM, YAHOO.COM or YAHOO.CN and send the mail from\n" +"one of those." +msgstr "" + +#: lib/gettor/i18n.py:35 +msgid "" +"We only process requests from email services that support \"DKIM\",\n" +"which is an email feature that lets us verify that the address in the\n" +"\"From\" line is actually the one who sent the mail." +msgstr "" + +#: lib/gettor/i18n.py:39 +msgid "" +"(We apologize if you didn't ask for this mail. Since your email is from\n" +"a service that doesn't use DKIM, we're sending a short explanation,\n" +"and then we'll ignore this email address for the next day or so.)" +msgstr "" + +#: lib/gettor/i18n.py:43 lib/gettor/i18n.py:130 +msgid "" +"If you have any questions or it doesn't work, you can contact a\n" +"human at this support email address: help(a)rt.torproject.org" +msgstr "" + +#: lib/gettor/i18n.py:46 +msgid "" +"I will mail you a Tor package, if you tell me which one you want.\n" +"Please select one of the following package names:\n" +"\n" +" windows\n" +" macos-i386\n" +" macos-ppc\n" +" linux-i386\n" +" linux-x86_64\n" +" source" +msgstr "" + +#: lib/gettor/i18n.py:56 +msgid "" +"Please reply to this mail, and tell me a single package name anywhere \n" +"in the body of your email." +msgstr "" + +#: lib/gettor/i18n.py:59 +msgid "" +"OBTAINING LOCALIZED VERSIONS OF TOR\n" +"===================================" +msgstr "" + +#: lib/gettor/i18n.py:62 +msgid "" +"To get a version of Tor translated into your language, specify the\n" +"language you want in the address you send the mail to:\n" +"\n" +" gettor+fa(a)torproject.org" +msgstr "" + +#: lib/gettor/i18n.py:67 +msgid "" +"This example will give you the requested package in a localized\n" +"version for Farsi (Persian). Check below for a list of supported language\n" +"codes. " +msgstr "" + +#: lib/gettor/i18n.py:71 +msgid " List of supported locales:" +msgstr "" + +#: lib/gettor/i18n.py:73 +msgid "Here is a list of all available languages:" +msgstr "" + +#: lib/gettor/i18n.py:75 +msgid "" +" gettor+ar(a)torproject.org: Arabic\n" +" gettor+de(a)torproject.org: German\n" +" gettor+en(a)torproject.org: English\n" +" gettor+es(a)torproject.org: Spanish\n" +" gettor+fa(a)torproject.org: Farsi (Iran)\n" +" gettor+fr(a)torproject.org: French\n" +" gettor+it(a)torproject.org: Italian\n" +" gettor+nl(a)torproject.org: Dutch\n" +" gettor+pl(a)torproject.org: Polish\n" +" gettor+ru(a)torproject.org: Russian\n" +" gettor+zh(a)torproject.org: Chinese" +msgstr "" + +#: lib/gettor/i18n.py:87 +msgid "If you select no language, you will receive the English version." +msgstr "言語を選択しない場合に英語がデフォルトにしてしまいます" + +#: lib/gettor/i18n.py:89 +msgid "" +"SMALLER SIZED PACKAGES\n" +"======================" +msgstr "" + +#: lib/gettor/i18n.py:92 +msgid "" +"If your bandwith is low or your provider doesn't allow you to\n" +"receive large attachments in your email, GetTor can send you several\n" +"small packages instead of one big one." +msgstr "" + +#: lib/gettor/i18n.py:96 +msgid "" +"Simply include the keyword 'split' in a new line on its own (this part\n" +"is important!) like so: \n" +" \n" +" windows\n" +" split" +msgstr "" + +#: lib/gettor/i18n.py:102 +msgid "" +"Sending this text in an email to GetTor will cause it to send you \n" +"the Tor Browser Bundle in a number of 1,4MB attachments." +msgstr "" + +#: lib/gettor/i18n.py:105 +msgid "" +"After having received all parts, you need to re-assemble them to \n" +"one package again. This is done as follows:" +msgstr "" + +#: lib/gettor/i18n.py:108 +msgid "1.) Save all received attachments into one folder on your disk." +msgstr "" + +#: lib/gettor/i18n.py:110 +msgid "" +"2.) Unzip all files ending in \".z\". If you saved all attachments to\n" +"a fresh folder before, simply unzip all files in that folder. If you don't\n" +"know how to unzip the .z files, please see the UNPACKING THE FILES section." +msgstr "" + +#: lib/gettor/i18n.py:114 +msgid "" +"3.) Verify all files as described in the mail you received with \n" +"each package. (gpg --verify)" +msgstr "" + +#: lib/gettor/i18n.py:117 +msgid "" +"4.) Now unpack the multi-volume archive into one file by double-\n" +"clicking the file ending in \"..split.part01.exe\". This should start the \n" +"process automatically." +msgstr "" + +#: lib/gettor/i18n.py:121 +msgid "" +"5.) After unpacking is finished, you should find a newly created \n" +"\".exe\" file in your destination folder. Simply doubleclick\n" +"that and Tor Browser Bundle should start within a few seconds." +msgstr "" + +#: lib/gettor/i18n.py:125 +msgid "6.) That's it. You're done. Thanks for using Tor and have fun!" +msgstr "" + +#: lib/gettor/i18n.py:127 +msgid "" +"SUPPORT\n" +"=======" +msgstr "サポート\n＝＝＝＝" + +#: lib/gettor/i18n.py:133 +msgid "" +"Here's your requested software as a zip file. Please unzip the\n" +"package and verify the signature." +msgstr "" + +#: lib/gettor/i18n.py:136 +msgid "" +"VERIFY SIGNATURE\n" +"================\n" +"If your computer has GnuPG installed, use the gpg commandline \n" +"tool as follows after unpacking the zip file:\n" +"\n" +" gpg --verify tor-browser-1.3.24_en-US.exe.asc tor-browser-1.3.24_en-US.exe" +msgstr "" + +#: lib/gettor/i18n.py:143 +msgid "" +"The output should look somewhat like this:\n" +"\n" +" gpg: Good signature from 'Erinn Clark <...>'" +msgstr "" + +#: lib/gettor/i18n.py:147 +msgid "" +"If you're not familiar with commandline tools, try looking for\n" +"a graphical user interface for GnuPG on this website:\n" +"\n" +" http://www.gnupg.org/related_software/frontends.html" +msgstr "" + +#: lib/gettor/i18n.py:152 +msgid "" +"BLOCKED ACCESS / CENSORSHIP\n" +"===========================" +msgstr "" + +#: lib/gettor/i18n.py:155 +msgid "" +"If your Internet connection blocks access to the Tor network, you\n" +"may need a bridge relay. Bridge relays (or \"bridges\" for short)\n" +"are Tor relays that aren't listed in the main directory. Since there\n" +"is no complete public list of them, even if your ISP is filtering\n" +"connections to all the known Tor relays, they probably won't be able\n" +"to block all the bridges." +msgstr "" + +#: lib/gettor/i18n.py:162 +msgid "" +"You can acquire a bridge by sending an email that contains \"get bridges\"\n" +"in the body of the email to the following email address:\n" +"\n" +" bridges(a)torproject.org" +msgstr "" + +#: lib/gettor/i18n.py:167 +msgid "" +"It is also possible to fetch bridges with a web browser at the following\n" +"url: https://bridges.torproject.org/" +msgstr "" + +#: lib/gettor/i18n.py:170 +msgid "" +"IMPORTANT NOTE:\n" +"Since this is part of a split-file request, you need to wait for\n" +"all split files to be received by you before you can save them all\n" +"into the same directory and unpack them by double-clicking the\n" +"first file." +msgstr "" + +#: lib/gettor/i18n.py:176 +msgid "" +"Packages might arrive out of order! Please make sure you received\n" +"all packages before you attempt to unpack them!" +msgstr "" + +#: lib/gettor/i18n.py:179 +#, python-format +msgid "" +"It was successfully understood. Your request is currently being processed.\n" +"Your package (%s) should arrive within the next ten minutes." +msgstr "" + +#: lib/gettor/i18n.py:182 +msgid "" +"If it doesn't arrive, the package might be too big for your mail provider.\n" +"Try resending the mail from a GMAIL.COM, YAHOO.CN or YAHOO.COM account." +msgstr "" + +#: lib/gettor/i18n.py:185 +msgid "" +"Unfortunately we are currently experiencing problems and we can't fulfill\n" +"your request right now. Please be patient as we try to resolve this issue." +msgstr "" + +#: lib/gettor/i18n.py:188 +msgid "" +"Unfortunately there is no split package available for the package you\n" +"requested. Please send us another package name or request the same package \n" +"again, but remove the 'split' keyword. In that case we'll send you the whole \n" +"package. Make sure this is what you want." +msgstr "" + +#: lib/gettor/i18n.py:193 +msgid "" +"UNPACKING THE FILES\n" +"===================" +msgstr "ファイルを解凍しています\n＝＝＝＝＝＝＝＝＝＝＝" + +#: lib/gettor/i18n.py:196 +msgid "" +"The easiest way to unpack the files you received is to install 7-Zip,\n" +"a free file compression/uncompression tool. If it isn't installed on\n" +"your computer yet, you can download it here:\n" +"\n" +" http://www.7-zip.org/" +msgstr "" + +#: lib/gettor/i18n.py:202 +msgid "" +"When 7-Zip is installed, you can open the .z archive you received from\n" +"us by double-clicking on it." +msgstr "" + +#: lib/gettor/i18n.py:205 +msgid "" +"An alternative way to get the .z files extraced is to rename them to\n" +".zip. For example, if you recevied a file called \"windows.z\", rename it to \n" +"\"windows.zip\". You should then be able to extract the archive with common \n" +"file archiver programs that probably are already installed on your computer." +msgstr "" + +#: lib/gettor/i18n.py:210 +msgid "" +"Please reply to this mail, and tell me a single package name anywhere\n" +"in your reply. Here's a short explanation of what these packages are:" +msgstr "" + +#: lib/gettor/i18n.py:213 +msgid "" +"windows:\n" +"The Tor Browser Bundle package for Windows operating systems. If you're \n" +"running some version of Windows, like Windows XP, Windows Vista or \n" +"Windows 7, this is the package you should get." +msgstr "" + +#: lib/gettor/i18n.py:218 +msgid "" +"macos-i386:\n" +"The Tor Browser Bundle package for OS X, Intel CPU architecture. In \n" +"general, newer Mac hardware will require you to use this package." +msgstr "" + +#: lib/gettor/i18n.py:222 +msgid "" +"macos-ppc:\n" +"This is an older installer (the \"Vidalia bundle\") for older Macs running\n" +"OS X on PowerPC CPUs. Note that this package will be deprecated soon." +msgstr "" + +#: lib/gettor/i18n.py:226 +msgid "" +"linux-i386:\n" +"The Tor Browser Bundle package for Linux, 32bit versions." +msgstr "" + +#: lib/gettor/i18n.py:229 +msgid "" +"Note that this package is rather large and needs your email provider to \n" +"allow for attachments of about 30MB in size." +msgstr "" + +#: lib/gettor/i18n.py:232 +msgid "" +"linux-x86_64:\n" +"The Tor Browser Bundle package for Linux, 64bit versions." +msgstr "" + +#: lib/gettor/i18n.py:235 +msgid "" +"source:\n" +"The Tor source code, for experts. Most users do not want this package." +msgstr "" + +#: lib/gettor/i18n.py:238 +msgid "" +"FREQUENTLY ASKED QUESTIONS\n" +"==========================" +msgstr "よくある質問に対する答え\n＝＝＝＝＝＝＝＝＝＝＝" + +#: lib/gettor/i18n.py:241 +msgid "What is Tor?" +msgstr "" + +#: lib/gettor/i18n.py:243 +msgid "The name \"Tor\" can refer to several different components." +msgstr "" + +#: lib/gettor/i18n.py:245 +msgid "" +"The Tor software is a program you can run on your computer that helps \n" +"keep you safe on the Internet. Tor protects you by bouncing your \n" +"communications around a distributed network of relays run by volunteers \n" +"all around the world: it prevents somebody watching your Internet connection \n" +"from learning what sites you visit, and it prevents the sites you visit from \n" +"learning your physical location. This set of volunteer relays is called the \n" +"Tor network. You can read more about how Tor works here:\n" +"\n" +" https://www.torproject.org/about/overview.html.en" +msgstr "" + +#: lib/gettor/i18n.py:255 +msgid "What is the Tor Browser Bundle?" +msgstr "" + +#: lib/gettor/i18n.py:257 +msgid "" +"The Browser Bundle (TBB) is the package we recommend to most users. \n" +"The bundle comes with everything you need to safely browse the Internet.\n" +"Just extract it and run." +msgstr "" + +#: lib/gettor/i18n.py:261 +msgid "What package should I request?" +msgstr "" + +#: lib/gettor/i18n.py:263 +msgid "" +"This depends on the operating system you use. For instance, if your\n" +"operating system is Microsoft Windows, you should request \"windows\". Here\n" +"is a short explanation of all packages to request and what operating \n" +"systems there are suitable for:" +msgstr "" + +#: lib/gettor/i18n.py:268 +msgid "How do I extract the file(s) you sent me?" +msgstr "" + +#: lib/gettor/i18n.py:270 +msgid "QUESTION:" +msgstr "質問：" + +#: lib/gettor/i18n.py:272 +msgid "ANSWER:" +msgstr "答え：" + +#: lib/gettor/i18n.py:274 +#, python-format +msgid "" +"Sorry, but the package you requested (%s) is too large for your \n" +"provider to accept as an attachment. Try using another provider that allows \n" +"for larger email attachments. Or try one of the following mirrors:\n" +"\n" +" https://www.oignon.net/dist/torbrowser/\n" +" https://tor.beme-it.de/dist/torbrowser/\n" +" https://www.torservers.net/mirrors/torproject.org/dist/torbrowser/" +msgstr ""

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 21 Feb '12

21 Feb '12

commit 3d3e23577dd1d7a91d4eacefa21306a93961b23e Author: Translation commit bot <translation(a)torproject.org> Date: Tue Feb 21 00:45:02 2012 +0000 Update translations for bridgedb --- ja/bridgedb.po | 72 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 72 insertions(+), 0 deletions(-) diff --git a/ja/bridgedb.po b/ja/bridgedb.po new file mode 100644 index 0000000..af17f4f --- /dev/null +++ b/ja/bridgedb.po @@ -0,0 +1,72 @@ +# 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: 2011-01-01 07:48-0800\n" +"PO-Revision-Date: 2011-02-19 16:53+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: ja\n" +"Plural-Forms: nplurals=1; plural=0\n" + +#: lib/bridgedb/I18n.py:21 +msgid "Here are your bridge relays: " +msgstr "" + +#: lib/bridgedb/I18n.py:23 +msgid "" +"Bridge relays (or \"bridges\" for short) are Tor relays that aren't listed\n" +"in the main directory. Since there is no complete public list of them,\n" +"even if your ISP is filtering connections to all the known Tor relays,\n" +"they probably won't be able to block all the bridges." +msgstr "" + +#: lib/bridgedb/I18n.py:28 +msgid "" +"To use the above lines, go to Vidalia's Network settings page, and click\n" +"\"My ISP blocks connections to the Tor network\". Then add each bridge\n" +"address one at a time." +msgstr "" + +#: lib/bridgedb/I18n.py:32 +msgid "" +"Configuring more than one bridge address will make your Tor connection\n" +"more stable, in case some of the bridges become unreachable." +msgstr "" + +#: lib/bridgedb/I18n.py:35 +msgid "" +"Another way to find public bridge addresses is to send mail to\n" +"bridges(a)torproject.org with the line \"get bridges\" by itself in the body\n" +"of the mail. However, so we can make it harder for an attacker to learn\n" +"lots of bridge addresses, you must send this request from an email address at\n" +"one of the following domains:" +msgstr "" + +#: lib/bridgedb/I18n.py:41 +msgid "[This is an automated message; please do not reply.]" +msgstr "" + +#: lib/bridgedb/I18n.py:43 +msgid "" +"Another way to find public bridge addresses is to visit\n" +"https://bridges.torproject.org/. The answers you get from that page\n" +"will change every few days, so check back periodically if you need more\n" +"bridge addresses." +msgstr "" + +#: lib/bridgedb/I18n.py:48 +msgid "(no bridges currently available)" +msgstr "" + +#: lib/bridgedb/I18n.py:50 +msgid "(e-mail requests not currently supported)" +msgstr ""

1 0

[translation/vidalia_installer] Update translations for vidalia_installer
by translation＠torproject.org 21 Feb '12

21 Feb '12

commit 995fb04738d105a8b8c43881534e072eaaf953b3 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Feb 21 00:15:24 2012 +0000 Update translations for vidalia_installer --- ja/vidalia_ja.po | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/ja/vidalia_ja.po b/ja/vidalia_ja.po index c5fc9d7..0644a5d 100755 --- a/ja/vidalia_ja.po +++ b/ja/vidalia_ja.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2008-07-12 05:29+0000\n" -"PO-Revision-Date: 2012-02-20 23:45+0000\n" +"PO-Revision-Date: 2012-02-21 00:07+0000\n" "Last-Translator: Chris Harris <praisebe4him(a)gmail.com>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -54,7 +54,7 @@ msgstr "インストールは終了しました。\nTorを利用するための msgctxt "BundleRunNow" msgid "Run installed components now" -msgstr "" +msgstr "インストールされた部品を実行する" msgctxt "VidaliaGroupDesc" msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor." @@ -62,7 +62,7 @@ msgstr "Vidalia はTorの制御・監視・設定を支援するグラフィカ msgctxt "VidaliaUninstDesc" msgid "Remove ${VIDALIA_DESC}." -msgstr "" +msgstr "${VIDALIA_DESC}を削除する" msgctxt "VidaliaSetupCaption" msgid "${VIDALIA_NAME} setup" @@ -73,7 +73,7 @@ msgid "" "This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n" "\n" "$_CLICK" -msgstr "" +msgstr "次のセットアップウィザードはVidaliaをインストールするように導くされます。VidaliaっというのはTorを制御・監視・設定を支援するグラフィカルユーザインタフェースです。" msgctxt "VidaliaWelcomeTitle" msgid "Welcome to the ${VIDALIA_NAME} Setup Wizard" @@ -152,7 +152,7 @@ msgstr "" msgctxt "PolipoUninstDesc" msgid "Remove ${POLIPO_DESC}." -msgstr "" +msgstr "${POLIPO_DESC}を削除する" msgctxt "PolipoAppDesc" msgid "Install ${POLIPO_DESC}." @@ -168,11 +168,11 @@ msgstr "" msgctxt "PolipoStartup" msgid "Run At Startup" -msgstr "" +msgstr "起動時に実行する" msgctxt "PolipoStartupDesc" msgid "Automatically run ${POLIPO_NAME} at startup." -msgstr "" +msgstr "起動時に${POLIPO_NAME} を自動実行する" msgctxt "TorbuttonGroupDesc" msgid "" @@ -182,7 +182,7 @@ msgstr "Torbuttonは匿名でのウェブ閲覧を簡単に有効化・無効化 msgctxt "TorbuttonUninstDesc" msgid "Remove ${TORBUTTON_DESC}." -msgstr "" +msgstr "${TORBUTTON_DESC}を削除する" msgctxt "TorbuttonAppDesc" msgid "Install ${TORBUTTON_DESC}." @@ -194,7 +194,7 @@ msgstr "Firefoxに追加する" msgctxt "TorbuttonAddToFirefoxDesc" msgid "Add the ${TORBUTTON_DESC} extension to Firefox." -msgstr "" +msgstr "Firefoxに${TORBUTTON_DESC} アドオンを追加する" msgctxt "TorbuttonFirefoxNotFound" msgid "Firefox was not found on your system. Not installing Torbutton." @@ -214,7 +214,7 @@ msgstr "" msgctxt "FirefoxWarningPageTitle" msgid "Firefox is not installed" -msgstr "" +msgstr "Firefoxはインストールしていません" msgctxt "FirefoxWarningPageSubtitle" msgid ""

1 0

[translation/vidalia_installer] Update translations for vidalia_installer
by translation＠torproject.org 20 Feb '12

20 Feb '12

commit 511e5ef32c16f597e3d553397683cfcd3de53ae5 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Feb 20 23:45:22 2012 +0000 Update translations for vidalia_installer --- ja/vidalia_ja.po | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/ja/vidalia_ja.po b/ja/vidalia_ja.po index bbb13e5..c5fc9d7 100755 --- a/ja/vidalia_ja.po +++ b/ja/vidalia_ja.po @@ -1,5 +1,6 @@ # # Translators: +# Chris Harris <praisebe4him(a)gmail.com>, 2012. # runasand <runa.sandvik(a)gmail.com>, 2011. # siomiz <>, 2012. msgid "" @@ -7,8 +8,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2008-07-12 05:29+0000\n" -"PO-Revision-Date: 2012-02-15 23:31+0000\n" -"Last-Translator: siomiz <>\n" +"PO-Revision-Date: 2012-02-20 23:45+0000\n" +"Last-Translator: Chris Harris <praisebe4him(a)gmail.com>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -155,7 +156,7 @@ msgstr "" msgctxt "PolipoAppDesc" msgid "Install ${POLIPO_DESC}." -msgstr "" +msgstr "${POLIPO_DESC}をインストール" msgctxt "PolipoShortcuts" msgid "Add to Start Menu" @@ -185,11 +186,11 @@ msgstr "" msgctxt "TorbuttonAppDesc" msgid "Install ${TORBUTTON_DESC}." -msgstr "" +msgstr "${TORBUTTON_DESC}をインストール" msgctxt "TorbuttonAddToFirefox" msgid "Add to Firefox" -msgstr "" +msgstr "Firefoxに追加する" msgctxt "TorbuttonAddToFirefoxDesc" msgid "Add the ${TORBUTTON_DESC} extension to Firefox."

1 0

r25458: {website} add a new mirror and refresh the table. (in website/trunk: . include)
by Andrew Lewman 20 Feb '12

20 Feb '12

Author: phobos Date: 2012-02-20 21:17:28 +0000 (Mon, 20 Feb 2012) New Revision: 25458 Modified: website/trunk/include/mirrors-table.wmi website/trunk/update-mirrors.pl Log: add a new mirror and refresh the table. Modified: website/trunk/include/mirrors-table.wmi =================================================================== --- website/trunk/include/mirrors-table.wmi 2012-02-20 14:24:42 UTC (rev 25457) +++ website/trunk/include/mirrors-table.wmi 2012-02-20 21:17:28 UTC (rev 25458) @@ -1,15 +1,15 @@ <tr> - <td>AT</td> + <td>NL</td> - <td></td> + <td>CCC</td> <td>Up to date</td> <td> - </td> - <td><a href="http://torproject.ph3x.at/dist/">http</a></td> - <td><a href="http://torproject.ph3x.at/">http</a></td> + <td><a href="http://tor.ccc.de/dist/">http</a></td> + <td><a href="http://tor.ccc.de/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -18,15 +18,15 @@ <tr> - <td>AT</td> + <td>DK</td> - <td></td> + <td>Zentrum der Gesundheit</td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.dont-know-me.at/dist/">http</a></td> - <td><a href="http://tor.dont-know-me.at/">http</a></td> + <td><a href="http://tor.idnr.ws/dist/">http</a></td> + <td><a href="http://tor.idnr.ws/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -35,15 +35,15 @@ <tr> - <td>US</td> + <td>IS</td> - <td>searchprivate</td> + <td>torproject.is</td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.searchprivate.com/dist/">http</a></td> - <td><a href="http://tor.searchprivate.com/">http</a></td> + <td><a href="http://torproject.is/dist/">http</a></td> + <td><a href="http://torproject.is/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -52,117 +52,117 @@ <tr> - <td>DE</td> + <td>AT</td> <td></td> <td>Up to date</td> <td> - </td> - <td><a href="http://mirror.open-networx.org/torproject.org/dist/">http</a></td> - <td><a href="http://mirror.open-networx.org/torproject.org/">http</a></td> - <td><a href="https://mirror.open-networx.org/torproject.org/dist/">https</a></td> - <td><a href="https://mirror.open-networx.org/torproject.org/">https</a></td> + <td><a href="http://torproject.ph3x.at/dist/">http</a></td> + <td><a href="http://torproject.ph3x.at/">http</a></td> <td> - </td> <td> - </td> + <td> - </td> + <td> - </td> </tr> <tr> - <td>DE</td> + <td>US</td> - <td>chaos darmstadt</td> + <td>BarkerJr</td> <td>Up to date</td> <td> - </td> - <td><a href="http://mirrors.chaos-darmstadt.de/tor-mirror/dist/">http</a></td> - <td><a href="http://mirrors.chaos-darmstadt.de/tor-mirror/">http</a></td> + <td><a href="http://www.torproject.us/dist/">http</a></td> + <td><a href="http://www.torproject.us/">http</a></td> + <td><a href="https://www.torproject.us/dist/">https</a></td> + <td><a href="https://www.torproject.us/">https</a></td> <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> + <td><a href="rsync://rsync.torproject.us/tor">rsync</a></td> </tr> <tr> - <td>DE</td> + <td>AT</td> - <td>beme it</td> + <td></td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.beme-it.de/dist/">http</a></td> - <td><a href="http://tor.beme-it.de/">http</a></td> - <td><a href="https://tor.beme-it.de/dist/">https</a></td> - <td><a href="https://tor.beme-it.de/">https</a></td> + <td><a href="http://tor.dont-know-me.at/dist/">http</a></td> + <td><a href="http://tor.dont-know-me.at/">http</a></td> <td> - </td> - <td><a href="rsync://tor.beme-it.de/tor">rsync</a></td> + <td> - </td> + <td> - </td> + <td> - </td> </tr> <tr> <td>DE</td> - <td>borgmann.tv</td> + <td>torservers</td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.borgmann.tv/dist/">http</a></td> - <td><a href="http://tor.borgmann.tv/">http</a></td> + <td><a href="http://www.torservers.net/mirrors/torproject.org/dist/">http</a></td> + <td><a href="http://www.torservers.net/mirrors/torproject.org/">http</a></td> + <td><a href="https://www.torservers.net/mirrors/torproject.org/dist/">https</a></td> + <td><a href="https://www.torservers.net/mirrors/torproject.org/">https</a></td> <td> - </td> <td> - </td> - <td> - </td> - <td> - </td> </tr> <tr> - <td>IL</td> + <td>IS</td> - <td>Host4site</td> + <td>myRL.net</td> <td>Up to date</td> <td> - </td> - <td><a href="http://mirror.host4site.co.il/torproject.org/dist/">http</a></td> - <td><a href="http://mirror.host4site.co.il/torproject.org/">http</a></td> + <td><a href="http://tor.myrl.net/dist/">http</a></td> + <td><a href="http://tor.myrl.net/">http</a></td> + <td><a href="https://tor.myrl.net/dist/">https</a></td> + <td><a href="https://tor.myrl.net/">https</a></td> <td> - </td> <td> - </td> - <td> - </td> - <td> - </td> </tr> <tr> - <td>GB</td> + <td>FR</td> - <td>torland</td> + <td>BarkerJr</td> <td>Up to date</td> <td> - </td> - <td><a href="http://mirror.torland.me/torproject.org/dist/">http</a></td> - <td><a href="http://mirror.torland.me/torproject.org/">http</a></td> - <td><a href="https://mirror.torland.me/torproject.org/dist/">https</a></td> - <td><a href="https://mirror.torland.me/torproject.org/">https</a></td> + <td><a href="http://www.oignon.net/dist/">http</a></td> + <td><a href="http://www.oignon.net/">http</a></td> + <td><a href="https://www.oignon.net/dist/">https</a></td> + <td><a href="https://www.oignon.net/">https</a></td> <td> - </td> <td> - </td> </tr> <tr> - <td>INT</td> + <td>AT</td> - <td>CoralCDN</td> + <td>cyberarmy</td> <td>Up to date</td> <td> - </td> - <td><a href="http://www.torproject.org.nyud.net/dist/">http</a></td> - <td><a href="http://www.torproject.org.nyud.net/">http</a></td> + <td><a href="http://tor.cyberarmy.at/dist/">http</a></td> + <td><a href="http://tor.cyberarmy.at/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -173,32 +173,32 @@ <td>US</td> - <td>BarkerJr</td> + <td>searchprivate</td> <td>Up to date</td> <td> - </td> - <td><a href="http://www.torproject.us/dist/">http</a></td> - <td><a href="http://www.torproject.us/">http</a></td> - <td><a href="https://www.torproject.us/dist/">https</a></td> - <td><a href="https://www.torproject.us/">https</a></td> + <td><a href="http://tor.searchprivate.com/dist/">http</a></td> + <td><a href="http://tor.searchprivate.com/">http</a></td> <td> - </td> - <td><a href="rsync://rsync.torproject.us/tor">rsync</a></td> + <td> - </td> + <td> - </td> + <td> - </td> </tr> <tr> - <td>FR</td> + <td>DE</td> - <td>BarkerJr</td> + <td></td> <td>Up to date</td> <td> - </td> - <td><a href="http://www.oignon.net/dist/">http</a></td> - <td><a href="http://www.oignon.net/">http</a></td> - <td><a href="https://www.oignon.net/dist/">https</a></td> - <td><a href="https://www.oignon.net/">https</a></td> + <td><a href="http://mirror.open-networx.org/torproject.org/dist/">http</a></td> + <td><a href="http://mirror.open-networx.org/torproject.org/">http</a></td> + <td><a href="https://mirror.open-networx.org/torproject.org/dist/">https</a></td> + <td><a href="https://mirror.open-networx.org/torproject.org/">https</a></td> <td> - </td> <td> - </td> </tr> @@ -207,47 +207,47 @@ <td>DE</td> - <td>spline</td> + <td>factor.cc</td> <td>Up to date</td> - <td><a href="ftp://ftp.spline.de/pub/tor">ftp</a></td> - <td><a href="http://tor.spline.de/dist/">http</a></td> - <td><a href="http://tor.spline.de/">http</a></td> <td> - </td> + <td><a href="http://tor.factor.cc/dist/">http</a></td> + <td><a href="http://tor.factor.cc/">http</a></td> + <td><a href="https://factor.cc/tor/dist/">https</a></td> + <td><a href="https://factor.cc/tor/">https</a></td> <td> - </td> <td> - </td> - <td><a href="rsync://ftp.spline.de/tor">rsync</a></td> </tr> <tr> - <td>NL</td> + <td>DE</td> - <td>torproject.nl</td> + <td>chaos darmstadt</td> <td>Up to date</td> <td> - </td> - <td><a href="http://www.torproject.nl/dist/">http</a></td> - <td><a href="http://www.torproject.nl/">http</a></td> - <td><a href="https://www.torproject.nl/dist/">https</a></td> - <td><a href="https://www.torproject.nl/">https</a></td> + <td><a href="http://mirrors.chaos-darmstadt.de/tor-mirror/dist/">http</a></td> + <td><a href="http://mirrors.chaos-darmstadt.de/tor-mirror/">http</a></td> <td> - </td> <td> - </td> + <td> - </td> + <td> - </td> </tr> <tr> - <td>NL</td> + <td>HU</td> - <td>CCC</td> + <td>Unknown</td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.ccc.de/dist/">http</a></td> - <td><a href="http://tor.ccc.de/">http</a></td> + <td><a href="http://mirror.tor.hu/dist/">http</a></td> + <td><a href="http://mirror.tor.hu/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -256,49 +256,49 @@ <tr> - <td>IS</td> + <td>DE</td> - <td>myRL.net</td> + <td>beme it</td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.myrl.net/dist/">http</a></td> - <td><a href="http://tor.myrl.net/">http</a></td> - <td><a href="https://tor.myrl.net/dist/">https</a></td> - <td><a href="https://tor.myrl.net/">https</a></td> + <td><a href="http://tor.beme-it.de/dist/">http</a></td> + <td><a href="http://tor.beme-it.de/">http</a></td> + <td><a href="https://tor.beme-it.de/dist/">https</a></td> + <td><a href="https://tor.beme-it.de/">https</a></td> <td> - </td> - <td> - </td> + <td><a href="rsync://tor.beme-it.de/tor">rsync</a></td> </tr> <tr> - <td>AT</td> + <td>US</td> - <td>cyberarmy</td> + <td>NW Linux</td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.cyberarmy.at/dist/">http</a></td> - <td><a href="http://tor.cyberarmy.at/">http</a></td> + <td><a href="http://torproject.nwlinux.us/dist/">http</a></td> + <td><a href="http://torproject.nwlinux.us/">http</a></td> <td> - </td> <td> - </td> <td> - </td> - <td> - </td> + <td><a href="rsync://nwlinux.us/tor-web">rsync</a></td> </tr> <tr> - <td>NL</td> + <td>DE</td> - <td>Amorphis</td> + <td>borgmann.tv</td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.amorphis.eu/dist/">http</a></td> - <td><a href="http://tor.amorphis.eu/">http</a></td> + <td><a href="http://tor.borgmann.tv/dist/">http</a></td> + <td><a href="http://tor.borgmann.tv/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -307,32 +307,32 @@ <tr> - <td>DE</td> + <td>US</td> - <td>factor.cc</td> + <td>Xpdm</td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.factor.cc/dist/">http</a></td> - <td><a href="http://tor.factor.cc/">http</a></td> - <td><a href="https://factor.cc/tor/dist/">https</a></td> - <td><a href="https://factor.cc/tor/">https</a></td> + <td><a href="http://torproj.xpdm.us/dist/">http</a></td> + <td><a href="http://torproj.xpdm.us/">http</a></td> + <td><a href="https://torproj.xpdm.us/dist/">https</a></td> + <td><a href="https://torproj.xpdm.us/">https</a></td> <td> - </td> <td> - </td> </tr> <tr> - <td>HU</td> + <td>IL</td> - <td>Unknown</td> + <td>Host4site</td> <td>Up to date</td> <td> - </td> - <td><a href="http://mirror.tor.hu/dist/">http</a></td> - <td><a href="http://mirror.tor.hu/">http</a></td> + <td><a href="http://mirror.host4site.co.il/torproject.org/dist/">http</a></td> + <td><a href="http://mirror.host4site.co.il/torproject.org/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -341,100 +341,100 @@ <tr> - <td>US</td> + <td>FR</td> - <td>Xpdm</td> + <td>LazyTiger</td> <td>Up to date</td> <td> - </td> - <td><a href="http://torproj.xpdm.us/dist/">http</a></td> - <td><a href="http://torproj.xpdm.us/">http</a></td> - <td><a href="https://torproj.xpdm.us/dist/">https</a></td> - <td><a href="https://torproj.xpdm.us/">https</a></td> + <td><a href="http://tor.taiga-san.net/dist/">http</a></td> + <td><a href="http://tor.taiga-san.net/">http</a></td> <td> - </td> <td> - </td> + <td> - </td> + <td> - </td> </tr> <tr> - <td>FR</td> + <td>DE</td> - <td>LazyTiger</td> + <td>spline</td> <td>Up to date</td> + <td><a href="ftp://ftp.spline.de/pub/tor">ftp</a></td> + <td><a href="http://tor.spline.de/dist/">http</a></td> + <td><a href="http://tor.spline.de/">http</a></td> <td> - </td> - <td><a href="http://tor.taiga-san.net/dist/">http</a></td> - <td><a href="http://tor.taiga-san.net/">http</a></td> <td> - </td> <td> - </td> - <td> - </td> - <td> - </td> + <td><a href="rsync://ftp.spline.de/tor">rsync</a></td> </tr> <tr> - <td>DE</td> + <td>GB</td> - <td>[[:bbs:]]</td> + <td>torland</td> <td>Up to date</td> <td> - </td> + <td><a href="http://mirror.torland.me/torproject.org/dist/">http</a></td> + <td><a href="http://mirror.torland.me/torproject.org/">http</a></td> + <td><a href="https://mirror.torland.me/torproject.org/dist/">https</a></td> + <td><a href="https://mirror.torland.me/torproject.org/">https</a></td> <td> - </td> - <td><a href="http://tor.blingblingsquad.net/">http</a></td> <td> - </td> - <td><a href="https://tor.blingblingsquad.net/">https</a></td> - <td> - </td> - <td> - </td> </tr> <tr> <td>IS</td> - <td>crypto.is</td> + <td>TheOnionRouter</td> <td>Up to date</td> <td> - </td> - <td><a href="https://torproject.crypto.is/dist/">http</a></td> - <td><a href="https://torproject.crypto.is/">http</a></td> - <td><a href="https://torproject.crypto.is/dist/">https</a></td> - <td><a href="https://torproject.crypto.is/">https</a></td> + <td><a href="http://theonionrouter.com/dist/">http</a></td> + <td><a href="http://theonionrouter.com/">http</a></td> <td> - </td> <td> - </td> + <td> - </td> + <td> - </td> </tr> <tr> - <td>DK</td> + <td>DE</td> - <td>Zentrum der Gesundheit</td> + <td>[[:bbs:]]</td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.idnr.ws/dist/">http</a></td> - <td><a href="http://tor.idnr.ws/">http</a></td> <td> - </td> + <td><a href="http://tor.blingblingsquad.net/">http</a></td> <td> - </td> + <td><a href="https://tor.blingblingsquad.net/">https</a></td> <td> - </td> <td> - </td> </tr> <tr> - <td>EE</td> + <td>INT</td> - <td>CyberSIDE</td> + <td>CoralCDN</td> <td>Up to date</td> <td> - </td> - <td><a href="http://cyberside.net.ee/tor/">http</a></td> - <td><a href="http://cyberside.planet.ee/tor/">http</a></td> + <td><a href="http://www.torproject.org.nyud.net/dist/">http</a></td> + <td><a href="http://www.torproject.org.nyud.net/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -443,32 +443,32 @@ <tr> - <td>SE</td> + <td>IS</td> - <td>homosu</td> + <td>crypto.is</td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.homosu.net/dist/">http</a></td> - <td><a href="http://tor.homosu.net/">http</a></td> + <td><a href="https://torproject.crypto.is/dist/">http</a></td> + <td><a href="https://torproject.crypto.is/">http</a></td> + <td><a href="https://torproject.crypto.is/dist/">https</a></td> + <td><a href="https://torproject.crypto.is/">https</a></td> <td> - </td> <td> - </td> - <td> - </td> - <td> - </td> </tr> <tr> - <td>LT</td> + <td>NL</td> - <td></td> + <td>Amorphis</td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.vesta.nu/dist/">http</a></td> - <td><a href="http://tor.vesta.nu/">http</a></td> + <td><a href="http://tor.amorphis.eu/dist/">http</a></td> + <td><a href="http://tor.amorphis.eu/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -477,15 +477,15 @@ <tr> - <td>IS</td> + <td>EE</td> - <td>torproject.is</td> + <td>CyberSIDE</td> <td>Up to date</td> <td> - </td> - <td><a href="http://torproject.is/dist/">http</a></td> - <td><a href="http://torproject.is/">http</a></td> + <td><a href="http://cyberside.net.ee/tor/">http</a></td> + <td><a href="http://cyberside.planet.ee/tor/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -494,15 +494,15 @@ <tr> - <td>IS</td> + <td>LT</td> - <td>TheOnionRouter</td> + <td></td> <td>Up to date</td> <td> - </td> - <td><a href="http://theonionrouter.com/dist/">http</a></td> - <td><a href="http://theonionrouter.com/">http</a></td> + <td><a href="http://tor.vesta.nu/dist/">http</a></td> + <td><a href="http://tor.vesta.nu/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -515,7 +515,7 @@ <td>AskApache</td> - <td>Out of date</td> + <td>Up to date</td> <td> - </td> <td><a href="http://tor.askapache.com/dist/">http</a></td> @@ -528,23 +528,40 @@ <tr> - <td>DE</td> + <td>SE</td> - <td>torservers</td> + <td>homosu</td> - <td>Out of date</td> + <td>Up to date</td> <td> - </td> - <td><a href="http://www.torservers.net/mirrors/torproject.org/dist/">http</a></td> - <td><a href="http://www.torservers.net/mirrors/torproject.org/">http</a></td> - <td><a href="https://www.torservers.net/mirrors/torproject.org/dist/">https</a></td> - <td><a href="https://www.torservers.net/mirrors/torproject.org/">https</a></td> + <td><a href="http://tor.homosu.net/dist/">http</a></td> + <td><a href="http://tor.homosu.net/">http</a></td> <td> - </td> <td> - </td> + <td> - </td> + <td> - </td> </tr> <tr> + <td>US</td> + + <td></td> + + <td>Up to date</td> + + <td> - </td> + <td><a href="http://mirror.hessmo.com/tor/">http</a></td> + <td><a href="http://mirror.hessmo.com/tor/">http</a></td> + <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + <td>IN</td> <td>India Tor Fans</td> @@ -615,30 +632,30 @@ <td>NL</td> - <td>BIT BV</td> + <td>torproject.nl</td> <td>Unknown</td> - <td><a href="ftp://ftp.bit.nl/mirror/tor/">ftp</a></td> - <td><a href="http://ftp.bit.nl/mirror/tor/">http</a></td> <td> - </td> + <td><a href="http://www.torproject.nl/dist/">http</a></td> + <td><a href="http://www.torproject.nl/">http</a></td> + <td><a href="https://www.torproject.nl/dist/">https</a></td> + <td><a href="https://www.torproject.nl/">https</a></td> <td> - </td> <td> - </td> - <td> - </td> - <td> - </td> </tr> <tr> - <td>AT</td> + <td>NL</td> - <td></td> + <td>BIT BV</td> <td>Unknown</td> + <td><a href="ftp://ftp.bit.nl/mirror/tor/">ftp</a></td> + <td><a href="http://ftp.bit.nl/mirror/tor/">http</a></td> <td> - </td> - <td><a href="http://tor.mirror.reisenb.at/dist/">http</a></td> - <td><a href="http://tor.mirror.reisenb.at/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -647,19 +664,19 @@ <tr> - <td>US</td> + <td>AT</td> - <td>NW Linux</td> + <td></td> <td>Unknown</td> <td> - </td> - <td><a href="http://torproject.nwlinux.us/dist/">http</a></td> - <td><a href="http://torproject.nwlinux.us/">http</a></td> + <td><a href="http://tor.mirror.reisenb.at/dist/">http</a></td> + <td><a href="http://tor.mirror.reisenb.at/">http</a></td> <td> - </td> <td> - </td> <td> - </td> - <td><a href="rsync://nwlinux.us/tor-web">rsync</a></td> + <td> - </td> </tr> <tr> Modified: website/trunk/update-mirrors.pl =================================================================== --- website/trunk/update-mirrors.pl 2012-02-20 14:24:42 UTC (rev 25457) +++ website/trunk/update-mirrors.pl 2012-02-20 21:17:28 UTC (rev 25458) @@ -838,6 +838,24 @@ httpsDistMirror => "", rsyncDistMirror => "", hiddenServiceMirror => "", + }, + mirror054 => { + adminContact => "", + orgName => "", + isoCC => "US", + subRegion => "", + region => "US", + ipv4 => "True", + ipv6 => "False", + loadBalanced => "No", + httpWebsiteMirror => "http://mirror.hessmo.com/tor/", + httpsWebsiteMirror => "", + rsyncWebsiteMirror => "", + ftpWebsiteMirror => "", + httpDistMirror => "http://mirror.hessmo.com/tor/", + httpsDistMirror => "", + rsyncDistMirror => "", + hiddenServiceMirror => "", } );

1 0

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 20 Feb '12

20 Feb '12

commit 05970300f1b9476277e14932d23d07fbfed5da8e Author: Translation commit bot <translation(a)torproject.org> Date: Mon Feb 20 18:45:08 2012 +0000 Update translations for vidalia --- eu/vidalia_eu.po | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eu/vidalia_eu.po b/eu/vidalia_eu.po index be657bf..97a5f8f 100755 --- a/eu/vidalia_eu.po +++ b/eu/vidalia_eu.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-09-07 14:40+0000\n" -"PO-Revision-Date: 2012-02-18 14:38+0000\n" +"PO-Revision-Date: 2012-02-20 18:42+0000\n" "Last-Translator: baldarra <baldarra(a)euskalerria.org>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -334,7 +334,7 @@ msgstr "Berria" msgctxt "Circuit" msgid "Open" -msgstr "Ireki" +msgstr "Irekita" msgctxt "Circuit" msgid "Building" @@ -1505,7 +1505,7 @@ msgstr "Bilaketa" msgctxt "HelpBrowser" msgid "Searching for:" -msgstr "Hau bilatzen:" +msgstr "Bilatu:" msgctxt "HelpBrowser" msgid "Found Documents" @@ -1964,7 +1964,7 @@ msgstr "Ondorengo konexioei berriak direlaren itxura eman" msgctxt "MainWindow" msgid "View recent bandwidth usage" -msgstr "Ikusi azken banda-zabalera erabilera" +msgstr "Ikusi azken banda-zabaleraren erabilera" msgctxt "MainWindow" msgid "View log message history" @@ -2343,7 +2343,7 @@ msgstr "Mezu erregistroaren lehioan erakutsi behar diren mezu kopurua" msgctxt "MessageLog" msgid "messages" -msgstr "mezuak" +msgstr "mezu" msgctxt "MessageLog" msgid "Browse" @@ -2790,7 +2790,7 @@ msgstr "%1 KB/s" msgctxt "RouterListWidget" msgid "Relay" -msgstr "Errele" +msgstr "Errelea" msgctxt "RouterListWidget" msgid "Zoom to Relay"

1 0