- tor-commits - lists.torproject.org

[translation/tsum] Update translations for tsum
by translation＠torproject.org 17 Nov '11

17 Nov '11

commit 64a6d0ceaedea775115c025da604181e9e0f9922 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Nov 16 20:15:04 2011 +0000 Update translations for tsum --- zh/tsum.po | 43 +++++++++++++++++++++++++++++++++---------- 1 files changed, 33 insertions(+), 10 deletions(-) diff --git a/zh/tsum.po b/zh/tsum.po index 41e553f..4dc70ad 100644 --- a/zh/tsum.po +++ b/zh/tsum.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-11-05 17:16+0000\n" -"PO-Revision-Date: 2011-11-16 18:58+0000\n" +"PO-Revision-Date: 2011-11-16 20:13+0000\n" "Last-Translator: LEMONed <lemoned(a)live.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -113,8 +113,9 @@ msgid "" "and requires no installation. You download the bundle, extract the archive, " "and start Tor." msgstr "" -"我们向大多数用户推荐 [Tor 浏览器软件包](https://www.torproject.org/projects/torbrowser.html)" -" 。此软件包内含一个预先配置好的浏览器，用于透过 Tor 安全地浏览互联网，且无需安装。你只需下载软件包，解压缩，并运行 Tor。" +"我们向大多数用户推荐 [Tor " +"浏览器软件包](https://www.torproject.org/projects/torbrowser.html)。此软件包内含一个预先配置好的…" +" Tor 安全地浏览互联网，且无需安装。你只需下载软件包，解压缩，并运行 Tor。" #. type: Plain text #: en/tsum.text:48 @@ -138,13 +139,15 @@ msgid "" "**macos-i386**), and Linux (write **linux-i386** for 32-bit systems or " "**linux-x86_64** for 64-bit systems)." msgstr "" +"你也可以索要 Tor 浏览器软件包的 Mac OS X 版本（写上**“macos-i386”**），和 Linux " +"版本（写上**“linux-i386”**注明32位系统或**“linux-x86_64”**注明64位系统）" #. type: Plain text #: en/tsum.text:61 msgid "" "If you want a translated version of Tor, write **help** instead. You will " "then receive an email with instructions and a list of available languages." -msgstr "" +msgstr "如果你想要其它语言版本的 Tor 软件，请写上 **help**。你将收到一封电子邮件，内含指引以及现有的语言版本的列表。" #. type: Plain text #: en/tsum.text:67 @@ -217,6 +220,8 @@ msgid "" "will allow you to verify the file you've downloaded is exactly the one that " "we intended you to get." msgstr "" +"你将获取到的，还有一个与软件包的文件名相同、扩展名为 **.asc** 的文件。这个 .asc 文件是一个 GPG " +"签名，它能允许你校验你下载到的文件是否与你想要下载的完全一致。" #. type: Plain text #: en/tsum.text:105 @@ -224,7 +229,7 @@ msgstr "" msgid "" "Before you can verify the signature, you will have to download and\n" "install GnuPG: \n" -msgstr "" +msgstr "在校验签名之前，你将需要下载和安装 GnuPG：\n" #. type: Plain text #: en/tsum.text:109 @@ -234,42 +239,49 @@ msgid "" "**Mac OS X**: [http://macgpg.sourceforge.net/](http://macgpg.sourceforge.net/) \n" "**Linux**: Most Linux distributions come with GnuPG preinstalled.\n" msgstr "" +"**Windows**: [http://gpg4win.org/download.html](http://gpg4win.org/download.html) \n" +"**Mac OS X**: [http://macgpg.sourceforge.net/](http://macgpg.sourceforge.net/) \n" +"**Linux**: 大多数 Linux 发行版已预装 GnuPG\n" #. type: Plain text #: en/tsum.text:112 msgid "" "Please note that you may need to edit the paths and the commands used below " "to get it to work on your system." -msgstr "" +msgstr "请注意，你将需要编辑以下使用到的路径和命令，让它们能在你的系统中运行。" #. type: Plain text #: en/tsum.text:115 msgid "" "Erinn Clark signs the Tor Browser Bundles with key 0x63FEE659. To import " "Erinn's key, run:" -msgstr "" +msgstr "Tor 浏览器软件由 Erinn Clark 使用密钥 0x63FEE659 签署。要导入 Erinn 的密钥，请执行：" #. type: Plain text #: en/tsum.text:117 #, no-wrap msgid "\tgpg --keyserver hkp://keys.gnupg.net --recv-keys 0x63FEE659\n" msgstr "" +"<span class=\"whitespace other\" title=\"Tab\">»</span>gpg --keyserver " +"hkp://keys.gnupg.net --recv-keys 0x63FEE659\n" #. type: Plain text #: en/tsum.text:119 msgid "After importing the key, verify that the fingerprint is correct:" -msgstr "" +msgstr "导入密钥之后，校验指纹是否正确：" #. type: Plain text #: en/tsum.text:121 #, no-wrap msgid "\tgpg --fingerprint 0x63FEE659\n" msgstr "" +"<span class=\"whitespace other\" title=\"Tab\">»</span>gpg --fingerprint " +"0x63FEE659\n" #. type: Plain text #: en/tsum.text:123 msgid "You should see:" -msgstr "" +msgstr "你应该会看到：" #. type: Plain text #: en/tsum.text:130 @@ -282,13 +294,19 @@ msgid "" "\tuid Erinn Clark <erinn(a)double-helix.org>\n" "\tsub 2048R/EB399FD7 2003-10-16\n" msgstr "" +"<span class=\"whitespace other\" title=\"Tab\">»</span>pub 2048R/63FEE659 2003-10-16\n" +"<span class=\"whitespace other\" title=\"Tab\">»</span> Key fingerprint = 8738 A680 B84B 3031 A630 F2DB 416F 0610 63FE E659\n" +"<span class=\"whitespace other\" title=\"Tab\">»</span>uid Erinn Clark <erinn(a)torproject.org>\n" +"<span class=\"whitespace other\" title=\"Tab\">»</span>uid Erinn Clark <erinn(a)debian.org>\n" +"<span class=\"whitespace other\" title=\"Tab\">»</span>uid Erinn Clark <erinn(a)double-helix.org>\n" +"<span class=\"whitespace other\" title=\"Tab\">»</span>sub 2048R/EB399FD7 2003-10-16\n" #. type: Plain text #: en/tsum.text:132 msgid "" "To verify the signature of the package you downloaded, run the following " "command:" -msgstr "" +msgstr "要校验你所下载到的软件包，请执行以下命令：" #. type: Plain text #: en/tsum.text:134 @@ -297,6 +315,8 @@ msgid "" "\tgpg --verify tor-browser-2.2.33-2_en-US.exe.asc tor-browser-2.2.33-2_en-" "US.exe\n" msgstr "" +"<span class=\"whitespace other\" title=\"Tab\">»</span>gpg --verify tor-" +"browser-2.2.33-2_en-US.exe.asc tor-browser-2.2.33-2_en-US.exe\n" #. type: Plain text #: en/tsum.text:140 @@ -317,6 +337,9 @@ msgid "" "want to make sure that the version number on the top line of the changelog " "file matches the version number in the filename." msgstr "" +"当你已完成校验并看到 *\"Good signature\"* 的输出结果，请把软件包解压缩。然后你应该会看到一个类似 **tor-" +"browser_en-US** 这样的文件夹。这个文件夹里有另一个名为 **Docs** 的文件夹，内含一个 **changelog** 文件。请确保 " +"changelog 里第一行的版本号与文件名中的版本号相符。" #. type: Plain text #: en/tsum.text:153

1 0

[translation/tsum] Update translations for tsum
by translation＠torproject.org 16 Nov '11

16 Nov '11

commit 36ccac180cc13f0a7c469921f94a5994189fda59 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Nov 16 19:15:04 2011 +0000 Update translations for tsum --- zh/tsum.po | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/zh/tsum.po b/zh/tsum.po index 1d0abe8..41e553f 100644 --- a/zh/tsum.po +++ b/zh/tsum.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-11-05 17:16+0000\n" -"PO-Revision-Date: 2011-11-16 18:15+0000\n" +"PO-Revision-Date: 2011-11-16 18:58+0000\n" "Last-Translator: LEMONed <lemoned(a)live.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -59,11 +59,13 @@ msgid "" "three random servers (also known as *relays*) in the Tor network, before the" " traffic is sent out onto the public Internet." msgstr "" +"Tor 是一个由虚拟通道组成的网络，能改善你的互联网隐私与安全。在你的网络通讯被发送至公共互联网之前，Tor 会先把它们经由 Tor " +"网络中的三台随机服务器（也称为*“中继”*）传送。" #. type: Plain text #: en/tsum.text:21 msgid "![How Tor Works](images/how-tor-works.png)" -msgstr "" +msgstr "![Tor 的工作原理](images/how-tor-works.png)" #. type: Plain text #: en/tsum.text:26 @@ -81,6 +83,8 @@ msgid "" "traffic inside the Tor network, but it cannot encrypt your traffic between " "the Tor network and its final destination." msgstr "" +"Tor 会把你的通讯来源匿名化，并且把介于你和 Tor 网络中传送的所有内容加密。Tor 也会把你在 Tor 网络内部的通讯加密，但不能加密 Tor " +"网络与最终目的地之间的通讯。" #. type: Plain text #: en/tsum.text:36 @@ -97,6 +101,8 @@ msgid "" "How to download Tor\n" "-------------------\n" msgstr "" +"如何下载 Tor\n" +"-------------------\n" #. type: Plain text #: en/tsum.text:44 @@ -107,6 +113,8 @@ msgid "" "and requires no installation. You download the bundle, extract the archive, " "and start Tor." msgstr "" +"我们向大多数用户推荐 [Tor 浏览器软件包](https://www.torproject.org/projects/torbrowser.html)" +" 。此软件包内含一个预先配置好的浏览器，用于透过 Tor 安全地浏览互联网，且无需安装。你只需下载软件包，解压缩，并运行 Tor。" #. type: Plain text #: en/tsum.text:48

1 0

r25225: {website} join the 'stop censorship' campaign for the day (but put the (in website/trunk: en images)
by Roger Dingledine 16 Nov '11

16 Nov '11

Author: arma Date: 2011-11-16 19:06:49 +0000 (Wed, 16 Nov 2011) New Revision: 25225 Added: website/trunk/images/stop-censorship-small.png Modified: website/trunk/en/index.wml Log: join the 'stop censorship' campaign for the day (but put their image on our website, rather than sending them a list of all our users for the day) Modified: website/trunk/en/index.wml =================================================================== --- website/trunk/en/index.wml 2011-11-16 17:32:25 UTC (rev 25224) +++ website/trunk/en/index.wml 2011-11-16 19:06:49 UTC (rev 25225) @@ -147,7 +147,9 @@  </div>  - + +<a style="width:200px;height:100px;vertical-align:middle;text-align:center;background-color:#000;position:absolute;z-index:5555;top:10px;left:150px;background-image:url(/images/stop-censorship-small.png);background-position:center center;background-repeat:no-repeat;" href="http://americancensorship.org"></a> + <div id="sidecol"> <div id="torusers"> <h2>Who Uses Tor?</h2> Added: website/trunk/images/stop-censorship-small.png =================================================================== (Binary files differ) Property changes on: website/trunk/images/stop-censorship-small.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream

1 0

[translation/tsum] Update translations for tsum
by translation＠torproject.org 16 Nov '11

16 Nov '11

commit 33beac669d8c9ba236be16fb6b4cc5b47ee79250 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Nov 16 18:45:04 2011 +0000 Update translations for tsum --- zh/tsum.po | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/zh/tsum.po b/zh/tsum.po index bde2a2a..1d0abe8 100644 --- a/zh/tsum.po +++ b/zh/tsum.po @@ -3,14 +3,15 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# <lemoned(a)live.com>, 2011. # <samxli(a)hotmail.com>, 2011. 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-05 17:16+0000\n" -"PO-Revision-Date: 2011-10-12 13:07+0000\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"PO-Revision-Date: 2011-11-16 18:15+0000\n" +"Last-Translator: LEMONed <lemoned(a)live.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -47,6 +48,8 @@ msgid "" "How Tor works\n" "-------------\n" msgstr "" +"Tor 是如何工作的\n" +"-------------\n" #. type: Plain text #: en/tsum.text:19

1 0

[translation/orbot] Update translations for orbot
by translation＠torproject.org 16 Nov '11

16 Nov '11

commit 34f1cc83b352eaaeec8134a2b43aa7fd9744d978 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Nov 16 18:15:03 2011 +0000 Update translations for orbot --- values-eu/strings.xml | 64 ++++++++++++++++++++++++------------------------ 1 files changed, 32 insertions(+), 32 deletions(-) diff --git a/values-eu/strings.xml b/values-eu/strings.xml index f26dbf8..54b38f0 100644 --- a/values-eu/strings.xml +++ b/values-eu/strings.xml @@ -10,29 +10,29 @@ <string name="status_starting_up">Orbot abiarazten ari da...</string> <string name="status_activated">Tor sarera konektatuta</string> <string name="status_disabled">\"Orbot desaktibatuta dago</string> - <string name="status_shutting_down"></string> + <string name="status_shutting_down">Orbot itzaltzen ari da</string> <string name="tor_process_starting"></string> <string name="tor_process_complete"></string> <string name="tor_process_waiting"></string> <string name="not_anonymous_yet"></string> - <string name="menu_home"></string> - <string name="menu_browse"></string> - <string name="menu_settings"></string> - <string name="menu_log"></string> - <string name="menu_info"></string> - <string name="menu_apps"></string> - <string name="menu_start"></string> - <string name="menu_stop"></string> - <string name="menu_about"></string> - <string name="menu_wizard"></string> - <string name="button_help"></string> - <string name="button_close"></string> - <string name="button_about"></string> - <string name="button_clear_log"></string> - <string name="menu_verify"></string> - <string name="menu_exit"></string> - <string name="powered_by"></string> - <string name="press_to_start"></string> + <string name="menu_home">Etxea</string> + <string name="menu_browse">Arakatu</string> + <string name="menu_settings">Ezarpenak</string> + <string name="menu_log">Saioa hasi</string> + <string name="menu_info">Laguntza</string> + <string name="menu_apps">Aplikazioak</string> + <string name="menu_start">Abiarazi</string> + <string name="menu_stop">Gelditu</string> + <string name="menu_about">Honi buruz</string> + <string name="menu_wizard">Laguntzailea</string> + <string name="button_help">Laguntza</string> + <string name="button_close">Itxi</string> + <string name="button_about">Honi buruz</string> + <string name="button_clear_log">Zerrenda Garbitu</string> + <string name="menu_verify">Egiaztatu</string> + <string name="menu_exit">Irten</string> + <string name="powered_by">Tor Projectek indartua</string> + <string name="press_to_start">- sakatu luze hasteko -</string> <string name="pref_trans_proxy_group"></string> <string name="pref_trans_proxy_title"></string> <string name="pref_trans_proxy_summary"></string> @@ -40,19 +40,19 @@ <string name="pref_transparent_all_summary"></string> <string name="pref_transparent_port_fallback_title"></string> <string name="pref_transparent_port_fallback_summary"></string> - <string name="pref_transparent_port_title"></string> + <string name="pref_transparent_port_title">Portu Zerrenda</string> <string name="pref_transparent_port_summary"></string> <string name="pref_transparent_port_dialog"></string> <string name="pref_has_root"></string> <string name="pref_has_root_summary"></string> - <string name="status_install_success"></string> + <string name="status_install_success">Tor bitarrak zuzen instalatuta!</string> <string name="status_install_fail"></string> - <string name="title_error"></string> - <string name="wizard_title"></string> - <string name="wizard_btn_tell_me_more"></string> - <string name="btn_next"></string> - <string name="btn_back"></string> - <string name="btn_finish"></string> + <string name="title_error">Aplikazio Akatsa</string> + <string name="wizard_title">Orbot</string> + <string name="wizard_btn_tell_me_more">Orboti buruz</string> + <string name="btn_next">Hurrengoa</string> + <string name="btn_back">Atzera</string> + <string name="btn_finish">Amaitu</string> <string name="btn_okay"></string> <string name="btn_cancel"></string> <string name="wizard_details"></string> @@ -85,7 +85,7 @@ <string name="wizard_title_msg"></string> <string name="wizard_warning_title"></string> <string name="wizard_warning_msg"></string> - <string name="wizard_permissions_title"></string> + <string name="wizard_permissions_title">Baimenak</string> <string name="wizard_permissions_root_msg1"></string> <string name="wizard_permissions_root_msg2"></string> <string name="wizard_permissions_no_root_msg"></string> @@ -97,11 +97,11 @@ <string name="wizard_transproxy_title"></string> <string name="wizard_transproxy_msg"></string> <string name="wizard_transproxy_hint"></string> - <string name="wizard_transproxy_none"></string> + <string name="wizard_transproxy_none">Bat ere ez</string> <string name="pref_transparent_tethering_title"></string> <string name="pref_transparent_tethering_summary"></string> <string name="button_grant_superuser"></string> - <string name="pref_select_apps"></string> + <string name="pref_select_apps">Aplikazioak hautatu</string> <string name="pref_select_apps_summary"></string> <string name="pref_node_configuration"></string> <string name="pref_node_configuration_summary"></string> @@ -110,7 +110,7 @@ <string name="pref_entrance_node_dialog"></string> <string name="pref_use_whispercore"></string> <string name="pref_use_whispercore_summary"></string> - <string name="pref_proxy_type_title"></string> + <string name="pref_proxy_type_title">Proxy mota</string> <string name="pref_proxy_type_summary"></string> <string name="pref_proxy_type_dialog"></string> <string name="pref_proxy_host_title"></string> @@ -119,7 +119,7 @@ <string name="pref_proxy_port_title"></string> <string name="pref_proxy_port_summary"></string> <string name="pref_proxy_port_dialog"></string> - <string name="status"></string> + <string name="status">Egoera</string> <string name="setting_up_full_transparent_proxying_"></string> <string name="setting_up_app_based_transparent_proxying_"></string> <string name="transparent_proxying_enabled"></string>

1 0

[translation/vidalia_help] Update translations for vidalia_help
by translation＠torproject.org 16 Nov '11

16 Nov '11

commit 28ab3a4787e34fce74c95f0b8e3dfa55338f5a6d Author: Translation commit bot <translation(a)torproject.org> Date: Wed Nov 16 17:45:22 2011 +0000 Update translations for vidalia_help --- eu/links.po | 28 +++++++++++++++++----------- 1 files changed, 17 insertions(+), 11 deletions(-) diff --git a/eu/links.po b/eu/links.po index 5f6f1b6..825903d 100644 --- a/eu/links.po +++ b/eu/links.po @@ -1,12 +1,13 @@ # # Translators: +# <baldarra(a)euskalerria.org>, 2011. msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-05-05 20:21+0200\n" -"PO-Revision-Date: 2010-11-30 05:02+0000\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"PO-Revision-Date: 2011-11-16 17:41+0000\n" +"Last-Translator: baldarra <baldarra(a)euskalerria.org>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -17,22 +18,22 @@ msgstr "" #. type: Content of: <html><body><h1> #: links.html:16 msgid "Helpful Links" -msgstr "" +msgstr "Lotura Lagungarriak" #. type: Content of: <html><body><h3> #: links.html:19 msgid "Vidalia" -msgstr "" +msgstr "Vidalia" #. type: Content of: <html><body><table><tr><td> #: links.html:22 links.html:30 links.html:42 links.html:49 links.html:57 msgid "   " -msgstr "" +msgstr "   " #. type: Content of: <html><body><table><tr><td> #: links.html:23 links.html:43 msgid "Homepage" -msgstr "" +msgstr "Etxe orria" #. type: Content of: <html><body><table><tr><td> #: links.html:25 @@ -40,31 +41,33 @@ msgid "" "<a href=\"https://www.torproject.org/vidalia/\"> " "https://www.torproject.org/vidalia/</a>" msgstr "" +"<a href=\"https://www.torproject.org/vidalia/\"> " +"https://www.torproject.org/vidalia/</a>" #. type: Content of: <html><body><table><tr><td> #: links.html:31 links.html:58 msgid "Wiki and Bugtracker" -msgstr "" +msgstr "Wiki eta Bugtracker" #. type: Content of: <html><body><table><tr><td> #: links.html:33 msgid "<a href=\"http://trac.torproject.org/\"> http://trac.torproject.org/</a>" -msgstr "" +msgstr "<a href=\"http://trac.torproject.org/\"> http://trac.torproject.org/</a>" #. type: Content of: <html><body><h3> #: links.html:39 msgid "Tor" -msgstr "" +msgstr "Tor" #. type: Content of: <html><body><table><tr><td> #: links.html:45 msgid "<a href=\"https://www.torproject.org/\">https://www.torproject.org/</a>" -msgstr "" +msgstr "<a href=\"https://www.torproject.org/\">https://www.torproject.org/</a>" #. type: Content of: <html><body><table><tr><td> #: links.html:50 msgid "FAQ" -msgstr "" +msgstr "FAQ" #. type: Content of: <html><body><table><tr><td> #: links.html:52 @@ -72,10 +75,13 @@ msgid "" "<a href=\"https://www.torproject.org/docs/faq.html\"> " "https://www.torproject.org/docs/faq.html</a>" msgstr "" +"<a href=\"https://www.torproject.org/docs/faq.html\"> " +"https://www.torproject.org/docs/faq.html</a>" #. type: Content of: <html><body><table><tr><td> #: links.html:60 msgid "<a href=\"https://trac.torproject.org/\"> https://trac.torproject.org/</a>" msgstr "" +"<a href=\"https://trac.torproject.org/\"> https://trac.torproject.org/</a>"

1 0

[translation/orbot] Update translations for orbot
by translation＠torproject.org 16 Nov '11

16 Nov '11

commit 401bedf65a244c26e7c1092bd0d08651d75703d1 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Nov 16 17:45:03 2011 +0000 Update translations for orbot --- values-eu/strings.xml | 186 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 186 insertions(+), 0 deletions(-) diff --git a/values-eu/strings.xml b/values-eu/strings.xml new file mode 100644 index 0000000..f26dbf8 --- /dev/null +++ b/values-eu/strings.xml @@ -0,0 +1,186 @@ +<?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">Tor abiarazi eta gelditu</string> + <string name="tor_proxy_service_process">torproxyservice</string> + <string name="status_starting_up">Orbot abiarazten ari da...</string> + <string name="status_activated">Tor sarera konektatuta</string> + <string name="status_disabled">\"Orbot desaktibatuta dago</string> + <string name="status_shutting_down"></string> + <string name="tor_process_starting"></string> + <string name="tor_process_complete"></string> + <string name="tor_process_waiting"></string> + <string name="not_anonymous_yet"></string> + <string name="menu_home"></string> + <string name="menu_browse"></string> + <string name="menu_settings"></string> + <string name="menu_log"></string> + <string name="menu_info"></string> + <string name="menu_apps"></string> + <string name="menu_start"></string> + <string name="menu_stop"></string> + <string name="menu_about"></string> + <string name="menu_wizard"></string> + <string name="button_help"></string> + <string name="button_close"></string> + <string name="button_about"></string> + <string name="button_clear_log"></string> + <string name="menu_verify"></string> + <string name="menu_exit"></string> + <string name="powered_by"></string> + <string name="press_to_start"></string> + <string name="pref_trans_proxy_group"></string> + <string name="pref_trans_proxy_title"></string> + <string name="pref_trans_proxy_summary"></string> + <string name="pref_transparent_all_title"></string> + <string name="pref_transparent_all_summary"></string> + <string name="pref_transparent_port_fallback_title"></string> + <string name="pref_transparent_port_fallback_summary"></string> + <string name="pref_transparent_port_title"></string> + <string name="pref_transparent_port_summary"></string> + <string name="pref_transparent_port_dialog"></string> + <string name="pref_has_root"></string> + <string name="pref_has_root_summary"></string> + <string name="status_install_success"></string> + <string name="status_install_fail"></string> + <string name="title_error"></string> + <string name="wizard_title"></string> + <string name="wizard_btn_tell_me_more"></string> + <string name="btn_next"></string> + <string name="btn_back"></string> + <string name="btn_finish"></string> + <string name="btn_okay"></string> + <string name="btn_cancel"></string> + <string name="wizard_details"></string> + <string name="wizard_details_msg"></string> + <string name="wizard_permissions_root"></string> + <string name="wizard_permissions_stock"></string> + <string name="wizard_premissions_msg_root"></string> + <string name="wizard_permissions_msg_stock"></string> + <string name="wizard_permissions_no_root"></string> + <string name="wizard_permissions_consent"></string> + <string name="wizard_permission_enable_root"></string> + <string name="wizard_configure"></string> + <string name="wizard_configure_msg"></string> + <string name="wizard_configure_all"></string> + <string name="wizard_configure_select_apps"></string> + <string name="wizard_tips_tricks"></string> + <string name="wizard_tips_msg"></string> + <string name="wizard_tips_otrchat"></string> + <string name="wizard_tips_proxy"></string> + <string name="wizard_proxy_help_info"></string> + <string name="wizard_proxy_help_msg"></string> + <string name="wizard_final"></string> + <string name="wizard_final_msg"></string> + <string name="connect_first_time"></string> + <string name="tor_check"></string> + <string name="pref_hs_group"></string> + <string name="pref_general_group"></string> + <string name="pref_start_boot_title"></string> + <string name="pref_start_boot_summary"></string> + <string name="wizard_title_msg"></string> + <string name="wizard_warning_title"></string> + <string name="wizard_warning_msg"></string> + <string name="wizard_permissions_title"></string> + <string name="wizard_permissions_root_msg1"></string> + <string name="wizard_permissions_root_msg2"></string> + <string name="wizard_permissions_no_root_msg"></string> + <string name="wizard_tips_title"></string> + <string name="wizard_tips_gibberbot"></string> + <string name="gibberbot_apk_url"></string> + <string name="wizard_tips_orweb"></string> + <string name="orweb_apk_url"></string> + <string name="wizard_transproxy_title"></string> + <string name="wizard_transproxy_msg"></string> + <string name="wizard_transproxy_hint"></string> + <string name="wizard_transproxy_none"></string> + <string name="pref_transparent_tethering_title"></string> + <string name="pref_transparent_tethering_summary"></string> + <string name="button_grant_superuser"></string> + <string name="pref_select_apps"></string> + <string name="pref_select_apps_summary"></string> + <string name="pref_node_configuration"></string> + <string name="pref_node_configuration_summary"></string> + <string name="pref_entrance_node"></string> + <string name="pref_entrance_node_summary"></string> + <string name="pref_entrance_node_dialog"></string> + <string name="pref_use_whispercore"></string> + <string name="pref_use_whispercore_summary"></string> + <string name="pref_proxy_type_title"></string> + <string name="pref_proxy_type_summary"></string> + <string name="pref_proxy_type_dialog"></string> + <string name="pref_proxy_host_title"></string> + <string name="pref_proxy_host_summary"></string> + <string name="pref_proxy_host_dialog"></string> + <string name="pref_proxy_port_title"></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_"></string> + <string name="setting_up_app_based_transparent_proxying_"></string> + <string name="transparent_proxying_enabled"></string> + <string name="transproxy_enabled_for_tethering_"></string> + <string name="warning_error_starting_transparent_proxying_"></string> + <string name="transproxy_rules_cleared"></string> + <string name="couldn_t_start_tor_process_"></string> + <string name="privoxy_is_running_on_port_"></string> + <string name="setting_up_port_based_transparent_proxying_"></string> + <string name="bridge_error"></string> + <string name="bridge_requires_ip"></string> + <string name="send_email_for_bridges"></string> + <string name="error"></string> + <string name="your_reachableaddresses_settings_caused_an_exception_"></string> + <string name="your_relay_settings_caused_an_exception_"></string> + <string name="exit_nodes"></string> + <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop"></string> + <string name="enter_exit_nodes"></string> + <string name="exclude_nodes"></string> + <string name="fingerprints_nicks_countries_and_addresses_to_exclude"></string> + <string name="enter_exclude_nodes"></string> + <string name="strict_nodes"></string> + <string name="use_only_these_specified_nodes"></string> + <string name="bridges"></string> + <string name="use_bridges"></string> + <string name="enable_alternate_entrance_nodes_into_the_tor_network"></string> + <string name="ip_address_and_port_of_bridges"></string> + <string name="enter_bridge_addresses"></string> + <string name="relays"></string> + <string name="relaying"></string> + <string name="enable_your_device_to_be_a_non_exit_relay"></string> + <string name="relay_port"></string> + <string name="listening_port_for_your_tor_relay"></string> + <string name="enter_or_port"></string> + <string name="relay_nickname"></string> + <string name="the_nickname_for_your_tor_relay"></string> + <string name="enter_a_custom_relay_nickname"></string> + <string name="reachable_addresses"></string> + <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies"></string> + <string name="reachable_ports"></string> + <string name="ports_reachable_behind_a_restrictive_firewall"></string> + <string name="enter_ports"></string> + <string name="enable_hidden_services"></string> + <string name="run_servers_accessible_via_the_tor_network"></string> + <string name="enter_localhost_ports_for_hidden_services"></string> + <string name="hidden_service_ports"></string> + <string name="the_addressable_name_for_your_hidden_service_generated_automatically_"></string> + <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_"></string> + <string name="project_home"></string> + <string name="project_urls"></string> + <string name="the_tor_license"></string> + <string name="https_torproject_org"></string> + <string name="third_party_software"></string> + <string name="tor_version"></string> + <string name="libevent_version"></string> + <string name="privoxy_version"></string> + <string name="iptables_version"></string> + <string name="hidden_service_request"></string> + <string name="found_existing_tor_process"></string> + <string name="something_bad_happened"></string> + <string name="hidden_service_on"></string> + <string name="unable_to_read_hidden_service_name"></string> + <string name="unable_to_start_tor"></string> +</resources>

1 0

r25224: {website} add the ars tor cloud story. (website/trunk/press/en)
by Andrew Lewman 16 Nov '11

16 Nov '11

Author: phobos Date: 2011-11-16 17:32:25 +0000 (Wed, 16 Nov 2011) New Revision: 25224 Modified: website/trunk/press/en/inthemedia.wml Log: add the ars tor cloud story. Modified: website/trunk/press/en/inthemedia.wml =================================================================== --- website/trunk/press/en/inthemedia.wml 2011-11-16 02:34:29 UTC (rev 25223) +++ website/trunk/press/en/inthemedia.wml 2011-11-16 17:32:25 UTC (rev 25224) @@ -32,6 +32,11 @@ <th>Topic</th> </tr> </thead> +<tr> +<td>2011 Nov 15</td> +<td>Ars Technica</td> +<td><a href="http://arstechnica.com/business/news/2011/11/tor-launches-do-it-yourself-pr…">Tor launches do-it-yourself privacy bridge in Amazon cloud</a></td> +</tr> <tr style="background-color: #e5e5e5;"> <td>2011 Aug 22</td> <td>VOA News: Asia</td>

1 0

[tor/master] Don't allow building on platforms where AF_UNSPEC != 0
by nickm＠torproject.org 16 Nov '11

16 Nov '11

commit 9fc7725aba8c623e2b35c4ceaee792d5f354912f Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Wed Nov 16 16:39:04 2011 +0100 Don't allow building on platforms where AF_UNSPEC != 0 --- changes/af_unspec | 4 ++++ src/common/address.c | 7 +++++++ 2 files changed, 11 insertions(+), 0 deletions(-) diff --git a/changes/af_unspec b/changes/af_unspec new file mode 100644 index 0000000..19ef4b4 --- /dev/null +++ b/changes/af_unspec @@ -0,0 +1,4 @@ + o Minor features: + - Detect when we build on a platform that doesn't define AF_UNSPEC to 0. + We don't work there, so refuse to compile. + diff --git a/src/common/address.c b/src/common/address.c index 00d2d10..f40e428 100644 --- a/src/common/address.c +++ b/src/common/address.c @@ -52,6 +52,13 @@ #include <string.h> #include <assert.h> +/* tor_addr_is_null() and maybe other functions rely on AF_UNSPEC being 0 to + * work correctly. Bail out here if we've found a platform where AF_UNSPEC + * isn't 0. */ +#if AF_UNSPEC != 0 +#error We rely on AF_UNSPEC being 0. Let us know about your platform, please! +#endif + /** Convert the tor_addr_t in <b>a</b>, with port in <b>port</b>, into a * sockaddr object in *<b>sa_out</b> of object size <b>len</b>. If not enough * room is available in sa_out, or on error, return 0. On success, return

1 0

[tor/master] Don't fail to send netinfo if real_addr is unset
by nickm＠torproject.org 16 Nov '11

16 Nov '11

commit 688b53059e56ddbc287de688258ebdd51b94e001 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Wed Nov 16 14:07:10 2011 +0100 Don't fail to send netinfo if real_addr is unset If we haven't set real_addr on a connection, we also now that _base.addr hasn't been tampered with. So we can use that. --- src/or/connection_or.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/src/or/connection_or.c b/src/or/connection_or.c index 18ee0df..320d8cb 100644 --- a/src/or/connection_or.c +++ b/src/or/connection_or.c @@ -1923,7 +1923,11 @@ connection_or_send_netinfo(or_connection_t *conn) /* Their address. */ out = cell.payload + 4; - len = append_address_to_payload(out, &conn->real_addr); + /* We use &conn->real_addr below, unless it hasn't yet been set. If it + * hasn't yet been set, we know that _base.addr hasn't been tampered with + * yet either. */ + len = append_address_to_payload(out, !tor_addr_is_null(&conn->real_addr) + ? &conn->real_addr : &conn->_base.addr); if (len<0) return -1; out += len;

1 0