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

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

21 Feb '12

commit c9bb2ec02df4785dc7b7d2596a9d686a00165152 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Feb 21 18:45:06 2012 +0000 Update translations for orbot --- values-ja/strings.xml | 66 ++++++++++++++++++++++++------------------------ 1 files changed, 33 insertions(+), 33 deletions(-) diff --git a/values-ja/strings.xml b/values-ja/strings.xml index 144db09..80e9f2f 100644 --- a/values-ja/strings.xml +++ b/values-ja/strings.xml @@ -6,29 +6,29 @@ <string name="secure_default_web_url">https://check.torproject.org</string> <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string> <string name="control_permission_label">start and stop Tor</string> - <string name="tor_proxy_service_process">torproxyservice</string> - <string name="status_starting_up">Orbot is starting...</string> - <string name="status_activated">Connected to the Tor network</string> - <string name="status_disabled">\"Orbot is Deactivated</string> - <string name="status_shutting_down">Orbot is shutting down</string> + <string name="tor_proxy_service_process">Torプロクシサービス</string> + <string name="status_starting_up">Orbotが開始されています...</string> + <string name="status_activated">Torネットワークに接続しています</string> + <string name="status_disabled">\"Orbotが解除されました</string> + <string name="status_shutting_down">Orbotが終了しています</string> <string name="tor_process_starting">Starting Tor client...</string> - <string name="tor_process_complete">complete.</string> + <string name="tor_process_complete">完了</string> <string name="tor_process_waiting">waiting.</string> <string name="not_anonymous_yet">WARNING: Your traffic is not anonymous yet! Please configure your applications to use HTTP proxy 127.0.0.1:8118 or SOCKS4A or SOCKS5 proxy 127.0.0.1:9050</string> - <string name="menu_home">Home</string> - <string name="menu_browse">Browse</string> - <string name="menu_settings">Settings</string> - <string name="menu_log">Log</string> - <string name="menu_info">Help</string> + <string name="menu_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">Apps</string> - <string name="menu_start">Start</string> - <string name="menu_stop">Stop</string> + <string name="menu_start">スタート</string> + <string name="menu_stop">停止</string> <string name="menu_about">About</string> - <string name="menu_wizard">Wizard</string> - <string name="button_help">Help</string> - <string name="button_close">Close</string> - <string name="button_about">About</string> - <string name="button_clear_log">Clear Log</string> + <string name="menu_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">Check</string> <string name="menu_exit">Exit</string> <string name="powered_by">powered by the Tor Project</string> @@ -43,19 +43,19 @@ <string name="pref_transparent_port_title">Port List</string> <string name="pref_transparent_port_summary">List of ports to proxy. *USE ONLY* if \'All\' or \'App\' mode doesn\'t work</string> <string name="pref_transparent_port_dialog">Enter ports to proxy</string> - <string name="pref_has_root">Request Root Access</string> + <string name="pref_has_root">ルートアクセスの許可を要求します</string> <string name="pref_has_root_summary">Request root access for transparent proxying</string> - <string name="status_install_success">Tor binaries successfully installed!</string> - <string name="status_install_fail">The Tor binary files were unable to be installed. Please check the log and notify tor-assistants(a)torproject.org</string> + <string name="status_install_success">Torバイナリインストールが成功しました</string> + <string name="status_install_fail">Torバイナリファイルがインストールできませんでした。ログを調べて、通知をtor-assistants(a)torproject.xn--org-u63b4bubm7e8b7b4044dl28h.</string> <string name="title_error">Application Error</string> <string name="wizard_title">Orbot</string> - <string name="wizard_btn_tell_me_more">About Orbot</string> - <string name="btn_next">Next</string> + <string name="wizard_btn_tell_me_more">Orbotについて</string> + <string name="btn_next">次</string> <string name="btn_back">Back</string> - <string name="btn_finish">Finish</string> + <string name="btn_finish">終了</string> <string name="btn_okay">Okay</string> - <string name="btn_cancel">Cancel</string> - <string name="wizard_details">Some Orbot Details</string> + <string name="btn_cancel">キャンセル</string> + <string name="wizard_details">Orbot詳細</string> <string name="wizard_details_msg">Orbot is an open-source application that contains Tor, LibEvent and Privoxy. It provides a local HTTP proxy (8118) and a SOCKS proxy (9050) into the Tor network. Orbot also has the ability, on rooted device, to send all internet traffic through Tor.</string> <string name="wizard_permissions_root">Permission Granted</string> <string name="wizard_permissions_stock">Orbot Permissions</string> @@ -64,7 +64,7 @@ <string name="wizard_permissions_no_root">If you don\'t have root access or have no idea what we\'re talking about, just be sure to use apps made to work with Orbot.</string> <string name="wizard_permissions_consent">I understand and would like to continue without Superuser</string> <string name="wizard_permission_enable_root">Grant Root for Orbot</string> - <string name="wizard_configure">Configure Torification</string> + <string name="wizard_configure">Tor通知を設定する</string> <string name="wizard_configure_msg">Orbot gives you the option to route all application traffic through Tor OR to choose your applications individually.</string> <string name="wizard_configure_all">Proxy All Apps Through Tor</string> <string name="wizard_configure_select_apps">Select Individual Apps for Tor</string> @@ -72,7 +72,7 @@ <string name="wizard_tips_msg">The apps below were developed to work with Orbot. Click each button to install now, or you can find them later in the Android Market.</string> <string name="wizard_tips_otrchat">Gibberbot - Secure instant messaging client for Android</string> <string name="wizard_tips_proxy">Proxy Settings - Learn how to configure apps to work with Orbot</string> - <string name="wizard_proxy_help_info">Proxy Settings</string> + <string name="wizard_proxy_help_info">プロキシ設定</string> <string name="wizard_proxy_help_msg">If the Android app you are using can support the use of an HTTP or SOCKS proxy, then you can configure it to connect to Orbot and use Tor.\n\n The host settings is 127.0.0.1 or \"localhost\". For HTTP, the port setting is 8118. For SOCKS, the proxy is 9050. You should use SOCKS4A or SOCKS5 if possible. \n\n @@ -84,12 +84,12 @@ <string name="tor_check">This will open your web browser to https://check.torproject.org in order to see if Orbot is probably configured and you are connected to Tor.</string> <string name="pref_hs_group">Hidden Services</string> <string name="pref_general_group">General</string> - <string name="pref_start_boot_title">Start Orbot on Boot</string> + <string name="pref_start_boot_title">起動時にOrbotを実行する</string> <string name="pref_start_boot_summary">Automatically start Orbot and connect Tor when your Android device boots</string> <string name="wizard_title_msg">Orbot brings Tor to Android!\n\nTor helps you defend against content filtering, traffic analysis and network surveillance that threatens privacy, confidential information and personal relationships.\n\nThis wizard will help you configure Orbot and Tor on your device.</string> - <string name="wizard_warning_title">Warning</string> + <string name="wizard_warning_title">注意</string> <string name="wizard_warning_msg">Simply installing Orbot will not automatically anonymize your mobile traffic.\n\nYou must properly configure Orbot, your device and other apps to successfully use Tor.</string> - <string name="wizard_permissions_title">Permissions</string> + <string name="wizard_permissions_title">許可</string> <string name="wizard_permissions_root_msg1">You can optionally grant Orbot \'Superuser\' access to enable advanced features, such as Transparent Proxying.</string> <string name="wizard_permissions_root_msg2">If you do not want to do this, please make sure to use apps made to work with Orbot</string> <string name="wizard_permissions_no_root_msg">Your device does not appear to be rooted or provide \'Superuser\' access.\n\nIn order to you to benefit from Tor, you will need to use apps built to work with Orbot, or that support HTTP or SOCKS proxy settings.\n\n</string> @@ -107,7 +107,7 @@ <string name="button_grant_superuser">Request Superuser Access</string> <string name="pref_select_apps">Select Apps</string> <string name="pref_select_apps_summary">Choose Apps to Route Through Tor</string> - <string name="pref_node_configuration">Node Configuration</string> + <string name="pref_node_configuration">ノード設定</string> <string name="pref_node_configuration_summary">These are advanced settings that can reduce your anonymity</string> <string name="pref_entrance_node">Entrance Nodes</string> <string name="pref_entrance_node_summary">Fingerprints, nicks, countries and addresses for the first hop</string> @@ -187,7 +187,7 @@ <string name="something_bad_happened">Something bad happened. Check the log</string> <string name="hidden_service_on">hidden service on:</string> <string name="unable_to_read_hidden_service_name">unable to read hidden service name</string> - <string name="unable_to_start_tor">Unable to start Tor:</string> + <string name="unable_to_start_tor">Torを実行できませんでした</string> <string name="pref_use_sys_iptables_title">Use Default Iptables</string> <string name="pref_use_sys_iptables_summary">use the built-in iptables binary instead of the one bundled with Orbot</string> <string name="error_installing_binares">The Tor binaries were not able to be installed or upgraded.</string>

1 0

[ooni-probe/master] Misc improvements
by art＠torproject.org 21 Feb '12

21 Feb '12

commit bfd84aa39d4323e4ee2262b8fef4caeab2ec14a0 Author: Arturo Filastò <hellais(a)gmail.com> Date: Tue Feb 21 10:15:29 2012 -0800 Misc improvements * Rename ooni-probe to ooniprobe * Improve error collection --- refactor/ooni-probe.conf | 1 + refactor/ooni-probe.py | 142 --------------------------------------------- refactor/ooniprobe.py | 142 +++++++++++++++++++++++++++++++++++++++++++++ refactor/plugoo.py | 9 +++- refactor/tests/bridget.py | 32 +++++++---- refactor/utils.py | 21 ++++++- 6 files changed, 191 insertions(+), 156 deletions(-) diff --git a/refactor/ooni-probe.conf b/refactor/ooni-probe.conf index e74b241..8ea67e3 100644 --- a/refactor/ooni-probe.conf +++ b/refactor/ooni-probe.conf @@ -56,6 +56,7 @@ tor_bridges_timeout = 40 [report] file = report.log +timestamp = true #ssh = 127.0.0.1:22 #ssh_user = theusername #ssh_password = thepassword diff --git a/refactor/ooni-probe.py b/refactor/ooni-probe.py deleted file mode 100644 index 64d35f5..0000000 --- a/refactor/ooni-probe.py +++ /dev/null @@ -1,142 +0,0 @@ -# -*- coding: UTF-8 -#!/usr/bin/env python -""" - ooni-probe - ********** - - Open Observatory of Network Interference - - "The Net interprets censorship as damage and routes around it." - - John Gilmore; TIME magazine (6 December 1993) - - The goal of ooni-probe is to collect data about censorship around - the world. - - :copyright: (c) 2012 by Arturo Filastò - :license: see LICENSE for more details. -""" - -import imp -import os -import sys - -from pprint import pprint - -import plugoo -from utils import Storage, parse_asset, import_test, get_logger -from config import Config - -class ooni(object): - """ooni-probe is a suite designed to run tests on your - network to detect censorship. - This is the main class that is used to start ooni probe - select the assets and run tests. - """ - def __init__(self): - self.config = Storage() - self.config.main = Config("main") - self.config.tests = Config("tests") - self.config.report = Config("report") - - self.logger = get_logger(self.config.main) - - self.logger.info("Started ooni-probe") - - self.assets = [] - self.get_assets() - - self.tests = Storage() - self.load_tests() - - self.runtests = self.config.tests.run.split(",") - - - def get_assets(self): - """Parse all the assets in the asset directory. - Assets can optionaly contain the ooni-probe asset file - format: #:<something> <something_else>, that will then - be used to render the asset details to the user. - It is also possible to have an asset file link to multiple - other files. - """ - for root, dir, files in os.walk(self.config.main.assetdir): - for name in files: - asset = os.path.join(root, name) - self.assets.append(parse_asset(asset)) - - def list_assets(self): - """Enumerate all the assets in the directory specified - in the config file - """ - print "[-] There are a total of %s assets loaded" % len(self.assets) - for asset in self.assets: - print " name: %s" % asset.name - if asset.desc: - print " description: %s" % asset.desc - if asset.files: - print " files: %s" % asset.files - if asset.tests: - print " tests: %s" % asset.tests - print "" - - def load_tests(self): - """Iterate through the plugoos insite the folder specified by the - config file and instantiate them. - """ - pluginfiles = [fname[:-3] for fname in os.listdir(self.config.main.testdir)\ - if fname.endswith(".py")] - for fname in pluginfiles: - test = Storage() - test_name = fname - if not self.config.main.testdir in sys.path: - sys.path.insert(0, self.config.main.testdir) - - module = __import__(fname) - try: - test.name = module.__plugoo__ - test.desc = module.__desc__ - test.module = module - except Exception, e: - self.logger.warning("Soft fail %s", e) - test.name = test_name - test.desc = "" - test.module = module - - try: - self.tests[test_name] = test - except Exception, e: - print "Failed to load the test %s %s" % (name, e) - - def list_tests(self): - """Print the loaded plugoonis to screen - """ - print "[-] There are a total of %s tests available" % len(self.tests) - for name, test in self.tests.items(): - print " name: %s" % name - if test.name: - print " long name: %s" % test.name - if test.desc: - print " description: %s" % test.desc - print "" - - - def run_tests(self): - """Run all the tests that have been loaded - """ - for name in self.runtests: - print "running %s" % name - try: - self.tests[name].module.run(self) - except Exception, e: - print "ERR: %s" % e - - def run_test(self, test): - """Run a single test - """ - self.tests[test].module.run(self) - -if __name__ == "__main__": - o = ooni() - o.list_tests() - o.run_test("bridget") - diff --git a/refactor/ooniprobe.py b/refactor/ooniprobe.py new file mode 100644 index 0000000..64d35f5 --- /dev/null +++ b/refactor/ooniprobe.py @@ -0,0 +1,142 @@ +# -*- coding: UTF-8 +#!/usr/bin/env python +""" + ooni-probe + ********** + + Open Observatory of Network Interference + + "The Net interprets censorship as damage and routes around it." + - John Gilmore; TIME magazine (6 December 1993) + + The goal of ooni-probe is to collect data about censorship around + the world. + + :copyright: (c) 2012 by Arturo Filastò + :license: see LICENSE for more details. +""" + +import imp +import os +import sys + +from pprint import pprint + +import plugoo +from utils import Storage, parse_asset, import_test, get_logger +from config import Config + +class ooni(object): + """ooni-probe is a suite designed to run tests on your + network to detect censorship. + This is the main class that is used to start ooni probe + select the assets and run tests. + """ + def __init__(self): + self.config = Storage() + self.config.main = Config("main") + self.config.tests = Config("tests") + self.config.report = Config("report") + + self.logger = get_logger(self.config.main) + + self.logger.info("Started ooni-probe") + + self.assets = [] + self.get_assets() + + self.tests = Storage() + self.load_tests() + + self.runtests = self.config.tests.run.split(",") + + + def get_assets(self): + """Parse all the assets in the asset directory. + Assets can optionaly contain the ooni-probe asset file + format: #:<something> <something_else>, that will then + be used to render the asset details to the user. + It is also possible to have an asset file link to multiple + other files. + """ + for root, dir, files in os.walk(self.config.main.assetdir): + for name in files: + asset = os.path.join(root, name) + self.assets.append(parse_asset(asset)) + + def list_assets(self): + """Enumerate all the assets in the directory specified + in the config file + """ + print "[-] There are a total of %s assets loaded" % len(self.assets) + for asset in self.assets: + print " name: %s" % asset.name + if asset.desc: + print " description: %s" % asset.desc + if asset.files: + print " files: %s" % asset.files + if asset.tests: + print " tests: %s" % asset.tests + print "" + + def load_tests(self): + """Iterate through the plugoos insite the folder specified by the + config file and instantiate them. + """ + pluginfiles = [fname[:-3] for fname in os.listdir(self.config.main.testdir)\ + if fname.endswith(".py")] + for fname in pluginfiles: + test = Storage() + test_name = fname + if not self.config.main.testdir in sys.path: + sys.path.insert(0, self.config.main.testdir) + + module = __import__(fname) + try: + test.name = module.__plugoo__ + test.desc = module.__desc__ + test.module = module + except Exception, e: + self.logger.warning("Soft fail %s", e) + test.name = test_name + test.desc = "" + test.module = module + + try: + self.tests[test_name] = test + except Exception, e: + print "Failed to load the test %s %s" % (name, e) + + def list_tests(self): + """Print the loaded plugoonis to screen + """ + print "[-] There are a total of %s tests available" % len(self.tests) + for name, test in self.tests.items(): + print " name: %s" % name + if test.name: + print " long name: %s" % test.name + if test.desc: + print " description: %s" % test.desc + print "" + + + def run_tests(self): + """Run all the tests that have been loaded + """ + for name in self.runtests: + print "running %s" % name + try: + self.tests[name].module.run(self) + except Exception, e: + print "ERR: %s" % e + + def run_test(self, test): + """Run a single test + """ + self.tests[test].module.run(self) + +if __name__ == "__main__": + o = ooni() + o.list_tests() + o.run_test("bridget") + diff --git a/refactor/plugoo.py b/refactor/plugoo.py index 49b3e16..0ce1d28 100644 --- a/refactor/plugoo.py +++ b/refactor/plugoo.py @@ -12,7 +12,7 @@ """ import os - +from datetime import datetime import yaml try: @@ -95,6 +95,13 @@ class Report: self.config = ooni.config.report self.logger = ooni.logger + if self.config.timestamp: + tmp = self.file.split('.') + self.file = '.'.join(tmp[:-1]) + "-" + \ + datetime.now().isoformat('-') + '.' + \ + tmp[-1] + print self.file + try: import paramiko except: diff --git a/refactor/tests/bridget.py b/refactor/tests/bridget.py index 7c1ca8b..1e18175 100644 --- a/refactor/tests/bridget.py +++ b/refactor/tests/bridget.py @@ -82,6 +82,8 @@ class BridgeT(Plugoo): datadir = "/tmp/" + randomname if bridge.startswith("obfs://"): obfsbridge = bridge.split("//")[1] + + self.logger.debug("Genearting torrc file for obfs bridge") torrc = """SocksPort %s UseBridges 1 Bridge obfs2 %s @@ -90,6 +92,7 @@ ClientTransportPlugin obfs2 exec /usr/local/bin/obfsproxy --managed ControlPort %s """ % (socksport, obfsbridge, datadir, controlport) else: + self.logger.debug("Generating torrc file for bridge") torrc = """SocksPort %s UseBridges 1 bridge %s @@ -97,7 +100,8 @@ DataDirectory %s usemicrodescriptors 0 ControlPort %s """ % (socksport, bridge, datadir, controlport) - print torrc + #print torrc + with open(randomname, "wb") as f: f.write(torrc) @@ -117,17 +121,15 @@ ControlPort %s #Can't use @torify as it doesn't support concurrency right now def download_file(self, socksport): - time_start=time.time() - opener = urllib2.build_opener(SocksiPyHandler(socks.PROXY_TYPE_SOCKS5, '127.0.0.1', int(socksport))) - f = opener.open('http://check.torproject.org') - data= f.readlines() - print data - print len(data) + + time_start=time.time() + f = opener.open('http://38.229.72.16/bwauth.torproject.org/256k') + f.read() time_end = time.time() print (time_end-time_start) - return len(data)/(time_end-time_start) + return str(256/(time_end-time_start)) + " KB/s" def connect(self, bridge, timeout=None): if not timeout: @@ -150,6 +152,7 @@ ControlPort %s except: self.logger.error("Unable to set file descriptor to non blocking") + self.logger.info("Testing bridge: %s" % bridge) while True: o = "" try: @@ -158,15 +161,17 @@ ControlPort %s self.logger.debug(str(o)) if re.search("100%", o): self.logger.info("Success in connecting to %s" % bridge) + print "%s bridge works" % bridge - print "%s controlport" % controlport + # print "%s controlport" % controlport try: c = TorCtl.connect('127.0.0.1', controlport) bridgeinfo = self.parsebridgeinfo(c.get_info('dir/server/all')['dir/server/all']) - bandwidth=self.download_file(socksport) + bandwidth = self.download_file(socksport) except: self.logger.error("Error in connecting to Tor Control port") - print bandwidth + + self.logger.info("Bandwidth: %s" % bandwidth) c.close() p.stdout.close() os.unlink(os.path.join(os.getcwd(), torrc)) @@ -182,6 +187,7 @@ ControlPort %s if re.search("%", o): # Keep updating the timeout if there is progress + self.logger.debug("Updating time...") tupdate = time.time() #print o continue @@ -189,13 +195,17 @@ ControlPort %s except IOError: ex = sys.exc_info()[1] if ex[0] != errno.EAGAIN: + self.logger.error("Error IOError: EAGAIN") raise sys.exc_clear() + try: # Set the timeout for the socket wait ct = timeout-(time.time() - tupdate) socket.wait_read(p.stdout.fileno(), timeout=ct) + except: + self.logger.info("%s bridge does not work (%s s timeout)" % (bridge, timeout)) print "%s bridge does not work (%s s timeout)" % (bridge, timeout) self.failures.append(bridge) p.stdout.close() diff --git a/refactor/utils.py b/refactor/utils.py index 5c743ba..93bd2fd 100644 --- a/refactor/utils.py +++ b/refactor/utils.py @@ -63,7 +63,7 @@ def get_logger(config): console.setFormatter(formatter) logging.getLogger('').addHandler(console) - return logging.getLogger('ooni-probe') + return logging.getLogger('ooniprobe') def parse_asset(asset): parsed = Storage() @@ -80,7 +80,7 @@ def parse_asset(asset): parsed[n] = v.split(",") else: parsed[n] = v - + elif line.startswith("#"): continue else: @@ -113,3 +113,20 @@ def import_test(name, config): return None, None +class Log(): + def __init__(self, file=None): + if file: + self.fh = open(file) + + def __iter__(self): + return self + + def next(self): + try: + line = self.fh.readline() + while not line.startswith("---"): + line = self.fh.readline() + except: + raise StopIteration + +

1 0

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

21 Feb '12

commit 1cca874084740a51a9f7b2d0f99604ed18a27dbd Author: Translation commit bot <translation(a)torproject.org> Date: Tue Feb 21 18:15:25 2012 +0000 Update translations for torcheck --- ja/torcheck.po | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ja/torcheck.po b/ja/torcheck.po index da9f84d..3ba6780 100644 --- a/ja/torcheck.po +++ b/ja/torcheck.po @@ -2,14 +2,15 @@ # Copyright (C) 2008-2012 The Tor Project, Inc # # Translators: +# Chris Harris <praisebe4him(a)gmail.com>, 2012. # siomiz <>, 2012. msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2012-02-18 09:03+0000\n" -"Last-Translator: siomiz <>\n" +"PO-Revision-Date: 2012-02-21 18:04+0000\n" +"Last-Translator: Chris Harris <praisebe4him(a)gmail.com>\n" "Language-Team: Tor Translation <tor-translation(a)torproject.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -25,7 +26,7 @@ msgid "" "Please refer to the <a href=\"https://www.torproject.org/\">Tor website</a> " "for further information about using Tor safely. You are now free to browse " "the Internet anonymously." -msgstr "" +msgstr "Torを安全に利用するように<a href=\"https://www.torproject.org/\">Tor ウェブサイト</a>をご覧してください。匿名的にインタネットを自由にブラウズをできます。" msgid "There is a security update available for the Tor Browser Bundle." msgstr ""

1 0

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

21 Feb '12

commit b5b8ecd9f0eda15fc547e59eae43bd4e515efb30 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Feb 21 09:15:05 2012 +0000 Update translations for orbot --- values-zh/strings.xml | 161 ++++++++++++++++++++++++------------------------- 1 files changed, 80 insertions(+), 81 deletions(-) diff --git a/values-zh/strings.xml b/values-zh/strings.xml index 144db09..8d55b45 100644 --- a/values-zh/strings.xml +++ b/values-zh/strings.xml @@ -5,99 +5,98 @@ <string name="default_web_url">http://check.torproject.org</string> <string name="secure_default_web_url">https://check.torproject.org</string> <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string> - <string name="control_permission_label">start and stop Tor</string> - <string name="tor_proxy_service_process">torproxyservice</string> - <string name="status_starting_up">Orbot is starting...</string> - <string name="status_activated">Connected to the Tor network</string> - <string name="status_disabled">\"Orbot is Deactivated</string> - <string name="status_shutting_down">Orbot is shutting down</string> - <string name="tor_process_starting">Starting Tor client...</string> - <string name="tor_process_complete">complete.</string> - <string name="tor_process_waiting">waiting.</string> - <string name="not_anonymous_yet">WARNING: Your traffic is not anonymous yet! Please configure your applications to use HTTP proxy 127.0.0.1:8118 or SOCKS4A or SOCKS5 proxy 127.0.0.1:9050</string> - <string name="menu_home">Home</string> - <string name="menu_browse">Browse</string> - <string name="menu_settings">Settings</string> - <string name="menu_log">Log</string> - <string name="menu_info">Help</string> - <string name="menu_apps">Apps</string> - <string name="menu_start">Start</string> - <string name="menu_stop">Stop</string> - <string name="menu_about">About</string> + <string name="control_permission_label">启动和停止 Tor</string> + <string name="tor_proxy_service_process">Tor 代理服务</string> + <string name="status_starting_up">Orbot 正在启动...</string> + <string name="status_activated">已连接到 Tor 网络</string> + <string name="status_disabled">Orbot 已停用</string> + <string name="status_shutting_down">Orbot 正在关闭</string> + <string name="tor_process_starting">开启Tor客户端...</string> + <string name="tor_process_complete">完成。</string> + <string name="tor_process_waiting">等待。</string> + <string name="not_anonymous_yet">警告: 您的通讯还不是匿名的! 请设置您的应用程序使用代理服务器 127.0.0.1:8118 或者 SOCKS4A 或者 SOCKS5 代理服务器 127.0.0.1:9050</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">Wizard</string> - <string name="button_help">Help</string> - <string name="button_close">Close</string> - <string name="button_about">About</string> + <string name="button_help">帮助</string> + <string name="button_close">关闭</string> + <string name="button_about">关于</string> <string name="button_clear_log">Clear Log</string> - <string name="menu_verify">Check</string> - <string name="menu_exit">Exit</string> - <string name="powered_by">powered by the Tor Project</string> - <string name="press_to_start">- long press to start -</string> - <string name="pref_trans_proxy_group">Transparent Proxying (Requires Root)</string> - <string name="pref_trans_proxy_title">Transparent Proxying</string> - <string name="pref_trans_proxy_summary">Automatic Torifying of Apps</string> - <string name="pref_transparent_all_title">Tor Everything</string> - <string name="pref_transparent_all_summary">Proxy traffic for all apps through Tor</string> + <string name="menu_verify">检查</string> + <string name="menu_exit">退出</string> + <string name="powered_by">由 Tor 项目强力驱动</string> + <string name="press_to_start">- 长按以启动 -</string> + <string name="pref_trans_proxy_group">透明代理(需要 root)</string> + <string name="pref_trans_proxy_title">透明代理</string> + <string name="pref_trans_proxy_summary">自动对应用程序使用 Tor</string> + <string name="pref_transparent_all_title">对所有应用使用 Tor</string> + <string name="pref_transparent_all_summary">使用 Tor 代理所有程序的流量</string> <string name="pref_transparent_port_fallback_title">Port Proxy Fallback</string> <string name="pref_transparent_port_fallback_summary">WARNING: Circumvents common ports (80, 443, etc). *USE ONLY* if \'All\' or \'App\' mode doesn\'t work.</string> - <string name="pref_transparent_port_title">Port List</string> + <string name="pref_transparent_port_title">端口列表</string> <string name="pref_transparent_port_summary">List of ports to proxy. *USE ONLY* if \'All\' or \'App\' mode doesn\'t work</string> <string name="pref_transparent_port_dialog">Enter ports to proxy</string> <string name="pref_has_root">Request Root Access</string> <string name="pref_has_root_summary">Request root access for transparent proxying</string> - <string name="status_install_success">Tor binaries successfully installed!</string> - <string name="status_install_fail">The Tor binary files were unable to be installed. Please check the log and notify tor-assistants(a)torproject.org</string> - <string name="title_error">Application Error</string> - <string name="wizard_title">Orbot</string> - <string name="wizard_btn_tell_me_more">About Orbot</string> - <string name="btn_next">Next</string> - <string name="btn_back">Back</string> - <string name="btn_finish">Finish</string> - <string name="btn_okay">Okay</string> - <string name="btn_cancel">Cancel</string> - <string name="wizard_details">Some Orbot Details</string> - <string name="wizard_details_msg">Orbot is an open-source application that contains Tor, LibEvent and Privoxy. It provides a local HTTP proxy (8118) and a SOCKS proxy (9050) into the Tor network. Orbot also has the ability, on rooted device, to send all internet traffic through Tor.</string> - <string name="wizard_permissions_root">Permission Granted</string> - <string name="wizard_permissions_stock">Orbot Permissions</string> - <string name="wizard_premissions_msg_root">Excellent! We\'ve detected that you have root permissions enabled for Orbot. We will use this power wisely.</string> - <string name="wizard_permissions_msg_stock"> While it is not required, Orbot can become a more powerful tool if your device has root access. Use the button below to grant Orbot superpowers! </string> - <string name="wizard_permissions_no_root">If you don\'t have root access or have no idea what we\'re talking about, just be sure to use apps made to work with Orbot.</string> - <string name="wizard_permissions_consent">I understand and would like to continue without Superuser</string> - <string name="wizard_permission_enable_root">Grant Root for Orbot</string> - <string name="wizard_configure">Configure Torification</string> - <string name="wizard_configure_msg">Orbot gives you the option to route all application traffic through Tor OR to choose your applications individually.</string> - <string name="wizard_configure_all">Proxy All Apps Through Tor</string> - <string name="wizard_configure_select_apps">Select Individual Apps for Tor</string> - <string name="wizard_tips_tricks">Orbot-enabled Apps</string> - <string name="wizard_tips_msg">The apps below were developed to work with Orbot. Click each button to install now, or you can find them later in the Android Market.</string> + <string name="status_install_success">Tor 二进制程序安装成功！</string> + <string name="status_install_fail">Tor 二进制程序无法安装。请查看日志 tor-assistants(a)torproject.org</string> + <string name="title_error">应用程序错误</string> + <string name="wizard_title">欢迎使用 Orbot</string> + <string name="wizard_btn_tell_me_more">关于 Orbot</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">一些 Orbot 详情</string> + <string name="wizard_details_msg">Orbot 是包含 Tor、LibEvent 和 Privoxy 的开源软件。它包含了一个本地 HTTP 代理(8118)和 SOCKS 代理(9050)，使您接入 Tor 网络。Orbot 在可以获得 root 权限的设备上接管所有流量经由 Tor 网络。</string> + <string name="wizard_permissions_root">已赋予权限</string> + <string name="wizard_permissions_stock">Orbot 权限</string> + <string name="wizard_premissions_msg_root">非常好！我们检测到您已经为 Orbot 配置了 root 权限。我们会聪明地使用这个特权。</string> + <string name="wizard_permissions_msg_stock">虽然并非必须，如果你的设备有 root 权限，Orbot 可以表现得更为强大。使用以下按钮来赋予 Orbot 超级能力！</string> + <string name="wizard_permissions_no_root">如果你没有 root 权限，或不明白上面说的是什么，那么只需使用可与 Orbot 工作的应用程序。</string> + <string name="wizard_permissions_consent">我明白并会以非 root 继续</string> + <string name="wizard_permission_enable_root">为 Orbot 赋予 root 权限</string> + <string name="wizard_configure">配置 Tor 使用</string> + <string name="wizard_configure_msg">Orbot 给予您路由所有应用程序流量通过 Tor 或者为单个程序设置选择的选项。</string> + <string name="wizard_configure_all">通过 Tor 代理全部应用程序</string> + <string name="wizard_configure_select_apps">选择使用 Tor 的单个应用程序</string> + <string name="wizard_tips_tricks">可用 Orbot 的应用程序</string> + <string name="wizard_tips_msg">我们建议您下载和使用能直接连接到 Orbot 的应用程序。点击以下按钮安装。</string> <string name="wizard_tips_otrchat">Gibberbot - Secure instant messaging client for Android</string> - <string name="wizard_tips_proxy">Proxy Settings - Learn how to configure apps to work with Orbot</string> - <string name="wizard_proxy_help_info">Proxy Settings</string> - <string name="wizard_proxy_help_msg">If the Android app you are using can support the use of an HTTP or SOCKS proxy, then you can configure it to connect to Orbot and use Tor.\n\n - The host settings is 127.0.0.1 or \"localhost\". For HTTP, the port setting is 8118. For SOCKS, the proxy is 9050. You should use SOCKS4A or SOCKS5 if possible. + <string name="wizard_tips_proxy">代理设置 - 学习如何配置应用程序使用 Orbot</string> + <string name="wizard_proxy_help_info">代理设置</string> + <string name="wizard_proxy_help_msg">如果您正在使用的 Android 应用程序支持使用 HTTP 或 SOCKS 代理，您可以配置它连接到 Orbot 并使用 Tor。\n\n + 主机设置为 127.0.0.1 或 localhost。对于 HTTP，端口为 8118，对于 SOCKS 端口为 9050。如果可能，应当使用 SOCKS4A 或 SOCKS5。 \n\n - You can learn more about proxying on Android via the FAQ at: http://tinyurl.com/proxyandroid - </string> - <string name="wizard_final">Orbot is ready!</string> - <string name="wizard_final_msg">Hundreds of thousands of people around the world use Tor for a wide variety of reasons.\n\nJournalists and bloggers, human rights defenders, law enforcement officers, soldiers, corporations, citizens of repressive regimes, and just ordinary citizens... and now you are ready to, as well!</string> - <string name="connect_first_time">You\'ve successfully connected to the Tor network - but this does NOT mean your device is secure. You can use the \'Check\' option from the menu to test your browser. \n\nVisit us at https://guardianproject.info/apps/orbot or send an email to help(a)guardianproject.info to learn more.</string> - <string name="tor_check">This will open your web browser to https://check.torproject.org in order to see if Orbot is probably configured and you are connected to Tor.</string> - <string name="pref_hs_group">Hidden Services</string> + 您可以通过 http://tinyurl.com/proxyandroid 了解更多 Android 上使用代理的知识。</string> + <string name="wizard_final">Orbot 已就绪！</string> + <string name="wizard_final_msg">数以万计的各国人们因为各种原因使用 Tor：记者、人权工作者、法律工作者、士兵、公司、迫于实际情况使用的市民，当然也有普通的市民。现在你也即将成为其中的一员！</string> + <string name="connect_first_time">您已成功连接至 Tor 网络 - 但这并不意味着您的设备安全。您可以使用“检查”选项测试您的浏览器。\n\n访问 https://guardianproject.info/apps/orbot 或发送邮件到 help(a)guardianproject.info 以了解更多信息。</string> + <string name="tor_check">这将启动默认浏览器并访问 https://check.torproject.org 以测试是否正确配置了 Orbot 并确认您是否已经连接到 Tor。</string> + <string name="pref_hs_group">隐藏服务</string> <string name="pref_general_group">General</string> - <string name="pref_start_boot_title">Start Orbot on Boot</string> - <string name="pref_start_boot_summary">Automatically start Orbot and connect Tor when your Android device boots</string> + <string name="pref_start_boot_title">开机启动Orbot</string> + <string name="pref_start_boot_summary">当您的 Android 设备开机时自动启动 Orbot 并连接至 Tor 网络</string> <string name="wizard_title_msg">Orbot brings Tor to Android!\n\nTor helps you defend against content filtering, traffic analysis and network surveillance that threatens privacy, confidential information and personal relationships.\n\nThis wizard will help you configure Orbot and Tor on your device.</string> - <string name="wizard_warning_title">Warning</string> + <string name="wizard_warning_title">警告</string> <string name="wizard_warning_msg">Simply installing Orbot will not automatically anonymize your mobile traffic.\n\nYou must properly configure Orbot, your device and other apps to successfully use Tor.</string> - <string name="wizard_permissions_title">Permissions</string> + <string name="wizard_permissions_title">允许</string> <string name="wizard_permissions_root_msg1">You can optionally grant Orbot \'Superuser\' access to enable advanced features, such as Transparent Proxying.</string> <string name="wizard_permissions_root_msg2">If you do not want to do this, please make sure to use apps made to work with Orbot</string> <string name="wizard_permissions_no_root_msg">Your device does not appear to be rooted or provide \'Superuser\' access.\n\nIn order to you to benefit from Tor, you will need to use apps built to work with Orbot, or that support HTTP or SOCKS proxy settings.\n\n</string> <string name="wizard_tips_title">Orbot-Enabled Apps</string> <string name="wizard_tips_gibberbot">Gibberbot: Secure chat app with Off-the-Record Encryption</string> <string name="gibberbot_apk_url">https://market.android.com/details?id=info.guardianproject.otr.app.im</string> - <string name="wizard_tips_orweb">Orweb: Privacy-enhanced browser that works through Tor</string> - <string name="orweb_apk_url">https://market.android.com/details?id=info.guardianproject.browser</string> + <string name="wizard_tips_orweb">ORWEB (仅 Android 1.x) - 着重隐私设计的浏览器</string> + <string name="orweb_apk_url">market://search?q=pname:nfo.guardianproject.browser</string> <string name="wizard_transproxy_title">Transparent Proxying</string> <string name="wizard_transproxy_msg">This allows your apps to automatically run through the Tor network without any configuration.</string> <string name="wizard_transproxy_hint">(Check this box if you have no idea what we are talking about)</string> @@ -123,7 +122,7 @@ <string name="pref_proxy_port_title">Proxy Port</string> <string name="pref_proxy_port_summary">Proxy server port</string> <string name="pref_proxy_port_dialog">Enter Proxy port</string> - <string name="status">Status</string> + <string name="status">状态</string> <string name="setting_up_full_transparent_proxying_">Setting up full transparent proxying...</string> <string name="setting_up_app_based_transparent_proxying_">Setting up app-based transparent proxying...</string> <string name="transparent_proxying_enabled">Transparent proxying ENABLED</string> @@ -133,10 +132,10 @@ <string name="couldn_t_start_tor_process_">Couldn\'t start Tor process: </string> <string name="privoxy_is_running_on_port_">Privoxy is running on port: </string> <string name="setting_up_port_based_transparent_proxying_">Setting up port-based transparent proxying...</string> - <string name="bridge_error">Bridge Error</string> + <string name="bridge_error">网桥错误</string> <string name="bridge_requires_ip">In order to use the bridge feature, you must enter at least one bridge IP address.</string> <string name="send_email_for_bridges">Send an email to bridges(a)torproject.org with the line \"get bridges\" by itself in the body of the mail from a gmail account.</string> - <string name="error">Error</string> + <string name="error">错误</string> <string name="your_reachableaddresses_settings_caused_an_exception_">Your ReachableAddresses settings caused an exception!</string> <string name="your_relay_settings_caused_an_exception_">Your relay settings caused an exception!</string> <string name="exit_nodes">Exit Nodes</string> @@ -147,10 +146,10 @@ <string name="enter_exclude_nodes">Enter Exclude Nodes</string> <string name="strict_nodes">Strict Nodes</string> <string name="use_only_these_specified_nodes">Use *only* these specified nodes</string> - <string name="bridges">Bridges</string> - <string name="use_bridges">Use Bridges</string> + <string name="bridges">网桥</string> + <string name="use_bridges">使用网桥</string> <string name="enable_alternate_entrance_nodes_into_the_tor_network">Enable alternate entrance nodes into the Tor Network</string> - <string name="ip_address_and_port_of_bridges">IP address and port of bridges</string> + <string name="ip_address_and_port_of_bridges">网桥的IP地址和端口</string> <string name="enter_bridge_addresses">Enter Bridge Addresses</string> <string name="relays">Relays</string> <string name="relaying">Relaying</string> @@ -174,7 +173,7 @@ <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">enable debug log to output (must use adb or aLogCat to view)</string> <string name="project_home">Project Home(s): </string> <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/…</string> - <string name="the_tor_license">The Tor License</string> + <string name="the_tor_license">Tor许可证</string> <string name="https_torproject_org">https://torproject.org</string> <string name="third_party_software">3rd-Party-Software: </string> <string name="tor_version">Tor v0.2.3.10: https://www.torproject.org</string>

1 0

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

21 Feb '12

commit 137128d73c10fb2781c9eff847158064a291d9d7 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Feb 21 08:45:10 2012 +0000 Update translations for vidalia --- eu/vidalia_eu.po | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/eu/vidalia_eu.po b/eu/vidalia_eu.po index 97a5f8f..9d17198 100755 --- a/eu/vidalia_eu.po +++ b/eu/vidalia_eu.po @@ -1,13 +1,14 @@ # Translators: # Translators: +# Antxon Baldarra <baldarra(a)euskalerria.org>, 2012. # <baldarra(a)euskalerria.org>, 2011, 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-09-07 14:40+0000\n" -"PO-Revision-Date: 2012-02-20 18:42+0000\n" -"Last-Translator: baldarra <baldarra(a)euskalerria.org>\n" +"PO-Revision-Date: 2012-02-21 08:33+0000\n" +"Last-Translator: Antxon Baldarra <baldarra(a)euskalerria.org>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -386,7 +387,7 @@ msgstr "Sarea" msgctxt "ConfigDialog" msgid "Sharing" -msgstr "Elkarbanatzen" +msgstr "Elkarbanaketa" msgctxt "ConfigDialog" msgid "Services"

1 0

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

21 Feb '12

commit cb78fb220d3caeba68d16969589a760cc696be35 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Feb 21 07:15:14 2012 +0000 Update translations for vidalia_completed --- ja/qt_ja.po | 437 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 437 insertions(+), 0 deletions(-) diff --git a/ja/qt_ja.po b/ja/qt_ja.po new file mode 100644 index 0000000..7ec5561 --- /dev/null +++ b/ja/qt_ja.po @@ -0,0 +1,437 @@ +# Translators: +# Translators: +# 5人のアノニマス <>, 2012. +# Chris Harris <praisebe4him(a)gmail.com>, 2012. +# runasand <runa.sandvik(a)gmail.com>, 2011. +# siomiz <>, 2012. +msgid "" +msgstr "" +"Project-Id-Version: The Tor Project\n" +"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" +"POT-Creation-Date: 2008-08-20 03:25+0000\n" +"PO-Revision-Date: 2012-02-21 07:11+0000\n" +"Last-Translator: Chris Harris <praisebe4him(a)gmail.com>\n" +"Language-Team: none\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" +"X-Generator: Vidalia ts2po 0.2\n" + +#: qaccessibleobject.cpp:348 +msgctxt "QApplication" +msgid "Activate" +msgstr "アクティブに" + +#: qmessagebox.h:319 +msgctxt "QApplication" +msgid "Executable '%1' requires Qt %2, found Qt %3." +msgstr "実行可能ファイル '%1' には Qt %2 が必要です。Qt %3 が見つかりました。" + +#: qmessagebox.h:321 +msgctxt "QApplication" +msgid "Incompatible Qt Library Error" +msgstr "互換性のないQtライブラリエラー" + +#: qapplication.cpp:2095 +msgctxt "QApplication" +msgid "QT_LAYOUT_DIRECTION" +msgstr "LTR" + +#: qaccessibleobject.cpp:350 +msgctxt "QApplication" +msgid "Activates the program's main window" +msgstr "メインウィンドウをアクティブにする" + +#: qmessagebox.cpp:2104 +msgctxt "QDialogButtonBox" +msgid "OK" +msgstr "OK" + +#: qdialogbuttonbox.cpp:528 +msgctxt "QDialogButtonBox" +msgid "Save" +msgstr "保存" + +#: qdialogbuttonbox.cpp:531 +msgctxt "QDialogButtonBox" +msgid "Open" +msgstr "オープン" + +#: qdialogbuttonbox.cpp:534 +msgctxt "QDialogButtonBox" +msgid "Cancel" +msgstr "キャンセル" + +#: qdialogbuttonbox.cpp:537 +msgctxt "QDialogButtonBox" +msgid "Close" +msgstr "閉じる" + +#: qdialogbuttonbox.cpp:540 +msgctxt "QDialogButtonBox" +msgid "Apply" +msgstr "適用" + +#: qdialogbuttonbox.cpp:543 +msgctxt "QDialogButtonBox" +msgid "Reset" +msgstr "リセット" + +#: qdialogbuttonbox.cpp:546 +msgctxt "QDialogButtonBox" +msgid "Help" +msgstr "ヘルプ" + +#: qdialogbuttonbox.cpp:550 +msgctxt "QDialogButtonBox" +msgid "Don't Save" +msgstr "保存しない" + +#: qdialogbuttonbox.cpp:554 +msgctxt "QDialogButtonBox" +msgid "Discard" +msgstr "変更を破棄" + +#: qdialogbuttonbox.cpp:557 +msgctxt "QDialogButtonBox" +msgid "&Yes" +msgstr "はい(&Y)" + +#: qdialogbuttonbox.cpp:560 +msgctxt "QDialogButtonBox" +msgid "Yes to &All" +msgstr "全てにはい(&A)" + +#: qdialogbuttonbox.cpp:563 +msgctxt "QDialogButtonBox" +msgid "&No" +msgstr "いいえ(&N)" + +#: qdialogbuttonbox.cpp:566 +msgctxt "QDialogButtonBox" +msgid "N&o to All" +msgstr "全てにいいえ(&O)" + +#: qdialogbuttonbox.cpp:569 +msgctxt "QDialogButtonBox" +msgid "Save All" +msgstr "すべて保存" + +#: qdialogbuttonbox.cpp:572 +msgctxt "QDialogButtonBox" +msgid "Abort" +msgstr "中止" + +#: qdialogbuttonbox.cpp:575 +msgctxt "QDialogButtonBox" +msgid "Retry" +msgstr "再試行" + +#: qdialogbuttonbox.cpp:578 +msgctxt "QDialogButtonBox" +msgid "Ignore" +msgstr "無視" + +#: qdialogbuttonbox.cpp:581 +msgctxt "QDialogButtonBox" +msgid "Restore Defaults" +msgstr "デフォルトに戻す" + +#: qdialogbuttonbox.cpp:552 +msgctxt "QDialogButtonBox" +msgid "Close without Saving" +msgstr "保存せずに閉じる" + +#: qdialogbuttonbox.cpp:525 +msgctxt "QDialogButtonBox" +msgid "&OK" +msgstr "OK(&O)" + +#: qdirmodel.cpp:423 +msgctxt "QDirModel" +msgid "Name" +msgstr "名前" + +#: qdirmodel.cpp:424 +msgctxt "QDirModel" +msgid "Size" +msgstr "サイズ" + +#: qdirmodel.cpp:427 +msgctxt "QDirModel" +msgid "Kind" +msgstr "種類" + +#: qdirmodel.cpp:429 +msgctxt "QDirModel" +msgid "Type" +msgstr "タイプ" + +#: qdirmodel.cpp:435 +msgctxt "QDirModel" +msgid "Date Modified" +msgstr "更新日" + +#: qfiledialog_win.cpp:126 +msgctxt "QFileDialog" +msgid "All Files (*)" +msgstr "すべてのファイル(*)" + +#: qfiledialog.cpp:881 +msgctxt "QFileDialog" +msgid "Directories" +msgstr "ディレクトリ" + +#: qfiledialog.cpp:2408 +msgctxt "QFileDialog" +msgid "&Open" +msgstr "オープン(&O)" + +#: qfiledialog.cpp:919 +msgctxt "QFileDialog" +msgid "&Save" +msgstr "保存(&S)" + +#: qfiledialog.cpp:435 +msgctxt "QFileDialog" +msgid "Open" +msgstr "オープン" + +#: qfiledialog.cpp:1670 +msgctxt "QFileDialog" +msgid "" +"%1 already exists.\n" +"Do you want to replace it?" +msgstr "%1はすでに存在します。\n置き換えますか?" + +#: qfiledialog.cpp:1690 +msgctxt "QFileDialog" +msgid "" +"%1\n" +"File not found.\n" +"Please verify the correct file name was given." +msgstr "%1\nファイルが見つかりません。\n正しいファイル名が入力されたかどうか確認してください。" + +#: qdirmodel.cpp:833 +msgctxt "QFileDialog" +msgid "My Computer" +msgstr "マイコンピュータ" + +#: qfiledialog.cpp:462 +msgctxt "QFileDialog" +msgid "&Rename" +msgstr "名前の変更(&R)" + +#: qfiledialog.cpp:463 +msgctxt "QFileDialog" +msgid "&Delete" +msgstr "削除(&D)" + +#: qfiledialog.cpp:464 +msgctxt "QFileDialog" +msgid "Show &hidden files" +msgstr "隠しファイルの表示(&H)" + +#: ui_qfiledialog.h:264 +msgctxt "QFileDialog" +msgid "Back" +msgstr "戻る" + +#: ui_qfiledialog.h:274 +msgctxt "QFileDialog" +msgid "Parent Directory" +msgstr "親ディレクトリ" + +#: ui_qfiledialog.h:284 +msgctxt "QFileDialog" +msgid "List View" +msgstr "一覧表示" + +#: ui_qfiledialog.h:289 +msgctxt "QFileDialog" +msgid "Detail View" +msgstr "詳細表示" + +#: ui_qfiledialog.h:292 +msgctxt "QFileDialog" +msgid "Files of type:" +msgstr "ファイルの種類:" + +#: qfiledialog.cpp:883 +msgctxt "QFileDialog" +msgid "Directory:" +msgstr "ディレクトリ:" + +#: qfiledialog.cpp:2476 +msgctxt "QFileDialog" +msgid "" +"%1\n" +"Directory not found.\n" +"Please verify the correct directory name was given." +msgstr "%1\nディレクトリが見つかりません。\n正しいディレクトリ名が入力されたかどうか確認してください。" + +#: qfiledialog.cpp:2281 +msgctxt "QFileDialog" +msgid "" +"'%1' is write protected.\n" +"Do you want to delete it anyway?" +msgstr "'%1' は書き込みが禁止されています。\n本当に削除しますか？" + +#: qfiledialog.cpp:2286 +msgctxt "QFileDialog" +msgid "Are sure you want to delete '%1'?" +msgstr "'%1' を本当に削除しますか？" + +#: qfiledialog.cpp:2299 +msgctxt "QFileDialog" +msgid "Could not delete directory." +msgstr "ディレクトリを削除できませんでした。" + +#: qfiledialog_win.cpp:128 +msgctxt "QFileDialog" +msgid "All Files (*.*)" +msgstr "すべてのファイル(*.*)" + +#: qfiledialog.cpp:437 +msgctxt "QFileDialog" +msgid "Save As" +msgstr "名前を付けて保存" + +#: qfileiconprovider.cpp:379 +msgctxt "QFileDialog" +msgid "Drive" +msgstr "ドライブ" + +#: qfileiconprovider.cpp:383 +msgctxt "QFileDialog" +msgid "File" +msgstr "ファイル" + +#: qfileiconprovider.cpp:412 +msgctxt "QFileDialog" +msgid "Unknown" +msgstr "不明" + +#: qfiledialog.cpp:439 +msgctxt "QFileDialog" +msgid "Find Directory" +msgstr "ディレクトリの検索" + +#: qfiledialog.cpp:458 +msgctxt "QFileDialog" +msgid "Show " +msgstr "表示" + +#: ui_qfiledialog.h:269 +msgctxt "QFileDialog" +msgid "Forward" +msgstr "進む" + +#: qfiledialog.cpp:2137 +msgctxt "QFileDialog" +msgid "New Folder" +msgstr "新しいフォルダ" + +#: qfiledialog.cpp:465 +msgctxt "QFileDialog" +msgid "&New Folder" +msgstr "新しいフォルダ(&F)" + +#: qfiledialog.cpp:917 +msgctxt "QFileDialog" +msgid "&Choose" +msgstr "選択(&S)" + +#: qsidebar.cpp:388 +msgctxt "QFileDialog" +msgid "Remove" +msgstr "削除" + +#: qfiledialog.cpp:886 +msgctxt "QFileDialog" +msgid "File &name:" +msgstr "ファイル名:" + +#: ui_qfiledialog.h:261 +msgctxt "QFileDialog" +msgid "Look in:" +msgstr "検索する場所:" + +#: ui_qfiledialog.h:279 +msgctxt "QFileDialog" +msgid "Create New Folder" +msgstr "新しいフォルダの作成" + +#: qfilesystemmodel.cpp:761 +msgctxt "QFileSystemModel" +msgid "Invalid filename" +msgstr "不正なファイル名" + +#: qfilesystemmodel.cpp:763 +msgctxt "QFileSystemModel" +msgid "" +"The name \"%1\" can not be used.Try using another name, with fewer" +" characters or no punctuations marks." +msgstr "\"%1\" という名前は使えません。名前を短くするか、記号を含まない別の名前で試してください。" + +#: qfilesystemmodel.cpp:832 +msgctxt "QFileSystemModel" +msgid "Name" +msgstr "名前" + +#: qfilesystemmodel.cpp:834 +msgctxt "QFileSystemModel" +msgid "Size" +msgstr "サイズ" + +#: qfilesystemmodel.cpp:838 +msgctxt "QFileSystemModel" +msgid "Kind" +msgstr "種類" + +#: qfilesystemmodel.cpp:840 +msgctxt "QFileSystemModel" +msgid "Type" +msgstr "タイプ" + +#: qfilesystemmodel.cpp:847 +msgctxt "QFileSystemModel" +msgid "Date Modified" +msgstr "更新日" + +#: qfilesystemmodel_p.h:198 +msgctxt "QFileSystemModel" +msgid "My Computer" +msgstr "マイコンピュータ" + +#: qfilesystemmodel_p.h:200 +msgctxt "QFileSystemModel" +msgid "Computer" +msgstr "コンピュータ" + +#: qfilesystemmodel.cpp:677 +msgctxt "QFileSystemModel" +msgid "%1 TB" +msgstr "%1 TB" + +#: qfilesystemmodel.cpp:679 +msgctxt "QFileSystemModel" +msgid "%1 GB" +msgstr "%1 GB" + +#: qfilesystemmodel.cpp:681 +msgctxt "QFileSystemModel" +msgid "%1 MB" +msgstr "%1 MB" + +#: qfilesystemmodel.cpp:683 +msgctxt "QFileSystemModel" +msgid "%1 KB" +msgstr "%1 KB" + +#: qfilesystemmodel.cpp:684 +msgctxt "QFileSystemModel" +msgid "%1 bytes" +msgstr "%1 バイト"

1 0

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

21 Feb '12

commit e6b78187adaefcaef0e8116579fd66a4737c1cdc Author: Translation commit bot <translation(a)torproject.org> Date: Tue Feb 21 07:15:11 2012 +0000 Update translations for vidalia --- ja/qt_ja.po | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ja/qt_ja.po b/ja/qt_ja.po index 167839a..7ec5561 100644 --- a/ja/qt_ja.po +++ b/ja/qt_ja.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2008-08-20 03:25+0000\n" -"PO-Revision-Date: 2012-02-21 03:52+0000\n" +"PO-Revision-Date: 2012-02-21 07:11+0000\n" "Last-Translator: Chris Harris <praisebe4him(a)gmail.com>\n" "Language-Team: none\n" "MIME-Version: 1.0\n" @@ -337,12 +337,12 @@ msgstr "新しいフォルダ" #: qfiledialog.cpp:465 msgctxt "QFileDialog" msgid "&New Folder" -msgstr "" +msgstr "新しいフォルダ(&F)" #: qfiledialog.cpp:917 msgctxt "QFileDialog" msgid "&Choose" -msgstr "" +msgstr "選択(&S)" #: qsidebar.cpp:388 msgctxt "QFileDialog"

1 0

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

21 Feb '12

commit 9c2a9f9f15b6df9b32ff30b0584e59c76219882e Author: Translation commit bot <translation(a)torproject.org> Date: Tue Feb 21 07:15:04 2012 +0000 Update translations for gettor --- ja/gettor.po | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ja/gettor.po b/ja/gettor.po index 4ea49a8..1677628 100644 --- a/ja/gettor.po +++ b/ja/gettor.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-13 22:01+0100\n" -"PO-Revision-Date: 2012-02-21 02:42+0000\n" +"PO-Revision-Date: 2012-02-21 07:00+0000\n" "Last-Translator: Chris Harris <praisebe4him(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -96,7 +96,7 @@ msgstr "" #: lib/gettor/i18n.py:71 msgid " List of supported locales:" -msgstr "" +msgstr "支援されているロケールリスト:" #: lib/gettor/i18n.py:73 msgid "Here is a list of all available languages:" @@ -157,7 +157,7 @@ msgstr "" #: lib/gettor/i18n.py:108 msgid "1.) Save all received attachments into one folder on your disk." -msgstr "" +msgstr "1).全部の添付ファイルをハードディスクに保存してください" #: lib/gettor/i18n.py:110 msgid ""

1 0

[ooni-probe/master] Fix bug in torrc writing.
by art＠torproject.org 21 Feb '12

21 Feb '12

commit 938ef093446ee2bcd553023b67943b048cd75f6c Author: Arturo Filastò <hellais(a)gmail.com> Date: Mon Feb 20 21:45:42 2012 -0800 Fix bug in torrc writing. --- refactor/tests/bridget.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/refactor/tests/bridget.py b/refactor/tests/bridget.py index ad4e59c..7c1ca8b 100644 --- a/refactor/tests/bridget.py +++ b/refactor/tests/bridget.py @@ -96,7 +96,7 @@ bridge %s DataDirectory %s usemicrodescriptors 0 ControlPort %s -""" % (socksport, bridge, datadir) +""" % (socksport, bridge, datadir, controlport) print torrc with open(randomname, "wb") as f:

1 0

[ooni-probe/master] Fix some bugs in BridgeT
by art＠torproject.org 21 Feb '12

21 Feb '12

commit 917ee64e2f991c214d5ab4f42f2d17ea52310023 Author: Arturo Filastò <hellais(a)gmail.com> Date: Mon Feb 20 21:41:39 2012 -0800 Fix some bugs in BridgeT --- refactor/tests/bridget.py | 24 ++++++++++++++++++------ 1 files changed, 18 insertions(+), 6 deletions(-) diff --git a/refactor/tests/bridget.py b/refactor/tests/bridget.py index 33f181d..ad4e59c 100644 --- a/refactor/tests/bridget.py +++ b/refactor/tests/bridget.py @@ -95,6 +95,7 @@ UseBridges 1 bridge %s DataDirectory %s usemicrodescriptors 0 +ControlPort %s """ % (socksport, bridge, datadir) print torrc @@ -137,23 +138,34 @@ usemicrodescriptors 0 cmd = ["tor", "-f", torrc] tupdate = time.time() - p = Popen(cmd, stdout=PIPE) + try: + p = Popen(cmd, stdout=PIPE) + except: + self.logger.error("Error in starting Tor (do you have tor installed?)") + # XXX this only works on UNIX (do we care?) # Make file reading non blocking - fcntl.fcntl(p.stdout, fcntl.F_SETFL, os.O_NONBLOCK) + try: + fcntl.fcntl(p.stdout, fcntl.F_SETFL, os.O_NONBLOCK) + except: + self.logger.error("Unable to set file descriptor to non blocking") while True: o = "" try: o = p.stdout.read(4096) if o: - print o + self.logger.debug(str(o)) if re.search("100%", o): + self.logger.info("Success in connecting to %s" % bridge) print "%s bridge works" % bridge print "%s controlport" % controlport - c = TorCtl.connect('127.0.0.1', controlport) - bridgeinfo = self.parsebridgeinfo(c.get_info('dir/server/all')['dir/server/all']) - bandwidth=self.download_file(socksport) + try: + c = TorCtl.connect('127.0.0.1', controlport) + bridgeinfo = self.parsebridgeinfo(c.get_info('dir/server/all')['dir/server/all']) + bandwidth=self.download_file(socksport) + except: + self.logger.error("Error in connecting to Tor Control port") print bandwidth c.close() p.stdout.close()

1 0