January 2013 - tor-commits - lists.torproject.org

[translation/vidalia_help] Update translations for vidalia_help
by translation＠torproject.org 18 Jan '13

18 Jan '13

commit a9d2810df6317912352006b6c40519672fdd4c7d Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jan 18 18:15:29 2013 +0000 Update translations for vidalia_help --- ja/config.po | 41 ++++++++++++++++++----------------------- ja/server.po | 36 ++++++++++++++++++------------------ 2 files changed, 36 insertions(+), 41 deletions(-) diff --git a/ja/config.po b/ja/config.po index d9b5c71..25105ef 100644 --- a/ja/config.po +++ b/ja/config.po @@ -1,18 +1,19 @@ # # Translators: +# <87(a)itokei.info>, 2013. msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2010-06-26 16:58+0200\n" -"PO-Revision-Date: 2010-12-21 22:40+0000\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"PO-Revision-Date: 2013-01-18 17:55+0000\n" +"Last-Translator: brt <87(a)itokei.info>\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" +"Plural-Forms: nplurals=1; plural=0;\n" #. type: Content of: <html><body><h1> #: en/config.html:16 @@ -35,7 +36,7 @@ msgstr "" #. type: Content of: <html><body><h3> #: en/config.html:27 msgid "General Settings" -msgstr "" +msgstr "一般設定" #. type: Content of: <html><body><p> #: en/config.html:29 @@ -64,12 +65,12 @@ msgstr "" #. type: Content of: <html><body> #: en/config.html:46 msgid "<a name=\"network\"/>" -msgstr "" +msgstr "<a name=\"network\"/>" #. type: Content of: <html><body><h3> #: en/config.html:47 msgid "Network Settings" -msgstr "" +msgstr "ネットワーク設定" #. type: Content of: <html><body><p> #: en/config.html:49 @@ -120,40 +121,36 @@ msgstr "" #. type: Content of: <html><body><ul><li><ul><li> #: en/config.html:80 msgid "128.213.48.13:8080" -msgstr "" +msgstr "128.213.48.13:8080" #. type: Content of: <html><body><ul><li><ul><li> #: en/config.html:83 msgid "128.213.48.13:8080 1054 13B1 DBDA F867 B226 74D2 52DF 3D9F A367 1F73" -msgstr "" +msgstr "128.213.48.13:8080 1054 13B1 DBDA F867 B226 74D2 52DF 3D9F A367 1F73" #. type: Content of: <html><body><ul><li><ul><li> #: en/config.html:86 msgid "128.213.48.13:8080 105413B1DBDAF867B22674D252DF3D9FA3671F73" -msgstr "" +msgstr "128.213.48.13:8080 105413B1DBDAF867B22674D252DF3D9FA3671F73" #. type: Content of: <html><body><ul><li> #: en/config.html:89 msgid "" -"Even if you do not know any bridge relay addresses, checking this checkbox " -"may still be helpful. Tor will encrypt its directory requests, which can " -"defeat blocking mechanisms that try to filter Tor's requests for information" -" about other relays. If connections to normal Tor relays are also blocked, " -"then you will need to learn a bridge relay address somehow and add it here. " -"See the help topic on <a href=\"bridges.html#finding\">finding bridge " -"relays</a> for more information on how to learn new bridge relay addresses " -"and fingerprints." +"If connections to normal Tor relays are blocked, then you will need to learn" +" a bridge relay address somehow and add it here. See the help topic on <a " +"href=\"bridges.html#finding\">finding bridge relays</a> for more information" +" on how to learn new bridge relay addresses and fingerprints." msgstr "" #. type: Content of: <html><body> #: en/config.html:100 msgid "<a name=\"relay\"/>" -msgstr "" +msgstr "<a name=\"relay\"/>" #. type: Content of: <html><body><h3> #: en/config.html:101 msgid "Relay Settings" -msgstr "" +msgstr "リレーの設定" #. type: Content of: <html><body><p> #: en/config.html:103 @@ -165,12 +162,12 @@ msgstr "" #. type: Content of: <html><body> #: en/config.html:109 msgid "<a name=\"appearance\"/>" -msgstr "" +msgstr "<a name=\"appearance\"/>" #. type: Content of: <html><body><h3> #: en/config.html:110 msgid "Appearance Settings" -msgstr "" +msgstr "外観設定" #. type: Content of: <html><body><p> #: en/config.html:112 @@ -302,5 +299,3 @@ msgid "" "Hidden services allow you to provide any kind of TCP-based service, e.g. an" " HTTP service, to others without revealing your IP address." msgstr "" - - diff --git a/ja/server.po b/ja/server.po index 2142ebf..fbf424d 100644 --- a/ja/server.po +++ b/ja/server.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: 2010-06-26 17:00+0200\n" -"PO-Revision-Date: 2013-01-18 17:41+0000\n" +"PO-Revision-Date: 2013-01-18 17:52+0000\n" "Last-Translator: brt <87(a)itokei.info>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -38,7 +38,7 @@ msgstr "基本設定" msgid "" "If you decide you want to help the Tor network grow by running a relay, you " "can follow these steps to get started:" -msgstr "" +msgstr "リレーを走らせてTorネットワーク拡大の手助けをしたいと思ったなら、以下のステップに従うことで始められます:" #. type: Content of: <html><body><ol><li> #: en/server.html:31 @@ -106,12 +106,12 @@ msgstr "" #. type: Content of: <html><body> #: en/server.html:71 msgid "<a name=\"bandwidth\"/>" -msgstr "" +msgstr "<a name=\"bandwidth\"/>" #. type: Content of: <html><body><h3> #: en/server.html:72 msgid "Bandwidth Limits" -msgstr "" +msgstr "帯域幅の制限" #. type: Content of: <html><body><p> #: en/server.html:74 @@ -172,12 +172,12 @@ msgstr "" #. type: Content of: <html><body> #: en/server.html:111 msgid "<a name=\"exitpolicy\"/>" -msgstr "" +msgstr "<a name=\"exitpolicy\"/>" #. type: Content of: <html><body><h3> #: en/server.html:112 msgid "Exit Policies" -msgstr "" +msgstr "終了ポリシー" #. type: Content of: <html><body><p> #: en/server.html:114 @@ -227,12 +227,12 @@ msgstr "" #. type: Content of: <html><body><table><tr><td> #: en/server.html:143 msgid "Websites" -msgstr "" +msgstr "ウェブサイト" #. type: Content of: <html><body><table><tr><td> #: en/server.html:144 msgid "80" -msgstr "" +msgstr "80" #. type: Content of: <html><body><table><tr><td> #: en/server.html:145 @@ -242,12 +242,12 @@ msgstr "" #. type: Content of: <html><body><table><tr><td> #: en/server.html:148 msgid "Secure Websites (SSL)" -msgstr "" +msgstr "セキュアウェブサイト (SSL)" #. type: Content of: <html><body><table><tr><td> #: en/server.html:149 msgid "443" -msgstr "" +msgstr "443" #. type: Content of: <html><body><table><tr><td> #: en/server.html:150 @@ -257,12 +257,12 @@ msgstr "" #. type: Content of: <html><body><table><tr><td> #: en/server.html:153 msgid "Retrieve Mail (POP, IMAP)" -msgstr "" +msgstr "メールの回収 (POP, IMAP)" #. type: Content of: <html><body><table><tr><td> #: en/server.html:154 msgid "110, 143, 993, 995" -msgstr "" +msgstr "110, 143, 993, 995" #. type: Content of: <html><body><table><tr><td> #: en/server.html:155 @@ -272,12 +272,12 @@ msgstr "" #. type: Content of: <html><body><table><tr><td> #: en/server.html:158 msgid "Instant Messaging (IM)" -msgstr "" +msgstr "インスタントメッセージング (IM)" #. type: Content of: <html><body><table><tr><td> #: en/server.html:159 msgid "703, 1863, 5050, 5190, 5222, 5223, 8300, 8888" -msgstr "" +msgstr "703, 1863, 5050, 5190, 5222, 5223, 8300, 8888" #. type: Content of: <html><body><table><tr><td> #: en/server.html:160 @@ -288,12 +288,12 @@ msgstr "" #. type: Content of: <html><body><table><tr><td> #: en/server.html:163 msgid "Internet Relay Chat (IRC)" -msgstr "" +msgstr "インターネットリレーチャット (IRC)" #. type: Content of: <html><body><table><tr><td> #: en/server.html:164 msgid "6660-6669, 6697, 7000-7001" -msgstr "" +msgstr "6660-6669, 6697, 7000-7001" #. type: Content of: <html><body><table><tr><td> #: en/server.html:165 @@ -336,12 +336,12 @@ msgstr "" #. type: Content of: <html><body> #: en/server.html:188 msgid "<a name=\"upnp\"/>" -msgstr "" +msgstr "<a name=\"upnp\"/>" #. type: Content of: <html><body><h3> #: en/server.html:189 msgid "Port Forwarding" -msgstr "" +msgstr "ポート転送" #. type: Content of: <html><body><p> #: en/server.html:191

1 0

[translation/vidalia_help] Update translations for vidalia_help
by translation＠torproject.org 18 Jan '13

18 Jan '13

commit f78a4f458962b616d97a05b3832c317d64f70d47 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jan 18 17:45:28 2013 +0000 Update translations for vidalia_help --- ja/index.po | 13 ++++++------- ja/log.po | 8 ++++---- ja/server.po | 15 +++++++-------- 3 files changed, 17 insertions(+), 19 deletions(-) diff --git a/ja/index.po b/ja/index.po index 5227a36..9bd497e 100644 --- a/ja/index.po +++ b/ja/index.po @@ -1,30 +1,31 @@ # # Translators: +# <87(a)itokei.info>, 2013. msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2010-06-26 16:59+0200\n" -"PO-Revision-Date: 2010-11-30 05:02+0000\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"PO-Revision-Date: 2013-01-18 17:30+0000\n" +"Last-Translator: brt <87(a)itokei.info>\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" +"Plural-Forms: nplurals=1; plural=0;\n" #. type: Content of: <html><body><h1> #: en/index.html:16 msgid "Vidalia Help" -msgstr "" +msgstr "Vidalia のヘルプ" #. type: Content of: <html><body><p> #: en/index.html:20 msgid "" "Select a help topic from the tree on the left or click on the Search button " "above the list of topics to search through all available help topics." -msgstr "" +msgstr "左側のツリーからヘルプトピックを選択するか、トピックリストの上にある検索ボタンをクリックして、すべての利用可能なヘルプトピックから検索して下さい。" #. type: Content of: <html><body><p> #: en/index.html:25 @@ -44,5 +45,3 @@ msgid "" "See the <a href=\"links.html\">Helpful Links</a> topic for some places you " "can visit to find additional help and information about Vidalia and Tor." msgstr "" - - diff --git a/ja/log.po b/ja/log.po index 1aaaba7..5ad9739 100644 --- a/ja/log.po +++ b/ja/log.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2010-06-26 17:00+0200\n" -"PO-Revision-Date: 2013-01-18 17:15+0000\n" +"PO-Revision-Date: 2013-01-18 17:23+0000\n" "Last-Translator: brt <87(a)itokei.info>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -100,7 +100,7 @@ msgstr "" #: en/log.html:71 msgid "" "To select which message severities you would like to see, do the following:" -msgstr "" +msgstr "どの重要度までメッセージを見たいかを選択するには以下を行います:" #. type: Content of: <html><body><ol><li> #: en/log.html:73 en/log.html:92 @@ -127,7 +127,7 @@ msgstr "" #. type: Content of: <html><body> #: en/log.html:84 msgid "<a name=\"logfile\"/>" -msgstr "" +msgstr "<a name=\"logfile\"/>" #. type: Content of: <html><body><h3> #: en/log.html:85 @@ -139,7 +139,7 @@ msgstr "" msgid "" "Vidalia can also write log messages to a file, as well as logging them in " "the message log window. To enable logging to a file, follow these steps:" -msgstr "" +msgstr "Vidaliaはメッセージログのウィンドウに表示するだけでなく、ファイルにもログメッセージを保存出来ます。ファイルへのロギングを有効にするには以下のステップに従って下さい:" #. type: Content of: <html><body><ol><li> #: en/log.html:94 diff --git a/ja/server.po b/ja/server.po index 7bb4b6a..2142ebf 100644 --- a/ja/server.po +++ b/ja/server.po @@ -1,23 +1,24 @@ # # Translators: +# <87(a)itokei.info>, 2013. msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2010-06-26 17:00+0200\n" -"PO-Revision-Date: 2010-11-30 05:03+0000\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"PO-Revision-Date: 2013-01-18 17:41+0000\n" +"Last-Translator: brt <87(a)itokei.info>\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" +"Plural-Forms: nplurals=1; plural=0;\n" #. type: Content of: <html><body><h1> #: en/server.html:16 msgid "Setting Up a Tor Relay" -msgstr "" +msgstr "Torリレーを設定する" #. type: Content of: <html><body> #: en/server.html:19 @@ -25,12 +26,12 @@ msgid "" "The Tor network is made up of volunteers all over the world who donate some " "of their spare bandwidth by running a Tor relay. Vidalia helps you do your " "part by making it easy to set up a relay of your own. <a name=\"basic\"/>" -msgstr "" +msgstr "Tor ネットワークは、世界中のボランティアがTorリレーを走らせて、余っている帯域を提供することによって成り立っています。Vidaliaは、あなたのリレーのセットアップを簡単にすることで、あなたの役目を果たす手助けをします。 <a name=\"basic\"/>" #. type: Content of: <html><body><h3> #: en/server.html:24 msgid "Basic Settings" -msgstr "" +msgstr "基本設定" #. type: Content of: <html><body><p> #: en/server.html:26 @@ -401,5 +402,3 @@ msgid "" "<i>Directory Port</i>. The <i>Directory Port</i> is set to port 9030 by " "default on all operating systems." msgstr "" - -

1 0

[stem/master] Updating test for the network status example
by atagar＠torproject.org 18 Jan '13

18 Jan '13

commit 42ddd84ce3106d350890db064c631eaafe9b8d17 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Jan 18 08:48:57 2013 -0800 Updating test for the network status example I change one of the pydoc examples in the networkstatus module to use stem.descriptor.parse_file() rather than the module's (now private) parse_file method. Updating the unit test for this example. Updating this test has the side benefit that it now gives us test coverage of the descriptor_type argument (I had missed that previously). --- test/unit/descriptor/networkstatus/document_v3.py | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/test/unit/descriptor/networkstatus/document_v3.py b/test/unit/descriptor/networkstatus/document_v3.py index c4180d7..b1cc74e 100644 --- a/test/unit/descriptor/networkstatus/document_v3.py +++ b/test/unit/descriptor/networkstatus/document_v3.py @@ -8,6 +8,7 @@ import datetime import StringIO import unittest +import stem.descriptor import stem.version from stem import Flag @@ -123,10 +124,10 @@ class TestNetworkStatusDocument(unittest.TestCase): for router in consensus.routers: self.assertEqual('caerSidi', router.nickname) - # second example: using _parse_file + # second example: using stem.descriptor.parse_file with support_with(StringIO.StringIO(content)) as consensus_file: - for router in _parse_file(consensus_file): + for router in stem.descriptor.parse_file(consensus_file, 'network-status-consensus-3 1.0'): self.assertEqual('caerSidi', router.nickname) def test_parse_file(self):

1 0

[stem/master] Adding support for '@type dir-key-certificate-3 1.0'
by atagar＠torproject.org 18 Jan '13

18 Jan '13

commit fa6ef6bca6e703e9b69a140ec5abe4c972122872 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Jan 18 09:24:11 2013 -0800 Adding support for '@type dir-key-certificate-3 1.0' We already parsed key certificates for network status documents. I didn't know though that they had their own @type annotation. Test data is from... https://metrics.torproject.org/data/certs.tar.bz2 https://trac.torproject.org/7987 --- stem/descriptor/__init__.py | 4 ++- test/integ/descriptor/data/metrics_cert | 34 ++++++++++++++++++++ test/integ/descriptor/networkstatus.py | 52 +++++++++++++++++++++++++++++++ 3 files changed, 89 insertions(+), 1 deletions(-) diff --git a/stem/descriptor/__init__.py b/stem/descriptor/__init__.py index aec8632..7280222 100644 --- a/stem/descriptor/__init__.py +++ b/stem/descriptor/__init__.py @@ -68,7 +68,7 @@ def parse_file(descriptor_file, descriptor_type = None, path = None): extra-info 1.0 :class:`~stem.descriptor.extrainfo_descriptor.RelayExtraInfoDescriptor` directory 1.0 **unsupported** network-status-2 1.0 :class:`~stem.descriptor.router_status_entry.RouterStatusEntryV2` (with a :class:`~stem.descriptor.networkstatus.NetworkStatusDocumentV2`) - dir-key-certificate-3 1.0 **unsupported** + dir-key-certificate-3 1.0 :class:`~stem.descriptor.networkstatus.KeyCertificate` network-status-consensus-3 1.0 :class:`~stem.descriptor.router_status_entry.RouterStatusEntryV3` (with a :class:`~stem.descriptor.networkstatus.NetworkStatusDocumentV3`) network-status-vote-3 1.0 :class:`~stem.descriptor.router_status_entry.RouterStatusEntryV3` (with a :class:`~stem.descriptor.networkstatus.NetworkStatusDocumentV3`) network-status-microdesc-consensus-3 :class:`~stem.descriptor.router_status_entry.RouterStatusEntryMicroV3` (with a :class:`~stem.descriptor.networkstatus.NetworkStatusDocumentV3`) @@ -168,6 +168,8 @@ def _parse_metrics_file(descriptor_type, major_version, minor_version, descripto for desc in stem.descriptor.networkstatus._parse_file(descriptor_file, document_type): yield desc + elif descriptor_type == "dir-key-certificate-3" and major_version == 1: + yield stem.descriptor.networkstatus.KeyCertificate(descriptor_file.read()) elif descriptor_type in ("network-status-consensus-3", "network-status-vote-3") and major_version == 1: document_type = stem.descriptor.networkstatus.NetworkStatusDocumentV3 diff --git a/test/integ/descriptor/data/metrics_cert b/test/integ/descriptor/data/metrics_cert new file mode 100644 index 0000000..510bfd8 --- /dev/null +++ b/test/integ/descriptor/data/metrics_cert @@ -0,0 +1,34 @@ +@type dir-key-certificate-3 1.0 +dir-key-certificate-version 3 +fingerprint 14C131DFC5C6F93646BE72FA1401C02A8DF2E8B4 +dir-key-published 2008-05-09 21:13:26 +dir-key-expires 2009-05-09 21:13:26 +dir-identity-key +-----BEGIN RSA PUBLIC KEY----- +MIIBigKCAYEA7cZXvDRxfjDYtr9/9UsQ852+6cmHMr8VVh8GkLwbq3RzqjkULwQ2 +R9mFvG4FnqMcMKXi62rYYA3fZL1afhT804cpvyp/D3dPM8QxW88fafFAgIFP4LiD +0JYjnF8cva5qZ0nzlWnMXLb32IXSvsGSE2FRyAV0YN9a6k967LSgCfUnZ+IKMezW +1vhL9YK4QIfsDowgtVsavg63GzGmA7JvZmn77+/J5wKz11vGr7Wttf8XABbH2taX +O9j/KGBOX2OKhoF3mXfZSmUO2dV9NMwtkJ7zD///Ny6sfApWV6kVP4O9TdG3bAsl ++fHCoCKgF/jAAWzh6VckQTOPzQZaH5aMWfXrDlzFWg17MjonI+bBTD2Ex2pHczzJ +bN7coDMRH2SuOXv8wFf27KdUxZ/GcrXSRGzlRLygxqlripUanjVGN2JvrVQVr0kz +pjNjiZl2z8ZyZ5d4zQuBi074JPGgx62xAstP37v1mPw14sIWfLgY16ewYuS5bCxV +lyS28jsPht9VAgMBAAE= +-----END RSA PUBLIC KEY----- +dir-signing-key +-----BEGIN RSA PUBLIC KEY----- +MIGJAoGBAOeE3Qr1Km97gTgiB3io0EU0fqHW2ESMXVHeQuNDtCWBa0XSCEG6gx4B +ZkkHjfVWqGQ7TmmzjYP9L9uCgtoKfhSvJA2w9NUMtMl8sgZmF4lcGpXXvGY9a566 +Bn+3wP0lMhb/I8CPVPX+NWEjgl1noZxo1C59SO/iALGQOpxRYgmbAgMBAAE= +-----END RSA PUBLIC KEY----- +dir-key-certification +-----BEGIN SIGNATURE----- +asvWwaMq34OfHoWUhAwh4+JDOuEUZJVIHQnedOYfQH8asS2QvW3Ma93OhrwVOC6b +FyKmTJmJsl0MJGiC7tcEOlL6knsKE4CsuIw/PEcu2Rnm+R9zWxQuMYiHvGQMoDxl +giOhLLs4LlzAAJlbfbd3hjF4STVAtTwmxYuIjb1Mq/JfAsx/wH3TLXgVZwj32w9s +zUd9KZwwLzFiiHpC+U7zh6+wRsZfo2tlpmcaP1dTSINgVbdzPJ/DOUlx9nwTCBsE +AQpUx2DpAikwrpw0zDqpQvYulcQlNLWFN/y/PkmiK8mIJk0OBMiQA7JgqWamnnk4 +PwqaGv483LkBF+25JFGJmnUVve3RMc+s61+2kBcjfUMed4QaHkeCMHqlRqpfQVkk +RY22NXCwrJvSMEwiy7acC8FGysqwHRyE356+Rw6TB43g3Tno9KaHEK7MHXjSHwNs +GM9hAsAMRX9Ogqhq5UjDNqEsvDKuyVeyh7unSZEOip9Zr6K/+7VsVPNb8vfBRBjo +-----END SIGNATURE----- diff --git a/test/integ/descriptor/networkstatus.py b/test/integ/descriptor/networkstatus.py index e34960a..c654158 100644 --- a/test/integ/descriptor/networkstatus.py +++ b/test/integ/descriptor/networkstatus.py @@ -148,6 +148,58 @@ class TestNetworkStatus(unittest.TestCase): self.assertEquals(443, router.or_port) self.assertEquals(None, router.dir_port) + def test_metrics_cert(self): + """ + Checks if consensus documents from Metrics are parsed properly. + """ + + expected_identity_key = """-----BEGIN RSA PUBLIC KEY----- +MIIBigKCAYEA7cZXvDRxfjDYtr9/9UsQ852+6cmHMr8VVh8GkLwbq3RzqjkULwQ2 +R9mFvG4FnqMcMKXi62rYYA3fZL1afhT804cpvyp/D3dPM8QxW88fafFAgIFP4LiD +0JYjnF8cva5qZ0nzlWnMXLb32IXSvsGSE2FRyAV0YN9a6k967LSgCfUnZ+IKMezW +1vhL9YK4QIfsDowgtVsavg63GzGmA7JvZmn77+/J5wKz11vGr7Wttf8XABbH2taX +O9j/KGBOX2OKhoF3mXfZSmUO2dV9NMwtkJ7zD///Ny6sfApWV6kVP4O9TdG3bAsl ++fHCoCKgF/jAAWzh6VckQTOPzQZaH5aMWfXrDlzFWg17MjonI+bBTD2Ex2pHczzJ +bN7coDMRH2SuOXv8wFf27KdUxZ/GcrXSRGzlRLygxqlripUanjVGN2JvrVQVr0kz +pjNjiZl2z8ZyZ5d4zQuBi074JPGgx62xAstP37v1mPw14sIWfLgY16ewYuS5bCxV +lyS28jsPht9VAgMBAAE= +-----END RSA PUBLIC KEY-----""" + + expected_signing_key = """-----BEGIN RSA PUBLIC KEY----- +MIGJAoGBAOeE3Qr1Km97gTgiB3io0EU0fqHW2ESMXVHeQuNDtCWBa0XSCEG6gx4B +ZkkHjfVWqGQ7TmmzjYP9L9uCgtoKfhSvJA2w9NUMtMl8sgZmF4lcGpXXvGY9a566 +Bn+3wP0lMhb/I8CPVPX+NWEjgl1noZxo1C59SO/iALGQOpxRYgmbAgMBAAE= +-----END RSA PUBLIC KEY-----""" + + expected_key_cert = """-----BEGIN SIGNATURE----- +asvWwaMq34OfHoWUhAwh4+JDOuEUZJVIHQnedOYfQH8asS2QvW3Ma93OhrwVOC6b +FyKmTJmJsl0MJGiC7tcEOlL6knsKE4CsuIw/PEcu2Rnm+R9zWxQuMYiHvGQMoDxl +giOhLLs4LlzAAJlbfbd3hjF4STVAtTwmxYuIjb1Mq/JfAsx/wH3TLXgVZwj32w9s +zUd9KZwwLzFiiHpC+U7zh6+wRsZfo2tlpmcaP1dTSINgVbdzPJ/DOUlx9nwTCBsE +AQpUx2DpAikwrpw0zDqpQvYulcQlNLWFN/y/PkmiK8mIJk0OBMiQA7JgqWamnnk4 +PwqaGv483LkBF+25JFGJmnUVve3RMc+s61+2kBcjfUMed4QaHkeCMHqlRqpfQVkk +RY22NXCwrJvSMEwiy7acC8FGysqwHRyE356+Rw6TB43g3Tno9KaHEK7MHXjSHwNs +GM9hAsAMRX9Ogqhq5UjDNqEsvDKuyVeyh7unSZEOip9Zr6K/+7VsVPNb8vfBRBjo +-----END SIGNATURE-----""" + + cert_path = test.integ.descriptor.get_resource("metrics_cert") + + with open(cert_path) as cert_file: + certs = stem.descriptor.parse_file(cert_file, path = cert_path) + + cert = next(certs) + self.assertEquals(3, cert.version) + self.assertEquals(None, cert.address) + self.assertEquals(None, cert.dir_port) + self.assertEquals("14C131DFC5C6F93646BE72FA1401C02A8DF2E8B4", cert.fingerprint) + self.assertEquals(expected_identity_key, cert.identity_key) + self.assertEquals(datetime.datetime(2008, 5, 9, 21, 13, 26), cert.published) + self.assertEquals(datetime.datetime(2009, 5, 9, 21, 13, 26), cert.expires) + self.assertEquals(expected_signing_key, cert.signing_key) + self.assertEquals(None, cert.crosscert) + self.assertEquals(expected_key_cert, cert.certification) + self.assertEquals([], cert.get_unrecognized_lines()) + def test_consensus_v3(self): """ Checks that version 3 consensus documents are properly parsed.

1 0

[translation/vidalia_help] Update translations for vidalia_help
by translation＠torproject.org 18 Jan '13

18 Jan '13

commit 9b7d4c787fdb7374f3a59cb831e0bbfe41f459de Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jan 18 17:15:29 2013 +0000 Update translations for vidalia_help --- ja/log.po | 9 +++++---- ja/troubleshooting.po | 8 ++++---- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/ja/log.po b/ja/log.po index a879973..1aaaba7 100644 --- a/ja/log.po +++ b/ja/log.po @@ -1,24 +1,25 @@ # # Translators: +# <87(a)itokei.info>, 2013. # <twitter816(a)hotmail.co.jp>, 2012. msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2010-06-26 17:00+0200\n" -"PO-Revision-Date: 2012-07-01 17:07+0000\n" -"Last-Translator: 816daijin <twitter816(a)hotmail.co.jp>\n" +"PO-Revision-Date: 2013-01-18 17:15+0000\n" +"Last-Translator: brt <87(a)itokei.info>\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" +"Plural-Forms: nplurals=1; plural=0;\n" #. type: Content of: <html><body><h1> #: en/log.html:16 msgid "Message Log" -msgstr "メッセージのログ" +msgstr "メッセージログ" #. type: Content of: <html><body> #: en/log.html:19 diff --git a/ja/troubleshooting.po b/ja/troubleshooting.po index 948a265..ac8f7bc 100644 --- a/ja/troubleshooting.po +++ b/ja/troubleshooting.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2010-08-03 15:49-0300\n" -"PO-Revision-Date: 2013-01-18 16:39+0000\n" +"PO-Revision-Date: 2013-01-18 17:10+0000\n" "Last-Translator: brt <87(a)itokei.info>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -42,7 +42,7 @@ msgid "" "is looking for your Tor installation in the wrong directory. You can tell " "Vidalia where Tor is located by updating the <i>Tor Executable</i> option in" " the <a href=\"config.html#general\">general configuration settings</a>." -msgstr "" +msgstr "Vidaliaがtorを起動できない最もありそうな理由は、Vidaliaが間違ったディレクトリでTorを探していることです。<a href=\"config.html#general\">general configuration settings</a> の <i>Tor Executable</i> オプションを更新することでVidaliaにTorの場所を伝えることができます。" # type: Content of: <html><body><p> #: en/troubleshooting.html:33 @@ -50,7 +50,7 @@ msgid "" "Another possible reason that Tor cannot start is because there is already " "another Tor process running. Check your list of running process and stop the" " previous Tor process, if you find one. Then, try running Tor again." -msgstr "" +msgstr "Torを起動できない、他に考えられる理由は、別のTorプロセスが既に起動中であることです。起動中のプロセスを確認し、前のTorプロセスを終了させてからTorを起動してみて下さい。" # type: Content of: <html><body><p> #: en/troubleshooting.html:38 @@ -58,7 +58,7 @@ msgid "" "If that did not help, check your <a href=\"log.html\">message log</a> to see" " if Tor printed any information about errors it encountered while trying to " "start." -msgstr "" +msgstr "それでも解決しないようであれば、<a href=\"log.html\">メッセージログ</a>を確認し、Torが起動時のエラーについて何か情報を残していないか確認して下さい。" # type: Content of: <html><body> #: en/troubleshooting.html:43

1 0

[translation/vidalia_help] Update translations for vidalia_help
by translation＠torproject.org 18 Jan '13

18 Jan '13

commit 6fa2ab5ff247fa3784173324dd38845b5f949e9a Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jan 18 16:45:34 2013 +0000 Update translations for vidalia_help --- ja/troubleshooting.po | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ja/troubleshooting.po b/ja/troubleshooting.po index ace1225..948a265 100644 --- a/ja/troubleshooting.po +++ b/ja/troubleshooting.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2010-08-03 15:49-0300\n" -"PO-Revision-Date: 2013-01-17 17:14+0000\n" +"PO-Revision-Date: 2013-01-18 16:39+0000\n" "Last-Translator: brt <87(a)itokei.info>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -28,7 +28,7 @@ msgid "" "running Tor. If you can't find anything about the particular problem you're " "having, check out our website at <i>www.vidalia-project.net</i> for more " "support and information. <a name=\"start\"/>" -msgstr "" +msgstr "以下はTor使用時に起こる、いくつかのよくある問題や人々が抱く疑問です。あなたが抱えている個別の問題について何も見つけられなければ、私たちのウェブサイト <i>www.vidalia-project.net</i> をチェックして追加のサポートと情報を取得して下さい。 <a name=\"start\"/>" # type: Content of: <html><body><h3> #: en/troubleshooting.html:25

1 0

[translation/vidalia_alpha] Update translations for vidalia_alpha
by translation＠torproject.org 18 Jan '13

18 Jan '13

commit aa54b9fd259124da73b1b33a048aa6ca8191ac1a Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jan 18 16:45:22 2013 +0000 Update translations for vidalia_alpha --- ja/vidalia_ja.po | 30 +++++++++++++++--------------- 1 files changed, 15 insertions(+), 15 deletions(-) diff --git a/ja/vidalia_ja.po b/ja/vidalia_ja.po index 52c6434..063e967 100644 --- a/ja/vidalia_ja.po +++ b/ja/vidalia_ja.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:46+0000\n" -"PO-Revision-Date: 2013-01-18 16:11+0000\n" +"PO-Revision-Date: 2013-01-18 16:30+0000\n" "Last-Translator: brt <87(a)itokei.info>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -196,7 +196,7 @@ msgstr "Torのソケットパスとして使うファイルを選んでくださ msgctxt "AdvancedPage" msgid "Configure ControlPort automatically" -msgstr "" +msgstr "コントロールポートを自動設定する" msgctxt "AdvancedPage" msgid "" @@ -226,7 +226,7 @@ msgid "" "You've checked the autoconfiguration option for the ControlPort, but " "provided no Data Directory. Please add one, or uncheck the \"Configure " "ControlPort automatically\" option." -msgstr "" +msgstr "コントロールポートの自動設定オプションをチェックしていますが、データディレクトリが設定されていません。データディレクトリを設定するか、\"コントロールポートを自動設定する\"のチェックを外してください。" msgctxt "AdvancedPage" msgid "" @@ -2060,7 +2060,7 @@ msgid "" "It seems Tor has stopped running since Vidalia started it.\n" "\n" "See the Advanced Message Log for more information." -msgstr "" +msgstr "Vidaliaによる起動後Torが停止したようです。\n\n詳細な情報はメッセージログの詳細を見てください。" msgctxt "MainWindow" msgid "" @@ -2092,7 +2092,7 @@ msgctxt "MainWindow" msgid "" "One of your applications %1 appears to be making a potentially unencrypted " "and unsafe connection to port %2." -msgstr "" +msgstr "アプリケーション%1がポート%2に、暗号化されておらず、安全ではない可能性のある接続を作成しているようです。" msgctxt "MainWindow" msgid "" @@ -2689,15 +2689,15 @@ msgctxt "PluginWrapper" msgid "" "%4: ERROR: Line: %1 - Column: %2\n" "%3" -msgstr "" +msgstr "%4: エラー: 行: %1 - 列: %2\n%3" msgctxt "PluginWrapper" msgid "%1: Error opening file %2" -msgstr "" +msgstr "%1: %2 ファイルのオープンエラー" msgctxt "PluginWrapper" msgid "%2: ERROR: Cannot open %1" -msgstr "" +msgstr "%2: エラー: %1 を開けません。" msgctxt "PluginWrapper" msgid "%2: ERROR: Parsing %1" @@ -2707,19 +2707,19 @@ msgctxt "PluginWrapper" msgid "" "Line: %1 - Column: %2\n" "Message: %3" -msgstr "" +msgstr "行: %1 - 列: %2\nメッセージ: %3" msgctxt "PluginWrapper" msgid "%1: Starting..." -msgstr "" +msgstr "%1: 起動中..." msgctxt "PluginWrapper" msgid "%1: Stoping..." -msgstr "" +msgstr "%1: 終了中..." msgctxt "PluginWrapper" msgid "%1: WARNING: doesn't have a GUI, and buildGUI() was called" -msgstr "" +msgstr "%1: 警告: GUIを持たずに buildGUI() が呼ばれました。" msgctxt "PluginWrapper" msgid "" @@ -3888,18 +3888,18 @@ msgstr "指定された無効な言語コード:" msgctxt "Vidalia" msgid "Invalid GUI style specified:" -msgstr "" +msgstr "指定された無効なGUIスタイル:" msgctxt "Vidalia" msgid "Invalid log level specified:" -msgstr "" +msgstr "指定された無効なログレベル:" msgctxt "Vidalia" msgid "" "Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway.\n" "\n" "Would you like to continue starting Vidalia?" -msgstr "" +msgstr "他のVidaliaプロセスが既に実行中である可能性があります。他のVidaliaプロセスが実行中ではない場合は、起動を継続できます。\n\nVidaliaの起動を継続しますか？" msgctxt "stringutil.h" msgid "%1 secs"

1 0

[translation/vidalia_alpha] Update translations for vidalia_alpha
by translation＠torproject.org 18 Jan '13

18 Jan '13

commit 2ebfe6bb065c1081e0d168c44c878ad4439c4e56 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jan 18 16:15:19 2013 +0000 Update translations for vidalia_alpha --- 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 f4a30ac..52c6434 100644 --- a/ja/vidalia_ja.po +++ b/ja/vidalia_ja.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:46+0000\n" -"PO-Revision-Date: 2013-01-18 13:57+0000\n" +"PO-Revision-Date: 2013-01-18 16:11+0000\n" "Last-Translator: brt <87(a)itokei.info>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -488,14 +488,14 @@ msgctxt "ControlPasswordInputDialog" msgid "" "Vidalia can try to restart Tor for you. Doing so will close all currently " "active connections through your Tor process." -msgstr "" +msgstr "VidaliaはTorの再起動を試みることができます。これは現在アクティブな、Torを通したすべての接続を切断します。" msgctxt "ControlPasswordInputDialog" msgid "" "Tor is already running, but Vidalia can't connect to it.\n" "\n" "This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor." -msgstr "" +msgstr "Torは既に起動していますがVidaliaはそれに接続出来ません。\n\nこれは何か他のもの (別のアクティブなVidaliaやクラッシュしたVidaliaのプロセス等) がTorを起動した場合に起こり得ます。" msgctxt "ControlPasswordInputDialog" msgid "" @@ -2733,7 +2733,7 @@ msgstr "" msgctxt "PluginWrapper" msgid "(untitled)" -msgstr "" +msgstr "(名称未設定)" msgctxt "PluginWrapper" msgid "Error: buildGUI() failed for plugin %1" @@ -2759,13 +2759,13 @@ msgctxt "QObject" msgid "" "Failed to set %1:\n" "Reason: %2" -msgstr "" +msgstr "%1 の適用に失敗:\n理由: %2" msgctxt "QObject" msgid "" "The failed options were saved in your torrc and will be applied when you " "restart." -msgstr "" +msgstr "失敗したオプションは torrc に保存され、再起動後に適用されます。" msgctxt "QObject" msgid "" @@ -3225,7 +3225,7 @@ msgstr "" msgctxt "ServerPage" msgid "h:mm" -msgstr "" +msgstr "h:mm" msgctxt "ServerPage" msgid "at" @@ -3568,11 +3568,11 @@ msgstr "" msgctxt "TorControl" msgid "Start failed: %1" -msgstr "" +msgstr "起動失敗: %1" msgctxt "TorControl" msgid "Process finished: ExitCode=%1" -msgstr "" +msgstr "プロセス終了: 終了コード =%1" msgctxt "TorControl" msgid "Connection failed: %1" @@ -3880,7 +3880,7 @@ msgstr "ログファイル '%1' を開くことができません: %2" msgctxt "Vidalia" msgid "Value required for parameter :" -msgstr "" +msgstr "パラメータには値が必要です:" msgctxt "Vidalia" msgid "Invalid language code specified:"

1 0

[translation/vidalia_alpha] Update translations for vidalia_alpha
by translation＠torproject.org 18 Jan '13

18 Jan '13

commit 9a95bfe5ca388f4db45a540f003306c5350b0330 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jan 18 14:15:22 2013 +0000 Update translations for vidalia_alpha --- ja/vidalia_ja.po | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/ja/vidalia_ja.po b/ja/vidalia_ja.po index f1f6826..f4a30ac 100644 --- a/ja/vidalia_ja.po +++ b/ja/vidalia_ja.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:46+0000\n" -"PO-Revision-Date: 2013-01-18 07:56+0000\n" +"PO-Revision-Date: 2013-01-18 13:57+0000\n" "Last-Translator: brt <87(a)itokei.info>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -262,11 +262,11 @@ msgstr "Vidaliaは選択された言語データをロードできませんで msgctxt "AppearancePage" msgid "" "System Icon Preferences (changes will take effect when you restart Vidalia)" -msgstr "" +msgstr "システムアイコンの設定 (変更はVidaliaの再起動後に反映されます)" msgctxt "AppearancePage" msgid "Show the Tray Icon and Dock Icon (default)" -msgstr "" +msgstr "トレイアイコンとドックアイコンを表示する (デフォルト)" msgctxt "AppearancePage" msgid "Hide the Tray Icon" @@ -1362,15 +1362,15 @@ msgctxt "CrashReportDialog" msgid "" "with a description of what you were doing before the application crashed, " "along with the following files corresponding to the crash report:" -msgstr "" +msgstr "チケットの登録の際にアプリケーションがクラッシュする前に行った操作の詳細を記述し、以下のクラッシュレポートに対応するファイルを添付してください。" msgctxt "DebugDialog" msgid "Plugin debug output" -msgstr "" +msgstr "プラグインデバッグ出力" msgctxt "DebugDialog" msgid "Plugin Output" -msgstr "" +msgstr "プラグイン出力" msgctxt "DebugDialog" msgid "Syntax Errors" @@ -2023,7 +2023,7 @@ msgstr "新しい回路" msgctxt "MainWindow" msgid "Debug output" -msgstr "" +msgstr "デバッグ出力" msgctxt "MainWindow" msgid "Panic!" @@ -2045,7 +2045,7 @@ msgctxt "MainWindow" msgid "" "Your computer's clock is wrong, tor may not work as expected. Please check " "the Message Log for more information." -msgstr "" +msgstr "あなたのコンピュータの時刻が間違っているため、Torが期待通りに機能しないかも知れません。より多くの情報を得るにはメッセージログを確認してください。" msgctxt "MainWindow" msgid "" @@ -2053,7 +2053,7 @@ msgid "" "\n" "Here's the last error message:\n" " %2" -msgstr "" +msgstr "次のファイルにアクセスできないためVidaliaはTorとやりとりする方法を見つけ出せません: %1\n\nこれは最後のエラーメッセージです:\n%2" msgctxt "MainWindow" msgid ""

1 0

[translation/bridgedb_completed] Update translations for bridgedb_completed
by translation＠torproject.org 18 Jan '13

18 Jan '13

commit fe807eca9ee09384a7dc30fe46e0730e442efd9b Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jan 18 12:45:08 2013 +0000 Update translations for bridgedb_completed --- es/bridgedb.po | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/es/bridgedb.po b/es/bridgedb.po index 14deb32..09bbbee 100644 --- a/es/bridgedb.po +++ b/es/bridgedb.po @@ -4,13 +4,14 @@ # # Translators: # NinjaTuna <nort0ngh0st(a)hotmail.com>, 2011. +# <strelnic(a)gmail.com>, 2013. # <strelnic(a)gmail.com>, 2012. 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: 2012-12-27 17:35+0000\n" +"PO-Revision-Date: 2013-01-18 12:30+0000\n" "Last-Translator: strel <strelnic(a)gmail.com>\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/torproject/language/es/)\n" "MIME-Version: 1.0\n" @@ -51,7 +52,7 @@ msgid "" "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 "Otra forma de encontrar direcciones de bridges públicos es enviar un\ncorreo a bridges(a)torproject.org con la línea \"get bridges\", por si sola,\nen el cuerpo del correo. Sin embargo, para que podamos ponerle más\ndifícil a un atacante conseguir muchas direcciones de bridge, debe enviar\nesta petición desde una dirección de correo de uno de estos dominios: " +msgstr "Otra forma de encontrar direcciones de bridges públicos es enviar un\ncorreo a bridges(a)torproject.org con la línea \"get bridges\" por si sola\nen el cuerpo del correo. Sin embargo, para que podamos ponerle más\ndifícil a un atacante conseguir muchas direcciones de bridge, debe enviar\nesta petición desde una dirección de correo de uno de estos dominios: " #: lib/bridgedb/I18n.py:41 msgid "[This is an automated message; please do not reply.]"

1 0