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

[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

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

18 Jan '13

commit 8261fde5340ce209b5d651e8c9e9a3e17d18782a Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jan 18 12:45:02 2013 +0000 Update translations for bridgedb --- 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

[metrics-tasks/master] Calculate and graph frac_relays and frac_cw using stem (#7241).
by karsten＠torproject.org 18 Jan '13

18 Jan '13

commit 0e4f962092b1e4c5545136485bb338cd839401f2 Author: peer <peer(a)lavabit.com> Date: Thu Jan 17 14:41:54 2013 +0000 Calculate and graph frac_relays and frac_cw using stem (#7241). --- task-7241/README | 22 +++++++++ task-7241/first_pass.py | 109 +++++++++++++++++++++++++++++++++++++++++++++++ task-7241/plot.R | 13 ++++++ 3 files changed, 144 insertions(+), 0 deletions(-) diff --git a/task-7241/README b/task-7241/README new file mode 100644 index 0000000..80a710f --- /dev/null +++ b/task-7241/README @@ -0,0 +1,22 @@ +Uses stem to parse network consensus documents to determine frac_relays and frac_cw based on fingerprint. + +*Definitions* + +Let Y be the consensus listed (now) and X the consensus some hours ago (now - hours). + +Let intersection(X,Y) be the routers in both X and Y based on fingerprint. + +frac_relay is count(intersection(X,Y))/count(Y). + +frac_cw is the sum of consensus weights in Y over intersection(X,Y) divided by the sum of consensus weights in Y. + +*Notes* + +Output is in CSV format and does not include a header. Fields are consensus, hour, frac_relays, frac_cw, month, day, and day of week. + +Unavailable network consensus documents based on path are ignored. + +Change initial_time_info_bound, final_time_info_bound, initial_time_data_bound, and final_time_data_bound to explore different time ranges. initial_time_data_bound should be at least 168 hours before initial_time_info_bound. + +Four months of hourly data (fingerprint, consensus weights) uses about 1.5GB of space. + diff --git a/task-7241/first_pass.py b/task-7241/first_pass.py new file mode 100644 index 0000000..f3f9707 --- /dev/null +++ b/task-7241/first_pass.py @@ -0,0 +1,109 @@ +import sys +from datetime import datetime, timedelta + +from stem.descriptor.networkstatus import NetworkStatusDocumentV3 + +# http://stackoverflow.com/questions/82831/how-do-i-check-if-a-file-exists-us… +def file_check(file_path): + try: + with open(file_path) as f: + return True + except IOError: + return False + +def filepath_from_time(cur_datetime): + consensus_path = 'consensuses-' + consensus_path += cur_datetime.strftime('%Y-%m') + consensus_path += '/' + consensus_path += cur_datetime.strftime('%d') + consensus_path += '/' + consensus_path += cur_datetime.strftime('%Y-%m-%d-%H-%M-%S') + consensus_path += '-consensus' + + return consensus_path + +def filename_from_time(cur_datetime): + consensus_filename = cur_datetime.strftime('%Y-%m-%d-%H-%M-%S') + consensus_filename += '-consensus' + + return consensus_filename + +time_interval = timedelta(0, 60*60) # one hour + +# base consensuses for examination +initial_time_info_bound = datetime(2012, 1, 1) # inclusive +final_time_info_bound = datetime(2013, 1, 1) # exclusive + +router_data = {} + +# data range for consensuses +initial_time_data_bound = datetime(2011, 12, 1) # inclusive +final_time_data_bound = datetime(2013, 1, 1) # exclusive + +# load information +cur_datetime = initial_time_data_bound - time_interval +while cur_datetime < final_time_data_bound - time_interval: + cur_datetime += time_interval + + cur_filepath = filepath_from_time(cur_datetime) + cur_filename = filename_from_time(cur_datetime) + + if file_check(cur_filepath) == True: + consensus_file = open(cur_filepath, 'r') + consensus_file.readline() + consensus = NetworkStatusDocumentV3(consensus_file.read()) + consensus_file.close() + + routers = {} + for router in consensus.routers: + routers[router.fingerprint] = router.bandwidth + + router_data[cur_filename] = routers + +# interval multipliers +time_interval_list = [1,2,3,4,5,6,12,24,36,48,72,96,120,144,168] # hours + +# iterate over base consensuses +cur_datetime = initial_time_info_bound - time_interval +while cur_datetime < final_time_info_bound - time_interval: + cur_datetime += time_interval + + cur_filepath = filepath_from_time(cur_datetime) # current + cur_filename = filename_from_time(cur_datetime) # current + + if file_check(cur_filepath) == True: + base_routers = router_data[cur_filename] + base_router_count = 0 + base_router_bandwidth = 0 + for fingerprint in router_data[cur_filename].keys(): + base_router_count += 1 + base_router_bandwidth += router_data[cur_filename][fingerprint] + + for comparison_time_interval_multiplier in time_interval_list: + comparison_time_interval = timedelta(0, comparison_time_interval_multiplier*60*60) + comparison_datetime = cur_datetime - comparison_time_interval + + comparison_filepath = filepath_from_time(comparison_datetime) # comparison + comparison_filename = filename_from_time(comparison_datetime) # comparison + + if file_check(comparison_filepath) == True: + comparison_router_count = 0 + comparison_router_bandwidth = 0 + comparison_router_overlap_bandwidth = 0 + base_router_overlap_bandwidth = 0 + comparison_router_overlap_count = 0 + + for fingerprint in router_data[comparison_filename].keys(): + comparison_router_count += 1 + comparison_router_bandwidth += router_data[comparison_filename][fingerprint] + + if fingerprint in base_routers: + base_router_overlap_bandwidth += base_routers[fingerprint] + comparison_router_overlap_count += 1 + comparison_router_overlap_bandwidth += router_data[comparison_filename][fingerprint] + + frac_relays = float(comparison_router_overlap_count)/float(base_router_count) + frac_cw = float(base_router_overlap_bandwidth)/float(base_router_bandwidth) + + print '%s,%d,%f,%f,%d,%d,%s' % (cur_filename, comparison_time_interval_multiplier, frac_relays, frac_cw, cur_datetime.month, cur_datetime.day, cur_datetime.strftime('%w')) + diff --git a/task-7241/plot.R b/task-7241/plot.R new file mode 100644 index 0000000..66d39d9 --- /dev/null +++ b/task-7241/plot.R @@ -0,0 +1,13 @@ +require(ggplot2) +data <- read.csv("s2012.csv", header=TRUE) + +# frac_relays +p <- ggplot(data, aes(factor(hours), frac_relays)) +p + geom_boxplot() + ylab("frac_relays") + xlab("time interval") + ggtitle(2012) +ggsave("2012_frac_relays.png", height=6, width=6) + +# frac_cw +p <- ggplot(data, aes(factor(hours), frac_cw)) +p + geom_boxplot() + ylab("frac_cw") + xlab("time interval") + ggtitle(2012) +ggsave("2012_frac_cw.png", height=6, width=6) +

1 0

[stem/master] Replacing our tuple descriptor_type arg with a str
by atagar＠torproject.org 18 Jan '13

18 Jan '13

commit d34b30903a071cc0fd8601c9af8a35da3f57f3d2 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Jan 17 23:28:53 2013 -0800 Replacing our tuple descriptor_type arg with a str Changing the type of the descriptor_type arg I added earlier today. A string would be more intuitive to use than a tuple. --- stem/descriptor/__init__.py | 19 +++++++------------ stem/descriptor/networkstatus.py | 2 +- 2 files changed, 8 insertions(+), 13 deletions(-) diff --git a/stem/descriptor/__init__.py b/stem/descriptor/__init__.py index 178795c..12a3a3e 100644 --- a/stem/descriptor/__init__.py +++ b/stem/descriptor/__init__.py @@ -59,7 +59,7 @@ def parse_file(descriptor_file, descriptor_type = None, path = None): :class:`~stem.descriptor.reader.DescriptorReader`. :param file descriptor_file: opened file with the descriptor contents - :param tuple descriptor_type: tuple of the form **(type, major_version, minor_version)** as per the `metrics site <https://metrics.torproject.org/formats.html#descriptortypes>`_ + :param str descriptor_type: `descriptor type <https://metrics.torproject.org/formats.html#descriptortypes>`_ :param str path: absolute path to the file's location on disk :returns: iterator for :class:`stem.descriptor.Descriptor` instances in the file @@ -85,18 +85,13 @@ def parse_file(descriptor_file, descriptor_type = None, path = None): file_parser = None if descriptor_type is not None: - if len(descriptor_type) != 3: - raise ValueError("The descriptor_type must be a tuple of the form (type, major_version, minor_version)") + descriptor_type_match = re.match("^(\S+) (\d+).(\d+)$", descriptor_type) - desc_type, major_version, minor_version = descriptor_type - - try: - major_version = int(major_version) - minor_version = int(minor_version) - except ValueError: - raise ValueError("The descriptor_type's major and minor versions must be integers") - - file_parser = lambda f: _parse_metrics_file(desc_type, major_version, minor_version, f) + if descriptor_type_match: + desc_type, major_version, minor_version = descriptor_type_match.groups() + file_parser = lambda f: _parse_metrics_file(desc_type, int(major_version), int(minor_version), f) + else: + raise ValueError("The descriptor_type must be of the form '<type> <major_version>.<minor_version>'") elif filename == "cached-descriptors": file_parser = stem.descriptor.server_descriptor._parse_file elif filename == "cached-extrainfo": diff --git a/stem/descriptor/networkstatus.py b/stem/descriptor/networkstatus.py index 2b80f85..fc46fa0 100644 --- a/stem/descriptor/networkstatus.py +++ b/stem/descriptor/networkstatus.py @@ -51,7 +51,7 @@ and upfront runtime. # Processes the routers as we read them in. The routers refer to a document # with an unset 'routers' attribute. - for router in parse_file(consensus_file, ('network-status-consensus-3', 1, 0)): + for router in parse_file(consensus_file, 'network-status-consensus-3 1.0'): print router.nickname **Module Overview:**

1 0

[stem/master] Table providing desctriptor_type to class mappings
by atagar＠torproject.org 18 Jan '13

18 Jan '13

commit 8b3e9ed828070b2da9010220e989017668cb994d Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Jan 18 00:04:30 2013 -0800 Table providing desctriptor_type to class mappings --- .gitignore | 2 -- docs/api.rst | 4 ++++ stem/descriptor/__init__.py | 30 ++++++++++++++++++++++++++---- stem/descriptor/networkstatus.py | 3 ++- 4 files changed, 32 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index c05eb6d..f74e628 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,4 @@ *.swp test/data/ docs/_build/ -docs/stem.* -docs/modules.rst diff --git a/docs/api.rst b/docs/api.rst index c876778..3f9d770 100644 --- a/docs/api.rst +++ b/docs/api.rst @@ -20,6 +20,10 @@ Controller Descriptors ----------- +To read descriptors from disk use :func:`~stem.descriptor.__init__.parse_file` for +individual files and `stem.descriptor.reader +<api/descriptor/reader.html>`_ for batches. + * **Classes** * `stem.descriptor <api/descriptor/descriptor.html>`_ - Base class for descriptors. diff --git a/stem/descriptor/__init__.py b/stem/descriptor/__init__.py index 12a3a3e..aec8632 100644 --- a/stem/descriptor/__init__.py +++ b/stem/descriptor/__init__.py @@ -43,7 +43,7 @@ PGP_BLOCK_END = "-----END %s-----" def parse_file(descriptor_file, descriptor_type = None, path = None): """ Simple function to read the descriptor contents from a file, providing an - iterator for its :class:`~stem.descriptor.Descriptor` contents. + iterator for its :class:`~stem.descriptor.__init__.Descriptor` contents. If you don't provide a **descriptor_type** argument then this automatically tries to determine the descriptor type based on the following... @@ -52,17 +52,39 @@ def parse_file(descriptor_file, descriptor_type = None, path = None): instance, tor's 'cached-descriptors' contains server descriptors. * The @type annotation on the first line. These are generally only found in - the descriptor archives from 'https://metrics.torproject.org'. + the `descriptor archives <https://metrics.torproject.org>`_. This is a handy function for simple usage, but if you're reading multiple descriptor files you might want to consider the :class:`~stem.descriptor.reader.DescriptorReader`. + Descriptor types include the following, including further minor versions (ie. + if we support 1.0 then we also support 1.1 and above)... + + ===================================== ===== + Descriptor Type Class + ===================================== ===== + server-descriptor 1.0 :class:`~stem.descriptor.server_descriptor.RelayDescriptor` + 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** + 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`) + bridge-network-status 1.0 :class:`~stem.descriptor.router_status_entry.RouterStatusEntryV3` (with a :class:`~stem.descriptor.networkstatus.BridgeNetworkStatusDocument`) + bridge-server-descriptor 1.0 :class:`~stem.descriptor.server_descriptor.BridgeDescriptor` + bridge-extra-info 1.0 :class:`~stem.descriptor.extrainfo_descriptor.BridgeExtraInfoDescriptor` + torperf 1.0 **unsupported** + bridge-pool-assignment 1.0 **unsupported** + tordnsel 1.0 **unsupported** + ===================================== ===== + :param file descriptor_file: opened file with the descriptor contents - :param str descriptor_type: `descriptor type <https://metrics.torproject.org/formats.html#descriptortypes>`_ + :param str descriptor_type: `descriptor type <https://metrics.torproject.org/formats.html#descriptortypes>`_, this is guessed if not provided :param str path: absolute path to the file's location on disk - :returns: iterator for :class:`stem.descriptor.Descriptor` instances in the file + :returns: iterator for :class:`~stem.descriptor.__init__.Descriptor` instances in the file :raises: * **TypeError** if we can't match the contents of the file to a descriptor type diff --git a/stem/descriptor/networkstatus.py b/stem/descriptor/networkstatus.py index fc46fa0..1ae412e 100644 --- a/stem/descriptor/networkstatus.py +++ b/stem/descriptor/networkstatus.py @@ -60,7 +60,8 @@ and upfront runtime. NetworkStatusDocument - Network status document |- NetworkStatusDocumentV2 - Version 2 network status document - +- NetworkStatusDocumentV3 - Version 3 network status document + |- NetworkStatusDocumentV3 - Version 3 network status document + +- BridgeNetworkStatusDocument - Version 3 network status document for bridges DocumentSignature - Signature of a document by a directory authority DirectoryAuthority - Directory authority as defined in a v3 network status document

1 0

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

18 Jan '13

commit dae6c7c69d8ac331204eaf65174bdf2acf227e74 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jan 18 08:15:27 2013 +0000 Update translations for vidalia_alpha --- ja/vidalia_ja.po | 208 +++++++++++++++++++++++++++--------------------------- 1 files changed, 104 insertions(+), 104 deletions(-) diff --git a/ja/vidalia_ja.po b/ja/vidalia_ja.po index c1d8077..f1f6826 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:45+0000\n" +"PO-Revision-Date: 2013-01-18 07:56+0000\n" "Last-Translator: brt <87(a)itokei.info>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -961,331 +961,331 @@ msgstr "パキスタン" msgctxt "CountryInfo" msgid "Palau" -msgstr "" +msgstr "パラオ" msgctxt "CountryInfo" msgid "Palestine" -msgstr "" +msgstr "パレスチナ" msgctxt "CountryInfo" msgid "Panama" -msgstr "" +msgstr "パナマ" msgctxt "CountryInfo" msgid "Papua New Guinea" -msgstr "" +msgstr "パプアニューギニア" msgctxt "CountryInfo" msgid "Paraguay" -msgstr "" +msgstr "パラグアイ" msgctxt "CountryInfo" msgid "Peru" -msgstr "" +msgstr "ペルー" msgctxt "CountryInfo" msgid "Philippines" -msgstr "" +msgstr "フィリピン" msgctxt "CountryInfo" msgid "Poland" -msgstr "" +msgstr "ポーランド" msgctxt "CountryInfo" msgid "Portugal" -msgstr "" +msgstr "ポルトガル" msgctxt "CountryInfo" msgid "Qatar" -msgstr "" +msgstr "カタール" msgctxt "CountryInfo" msgid "Romania" -msgstr "" +msgstr "ルーマニア" msgctxt "CountryInfo" msgid "Russia" -msgstr "" +msgstr "ロシア" msgctxt "CountryInfo" msgid "Rwanda" -msgstr "" +msgstr "ルワンダ" msgctxt "CountryInfo" msgid "Saint Kitts & Nevis" -msgstr "" +msgstr "セントクリストファー・ネイビス" msgctxt "CountryInfo" msgid "Saint Lucia" -msgstr "" +msgstr "セントルシア" msgctxt "CountryInfo" msgid "Saint Vincent & the Grenadines" -msgstr "" +msgstr "セントビンセント・グレナディーン" msgctxt "CountryInfo" msgid "Samoa" -msgstr "" +msgstr "サモア" msgctxt "CountryInfo" msgid "San Marino" -msgstr "" +msgstr "サンマリノ" msgctxt "CountryInfo" msgid "Sao Tome & Principe" -msgstr "" +msgstr "サントメ・プリンシペ" msgctxt "CountryInfo" msgid "Saudi Arabia" -msgstr "" +msgstr "サウジアラビア" msgctxt "CountryInfo" msgid "Senegal" -msgstr "" +msgstr "セネガル" msgctxt "CountryInfo" msgid "Serbia" -msgstr "" +msgstr "セルビア" msgctxt "CountryInfo" msgid "Seychelles" -msgstr "" +msgstr "セーシェル" msgctxt "CountryInfo" msgid "Sierra Leone" -msgstr "" +msgstr "シエラレオネ" msgctxt "CountryInfo" msgid "Singapore" -msgstr "" +msgstr "シンガポール" msgctxt "CountryInfo" msgid "Slovakia" -msgstr "" +msgstr "スロバキア" msgctxt "CountryInfo" msgid "Slovenia" -msgstr "" +msgstr "スロベニア" msgctxt "CountryInfo" msgid "Solomon Islands" -msgstr "" +msgstr "ソロモン諸島" msgctxt "CountryInfo" msgid "Somalia" -msgstr "" +msgstr "ソマリア" msgctxt "CountryInfo" msgid "South Africa" -msgstr "" +msgstr "南アフリカ" msgctxt "CountryInfo" msgid "Spain" -msgstr "" +msgstr "スペイン" msgctxt "CountryInfo" msgid "Sri Lanka" -msgstr "" +msgstr "スリランカ" msgctxt "CountryInfo" msgid "Sudan" -msgstr "" +msgstr "スーダン" msgctxt "CountryInfo" msgid "Suriname" -msgstr "" +msgstr "スリナム" msgctxt "CountryInfo" msgid "Swaziland" -msgstr "" +msgstr "スワジランド" msgctxt "CountryInfo" msgid "Sweden" -msgstr "" +msgstr "スウェーデン" msgctxt "CountryInfo" msgid "Switzerland" -msgstr "" +msgstr "スイス" msgctxt "CountryInfo" msgid "Syria" -msgstr "" +msgstr "シリア" msgctxt "CountryInfo" msgid "Tajikistan" -msgstr "" +msgstr "タジキスタン" msgctxt "CountryInfo" msgid "Tanzania" -msgstr "" +msgstr "タンザニア" msgctxt "CountryInfo" msgid "Thailand" -msgstr "" +msgstr "タイ王国" msgctxt "CountryInfo" msgid "Timor-Leste (East Timor)" -msgstr "" +msgstr "東ティモール" msgctxt "CountryInfo" msgid "Togo" -msgstr "" +msgstr "トーゴ" msgctxt "CountryInfo" msgid "Tonga" -msgstr "" +msgstr "トンガ" msgctxt "CountryInfo" msgid "Trinidad & Tobago" -msgstr "" +msgstr "トリニダード・トバゴ" msgctxt "CountryInfo" msgid "Tunisia" -msgstr "" +msgstr "チュニジア" msgctxt "CountryInfo" msgid "Turkey" -msgstr "" +msgstr "トルコ" msgctxt "CountryInfo" msgid "Turkmenistan" -msgstr "" +msgstr "トルクメニスタン" msgctxt "CountryInfo" msgid "Tuvalu" -msgstr "" +msgstr "ツバル" msgctxt "CountryInfo" msgid "Uganda" -msgstr "" +msgstr "ウガンダ" msgctxt "CountryInfo" msgid "Ukraine" -msgstr "" +msgstr "ウクライナ" msgctxt "CountryInfo" msgid "United Arab Emirates" -msgstr "" +msgstr "アラブ首長国連邦" msgctxt "CountryInfo" msgid "United Kingdom" -msgstr "" +msgstr "イギリス" msgctxt "CountryInfo" msgid "United States" -msgstr "" +msgstr "アメリカ合衆国" msgctxt "CountryInfo" msgid "Uruguay" -msgstr "" +msgstr "ウルグアイ" msgctxt "CountryInfo" msgid "Uzbekistan" -msgstr "" +msgstr "ウズベキスタン" msgctxt "CountryInfo" msgid "Vanuatu" -msgstr "" +msgstr "バヌアツ" msgctxt "CountryInfo" msgid "Vatican" -msgstr "" +msgstr "バチカン" msgctxt "CountryInfo" msgid "Venezuela" -msgstr "" +msgstr "ベネズエラ" msgctxt "CountryInfo" msgid "Vietnam" -msgstr "" +msgstr "ベトナム" msgctxt "CountryInfo" msgid "Western Sahara" -msgstr "" +msgstr "西サハラ" msgctxt "CountryInfo" msgid "Yemen" -msgstr "" +msgstr "イエメン" msgctxt "CountryInfo" msgid "Zambia" -msgstr "" +msgstr "ザンビア" msgctxt "CountryInfo" msgid "Zimbabwe" -msgstr "" +msgstr "ジンバブエ" msgctxt "CountryInfo" msgid "Zaire" -msgstr "" +msgstr "ザイール" msgctxt "CountryInfo" msgid "Albania" -msgstr "" +msgstr "アルバニア" msgctxt "CountryInfo" msgid "Algeria" -msgstr "" +msgstr "アルジェリア" msgctxt "CountryInfo" msgid "Austria" -msgstr "" +msgstr "オーストリア" msgctxt "CountryInfo" msgid "Bahrain" -msgstr "" +msgstr "バーレーン" msgctxt "CountryInfo" msgid "Benin" -msgstr "" +msgstr "ベニン" msgctxt "CountryInfo" msgid "Ethiopia" -msgstr "" +msgstr "エチオピア" msgctxt "CountryInfo" msgid "Fiji" -msgstr "" +msgstr "フィジー" msgctxt "CountryInfo" msgid "Finland" -msgstr "" +msgstr "フィンランド" msgctxt "CountryInfo" msgid "Greece" -msgstr "" +msgstr "ギリシャ" msgctxt "CountryInfo" msgid "Guam" -msgstr "" +msgstr "グアム" msgctxt "CountryInfo" msgid "Hungary" -msgstr "" +msgstr "ハンガリー" msgctxt "CountryInfo" msgid "Iceland" -msgstr "" +msgstr "アイスランド" msgctxt "CountryInfo" msgid "India" -msgstr "" +msgstr "インド" msgctxt "CountryInfo" msgid "Indonesia" -msgstr "" +msgstr "インドネシア" msgctxt "CountryInfo" msgid "Iran" -msgstr "" +msgstr "イラン" msgctxt "CountryInfo" msgid "Iraq" -msgstr "" +msgstr "イラク" msgctxt "CountryInfo" msgid "Ireland" -msgstr "" +msgstr "アイルランド" msgctxt "CountryInfo" msgid "Korea, North" @@ -1297,23 +1297,23 @@ msgstr "韓国" msgctxt "CountryInfo" msgid "Libya" -msgstr "" +msgstr "リビア" msgctxt "CountryInfo" msgid "Maldives" -msgstr "" +msgstr "モルディブ" msgctxt "CountryInfo" msgid "Mexico" -msgstr "" +msgstr "メキシコ" msgctxt "CountryInfo" msgid "Myanmar" -msgstr "" +msgstr "ミャンマー" msgctxt "CountryInfo" msgid "Taiwan" -msgstr "" +msgstr "台湾" msgctxt "CrashReportDialog" msgid "Submit a Crash Report" @@ -1956,7 +1956,7 @@ msgstr "インストール失敗" msgctxt "MainWindow" msgid "Vidalia was unable to install your software updates." -msgstr "" +msgstr "Vidalia はソフトウェアアップデートをインストールすることができませんでした。" msgctxt "MainWindow" msgid "The following error occurred:" @@ -1979,7 +1979,7 @@ msgstr "再起動" msgctxt "MainWindow" msgid "Reload Tor's config" -msgstr "" +msgstr "Torの設定を更新" msgctxt "MainWindow" msgid "Actions" @@ -2807,7 +2807,7 @@ msgstr "帯域幅:" msgctxt "RouterDescriptorView" msgid "Uptime:" -msgstr "" +msgstr "起動期間:" msgctxt "RouterDescriptorView" msgid "Last Updated:" @@ -2899,7 +2899,7 @@ msgstr "リレー" msgctxt "RouterListWidget" msgid "Zoom to Relay" -msgstr "" +msgstr "リレーにズーム" msgctxt "RouterListWidget" msgid "%1 relays online" @@ -3147,7 +3147,7 @@ msgstr "最近の利用はありません" msgctxt "ServerPage" msgid "No clients have used your relay recently." -msgstr "" +msgstr "最近あなたのリレーを利用したクライアントはありません。" msgctxt "ServerPage" msgid "" @@ -3776,7 +3776,7 @@ msgstr "インストール" msgctxt "UpdatesAvailableDialog" msgid "The following updated software packages are ready for installation:" -msgstr "" +msgstr "以下のアップデートソフトウェアパッケージのインストール準備ができています:" msgctxt "UpdatesAvailableDialog" msgid "Package" @@ -3832,35 +3832,35 @@ msgstr "参照" msgctxt "Vidalia" msgid "Invalid Argument" -msgstr "" +msgstr "不正な引数" msgctxt "Vidalia" msgid "Vidalia is already running" -msgstr "" +msgstr "Vidalia はすでに起動しています" msgctxt "Vidalia" msgid "Displays this usage message and exits." -msgstr "" +msgstr "この使用法メッセージを表示して終了します。" msgctxt "Vidalia" msgid "Resets ALL stored Vidalia settings." -msgstr "" +msgstr "すべての格納されている Vidalia の設定をリセットします。" msgctxt "Vidalia" msgid "Sets the directory Vidalia uses for data files." -msgstr "" +msgstr "Vidalia がデータファイルに使用するディレクトリを設定します。" msgctxt "Vidalia" msgid "Sets the name and location of Vidalia's pidfile." -msgstr "" +msgstr "Vidalia の pidfile の名前と場所を設定します。" msgctxt "Vidalia" msgid "Sets the name and location of Vidalia's logfile." -msgstr "" +msgstr "Vidalia の logfile の名前と場所を設定します。" msgctxt "Vidalia" msgid "Sets the verbosity of Vidalia's logging." -msgstr "" +msgstr "Vidalia のログの冗長さを設定します。" msgctxt "Vidalia" msgid "Sets Vidalia's interface style." @@ -3876,7 +3876,7 @@ msgstr "Vidalia の使用情報" msgctxt "Vidalia" msgid "Unable to open log file '%1': %2" -msgstr "" +msgstr "ログファイル '%1' を開くことができません: %2" msgctxt "Vidalia" msgid "Value required for parameter :" @@ -3884,7 +3884,7 @@ msgstr "" msgctxt "Vidalia" msgid "Invalid language code specified:" -msgstr "" +msgstr "指定された無効な言語コード:" msgctxt "Vidalia" msgid "Invalid GUI style specified:"

1 0

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

18 Jan '13

commit a7bd82d42c310608136b6fc0c20994531292d022 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jan 18 07:45:21 2013 +0000 Update translations for vidalia_alpha --- ja/vidalia_ja.po | 56 +++++++++++++++++++++++++++--------------------------- 1 files changed, 28 insertions(+), 28 deletions(-) diff --git a/ja/vidalia_ja.po b/ja/vidalia_ja.po index fddf76e..c1d8077 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-17 17:30+0000\n" +"PO-Revision-Date: 2013-01-18 07:45+0000\n" "Last-Translator: brt <87(a)itokei.info>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -853,111 +853,111 @@ msgstr "ルクセンブルク" msgctxt "CountryInfo" msgid "Macedonia" -msgstr "" +msgstr "マケドニア" msgctxt "CountryInfo" msgid "Madagascar" -msgstr "" +msgstr "マダガスカル" msgctxt "CountryInfo" msgid "Malawi" -msgstr "" +msgstr "マラウイ" msgctxt "CountryInfo" msgid "Malaysia" -msgstr "" +msgstr "マレーシア" msgctxt "CountryInfo" msgid "Mali" -msgstr "" +msgstr "マリ" msgctxt "CountryInfo" msgid "Malta" -msgstr "" +msgstr "マルタ" msgctxt "CountryInfo" msgid "Marshall Islands" -msgstr "" +msgstr "マーシャル諸島" msgctxt "CountryInfo" msgid "Mauritania" -msgstr "" +msgstr "モーリタニア" msgctxt "CountryInfo" msgid "Mauritius" -msgstr "" +msgstr "モーリシャス" msgctxt "CountryInfo" msgid "Micronesia" -msgstr "" +msgstr "ミクロネシア" msgctxt "CountryInfo" msgid "Moldova" -msgstr "" +msgstr "モルドバ" msgctxt "CountryInfo" msgid "Monaco" -msgstr "" +msgstr "モナコ" msgctxt "CountryInfo" msgid "Mongolia" -msgstr "" +msgstr "モンゴル" msgctxt "CountryInfo" msgid "Montenegro" -msgstr "" +msgstr "モンテネグロ" msgctxt "CountryInfo" msgid "Morocco" -msgstr "" +msgstr "モロッコ" msgctxt "CountryInfo" msgid "Mozambique" -msgstr "" +msgstr "モザンビーク" msgctxt "CountryInfo" msgid "Namibia" -msgstr "" +msgstr "ナミビア" msgctxt "CountryInfo" msgid "Nauru" -msgstr "" +msgstr "ナウル" msgctxt "CountryInfo" msgid "Nepal" -msgstr "" +msgstr "ネパール" msgctxt "CountryInfo" msgid "Netherlands" -msgstr "" +msgstr "オランダ" msgctxt "CountryInfo" msgid "New Zealand" -msgstr "" +msgstr "ニュージーランド" msgctxt "CountryInfo" msgid "Nicaragua" -msgstr "" +msgstr "ニカラグア" msgctxt "CountryInfo" msgid "Niger" -msgstr "" +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"

1 0

[torspec/master] Replace base-{16, 32, 64} with base{16, 32, 64} in specs
by nickm＠torproject.org 17 Jan '13

17 Jan '13

commit 487dd9d0d2ee08d8797370544e49f44dbca51d66 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jan 17 16:10:26 2013 -0500 Replace base-{16,32,64} with base{16,32,64} in specs I'm not changing the proposals or attic'd specs, since those are more or less frozen. Fixes 6875 in tor-spec Patch from onizuka generated with find ./ -type f -perm -u+rw -exec sed -ri 's/(Base)-(16|32|64)/\1\2/gi' {} \; --- dir-spec-v2.txt | 4 ++-- dir-spec.txt | 6 +++--- rend-spec.txt | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dir-spec-v2.txt b/dir-spec-v2.txt index a2dacd3..021532e 100644 --- a/dir-spec-v2.txt +++ b/dir-spec-v2.txt @@ -102,7 +102,7 @@ KeywordChar ::= 'A' ... 'Z' | 'a' ... 'z' | '0' ... '9' | '-' ArgumentChar ::= any printing ASCII character except NL. WS = (SP | TAB)+ - Object ::= BeginLine Base-64-encoded-data EndLine + Object ::= BeginLine Base64-encoded-data EndLine BeginLine ::= "-----BEGIN " Keyword "-----" NL EndLine ::= "-----END " Keyword "-----" NL @@ -552,7 +552,7 @@ 4.4. HTTP URLs - "Fingerprints" in these URLs are base-16-encoded SHA1 hashes. + "Fingerprints" in these URLs are base16-encoded SHA1 hashes. The authoritative network-status published by a host should be available at: http://<hostname>/tor/status/authority.z diff --git a/dir-spec.txt b/dir-spec.txt index 531be5e..09a5967 100644 --- a/dir-spec.txt +++ b/dir-spec.txt @@ -223,7 +223,7 @@ KeywordChar ::= 'A' ... 'Z' | 'a' ... 'z' | '0' ... '9' | '-' ArgumentChar ::= any printing ASCII character except NL. WS = (SP | TAB)+ - Object ::= BeginLine Base-64-encoded-data EndLine + Object ::= BeginLine Base64-encoded-data EndLine BeginLine ::= "-----BEGIN " Keyword "-----" NL EndLine ::= "-----END " Keyword "-----" NL @@ -2363,7 +2363,7 @@ at: http://<hostname>/tor/micro/d/<D1>-<D2>-<D3>[.z] - <Dn> are base-64 encoded with trailing =s omitted for size and for + <Dn> are base64 encoded with trailing =s omitted for size and for consistency with the microdescriptor consensus format. -s are used instead of +s to separate items, since the + character is used in base64 encoding. @@ -2398,7 +2398,7 @@ 4.7. General-use HTTP URLs - "Fingerprints" in these URLs are base-16-encoded SHA1 hashes. + "Fingerprints" in these URLs are base16-encoded SHA1 hashes. The most recent v3 consensus should be available at: http://<hostname>/tor/status-vote/current/consensus.z diff --git a/rend-spec.txt b/rend-spec.txt index dfadc7d..6c90c70 100644 --- a/rend-spec.txt +++ b/rend-spec.txt @@ -345,7 +345,7 @@ [At start, exactly once] - The identifier of this introduction point: the base-32 encoded + The identifier of this introduction point: the base32 encoded hash of this introduction point's identity key. "ip-address" SP ip-address NL @@ -526,7 +526,7 @@ 1.5. Alice receives a z.onion address. When Alice receives a pointer to a location-hidden service, it is as a - hostname of the form "z.onion", where z is a base-32 encoding of a + hostname of the form "z.onion", where z is a base32 encoding of a 10-octet hash of Bob's service's public key, computed as follows: 1. Let H = H(PK).

1 0

[tor/master] Replace base-{16, 32, 64} with base{16, 32, 64} in the code
by nickm＠torproject.org 17 Jan '13

17 Jan '13

commit e0581a4b571f13dd0de801792c853e22ac244a36 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jan 17 16:08:28 2013 -0500 Replace base-{16,32,64} with base{16,32,64} in the code Patch from onizuka generated with find ./ -type f -perm -u+rw -exec sed -ri 's/(Base)-(16|32|64)/\1\2/gi' {} \; Fixes issue 6875 on Tor. --- src/common/crypto.c | 12 ++++++------ src/common/crypto.h | 2 +- src/or/rendcommon.c | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/common/crypto.c b/src/common/crypto.c index 672ab2d..7c73f79 100644 --- a/src/common/crypto.c +++ b/src/common/crypto.c @@ -2579,7 +2579,7 @@ smartlist_shuffle(smartlist_t *sl) } } -/** Base-64 encode srclen bytes of data from src. Write +/** Base64 encode srclen bytes of data from src. Write * the result into dest, if it will fit within destlen * bytes. Return the number of bytes written on success; -1 if * destlen is too short, or other failure. @@ -2638,7 +2638,7 @@ static const uint8_t base64_decode_table[256] = { X, X, X, X, X, X, X, X, X, X, X, X, X, X, X, X, }; -/** Base-64 decode srclen bytes of data from src. Write +/** Base64 decode srclen bytes of data from src. Write * the result into dest, if it will fit within destlen * bytes. Return the number of bytes written on success; -1 if * destlen is too short, or other failure. @@ -2745,7 +2745,7 @@ base64_decode(char *dest, size_t destlen, const char *src, size_t srclen) #undef SP #undef PAD -/** Base-64 encode DIGEST_LINE bytes from digest, remove the trailing = +/** Base64 encode DIGEST_LINE bytes from digest, remove the trailing = * and newline characters, and store the nul-terminated result in the first * BASE64_DIGEST_LEN+1 bytes of d64. */ int @@ -2758,7 +2758,7 @@ digest_to_base64(char *d64, const char *digest) return 0; } -/** Given a base-64 encoded, nul-terminated digest in d64 (without +/** Given a base64 encoded, nul-terminated digest in d64 (without * trailing newline or = characters), decode it and store the result in the * first DIGEST_LEN bytes at digest. */ int @@ -2783,7 +2783,7 @@ digest_from_base64(char *digest, const char *d64) #endif } -/** Base-64 encode DIGEST256_LINE bytes from digest, remove the +/** Base64 encode DIGEST256_LINE bytes from digest, remove the * trailing = and newline characters, and store the nul-terminated result in * the first BASE64_DIGEST256_LEN+1 bytes of d64. */ int @@ -2796,7 +2796,7 @@ digest256_to_base64(char *d64, const char *digest) return 0; } -/** Given a base-64 encoded, nul-terminated digest in d64 (without +/** Given a base64 encoded, nul-terminated digest in d64 (without * trailing newline or = characters), decode it and store the result in the * first DIGEST256_LEN bytes at digest. */ int diff --git a/src/common/crypto.h b/src/common/crypto.h index 24f6a48..08efc80 100644 --- a/src/common/crypto.h +++ b/src/common/crypto.h @@ -266,7 +266,7 @@ void smartlist_shuffle(struct smartlist_t *sl); int base64_encode(char *dest, size_t destlen, const char *src, size_t srclen); int base64_decode(char *dest, size_t destlen, const char *src, size_t srclen); -/** Characters that can appear (case-insensitively) in a base-32 encoding. */ +/** Characters that can appear (case-insensitively) in a base32 encoding. */ #define BASE32_CHARS "abcdefghijklmnopqrstuvwxyz234567" void base32_encode(char *dest, size_t destlen, const char *src, size_t srclen); int base32_decode(char *dest, size_t destlen, const char *src, size_t srclen); diff --git a/src/or/rendcommon.c b/src/or/rendcommon.c index addbd42..79c1a72 100644 --- a/src/or/rendcommon.c +++ b/src/or/rendcommon.c @@ -954,7 +954,7 @@ rend_cache_lookup_entry(const char *query, int version, rend_cache_entry_t **e) return 1; } -/** query is a base-32'ed service id. If it's malformed, return -1. +/** query is a base32'ed service id. If it's malformed, return -1. * Else look it up. * - If it is found, point *desc to it, and write its length into * *desc_len, and return 1.

1 0

[tor/master] Fix an MSVC warning in onion.h prototypes
by nickm＠torproject.org 17 Jan '13

17 Jan '13

commit 1af89ce540d4cac253169423325bad73fa57f7fd Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jan 17 14:38:15 2013 -0500 Fix an MSVC warning in onion.h prototypes --- src/or/onion.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/or/onion.h b/src/or/onion.h index 8b5fb7e..db4c999 100644 --- a/src/or/onion.h +++ b/src/or/onion.h @@ -101,9 +101,9 @@ typedef struct extended_cell_t { int create_cell_parse(create_cell_t *cell_out, const cell_t *cell_in); int created_cell_parse(created_cell_t *cell_out, const cell_t *cell_in); -int extend_cell_parse(extend_cell_t *cell_out, uint8_t command, +int extend_cell_parse(extend_cell_t *cell_out, const uint8_t command, const uint8_t *payload_in, size_t payload_len); -int extended_cell_parse(extended_cell_t *cell_out, uint8_t command, +int extended_cell_parse(extended_cell_t *cell_out, const uint8_t command, const uint8_t *payload_in, size_t payload_len); int create_cell_format(cell_t *cell_out, const create_cell_t *cell_in);

1 0