tor-commits May 2014

tor-commits@lists.torproject.org

25 participants
1732 discussions

[stem/master] Added missing versionadded tags
by atagar＠torproject.org 31 May '14

31 May '14

commit bbaa4c85bd5d3fabf43bc1e899e234aefa111235 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat May 31 12:17:27 2014 -0700 Added missing versionadded tags We were missing a handful of versionadded tags for things being added in 1.2.0. --- stem/connection.py | 2 ++ stem/control.py | 4 ++++ stem/util/test_tools.py | 2 ++ stem/util/tor_tools.py | 2 ++ 4 files changed, 10 insertions(+) diff --git a/stem/connection.py b/stem/connection.… [View More]py index d807bcf..4bfcd5c 100644 --- a/stem/connection.py +++ b/stem/connection.py @@ -214,6 +214,8 @@ def connect(control_port = ('127.0.0.1', 9051), control_socket = '/var/run/tor/c details of how this works. Messages and details of this function's behavior could change in the future. + .. versionadded:: 1.2.0 + :param tuple contol_port: address and port tuple, for instance **('127.0.0.1', 9051)** :param str path: path where the control socket is located :param str password: passphrase to authenticate to the socket diff --git a/stem/control.py b/stem/control.py index 78e949c..30cb1b8 100644 --- a/stem/control.py +++ b/stem/control.py @@ -1047,6 +1047,8 @@ class Controller(BaseController): :func:`~stem.control.Controller.get_listeners`, but doesn't provide addresses nor include non-local endpoints. + .. versionadded:: 1.2.0 + :param stem.control.Listener listener_type: connection type being handled by the ports we return :param object default: response if the query fails @@ -1073,6 +1075,8 @@ class Controller(BaseController): :func:`~stem.control.Controller.get_ports` but includes listener addresses and non-local endpoints. + .. versionadded:: 1.2.0 + :param stem.control.Listener listener_type: connection type being handled by the listeners we return :param object default: response if the query fails diff --git a/stem/util/test_tools.py b/stem/util/test_tools.py index cd94ff5..c976128 100644 --- a/stem/util/test_tools.py +++ b/stem/util/test_tools.py @@ -4,6 +4,8 @@ """ Helper functions for testing. +.. versionadded:: 1.2.0 + :: clean_orphaned_pyc - delete *.pyc files without corresponding *.py diff --git a/stem/util/tor_tools.py b/stem/util/tor_tools.py index aae7426..9eb46a0 100644 --- a/stem/util/tor_tools.py +++ b/stem/util/tor_tools.py @@ -4,6 +4,8 @@ """ Miscellaneous utility functions for working with tor. +.. versionadded:: 1.2.0 + **Module Overview:** :: [View Less]

1 0

[stem/master] Adding tarfile support to stem.descriptor.parse_file()
by atagar＠torproject.org 31 May '14

31 May '14

commit a5596873fd544d79c53f0c0123caa89bdb5a9f72 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat May 31 14:14:06 2014 -0700 Adding tarfile support to stem.descriptor.parse_file() A while back Karsten tried to hand a tarfile to our parse_file() method and had confusing results... https://trac.torproject.org/projects/tor/ticket/10977 Expanding our parse_file() function so it'll happily handle tarfiles and tar paths. Note that … [View More]the DescriptorReader, which already had tar support, is keeping its own separate implementation. This is because using the parse_file()'s tar support has a couple drawbacks... 1. The reader then couldn't stop in the middle of handling tarballs. 2. If a tarball contains both descriptor and non-descriptor content then the DescriptorReader can handle that. parse_file(), however, raises an exception. --- docs/change_log.rst | 2 + stem/descriptor/__init__.py | 55 +++++++++++++++++++++++++--- stem/descriptor/reader.py | 24 +++--------- stem/util/system.py | 34 ++++++++++++++++- test/integ/descriptor/server_descriptor.py | 31 ++++++++++++++++ 5 files changed, 121 insertions(+), 25 deletions(-) diff --git a/docs/change_log.rst b/docs/change_log.rst index 279f2bb..7f2982b 100644 --- a/docs/change_log.rst +++ b/docs/change_log.rst @@ -59,6 +59,7 @@ The following are only available within Stem's `git repository * **Descriptors** + * Added tarfile support to :func:`~stem.descriptor.__init__.parse_file` (:trac:`10977`) * Added microdescriptor's new identity and identity_type attributes (:spec:`22cda72`) * **Utilities** @@ -116,6 +117,7 @@ and a myriad of smaller improvements and fixes. * Added :func:`stem.util.system.get_user` * Added :func:`stem.util.system.get_start_time` * Added :func:`stem.util.system.get_bsd_jail_path` + * Added :func:`stem.util.system.is_tarfile` * Added :func:`stem.util.connection.is_private_address` * **Website** diff --git a/stem/descriptor/__init__.py b/stem/descriptor/__init__.py index 2d7cc69..4270cb9 100644 --- a/stem/descriptor/__init__.py +++ b/stem/descriptor/__init__.py @@ -52,10 +52,12 @@ __all__ = [ import os import re +import tarfile import stem.prereq import stem.util.enum import stem.util.str_tools +import stem.util.system try: # added in python 2.7 @@ -127,7 +129,7 @@ def parse_file(descriptor_file, descriptor_type = None, validate = True, documen my_descriptor_file = open(descriptor_path, 'rb') - :param str,file descriptor_file: path or opened file with the descriptor contents + :param str,file,tarfile descriptor_file: path or opened file with the descriptor contents :param str descriptor_type: `descriptor type <https://metrics.torproject.org/formats.html#descriptortypes>`_, this is guessed if not provided :param bool validate: checks the validity of the descriptor's content if **True**, skips these checks otherwise @@ -143,14 +145,23 @@ def parse_file(descriptor_file, descriptor_type = None, validate = True, documen * **IOError** if unable to read from the descriptor_file """ - # if we got a path then open that file for parsing + # Delegate to a helper if this is a path or tarfile. + + handler = None if isinstance(descriptor_file, (bytes, unicode)): - with open(descriptor_file) as desc_file: - for desc in parse_file(desc_file, descriptor_type, validate, document_handler, **kwargs): - yield desc + if stem.util.system.is_tarfile(descriptor_file): + handler = _parse_file_for_tar_path + else: + handler = _parse_file_for_path + elif isinstance(descriptor_file, tarfile.TarFile): + handler = _parse_file_for_tarfile + + if handler: + for desc in handler(descriptor_file, descriptor_type, validate, document_handler, **kwargs): + yield desc - return + return # The tor descriptor specifications do not provide a reliable method for # identifying a descriptor file's type and version so we need to guess @@ -210,6 +221,38 @@ def parse_file(descriptor_file, descriptor_type = None, validate = True, documen raise TypeError("Unable to determine the descriptor's type. filename: '%s', first line: '%s'" % (filename, first_line)) +def _parse_file_for_path(descriptor_file, *args, **kwargs): + with open(descriptor_file, 'rb') as desc_file: + for desc in parse_file(desc_file, *args, **kwargs): + yield desc + + +def _parse_file_for_tar_path(descriptor_file, *args, **kwargs): + # TODO: use 'with' for tarfile after dropping python 2.6 support + tar_file = tarfile.open(descriptor_file) + + try: + for desc in parse_file(tar_file, *args, **kwargs): + desc._set_path(os.path.abspath(descriptor_file)) + yield desc + finally: + if tar_file: + tar_file.close() + + +def _parse_file_for_tarfile(descriptor_file, *args, **kwargs): + for tar_entry in descriptor_file: + if tar_entry.isfile(): + entry = descriptor_file.extractfile(tar_entry) + + try: + for desc in parse_file(entry, *args, **kwargs): + desc._set_archive_path(entry.name) + yield desc + finally: + entry.close() + + def _parse_metrics_file(descriptor_type, major_version, minor_version, descriptor_file, validate, document_handler, **kwargs): # Parses descriptor files from metrics, yielding individual descriptors. This # throws a TypeError if the descriptor_type or version isn't recognized. diff --git a/stem/descriptor/reader.py b/stem/descriptor/reader.py index 3fb4166..05c7533 100644 --- a/stem/descriptor/reader.py +++ b/stem/descriptor/reader.py @@ -85,6 +85,7 @@ import threading import stem.descriptor import stem.prereq +import stem.util.system # flag to indicate when the reader thread is out of descriptor files to read FINISHED = 'DONE' @@ -487,24 +488,10 @@ class DescriptorReader(object): target_type = mimetypes.guess_type(target) - # Checking if it's a tar file may fail due to permissions so failing back - # to the mime type... - # - # IOError: [Errno 13] Permission denied: '/vmlinuz.old' - # - # With python 3 insuffient permissions raises an AttributeError instead... - # - # http://bugs.python.org/issue17059 - - try: - is_tar = tarfile.is_tarfile(target) - except (IOError, AttributeError): - is_tar = target_type[0] == 'application/x-tar' - if target_type[0] in (None, 'text/plain'): # either '.txt' or an unknown type self._handle_descriptor_file(target, target_type) - elif is_tar: + elif stem.util.system.is_tarfile(target): # handles gzip, bz2, and decompressed tarballs among others self._handle_archive(target) else: @@ -529,9 +516,10 @@ class DescriptorReader(object): self._notify_skip_listeners(target, ReadFailed(exc)) def _handle_archive(self, target): - # TODO: This would be nicer via the 'with' keyword, but tarfile's __exit__ - # method was added sometime after python 2.5. We should change this when - # we drop python 2.5 support. + # TODO: When dropping python 2.6 support go back to using 'with' for + # tarfiles... + # + # http://bugs.python.org/issue7232 tar_file = None diff --git a/stem/util/system.py b/stem/util/system.py index 89317df..d24d34b 100644 --- a/stem/util/system.py +++ b/stem/util/system.py @@ -16,6 +16,8 @@ best-effort, providing **None** if the lookup fails. is_available - determines if a command is available on this system is_running - determines if a given process is running + call - runs the given system command and provides back the results + get_name_by_pid - gets the name for a process by the given pid get_pid_by_name - gets the pid for a process by the given name get_pid_by_port - gets the pid for a process listening to a given port @@ -25,9 +27,11 @@ best-effort, providing **None** if the lookup fails. get_start_time - provides the unix timestamp when the process started get_bsd_jail_id - provides the BSD jail id a given process is running within get_bsd_jail_path - provides the path of the given BSD jail + + is_tarfile - checks if the given path is a tarball expand_path - expands relative paths and ~ entries files_with_suffix - provides files with the given suffix - call - runs the given system command and provides back the results + get_process_name - provides our process' name set_process_name - changes our process' name @@ -35,9 +39,11 @@ best-effort, providing **None** if the lookup fails. import ctypes import ctypes.util +import mimetypes import os import platform import subprocess +import tarfile import time import stem.util.proc @@ -763,6 +769,32 @@ def get_bsd_jail_path(jid): return None +def is_tarfile(path): + """ + Returns if the path belongs to a tarfile or not. + + .. versionadded:: 1.2.0 + + :param str path: path to be checked + + :returns: **True** if the path belongs to a tarball, **False** otherwise + """ + + # Checking if it's a tar file may fail due to permissions so failing back + # to the mime type... + # + # IOError: [Errno 13] Permission denied: '/vmlinuz.old' + # + # With python 3 insuffient permissions raises an AttributeError instead... + # + # http://bugs.python.org/issue17059 + + try: + return tarfile.is_tarfile(path) + except (IOError, AttributeError): + return mimetypes.guess_type(path)[0] == 'application/x-tar' + + def expand_path(path, cwd = None): """ Provides an absolute path, expanding tildes with the user's home and diff --git a/test/integ/descriptor/server_descriptor.py b/test/integ/descriptor/server_descriptor.py index 7b4645c..6d16add 100644 --- a/test/integ/descriptor/server_descriptor.py +++ b/test/integ/descriptor/server_descriptor.py @@ -4,6 +4,7 @@ Integration tests for stem.descriptor.server_descriptor. import datetime import os +import tarfile import unittest import stem.control @@ -15,8 +16,38 @@ import test.runner from test.integ.descriptor import get_resource +TARFILE_PATH = os.path.join(os.path.dirname(__file__), 'data', 'descriptor_archive.tar') +TARFILE_FINGERPRINTS = set([ + u'B6D83EC2D9E18B0A7A33428F8CFA9C536769E209', + u'E0BD57A11F00041A9789577C53A1B784473669E4', + u'1F43EE37A0670301AD9CB555D94AFEC2C89FDE86', +]) + class TestServerDescriptor(unittest.TestCase): + def test_with_tarfile_path(self): + """ + Fetch server descriptors via parse_file() for a tarfile path. + """ + + descriptors = list(stem.descriptor.parse_file(TARFILE_PATH)) + self.assertEqual(3, len(descriptors)) + + fingerprints = set([desc.fingerprint for desc in descriptors]) + self.assertEqual(TARFILE_FINGERPRINTS, fingerprints) + + def test_with_tarfile_object(self): + """ + Fetch server descriptors via parse_file() for a tarfile object. + """ + + with tarfile.open(TARFILE_PATH) as tar_file: + descriptors = list(stem.descriptor.parse_file(tar_file)) + self.assertEqual(3, len(descriptors)) + + fingerprints = set([desc.fingerprint for desc in descriptors]) + self.assertEqual(TARFILE_FINGERPRINTS, fingerprints) + def test_metrics_descriptor(self): """ Parses and checks our results against a server descriptor from metrics. [View Less]

1 0

[stem/master] Vending the test_tools and tor_tools utility modules
by atagar＠torproject.org 31 May '14

31 May '14

commit 29f2a1cde6f6bc4fb523a410568559d9bd2c142e Author: Damian Johnson <atagar(a)torproject.org> Date: Sat May 31 11:35:07 2014 -0700 Vending the test_tools and tor_tools utility modules On reflection both are very well written and tested. I've found these useful in my projects and there's little reason so keep 'em to ourselves so sharing the wealth. --- docs/api.rst | 2 ++ docs/api/util/test_tools.rst | 5 +++++ docs/change_log.rst … [View More]| 2 ++ docs/contents.rst | 1 + stem/util/test_tools.py | 4 ---- stem/util/tor_tools.py | 3 --- 6 files changed, 10 insertions(+), 7 deletions(-) diff --git a/docs/api.rst b/docs/api.rst index 56b9d54..4f1a01c 100644 --- a/docs/api.rst +++ b/docs/api.rst @@ -49,4 +49,6 @@ Utilities * `stem.util.str_tools <api/util/str_tools.html>`_ - String utilities. * `stem.util.system <api/util/system.html>`_ - Tools related to the local system. * `stem.util.term <api/util/term.html>`_ - Tools for interacting with the terminal. +* `stem.util.test_tools <api/util/test_tools.html>`_ - Static analysis checks and tools to help with test runs. +* `stem.util.tor_tools <api/util/tor_tools.html>`_ - Miscellaneous toolkit for working with tor. diff --git a/docs/api/util/test_tools.rst b/docs/api/util/test_tools.rst new file mode 100644 index 0000000..113ca64 --- /dev/null +++ b/docs/api/util/test_tools.rst @@ -0,0 +1,5 @@ +Test Utilities +============== + +.. automodule:: stem.util.test_tools + diff --git a/docs/change_log.rst b/docs/change_log.rst index ac892d1..6b71913 100644 --- a/docs/change_log.rst +++ b/docs/change_log.rst @@ -62,6 +62,8 @@ The following are only available within Stem's `git repository * **Utilities** + * Added the `stem.util.test_tools <api/util/test_tools.html>`_ module + * Started vending the `stem.util.tor_tools <api/util/tor_tools.html>`_ module * Added :func:`stem.util.connection.port_usage` * Added :func:`stem.util.system.files_with_suffix` diff --git a/docs/contents.rst b/docs/contents.rst index 6667123..15283f1 100644 --- a/docs/contents.rst +++ b/docs/contents.rst @@ -53,5 +53,6 @@ Contents api/util/str_tools api/util/system api/util/term + api/util/test_tools api/util/tor_tools diff --git a/stem/util/test_tools.py b/stem/util/test_tools.py index b95cbd5..cd94ff5 100644 --- a/stem/util/test_tools.py +++ b/stem/util/test_tools.py @@ -4,10 +4,6 @@ """ Helper functions for testing. -**Stem users are more than welcome to use these for their own test runs, but -these functions are not being vended to our users. They may change in the -future, use them at your own risk.** - :: clean_orphaned_pyc - delete *.pyc files without corresponding *.py diff --git a/stem/util/tor_tools.py b/stem/util/tor_tools.py index 325fcbe..aae7426 100644 --- a/stem/util/tor_tools.py +++ b/stem/util/tor_tools.py @@ -4,9 +4,6 @@ """ Miscellaneous utility functions for working with tor. -**These functions are not being vended to stem users. They may change in the -future, use them at your own risk.** - **Module Overview:** :: [View Less]

1 0

[stem/master] Note that process renaming might cause problems for FreeBSD
by atagar＠torproject.org 31 May '14

31 May '14

commit d14594b61f85527fcf2b20e90f36439391e1310b Author: Damian Johnson <atagar(a)torproject.org> Date: Thu May 29 09:13:52 2014 -0700 Note that process renaming might cause problems for FreeBSD Citing a ticket where a user indicated that _set_argv() caused issues for them. The user disappeared so not positive if it's really an issue (nor a fix if so). --- stem/util/system.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/stem/util/system.py b/stem/util/… [View More]

1 0

[stem/master] Close stdout/stderr after the tor process initializes
by atagar＠torproject.org 31 May '14

31 May '14

commit fcf49ad8afe52a36553fabbeaa3741566fa299f6 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu May 29 08:48:51 2014 -0700 Close stdout/stderr after the tor process initializes We use tor's stdout and stderr to determine two things... * at what stage it has bootstrapped to * errors if tor fails to start After startup, however, we stop listing to stdout which can cause Tor to lock up if it's registering a lot of NOTICE level messages.… [View More].. https://trac.torproject.org/projects/tor/ticket/9862 Tested by the following script. Before this fix tor hung after ~3 seconds. With it things happily chug along... import time import stem.process from stem.control import EventType, Controller tor_process = stem.process.launch_tor_with_config( config = { 'ControlPort': '9051', 'Log': 'DEBUG stdout', }, take_ownership = True, ) with Controller.from_port() as controller: controller.authenticate() def heartbeat(event): print "%s - %s / %s" % (time.time(), event.read, event.written) controller.add_event_listener(heartbeat, EventType.BW) print "Press any key to quit..." raw_input() --- docs/change_log.rst | 7 ++++--- stem/process.py | 3 +++ test/integ/process.py | 2 +- test/runner.py | 2 +- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/docs/change_log.rst b/docs/change_log.rst index 6b71913..279f2bb 100644 --- a/docs/change_log.rst +++ b/docs/change_log.rst @@ -52,9 +52,10 @@ The following are only available within Stem's `git repository * Added `support for TB_EMPTY events <api/response.html#stem.response.events.TokenBucketEmptyEvent>`_ (:spec:`6f2919a`) * Added `support for HS_DESC events <api/response.html#stem.response.events.HSDescEvent>`_ (:spec:`a67ac4d`, :trac:`10807`) * Changed :func:`~stem.control.Controller.get_network_status` and :func:`~stem.control.Controller.get_network_statuses` to provide :class:`~stem.descriptor.router_status_entry.RouterStatusEntryMicroV3` if Tor is using microdescriptors (:trac:`7646`) - * The :func:`~stem.connection.connect_port` and :func:`~stem.connection.connect_socket_file` didn't properly mark the Controller it returned as being authenticated, causing event listening among other things to fail. - * The :func:`~stem.control.Controller.add_event_listener` method couldn't accept event types that Stem didn't already recognize. - * The :class:`~stem.exit_policy.ExitPolicy` class couldn't be pickled. + * The :func:`~stem.connection.connect_port` and :func:`~stem.connection.connect_socket_file` didn't properly mark the Controller it returned as being authenticated, causing event listening among other things to fail + * The :func:`~stem.control.Controller.add_event_listener` method couldn't accept event types that Stem didn't already recognize + * The :class:`~stem.exit_policy.ExitPolicy` class couldn't be pickled + * Tor instances spawned with :func:`~stem.process.launch_tor` and :func:`~stem.process.launch_tor_with_config` could hang due to unread stdout content, we now close stdout and stderr once tor finishes bootstrapping (:trac:`9862`) * **Descriptors** diff --git a/stem/process.py b/stem/process.py index ad05659..c9fe863 100644 --- a/stem/process.py +++ b/stem/process.py @@ -159,6 +159,9 @@ def launch_tor(tor_cmd = 'tor', args = None, torrc_path = None, completion_perce if timeout: signal.alarm(0) # stop alarm + tor_process.stdout.close() + tor_process.stderr.close() + if temp_file: try: os.remove(temp_file) diff --git a/test/integ/process.py b/test/integ/process.py index d87dda4..b06e500 100644 --- a/test/integ/process.py +++ b/test/integ/process.py @@ -65,7 +65,7 @@ class TestProcess(unittest.TestCase): control_socket.close() tor_process.kill() - tor_process.communicate() + tor_process.wait() def test_launch_tor_with_timeout(self): """ diff --git a/test/runner.py b/test/runner.py index 3ad78f2..07cbd34 100644 --- a/test/runner.py +++ b/test/runner.py @@ -349,7 +349,7 @@ class Runner(object): except OSError: pass - self._tor_process.communicate() # blocks until the process is done + self._tor_process.wait() # blocks until the process is done # if we've made a temporary data directory then clean it up if self._test_dir and CONFIG['integ.test_directory'] == '': [View Less]

1 0

[translation/tails-greeter_completed] Update translations for tails-greeter_completed
by translation＠torproject.org 31 May '14

31 May '14

commit 4f47e5f13e4e424d449d58ba9581d36c4d1fa2af Author: Translation commit bot <translation(a)torproject.org> Date: Sat May 31 16:45:31 2014 +0000 Update translations for tails-greeter_completed --- zh_TW/zh_TW.po | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/zh_TW/zh_TW.po b/zh_TW/zh_TW.po index e0b4d95..992a2e7 100644 --- a/zh_TW/zh_TW.po +++ b/zh_TW/zh_TW.po @@ -6,12 +6,13 @@ # chinrur <chinrur(a)gmail.com>, 2013 # wongyinho981 <… [View More]

1 0

[translation/tails-greeter] Update translations for tails-greeter
by translation＠torproject.org 31 May '14

31 May '14

commit f29534e8268c2131053cd417622cb3bd2c6d9a64 Author: Translation commit bot <translation(a)torproject.org> Date: Sat May 31 16:45:29 2014 +0000 Update translations for tails-greeter --- zh_TW/zh_TW.po | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/zh_TW/zh_TW.po b/zh_TW/zh_TW.po index 32a1c59..992a2e7 100644 --- a/zh_TW/zh_TW.po +++ b/zh_TW/zh_TW.po @@ -6,13 +6,14 @@ # chinrur <chinrur(a)gmail.com>, 2013 # wongyinho981 <wongyinho981(a)… [View More]

1 0

[translation/tails-persistence-setup_completed] Update translations for tails-persistence-setup_completed
by translation＠torproject.org 31 May '14

31 May '14

commit 702c0ac3356cf07a5d4463c9c47f880a44069297 Author: Translation commit bot <translation(a)torproject.org> Date: Sat May 31 16:45:26 2014 +0000 Update translations for tails-persistence-setup_completed --- zh_TW/zh_TW.po | 317 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 317 insertions(+) diff --git a/zh_TW/zh_TW.po b/zh_TW/zh_TW.po new file mode 100644 index 0000000..1e56a83 --- /dev/null +++ b/zh_TW/zh_TW.po @@ -0,0 +1,317 @@ +# SOME DESCRIPTIVE … [View More]TITLE. +# Copyright (C) YEAR Tails developers +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# 修銘張 <cges30901(a)gmail.com>, 2014 +# xatier 同學@提不起勁 <xatierlike(a)gmail.com>, 2014 +# 冠旭陳 <zakk0610(a)gmail.com>, 2014 +msgid "" +msgstr "" +"Project-Id-Version: The Tor Project\n" +"Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" +"POT-Creation-Date: 2014-05-28 22:46+0200\n" +"PO-Revision-Date: 2014-05-31 16:21+0000\n" +"Last-Translator: xatier 同學@提不起勁 <xatierlike(a)gmail.com>\n" +"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/torproject/language/zh_TW/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: zh_TW\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:48 +msgid "Personal Data" +msgstr "個人資料" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:50 +msgid "Keep files stored in the `Persistent' directory" +msgstr "將檔案存在 `Persistent' 資料夾" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:58 +msgid "GnuPG" +msgstr "GnuPG" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:60 +msgid "GnuPG keyrings and configuration" +msgstr "GnuPG keyrings 和設定" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:68 +msgid "SSH Client" +msgstr "SSH Client" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:70 +msgid "SSH keys, configuration and known hosts" +msgstr "SSH keys, configuration and known hosts" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:78 +msgid "Pidgin" +msgstr "Pidgin" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:80 +msgid "Pidgin profiles and OTR keyring" +msgstr "Pidgin profiles 和 OTR keyring" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:88 +msgid "Claws Mail" +msgstr "Claws Mail" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:90 +msgid "Claws Mail profiles and locally stored email" +msgstr "Claws Mail 設定和本機儲存郵件" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:98 +msgid "GNOME Keyring" +msgstr "GNOME Keyring" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:100 +msgid "Secrets stored by GNOME Keyring" +msgstr "秘密透過 GNOME Keyring 儲存" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:108 +msgid "Network Connections" +msgstr "網路連線" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:110 +msgid "Configuration of network devices and connections" +msgstr "網路設備和連線設定" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:118 +msgid "Browser bookmarks" +msgstr "瀏覽器書籤" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:120 +msgid "Bookmarks saved in Iceweasel browser" +msgstr "儲存在 Iceweasel 瀏覽器的書籤" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:128 +msgid "Printers" +msgstr "印表機" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:130 +msgid "Printers configuration" +msgstr "印表機配置" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:138 +msgid "APT Packages" +msgstr "APT 軟體包裹" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:140 +msgid "Packages downloaded by APT" +msgstr "透過 APT 下載的套件" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:148 +msgid "APT Lists" +msgstr "APT 清單" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:150 +msgid "Lists downloaded by APT" +msgstr "透過 APT 下載的清單" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:158 +msgid "Dotfiles" +msgstr "Dotfiles" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:160 +msgid "" +"Symlink into $HOME every file or directory found in the `dotfiles' directory" +msgstr "`dotfiles' directory 找到的每個檔案和資料夾 Symlink 到 $HOME " + +#: ../lib/Tails/Persistence/Setup.pm:227 +msgid "Setup Tails persistent volume" +msgstr "設定 Tails 永久儲存" + +#: ../lib/Tails/Persistence/Setup.pm:337 +#, perl-format +msgid "Device %s already has a persistent volume." +msgstr "設備 %s 已有永久儲存。" + +#: ../lib/Tails/Persistence/Setup.pm:345 +#, perl-format +msgid "Device %s has not enough unallocated space." +msgstr "設備 %s 沒有足夠的空閒空間。" + +#: ../lib/Tails/Persistence/Setup.pm:353 ../lib/Tails/Persistence/Setup.pm:367 +#, perl-format +msgid "Device %s has no persistent volume." +msgstr "設備 %s 沒有永久儲存" + +#: ../lib/Tails/Persistence/Setup.pm:359 +msgid "" +"Cannot delete the persistent volume while in use. You should restart Tails " +"without persistence." +msgstr "使用中無法刪除永久儲存。您必須重新啟動 Tails 並不使用永久儲存。" + +#: ../lib/Tails/Persistence/Setup.pm:378 +msgid "Persistence volume is not unlocked." +msgstr "永久儲存沒有被鎖定" + +#: ../lib/Tails/Persistence/Setup.pm:383 +msgid "Persistence volume is not mounted." +msgstr "永久儲存沒有被掛載" + +#: ../lib/Tails/Persistence/Setup.pm:388 +msgid "Persistence volume is not readable. Permissions or ownership problems?" +msgstr "無法讀取永久儲存，權限或是擁有者問題？" + +#: ../lib/Tails/Persistence/Setup.pm:393 +msgid "Persistence volume is not writable. Maybe it was mounted read-only?" +msgstr "永久儲存無法寫入。也許它被掛載成唯讀?" + +#: ../lib/Tails/Persistence/Setup.pm:402 +#, perl-format +msgid "Tails is running from non-USB / non-SDIO device %s." +msgstr "Tails 正從非 USB / 非 SDIO 設備 %s 執行。" + +#: ../lib/Tails/Persistence/Setup.pm:408 +#, perl-format +msgid "Device %s is optical." +msgstr "設備 %s 是可選的。" + +#: ../lib/Tails/Persistence/Setup.pm:415 +#, perl-format +msgid "Device %s was not created using Tails Installer." +msgstr "裝置 %s 不是用 Tails Installer 安裝的。" + +#: ../lib/Tails/Persistence/Setup.pm:450 +msgid "Error" +msgstr "錯誤" + +#: ../lib/Tails/Persistence/Setup.pm:670 +msgid "Persistence wizard - Finished" +msgstr "永久精靈 - 已完成" + +#: ../lib/Tails/Persistence/Setup.pm:673 +msgid "" +"Any changes you have made will only take effect after restarting Tails.\n" +"\n" +"You may now close this application." +msgstr "所以您作過的改變都將在重新啟動 Tails 後生效。\n\n您現在可以關閉這個應用程式了。" + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:54 +msgid "Persistence wizard - Persistent volume creation" +msgstr "永久精靈 - 建立永久儲存空間" + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:57 +msgid "Choose a passphrase to protect the persistent volume" +msgstr "請選擇一個通關密與來保護永久儲存空間" + +#. TRANSLATORS: size, device vendor, device model +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:61 +#, perl-format +msgid "" +"A %s persistent volume will be created on the <b>%s %s</b> device. Data on " +"this volume will be stored in an encrypted form protected by a passphrase." +msgstr "一個永久儲存空間 %s 將會被建立在 <b>%s %s</b> 設備上。在這個儲存空間的資料將會被透過通關密與並w加密保護。" + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:66 +msgid "Create" +msgstr "建立" + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:110 +msgid "" +"<b>Beware!</b> Using persistence has consequences that must be well " +"understood. Tails can't help you if you use it wrong! See <a " +"href='file:///usr/share/doc/tails/website/doc/first_steps/persistence.en.html'>Tails" +" documentation about persistence</a> to learn more." +msgstr "<b>小心！</b> 使用永久設定表示您已經完全了解。Tails 無法替您錯誤的使用方式有任何幫助。請參閱 <a href='file:///usr/share/doc/tails/website/doc/first_steps/persistence.en.html'>Tails 文件 - 關於永久設定</a> 來了解更多。" + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:144 +msgid "Passphrase:" +msgstr "密碼：" + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:154 +msgid "Verify Passphrase:" +msgstr "確認密碼：" + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:167 +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:231 +msgid "Passphrase can't be empty" +msgstr "密碼不能為空" + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:222 +msgid "Passphrases do not match" +msgstr "密碼不相符" + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:262 +#: ../lib/Tails/Persistence/Step/Configure.pm:129 +msgid "Failed" +msgstr "失敗" + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:271 +msgid "Mounting Tails persistence partition." +msgstr "掛載 Tails 永久分割區。" + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:274 +msgid "The Tails persistence partition will be mounted." +msgstr "此 Tails 永久分割區將會被掛載。" + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:283 +msgid "Correcting permissions of the persistent volume." +msgstr "更正永久儲存空間權限。" + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:286 +msgid "The permissions of the persistent volume will be corrected." +msgstr "永久儲存空間的權限已被更正。" + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:308 +msgid "Creating..." +msgstr "建立中..." + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:311 +msgid "Creating the persistent volume..." +msgstr "建立永久儲存空間..." + +#: ../lib/Tails/Persistence/Step/Configure.pm:61 +msgid "Persistence wizard - Persistent volume configuration" +msgstr "永久精靈 - 永久儲存空間設定" + +#: ../lib/Tails/Persistence/Step/Configure.pm:64 +msgid "Specify the files that will be saved in the persistent volume" +msgstr "指定會被儲存在永久儲存空間的檔案" + +#. TRANSLATORS: partition, size, device vendor, device model +#: ../lib/Tails/Persistence/Step/Configure.pm:68 +#, perl-format +msgid "" +"The selected files will be stored in the encrypted partition %s (%s), on the" +" <b>%s %s</b> device." +msgstr "選擇的檔案將會被儲存在加密分割區 %s (%s), 在 <b>%s %s</b> 裝置上。" + +#: ../lib/Tails/Persistence/Step/Configure.pm:74 +msgid "Save" +msgstr "儲存" + +#: ../lib/Tails/Persistence/Step/Configure.pm:143 +msgid "Saving..." +msgstr "儲存中..." + +#: ../lib/Tails/Persistence/Step/Configure.pm:146 +msgid "Saving persistence configuration..." +msgstr "保存永久設定..." + +#: ../lib/Tails/Persistence/Step/Delete.pm:41 +msgid "Persistence wizard - Persistent volume deletion" +msgstr "永久精靈 - 刪除永久儲存空間" + +#: ../lib/Tails/Persistence/Step/Delete.pm:44 +msgid "Your persistent data will be deleted." +msgstr "您的永久資料將會被刪除。" + +#: ../lib/Tails/Persistence/Step/Delete.pm:48 +#, perl-format +msgid "" +"The persistent volume %s (%s), on the <b>%s %s</b> device, will be deleted." +msgstr "永久儲存空間 %s (%s), 在 <b>%s %s</b> 設備上將會被刪除。" + +#: ../lib/Tails/Persistence/Step/Delete.pm:54 +msgid "Delete" +msgstr "刪除" + +#: ../lib/Tails/Persistence/Step/Delete.pm:101 +msgid "Deleting..." +msgstr "刪除中..." + +#: ../lib/Tails/Persistence/Step/Delete.pm:104 +msgid "Deleting the persistent volume..." +msgstr "刪除永久儲存空間..." [View Less]

1 0

[translation/tails-persistence-setup] Update translations for tails-persistence-setup
by translation＠torproject.org 31 May '14

31 May '14

commit bb8beb40ee83330ec7c9adbc4d2208f6b0a8f0ee Author: Translation commit bot <translation(a)torproject.org> Date: Sat May 31 16:45:24 2014 +0000 Update translations for tails-persistence-setup --- zh_TW/zh_TW.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/zh_TW/zh_TW.po b/zh_TW/zh_TW.po index b661dc1..1e56a83 100644 --- a/zh_TW/zh_TW.po +++ b/zh_TW/zh_TW.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-… [View More]

1 0

[translation/liveusb-creator_completed] Update translations for liveusb-creator_completed
by translation＠torproject.org 31 May '14

31 May '14

commit aa54ee4f7dcf07a7c49c40ddb91bc65459fb7519 Author: Translation commit bot <translation(a)torproject.org> Date: Sat May 31 16:45:21 2014 +0000 Update translations for liveusb-creator_completed --- zh_TW/zh_TW.po | 206 +++++++++++++++++++++++++++++--------------------------- 1 file changed, 106 insertions(+), 100 deletions(-) diff --git a/zh_TW/zh_TW.po b/zh_TW/zh_TW.po index c504948..41a50d5 100644 --- a/zh_TW/zh_TW.po +++ b/zh_TW/zh_TW.po @@ -9,12 +9,13 @@ # Terry Chuang … [View More]<tchuang(a)redhat.com>, 2009 # Wei-Lun Chao <william.chao(a)ossii.com.tw>, 2009 # xatier 同學@提不起勁 <xatierlike(a)gmail.com>, 2014 +# xatier 同學@提不起勁 <xatierlike(a)gmail.com>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-03-06 18:42+0100\n" -"PO-Revision-Date: 2014-03-13 08:10+0000\n" +"POT-Creation-Date: 2014-05-28 16:00+0200\n" +"PO-Revision-Date: 2014-05-31 16:31+0000\n" "Last-Translator: xatier 同學@提不起勁 <xatierlike(a)gmail.com>\n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/torproject/language/zh_TW/)\n" "MIME-Version: 1.0\n" @@ -28,22 +29,22 @@ msgstr "" msgid "%(distribution)s Installer" msgstr "%(distribution)s Installer" -#: ../liveusb/gui.py:808 +#: ../liveusb/gui.py:794 #, python-format msgid "%(filename)s selected" msgstr "%(filename)s 選擇" -#: ../liveusb/gui.py:439 +#: ../liveusb/gui.py:425 #, python-format msgid "%(size)s %(label)s" msgstr "%(size)s %(label)s" -#: ../liveusb/gui.py:445 +#: ../liveusb/gui.py:431 #, python-format msgid "%(vendor)s %(model)s (%(details)s) - %(device)s" msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s" -#: ../liveusb/creator.py:1020 +#: ../liveusb/creator.py:1046 #, python-format msgid "%s already bootable" msgstr "%s 已經是可開機的" @@ -53,36 +54,36 @@ msgid "" "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n" "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\n" "p, li { white-space: pre-wrap; }\n" -"</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;\">\n" -"<p align=\"center\" style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:10pt;\">Need help? Read the </span><a href=\"file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html\"><span style=\" text-decoration: underline; color:#0000ff;\">documentation</span></a><span style=\" font-size:10pt;\">.</span></p></body></html>" -msgstr "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\np, li { white-space: pre-wrap; }\n</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;\">\n<p align=\"center\" style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:10pt;\">需要幫助? 請閱讀 </span><a href=\"file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html\"><span style=\" text-decoration: underline; color:#0000ff;\">文件</span></a><span style=\" font-size:10pt;\">.</span></p></body></html>" +"</style></head><body style=\" font-family:'Sans Serif'; font-size:11pt; font-weight:400; font-style:normal;\">\n" +"<p align=\"center\" style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:11pt;\">Need help? Read the </span><a href=\"file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html\"><span style=\" text-decoration: underline; color:#0000ff;\">documentation</span></a><span style=\" font-size:11pt;\">.</span></p></body></html>" +msgstr "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\np, li { white-space: pre-wrap; }\n</style></head><body style=\" font-family:'Sans Serif'; font-size:11pt; font-weight:400; font-style:normal;\">\n<p align=\"center\" style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:11pt;\">需要幫助？請閱讀</span><a href=\"file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html\"><span style=\" text-decoration: underline; color:#0000ff;\">文件</span></a><span style=\" font-size:11pt;\">.</span></p></body></html>" #: ../liveusb/launcher_ui.py:160 msgid "" "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n" "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\n" "p, li { white-space: pre-wrap; }\n" -"</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;\">\n" -"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:10pt;\">Copy the running Tails onto a USB stick or SD card. All data on the target drive will be lost.</span></p></body></html>" -msgstr "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\np, li { white-space: pre-wrap; }\n</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;\">\n<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:10pt;\">複製正在執行的 Tails 到 USB 隨身碟或是 SD 卡。所有在上面的資料將會消失</span></p></body></html>" +"</style></head><body style=\" font-family:'Sans Serif'; font-size:11pt; font-weight:400; font-style:normal;\">\n" +"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:11pt;\">Copy the running Tails onto a USB stick or SD card. All data on the target drive will be lost.</span></p></body></html>" +msgstr "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\np, li { white-space: pre-wrap; }\n</style></head><body style=\" font-family:'Sans Serif'; font-size:11pt; font-weight:400; font-style:normal;\">\n<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:11pt;\">複製正在執行的 Tails 到 USB 隨身碟或是 SD 卡。所以目標硬碟上的資料機會消失。</span></p></body></html>" #: ../liveusb/launcher_ui.py:162 msgid "" "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n" "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\n" "p, li { white-space: pre-wrap; }\n" -"</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;\">\n" -"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:10pt;\">Copy the running Tails onto an already installed Tails device. Other partitions found on the stick are preserved.</span></p></body></html>" -msgstr "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\np, li { white-space: pre-wrap; }\n</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;\">\n<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:10pt;\">複製正在執行的 Tails 到已安裝 Tails 設備上。所有在上面的資料將會消失</span></p></body></html>" +"</style></head><body style=\" font-family:'Sans Serif'; font-size:11pt; font-weight:400; font-style:normal;\">\n" +"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:11pt;\">Copy the running Tails onto an already installed Tails device. Other partitions found on the stick are preserved.</span></p></body></html>" +msgstr "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\np, li { white-space: pre-wrap; }\n</style></head><body style=\" font-family:'Sans Serif'; font-size:11pt; font-weight:400; font-style:normal;\">\n<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:11pt;\">複製正在執行的 Tails 到已安裝 Tails 的設備。其他在隨身碟上發現的分割區將會被保留。</span></p></body></html>" #: ../liveusb/launcher_ui.py:164 msgid "" "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n" "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\n" "p, li { white-space: pre-wrap; }\n" -"</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;\">\n" -"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:10pt;\">Upgrade an already installed Tails device from a new ISO image.</span></p></body></html>" -msgstr "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\np, li { white-space: pre-wrap; }\n</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;\">\n<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:10pt;\">從新的 ISO 映像檔升級已安裝的 Tails 設備</span></p></body></html>" +"</style></head><body style=\" font-family:'Sans Serif'; font-size:11pt; font-weight:400; font-style:normal;\">\n" +"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:11pt;\">Upgrade an already installed Tails device from a new ISO image.</span></p></body></html>" +msgstr "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\np, li { white-space: pre-wrap; }\n</style></head><body style=\" font-family:'Sans Serif'; font-size:11pt; font-weight:400; font-style:normal;\">\n<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:11pt;\">從新的 ISO 映像檔升級已安裝的 Tails 裝置。</span></p></body></html>" #: ../liveusb/dialog.py:163 msgid "Alt+B" @@ -100,16 +101,16 @@ msgid "" "persist after a reboot." msgstr "藉由在您的 USB 隨身碟分派額外永久的空間，你將可以在 live 作業系統中保存資料和修改。否則，您將無法在重新開機後保存資料。" -#: ../liveusb/creator.py:1122 ../liveusb/creator.py:1385 +#: ../liveusb/creator.py:1150 ../liveusb/creator.py:1413 #, python-format msgid "Calculating the SHA1 of %s" msgstr "計算 %s 的 SHA1" -#: ../liveusb/creator.py:1333 +#: ../liveusb/creator.py:1361 msgid "Cannot find" msgstr "找不到" -#: ../liveusb/creator.py:542 +#: ../liveusb/creator.py:551 #, python-format msgid "Cannot find device %s" msgstr "找不到裝置 %s" @@ -128,12 +129,12 @@ msgid "" "Upgrade" msgstr "複製\n&&\n升級" -#: ../liveusb/creator.py:400 +#: ../liveusb/creator.py:407 #, python-format msgid "Creating %sMB persistent overlay" msgstr "新增 %sMB 永久覆蓋" -#: ../liveusb/gui.py:567 +#: ../liveusb/gui.py:553 msgid "" "Device is not yet mounted, so we cannot determine the amount of free space." msgstr "設備還沒有被掛載，所以我們無法決定剩餘空間的數量。" @@ -143,11 +144,11 @@ msgstr "設備還沒有被掛載，所以我們無法決定剩餘空間的數量 msgid "Download %(distribution)s" msgstr "下載 %(distribution)s" -#: ../liveusb/gui.py:782 +#: ../liveusb/gui.py:768 msgid "Download complete!" msgstr "下載完成！" -#: ../liveusb/gui.py:786 +#: ../liveusb/gui.py:772 msgid "Download failed: " msgstr "下載失敗：" @@ -156,45 +157,45 @@ msgstr "下載失敗：" msgid "Downloading %s..." msgstr "正在下載 %s..." -#: ../liveusb/creator.py:1118 +#: ../liveusb/creator.py:1146 msgid "Drive is a loopback, skipping MBR reset" msgstr "磁碟是 loopback，跳過 MBR 設定" -#: ../liveusb/creator.py:813 +#: ../liveusb/creator.py:822 #, python-format msgid "Entering unmount_device for '%(device)s'" msgstr "進入未掛載設備 '%(device)s'" -#: ../liveusb/creator.py:1198 +#: ../liveusb/creator.py:1226 msgid "Error probing device" msgstr "設備探測失敗" -#: ../liveusb/gui.py:227 +#: ../liveusb/gui.py:211 msgid "" "Error: Cannot set the label or obtain the UUID of your device. Unable to " "continue." msgstr "錯誤：無法設定標籤或取得裝置的 UUID，無法繼續。" -#: ../liveusb/creator.py:376 +#: ../liveusb/creator.py:383 msgid "" "Error: The SHA1 of your Live CD is invalid. You can run this program with " "the --noverify argument to bypass this verification check." msgstr "錯誤：Live CD 的 SHA1 無效。您可以在執行這個程式時以 --noverify 引數來略過這項驗證檢查。" -#: ../liveusb/creator.py:145 +#: ../liveusb/creator.py:146 msgid "Extracting live image to the target device..." msgstr "解開 live 映像檔到目標設備上" -#: ../liveusb/creator.py:1063 +#: ../liveusb/creator.py:1089 #, python-format msgid "Formatting %(device)s as FAT32" msgstr "將 %(device)s 格式化成 FAT32 格式" -#: ../liveusb/creator.py:140 +#: ../liveusb/creator.py:141 msgid "ISO MD5 checksum passed" msgstr "ISO MD5 checksum 成功" -#: ../liveusb/creator.py:138 +#: ../liveusb/creator.py:139 msgid "ISO MD5 checksum verification failed" msgstr "ISO MD5 checksum 驗證失敗" @@ -208,70 +209,70 @@ msgstr "如果你沒有選擇一個已存在的 Live ISO ，將會替您下載 msgid "Install Tails" msgstr "安裝 Tails" -#: ../liveusb/gui.py:630 +#: ../liveusb/gui.py:616 msgid "Installation complete!" msgstr "安裝完成！" -#: ../liveusb/gui.py:279 +#: ../liveusb/gui.py:265 #, python-format msgid "Installation complete! (%s)" msgstr "安裝完成! (%s)" -#: ../liveusb/gui.py:631 +#: ../liveusb/gui.py:617 msgid "Installation was completed. Press OK to close this program." msgstr "安裝已完成，按“確定”以關閉該程式。" -#: ../liveusb/creator.py:916 ../liveusb/creator.py:1239 +#: ../liveusb/creator.py:942 ../liveusb/creator.py:1267 msgid "Installing bootloader..." msgstr "安裝 bootloader ..." -#: ../liveusb/gui.py:284 +#: ../liveusb/gui.py:270 msgid "LiveUSB creation failed!" msgstr "LiveUSB 建立失敗！" -#: ../liveusb/creator.py:1334 +#: ../liveusb/creator.py:1362 msgid "" "Make sure to extract the entire liveusb-creator zip file before running this" " program." msgstr "在執行這個程式之前確認解壓縮整個 libusb-creator zip 檔案。" -#: ../liveusb/creator.py:1210 +#: ../liveusb/creator.py:1238 msgid "" "Make sure your USB key is plugged in and formatted with the FAT filesystem" msgstr "請確認您的 USB 磁碟已插入，並以 FAT 檔案系統進行格式化" -#: ../liveusb/creator.py:835 +#: ../liveusb/creator.py:844 #, python-format msgid "Mount %s exists after unmounting" msgstr "卸載後 %s 掛載仍存在" -#: ../liveusb/gui.py:573 +#: ../liveusb/gui.py:559 #, python-format msgid "No free space on device %(device)s" msgstr "%(device)s 裝置上的剩餘空間不足。" -#: ../liveusb/creator.py:802 +#: ../liveusb/creator.py:811 msgid "No mount points found" msgstr "找不到掛載點" -#: ../liveusb/creator.py:393 +#: ../liveusb/creator.py:400 msgid "Not enough free space on device." msgstr "裝置上的剩餘空間不足。" -#: ../liveusb/gui.py:554 +#: ../liveusb/gui.py:540 msgid "Partition is FAT16; Restricting overlay size to 2G" msgstr "磁碟分區為FAT16；覆蓋限制大小為2 GB" -#: ../liveusb/gui.py:550 +#: ../liveusb/gui.py:536 msgid "Partition is FAT32; Restricting overlay size to 4G" msgstr "分割趨勢 FAT32; 限制 overlay 大小為 4G" -#: ../liveusb/creator.py:226 ../liveusb/creator.py:842 +#: ../liveusb/creator.py:227 ../liveusb/creator.py:851 #, python-format msgid "Partitioning device %(device)s" msgstr "分割設備是 %(device)s" -#: ../liveusb/gui.py:621 +#: ../liveusb/gui.py:607 msgid "Persistent Storage" msgstr "持續性儲存裝置" @@ -279,53 +280,53 @@ msgstr "持續性儲存裝置" msgid "Persistent Storage (0 MB)" msgstr "永久容量 (0 MB)" -#: ../liveusb/gui.py:702 ../liveusb/gui.py:731 +#: ../liveusb/gui.py:688 ../liveusb/gui.py:717 msgid "Please confirm your device selection" msgstr "請確認您的設備選擇" -#: ../liveusb/gui.py:467 +#: ../liveusb/gui.py:453 msgid "Refreshing releases..." msgstr "重新整理發行..." -#: ../liveusb/gui.py:472 +#: ../liveusb/gui.py:458 msgid "Releases updated!" msgstr "Release 已更新！" -#: ../liveusb/creator.py:939 ../liveusb/creator.py:1257 +#: ../liveusb/creator.py:965 ../liveusb/creator.py:1285 #, python-format msgid "Removing %(file)s" msgstr "移除 %(file)s" -#: ../liveusb/creator.py:469 +#: ../liveusb/creator.py:478 msgid "Removing existing Live OS" msgstr "移除已存在的 Live OS" -#: ../liveusb/creator.py:1112 +#: ../liveusb/creator.py:1140 #, python-format msgid "Resetting Master Boot Record of %s" msgstr "重新設定 %s 的 MBR 主開機紀錄" -#: ../liveusb/gui.py:793 +#: ../liveusb/gui.py:779 msgid "Select Live ISO" msgstr "選取 Live ISO" -#: ../liveusb/creator.py:182 +#: ../liveusb/creator.py:183 msgid "Setting up OLPC boot file..." msgstr "設定 OLPC 開機檔案..." -#: ../liveusb/creator.py:716 +#: ../liveusb/creator.py:725 #, python-format msgid "" "Some partitions of the target device %(device)s are mounted. They will be " "unmounted before starting the installation process." msgstr "目標設備 %(device)s 中一些分割區是被掛載的。他們必須要在開始安裝過程之前被卸載。" -#: ../liveusb/creator.py:131 +#: ../liveusb/creator.py:132 msgid "" "Source type does not support verification of ISO MD5 checksum, skipping" msgstr "該分數類型不提供 ISO MD5 checksum 驗證方式，略過。" -#: ../liveusb/creator.py:1146 +#: ../liveusb/creator.py:1174 msgid "Synchronizing data on disk..." msgstr "同步資料到硬碟..." @@ -333,19 +334,19 @@ msgstr "同步資料到硬碟..." msgid "Target Device" msgstr "目標設備" -#: ../liveusb/gui.py:667 +#: ../liveusb/gui.py:653 msgid "" "The Master Boot Record on your device is blank. Pressing 'Install Tails' " "again will reset the MBR on this device." msgstr "您設備設備上的主開機紀錄是空白的。請再按一次 '安裝 Tails' 以重新設定這個設備上的 MBR" -#: ../liveusb/gui.py:796 +#: ../liveusb/gui.py:782 msgid "" "The selected file is unreadable. Please fix its permissions or select " "another file." msgstr "已選的檔案是不可取得的。請修復他的權限或是選擇另外一個檔案。" -#: ../liveusb/creator.py:337 +#: ../liveusb/creator.py:344 #, python-format msgid "" "There was a problem executing the following command: `%(command)s`.\n" @@ -383,87 +384,87 @@ msgstr "這個進度條會指出 LiveUSB 創建過程還需要多久" msgid "This is the status console, where all messages get written to." msgstr "這是狀態主控台，所有信息都會被寫入到這邊。" -#: ../liveusb/creator.py:879 +#: ../liveusb/creator.py:905 msgid "Trying to continue anyway." msgstr "嘗試直接繼續" -#: ../liveusb/creator.py:911 +#: ../liveusb/creator.py:937 #, python-format msgid "Unable to change volume label: %(message)s" msgstr "無法改變 volume 標籤: %(message)s" -#: ../liveusb/creator.py:478 ../liveusb/creator.py:489 +#: ../liveusb/creator.py:487 ../liveusb/creator.py:498 #, python-format msgid "Unable to chmod %(file)s: %(message)s" msgstr "無法以 chmod 變更權限 %(file)s: %(message)s" -#: ../liveusb/creator.py:459 +#: ../liveusb/creator.py:468 #, python-format msgid "Unable to copy %(infile)s to %(outfile)s: %(message)s" msgstr "無法複製 %(infile)s 到 %(outfile)s: %(message)s" -#: ../liveusb/gui.py:418 +#: ../liveusb/gui.py:404 msgid "Unable to find any USB drive" msgstr "無法找到任何的 USB 裝置" -#: ../liveusb/creator.py:1200 +#: ../liveusb/creator.py:1228 msgid "Unable to find any supported device" msgstr "無法找到任何有支援的設備" -#: ../liveusb/creator.py:1040 +#: ../liveusb/creator.py:1066 msgid "Unable to find partition" msgstr "無法找到分割區" -#: ../liveusb/creator.py:1280 +#: ../liveusb/creator.py:1308 msgid "" "Unable to get Win32_LogicalDisk; win32com query did not return any results" msgstr "無法取得 Win32_LogicalDisk; win32com 查詢沒有返回任何結果" -#: ../liveusb/gui.py:695 +#: ../liveusb/gui.py:681 msgid "Unable to mount device" msgstr "無法移除裝置" -#: ../liveusb/creator.py:790 +#: ../liveusb/creator.py:799 #, python-format msgid "Unable to mount device: %(message)s" msgstr "無法掛載設備: %(message)s" -#: ../liveusb/creator.py:494 +#: ../liveusb/creator.py:503 #, python-format msgid "Unable to remove directory from previous LiveOS: %(message)s" msgstr "無法從之前的 LiveOS 移除資料夾: %(message)s" -#: ../liveusb/creator.py:482 +#: ../liveusb/creator.py:491 #, python-format msgid "Unable to remove file from previous LiveOS: %(message)s" msgstr "無法從之前的 LiveOS 移除檔案: %(message)s" -#: ../liveusb/creator.py:1115 +#: ../liveusb/creator.py:1143 msgid "" "Unable to reset MBR. You may not have the `syslinux` package installed." msgstr "無法重設 MBR。您可能沒有安裝 `syslinux` 套件" -#: ../liveusb/gui.py:802 +#: ../liveusb/gui.py:788 msgid "" "Unable to use the selected file. You may have better luck if you move your " "ISO to the root of your drive (ie: C:\\)" msgstr "無法使用已選取的檔案，您可能有更好的運氣，如果您移動您的ISO到您的裝置根目錄下(例如：C：\\)" -#: ../liveusb/creator.py:697 +#: ../liveusb/creator.py:706 #, python-format msgid "Unable to write on %(device)s, skipping." msgstr "無法寫入 %(device)s, 略過." -#: ../liveusb/creator.py:382 +#: ../liveusb/creator.py:389 msgid "Unknown ISO, skipping checksum verification" msgstr "未知的 ISO，跳過 checksum 驗證" -#: ../liveusb/creator.py:786 +#: ../liveusb/creator.py:795 #, python-format msgid "Unknown dbus exception while trying to mount device: %(message)s" msgstr "掛載設備時發生未知的 dbus 例外: %(message)s" -#: ../liveusb/creator.py:765 ../liveusb/creator.py:890 +#: ../liveusb/creator.py:774 ../liveusb/creator.py:916 msgid "Unknown filesystem. Your device may need to be reformatted." msgstr "未知的檔案系統。您的設備可能無法被重新格式化。" @@ -472,40 +473,45 @@ msgstr "未知的檔案系統。您的設備可能無法被重新格式化。" msgid "Unknown release: %s" msgstr "未知的發行版本：%s" -#: ../liveusb/creator.py:827 +#: ../liveusb/creator.py:836 #, python-format msgid "Unmounting '%(udi)s' on '%(device)s'" msgstr "卸載 '%(udi)s' 在 '%(device)s'" -#: ../liveusb/creator.py:823 +#: ../liveusb/creator.py:832 #, python-format msgid "Unmounting mounted filesystems on '%(device)s'" msgstr "卸載掛在 '%(device)s' 上的檔案系統" -#: ../liveusb/creator.py:876 +#: ../liveusb/creator.py:902 #, python-format msgid "Unsupported device '%(device)s', please report a bug." msgstr "不支援的設備 '%(device)s' ，請回報 bug" -#: ../liveusb/creator.py:770 ../liveusb/creator.py:893 +#: ../liveusb/creator.py:779 ../liveusb/creator.py:919 #, python-format msgid "Unsupported filesystem: %s" msgstr "不支援的檔案系統：%s" -#: ../liveusb/creator.py:768 +#: ../liveusb/creator.py:777 #, python-format msgid "" "Unsupported filesystem: %s\n" "In case you are trying to upgrade a manually installed Tails system (that is, if it was installed without this installer), this option is not supported: you need to install it anew to start with, e.g. by choosing the \"Clone & Install\" action instead." msgstr "不支援的檔案系統: %s\n現在你正在嘗試升級到手動安裝的 Tails 系統 (也就是說，可能不是用這個 intsaller 安裝的話)，這個選項是不支援的：你必須重新安裝然後開始，換句話說，選擇 \"複製然後安裝\"。" -#: ../liveusb/creator.py:1213 +#: ../liveusb/creator.py:1241 #, python-format msgid "" "Unsupported filesystem: %s\n" "Please backup and format your USB key with the FAT filesystem." msgstr "不支援的檔案系統：%s\n請進行備份並以 FAT 檔案系統來格式化您的 USB 磁碟。" +#: ../liveusb/creator.py:877 +#, python-format +msgid "Updating properties of system partition %(system_partition)s" +msgstr "升級系統分割區的屬性 %(system_partition)s" + #: ../liveusb/launcher_ui.py:163 msgid "Upgrade from ISO" msgstr "從 ISO 升級" @@ -514,54 +520,54 @@ msgstr "從 ISO 升級" msgid "Use existing Live system ISO" msgstr "使用已存在的 Live system ISO" -#: ../liveusb/creator.py:133 +#: ../liveusb/creator.py:134 msgid "Verifying ISO MD5 checksum" msgstr "校驗 ISO MD5 checksum" -#: ../liveusb/creator.py:356 +#: ../liveusb/creator.py:363 msgid "Verifying SHA1 checksum of LiveCD image..." msgstr "驗證 LiveCD 映像黨的 SHA1 checksum" -#: ../liveusb/creator.py:360 +#: ../liveusb/creator.py:367 msgid "Verifying SHA256 checksum of LiveCD image..." msgstr "驗證 LiveCD 映像黨的 SHA256 checksum" -#: ../liveusb/creator.py:887 ../liveusb/creator.py:1206 +#: ../liveusb/creator.py:913 ../liveusb/creator.py:1234 msgid "Verifying filesystem..." msgstr "正在驗證檔案系統..." -#: ../liveusb/gui.py:729 +#: ../liveusb/gui.py:715 msgid "" "Warning: Creating a new persistent overlay will delete your existing one." msgstr "警告：建立新的持續性覆蓋層將會刪除您現有的持續性覆蓋層。" -#: ../liveusb/gui.py:681 +#: ../liveusb/gui.py:667 msgid "" "Warning: The Master Boot Record on your device does not match your system's " "syslinux MBR. If you have trouble booting this stick, try running the " "liveusb-creator with the --reset-mbr option." msgstr "警告：在您裝置上的主要開機記錄與syslinux 作業系統MBR無法匹配。如果您對此感到麻煩，嘗試執行liveusb-creator，並重新設定MBR選項。" -#: ../liveusb/gui.py:392 +#: ../liveusb/gui.py:378 msgid "" "Warning: This tool needs to be run as an Administrator. To do this, right " "click on the icon and open the Properties. Under the Compatibility tab, " "check the \"Run this program as an administrator\" box." msgstr "警告：此工具需以系統管理員身分執行。請右鍵圖標點選內容，在相容性一欄下，勾選以「系統管理員的身分執行此程式」一格。" -#: ../liveusb/creator.py:152 +#: ../liveusb/creator.py:153 #, python-format msgid "Wrote to device at %(speed)d MB/sec" msgstr "以 %(speed)d MB/sec 的速度寫入設備" -#: ../liveusb/gui.py:703 +#: ../liveusb/gui.py:689 #, python-format msgid "" "You are going to install Tails on the %(size)s %(vendor)s %(model)s device " "(%(device)s). All data on the selected device will be lost. Continue?" msgstr "您正要安裝 Tails 在 %(size)s %(vendor)s %(model)s 設備 (%(device)s). 所有已選擇設備上的資料將會消失。確定要繼續？" -#: ../liveusb/gui.py:719 +#: ../liveusb/gui.py:705 #, python-format msgid "" "You are going to upgrade Tails on the %(parent_size)s %(vendor)s %(model)s " @@ -569,17 +575,17 @@ msgid "" "unchanged. Continue?" msgstr "您正要升級 Tails 在 %(parent_size)s %(vendor)s %(model)s 設備 (%(device)s). 所有設備上的永久儲存容量會維持不變。確定要繼續？" -#: ../liveusb/creator.py:604 +#: ../liveusb/creator.py:613 msgid "" "You are using an old version of syslinux-extlinux that does not support the " "ext4 filesystem" msgstr "您正在使用舊版 syslinux-extlinux ，不支援 ext4 檔案系統" -#: ../liveusb/gui.py:787 +#: ../liveusb/gui.py:773 msgid "You can try again to resume your download" msgstr "您可再次嘗試復原您的下載" -#: ../liveusb/creator.py:92 +#: ../liveusb/creator.py:93 msgid "You must run this application as root" msgstr "你必須以root身份執行此應用程式" [View Less]

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits May 2014