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

[torbrowser/maint-2.3] Merge branch 'maint-2.2' into maint-2.3
by erinn＠torproject.org 29 Oct '12

29 Oct '12

commit b53024f0baa2de0260244db02608c2c7bdb89742 Merge: 8ab988a 80c9f3e Author: Erinn Clark <erinn(a)torproject.org> Date: Mon Oct 29 22:58:18 2012 +0000 Merge branch 'maint-2.2' into maint-2.3 build-scripts/recommended-versions | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-)

1 0

[torbrowser/maint-2.2] bump recommended-versions for 2.2.39-5 and 2.3.24-alpha-1
by erinn＠torproject.org 29 Oct '12

29 Oct '12

commit 80c9f3e3fa0248400c2871ca5063a2c9c499bba6 Author: Erinn Clark <erinn(a)torproject.org> Date: Mon Oct 29 22:58:00 2012 +0000 bump recommended-versions for 2.2.39-5 and 2.3.24-alpha-1 --- build-scripts/recommended-versions | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/build-scripts/recommended-versions b/build-scripts/recommended-versions index a63051a..7d5f19f 100644 --- a/build-scripts/recommended-versions +++ b/build-scripts/recommended-versions @@ -1,11 +1,11 @@ [ -"2.2.39-4-MacOS-i386", -"2.2.39-4-MacOS-x86_64", -"2.2.39-4-Windows", -"2.2.39-4-Linux-i686", -"2.2.39-4-Linux-x86_64", -"2.3.23-alpha-1-MacOS-i386", -"2.3.23-alpha-1-Windows", -"2.3.23-alpha-1-Linux-i386", -"2.3.23-alpha-1-Linux-x86_64" +"2.2.39-5-MacOS-i386", +"2.2.39-5-MacOS-x86_64", +"2.2.39-5-Windows", +"2.2.39-5-Linux-i686", +"2.2.39-5-Linux-x86_64", +"2.3.24-alpha-1-MacOS-i386", +"2.3.24-alpha-1-Windows", +"2.3.24-alpha-1-Linux-i386", +"2.3.24-alpha-1-Linux-x86_64" ]

1 0

r25856: {website} bump stable TBBs to 2.2.39-5 and alpha TBBs to 2.3.24-alpha- (website/trunk/include)
by Erinn Clark 29 Oct '12

29 Oct '12

Author: erinn Date: 2012-10-29 22:51:14 +0000 (Mon, 29 Oct 2012) New Revision: 25856 Modified: website/trunk/include/versions.wmi Log: bump stable TBBs to 2.2.39-5 and alpha TBBs to 2.3.24-alpha-1 Modified: website/trunk/include/versions.wmi =================================================================== --- website/trunk/include/versions.wmi 2012-10-29 15:32:43 UTC (rev 25855) +++ website/trunk/include/versions.wmi 2012-10-29 22:51:14 UTC (rev 25856) @@ -2,61 +2,61 @@ <define-tag version-alpha whitespace=delete>0.2.3.24-rc</define-tag> <define-tag version-win32-stable whitespace=delete>0.2.2.39</define-tag> -<define-tag version-win32-alpha whitespace=delete>0.2.3.23-rc</define-tag> +<define-tag version-win32-alpha whitespace=delete>0.2.3.24-rc</define-tag> <define-tag version-win32-bundle-stable whitespace=delete>0.2.2.39</define-tag> -<define-tag version-win32-bundle-alpha whitespace=delete>0.2.3.23-rc</define-tag> +<define-tag version-win32-bundle-alpha whitespace=delete>0.2.3.24-rc</define-tag> -<define-tag version-win32-bridge-bundle-alpha whitespace=delete>0.2.3.23-rc-<version-vidalia-stable></define-tag> -<define-tag version-win32-relay-bundle-alpha whitespace=delete>0.2.3.23-rc-<version-vidalia-stable></define-tag> -<define-tag version-win32-exit-bundle-alpha whitespace=delete>0.2.3.23-rc-<version-vidalia-stable></define-tag> +<define-tag version-win32-bridge-bundle-alpha whitespace=delete>0.2.3.24-rc-<version-vidalia-stable></define-tag> +<define-tag version-win32-relay-bundle-alpha whitespace=delete>0.2.3.24-rc-<version-vidalia-stable></define-tag> +<define-tag version-win32-exit-bundle-alpha whitespace=delete>0.2.3.24-rc-<version-vidalia-stable></define-tag> <define-tag version-osx-x86-bundle-stable whitespace=delete>0.2.2.39</define-tag> -<define-tag version-osx-x86-bundle-alpha whitespace=delete>0.2.3.23-rc</define-tag> +<define-tag version-osx-x86-bundle-alpha whitespace=delete>0.2.3.24-rc</define-tag> <define-tag version-osx-ppc-bundle-stable whitespace=delete>0.2.2.39</define-tag> -<define-tag version-osx-ppc-bundle-alpha whitespace=delete>0.2.3.23-rc</define-tag> +<define-tag version-osx-ppc-bundle-alpha whitespace=delete>0.2.3.24-rc</define-tag> <define-tag version-osx-x86-stable whitespace=delete>0.2.2.39</define-tag> -<define-tag version-osx-x86-alpha whitespace=delete>0.2.3.23-rc</define-tag> +<define-tag version-osx-x86-alpha whitespace=delete>0.2.3.24-rc</define-tag> <define-tag version-osx-ppc-stable whitespace=delete>0.2.2.39</define-tag> -<define-tag version-osx-ppc-alpha whitespace=delete>0.2.3.23-rc</define-tag> +<define-tag version-osx-ppc-alpha whitespace=delete>0.2.3.24-rc</define-tag> -<define-tag version-torbrowserbundle whitespace=delete>2.2.39-4</define-tag> +<define-tag version-torbrowserbundle whitespace=delete>2.2.39-5</define-tag> <define-tag version-torbrowser-tor whitespace=delete>0.2.2.39</define-tag> <define-tag version-torbrowser-tor-components whitespace=delete>libevent-2.0.20-stable, zlib-1.2.7, openssl-1.0.1c</define-tag> -<define-tag version-torbrowser-firefox whitespace=delete>10.0.9esr</define-tag> +<define-tag version-torbrowser-firefox whitespace=delete>10.0.10esr</define-tag> <define-tag version-torbrowser-torbutton whitespace=delete>1.4.6.3</define-tag> <define-tag version-torbrowser-pidgin whitespace=delete>2.7.5</define-tag> <define-tag version-torbrowser-otr whitespace=delete>3.2</define-tag> <define-tag version-torbrowser-vidalia whitespace=delete>0.2.20</define-tag> <define-tag version-torimbrowserbundle whitespace=delete>1.3.21</define-tag> -<define-tag version-torbrowserbundlealpha whitespace=delete>2.3.23-alpha-1</define-tag> -<define-tag version-torobfsbundlealpha whitespace=delete>2.3.23-alpha-1</define-tag> +<define-tag version-torbrowserbundlealpha whitespace=delete>2.3.24-alpha-1</define-tag> +<define-tag version-torobfsbundlealpha whitespace=delete>2.3.24-alpha-1</define-tag> -<define-tag version-torbrowserbundlelinux32 whitespace=delete>2.2.39-4</define-tag> -<define-tag version-torbrowserbundlelinux64 whitespace=delete>2.2.39-4</define-tag> +<define-tag version-torbrowserbundlelinux32 whitespace=delete>2.2.39-5</define-tag> +<define-tag version-torbrowserbundlelinux64 whitespace=delete>2.2.39-5</define-tag> <define-tag version-gnu-torbrowser-tor whitespace=delete>0.2.2.39</define-tag> <define-tag version-gnu-torbrowser-tor-components whitespace=delete>libevent-2.0.20-stable, zlib-1.2.7, openssl-1.0.1c</define-tag> -<define-tag version-gnu-torbrowser-firefox whitespace=delete>10.0.9esr</define-tag> +<define-tag version-gnu-torbrowser-firefox whitespace=delete>10.0.10esr</define-tag> <define-tag version-gnu-torbrowser-torbutton whitespace=delete>1.4.6.3</define-tag> <define-tag version-gnu-torbrowser-vidalia whitespace=delete>0.2.20</define-tag> -<define-tag version-torbrowserbundlelinux32alpha whitespace=delete>2.3.23-alpha-1</define-tag> -<define-tag version-torbrowserbundlelinux64alpha whitespace=delete>2.3.23-alpha-1</define-tag> -<define-tag version-torobfsbundlelinux32alpha whitespace=delete>2.3.23-alpha-1</define-tag> -<define-tag version-torobfsbundlelinux64alpha whitespace=delete>2.3.23-alpha-1</define-tag> +<define-tag version-torbrowserbundlelinux32alpha whitespace=delete>2.3.24-alpha-1</define-tag> +<define-tag version-torbrowserbundlelinux64alpha whitespace=delete>2.3.24-alpha-1</define-tag> +<define-tag version-torobfsbundlelinux32alpha whitespace=delete>2.3.24-alpha-1</define-tag> +<define-tag version-torobfsbundlelinux64alpha whitespace=delete>2.3.24-alpha-1</define-tag> -<define-tag version-torbrowserbundleosx32 whitespace=delete>2.2.39-4</define-tag> -<define-tag version-torbrowserbundleosx64 whitespace=delete>2.2.39-4</define-tag> +<define-tag version-torbrowserbundleosx32 whitespace=delete>2.2.39-5</define-tag> +<define-tag version-torbrowserbundleosx64 whitespace=delete>2.2.39-5</define-tag> <define-tag version-osx-torbrowser-tor whitespace=delete>0.2.2.39</define-tag> -<define-tag version-osx-torbrowser-firefox whitespace=delete>10.0.9esr</define-tag> +<define-tag version-osx-torbrowser-firefox whitespace=delete>10.0.10esr</define-tag> <define-tag version-osx-torbrowser-torbutton whitespace=delete>1.4.6.3</define-tag> <define-tag version-osx-torbrowser-vidalia whitespace=delete>0.2.20</define-tag> -<define-tag version-torbrowserbundleosx32alpha whitespace=delete>2.3.23-alpha-1</define-tag> -<define-tag version-torbrowserbundleosx64alpha whitespace=delete>2.3.23-alpha-1</define-tag> -<define-tag version-torobfsbundleosx32alpha whitespace=delete>2.3.23-alpha-1</define-tag> -<define-tag version-torobfsbundleosx64alpha whitespace=delete>2.3.23-alpha-1</define-tag> +<define-tag version-torbrowserbundleosx32alpha whitespace=delete>2.3.24-alpha-1</define-tag> +<define-tag version-torbrowserbundleosx64alpha whitespace=delete>2.3.24-alpha-1</define-tag> +<define-tag version-torobfsbundleosx32alpha whitespace=delete>2.3.24-alpha-1</define-tag> +<define-tag version-torobfsbundleosx64alpha whitespace=delete>2.3.24-alpha-1</define-tag> <define-tag version-vidalia-stable whitespace=delete>0.2.20</define-tag> <define-tag version-vidalia-alpha whitespace=delete>0.3.1</define-tag>

1 0

[stem/master] OrderedDict substitute for older python versions
by atagar＠torproject.org 29 Oct '12

29 Oct '12

commit b09de1093e7a7237d3825d5728126cbf2f15842b Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Oct 29 08:47:26 2012 -0700 OrderedDict substitute for older python versions In d30a628e I simplified the _get_descriptor_components() by using the collections.OrderedDict builtin. Unforutunately OrderedDict was introduced in python 2.7, breaking our 2.5 and 2.6 compatability... ====================================================================== ERROR: test_voting_delay ---------------------------------------------------------------------- Traceback: File "/home/atagar/Desktop/stem/test/unit/descriptor/networkstatus/document_v3.py", line 359, in test_voting_delay document = get_network_status_document_v3({"voting-delay": "12 345"}) File "/home/atagar/Desktop/stem/test/mocking.py", line 782, in get_network_status_document_v3 return stem.descriptor.networkstatus.NetworkStatusDocumentV3(desc_content, validate = True) File "/home/atagar/Desktop/stem/stem/descriptor/networkstatus.py", line 458, in __init__ self._header = _DocumentHeader(document_file, validate, default_params) File "/home/atagar/Desktop/stem/stem/descriptor/networkstatus.py", line 541, in __init__ entries = stem.descriptor._get_descriptor_components(content, validate) File "/home/atagar/Desktop/stem/stem/descriptor/__init__.py", line 289, in _get_descriptor_components entries = collections.OrderedDict() AttributeError: 'module' object has no attribute 'OrderedDict' Caught by eoinof on... https://trac.torproject.org/7244 I'm fixing this by adding an OrderedDict substitute that's under the MIT license... http://pypi.python.org/pypi/ordereddict --- stem/descriptor/__init__.py | 8 ++- stem/util/__init__.py | 1 + stem/util/ordereddict.py | 130 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 137 insertions(+), 2 deletions(-) diff --git a/stem/descriptor/__init__.py b/stem/descriptor/__init__.py index ff3d59f..d667946 100644 --- a/stem/descriptor/__init__.py +++ b/stem/descriptor/__init__.py @@ -25,10 +25,14 @@ __all__ = [ import os import re -import collections import stem.util.enum +try: + from collections import OrderedDict +except ImportError: + from stem.util.ordereddict import OrderedDict + KEYWORD_CHAR = "a-zA-Z0-9-" WHITESPACE = " \t" KEYWORD_LINE = re.compile("^([%s]+)(?:[%s]+(.*))?$" % (KEYWORD_CHAR, WHITESPACE)) @@ -286,7 +290,7 @@ def _get_descriptor_components(raw_contents, validate, extra_keywords = ()): value tuple, the second being a list of those entries. """ - entries = collections.OrderedDict() + entries = OrderedDict() extra_entries = [] # entries with a keyword in extra_keywords remaining_lines = raw_contents.split("\n") diff --git a/stem/util/__init__.py b/stem/util/__init__.py index 78fe9e1..d371629 100644 --- a/stem/util/__init__.py +++ b/stem/util/__init__.py @@ -7,6 +7,7 @@ __all__ = [ "connection", "enum", "log", + "ordereddict", "proc", "system", "term", diff --git a/stem/util/ordereddict.py b/stem/util/ordereddict.py new file mode 100644 index 0000000..cb97874 --- /dev/null +++ b/stem/util/ordereddict.py @@ -0,0 +1,130 @@ +# Drop in replacement for python 2.7's OrderedDict, from... +# http://pypi.python.org/pypi/ordereddict + +# Copyright (c) 2009 Raymond Hettinger +# +# Permission is hereby granted, free of charge, to any person +# obtaining a copy of this software and associated documentation files +# (the "Software"), to deal in the Software without restriction, +# including without limitation the rights to use, copy, modify, merge, +# publish, distribute, sublicense, and/or sell copies of the Software, +# and to permit persons to whom the Software is furnished to do so, +# subject to the following conditions: +# +# The above copyright notice and this permission notice shall be +# included in all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES +# OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT +# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +# OTHER DEALINGS IN THE SOFTWARE. + +from UserDict import DictMixin + +class OrderedDict(dict, DictMixin): + def __init__(self, *args, **kwds): + if len(args) > 1: + raise TypeError('expected at most 1 arguments, got %d' % len(args)) + try: + self.__end + except AttributeError: + self.clear() + self.update(*args, **kwds) + + def clear(self): + self.__end = end = [] + end += [None, end, end] # sentinel node for doubly linked list + self.__map = {} # key --> [key, prev, next] + dict.clear(self) + + def __setitem__(self, key, value): + if key not in self: + end = self.__end + curr = end[1] + curr[2] = end[1] = self.__map[key] = [key, curr, end] + dict.__setitem__(self, key, value) + + def __delitem__(self, key): + dict.__delitem__(self, key) + key, prev, next = self.__map.pop(key) + prev[2] = next + next[1] = prev + + def __iter__(self): + end = self.__end + curr = end[2] + while curr is not end: + yield curr[0] + curr = curr[2] + + def __reversed__(self): + end = self.__end + curr = end[1] + while curr is not end: + yield curr[0] + curr = curr[1] + + def popitem(self, last=True): + if not self: + raise KeyError('dictionary is empty') + if last: + key = reversed(self).next() + else: + key = iter(self).next() + value = self.pop(key) + return key, value + + def __reduce__(self): + items = [[k, self[k]] for k in self] + tmp = self.__map, self.__end + del self.__map, self.__end + inst_dict = vars(self).copy() + self.__map, self.__end = tmp + if inst_dict: + return (self.__class__, (items,), inst_dict) + return self.__class__, (items,) + + def keys(self): + return list(self) + + setdefault = DictMixin.setdefault + update = DictMixin.update + pop = DictMixin.pop + values = DictMixin.values + items = DictMixin.items + iterkeys = DictMixin.iterkeys + itervalues = DictMixin.itervalues + iteritems = DictMixin.iteritems + + def __repr__(self): + if not self: + return '%s()' % (self.__class__.__name__,) + return '%s(%r)' % (self.__class__.__name__, self.items()) + + def copy(self): + return self.__class__(self) + + @classmethod + def fromkeys(cls, iterable, value=None): + d = cls() + for key in iterable: + d[key] = value + return d + + def __eq__(self, other): + if isinstance(other, OrderedDict): + if len(self) != len(other): + return False + for p, q in zip(self.items(), other.items()): + if p != q: + return False + return True + return dict.__eq__(self, other) + + def __ne__(self, other): + return not self == other +

1 0

[stem/master] DictWriter.writeheader() introduced in python 2.7
by atagar＠torproject.org 29 Oct '12

29 Oct '12

commit aac44fe0a23f409e61484f8ce6c1b5c79a312714 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Oct 29 09:03:52 2012 -0700 DictWriter.writeheader() introduced in python 2.7 The writeheader() method of the DictWriter class was added in python 2.7, breaking our 2.5 and 2.6 compatability... ====================================================================== ERROR: test_multiple_descriptor_types ---------------------------------------------------------------------- Traceback: File "/home/atagar/Desktop/stem/test/unit/descriptor/export.py", line 91, in test_multiple_descriptor_types self.assertRaises(ValueError, export_csv,) File "/usr/lib/python2.6/unittest.py", line 336, in failUnlessRaises callableObj(*args, **kwargs) File "/home/atagar/Desktop/stem/stem/descriptor/export.py", line 39, in export_csv export_csv_file(output_buffer, descriptors, included_fields, excluded_fields, header) File "/home/atagar/Desktop/stem/stem/descriptor/export.py", line 91, in export_csv_file writer.writeheader() AttributeError: DictWriter instance has no attribute 'writeheader' Noting the prereq in our pydocs and ignoring the 'header' flag if we can't support it. --- stem/descriptor/export.py | 7 ++++--- test/unit/descriptor/export.py | 13 +++++++++++++ 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/stem/descriptor/export.py b/stem/descriptor/export.py index 9785421..455e4ef 100644 --- a/stem/descriptor/export.py +++ b/stem/descriptor/export.py @@ -13,6 +13,7 @@ import csv import cStringIO import stem.descriptor +import stem.prereq class _ExportDialect(csv.excel): lineterminator = '\n' @@ -29,7 +30,7 @@ def export_csv(descriptors, included_fields = (), excluded_fields = (), header = :param list included_fields: attributes to include in the csv :param list excluded_fields: attributes to exclude from the csv :param bool header: if **True** then the first line will be a comma separated - list of the attribute names + list of the attribute names (**only supported in python 2.7 and higher**) :returns: **str** of the CSV for the descriptors, one per line :raises: **ValueError** if descriptors contain more than one descriptor type @@ -50,7 +51,7 @@ def export_csv_file(output_file, descriptors, included_fields = (), excluded_fie :param list included_fields: attributes to include in the csv :param list excluded_fields: attributes to exclude from the csv :param bool header: if **True** then the first line will be a comma separated - list of the attribute names + list of the attribute names (**only supported in python 2.7 and higher**) :returns: **str** of the CSV for the descriptors, one per line :raises: **ValueError** if descriptors contain more than one descriptor type @@ -87,7 +88,7 @@ def export_csv_file(output_file, descriptors, included_fields = (), excluded_fie writer = csv.DictWriter(output_file, included_fields, dialect = _ExportDialect(), extrasaction='ignore') - if header: + if header and stem.prereq.is_python_27(): writer.writeheader() for desc in descriptors: diff --git a/test/unit/descriptor/export.py b/test/unit/descriptor/export.py index 463171d..5d43a8f 100644 --- a/test/unit/descriptor/export.py +++ b/test/unit/descriptor/export.py @@ -5,6 +5,9 @@ Unit tests for stem.descriptor.export. import StringIO import unittest +import stem.prereq +import test.runner + from stem.descriptor.export import export_csv, export_csv_file from test.mocking import get_relay_server_descriptor, get_bridge_server_descriptor @@ -14,6 +17,11 @@ class TestExport(unittest.TestCase): Exports a single minimal tor server descriptor. """ + # we won't have a header prior to python 2.7 + if not stem.prereq.is_python_27(): + test.runner.skip(self, "(header added in python 2.7)") + return + desc = get_relay_server_descriptor() desc_csv = export_csv(desc, included_fields = ('nickname', 'address', 'published'), header = False) @@ -59,6 +67,11 @@ class TestExport(unittest.TestCase): Checks that the default attributes for our csv output doesn't include private fields. """ + # we won't have a header prior to python 2.7 + if not stem.prereq.is_python_27(): + test.runner.skip(self, "(header added in python 2.7)") + return + desc = get_relay_server_descriptor() desc_csv = export_csv(desc)

1 0

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 29 Oct '12

29 Oct '12

commit 14d6dc95f034b9d39971d04bd83c239342a64547 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Oct 29 15:45:56 2012 +0000 Update translations for liveusb-creator --- el/el.po | 19 ++++++++++--------- 1 files changed, 10 insertions(+), 9 deletions(-) diff --git a/el/el.po b/el/el.po index ede7c2d..bbf7de2 100644 --- a/el/el.po +++ b/el/el.po @@ -3,6 +3,7 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# <jcbgr(a)yahoo.co.uk>, 2012. # <kotakota(a)gmail.com>, 2012. # Nikos Charonitakis <nikosx(a)gmail.com>, 2008. msgid "" @@ -10,8 +11,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-04-13 14:16+0200\n" -"PO-Revision-Date: 2012-10-21 11:11+0000\n" -"Last-Translator: kotkotkot <kotakota(a)gmail.com>\n" +"PO-Revision-Date: 2012-10-29 15:41+0000\n" +"Last-Translator: jcbgr <jcbgr(a)yahoo.co.uk>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -261,12 +262,12 @@ msgstr "Αδυναμία εύρεσης συσκευής %s" msgid "" "You are using an old version of syslinux-extlinux that does not support the " "ext4 filesystem" -msgstr "" +msgstr "Χρησιμοποιείτε μια παλιά έκδοση του syslinux-extlinux που δεν υποστηρίζει το σύστημα αρχείων ext4. " #: ../liveusb/creator.py:718 #, python-format msgid "Unable to write on %(device)s, skipping." -msgstr "" +msgstr "Αδυναμία εγγραφής στο %(device)s, προσπέραση." #: ../liveusb/creator.py:737 #, python-format @@ -277,7 +278,7 @@ msgstr "" #: ../liveusb/creator.py:786 ../liveusb/creator.py:886 msgid "Unknown filesystem. Your device may need to be reformatted." -msgstr "" +msgstr "Άγνωστο σύστημα αρχείων. Η συσκευή μπορεί να χρειάζεται διαμόρφωση." #: ../liveusb/creator.py:789 #, python-format @@ -299,21 +300,21 @@ msgstr "" #: ../liveusb/creator.py:811 #, python-format msgid "Unable to mount device: %(message)s" -msgstr "" +msgstr "Αδυναμία προσάρτησης συσκευής: %(message)s" #: ../liveusb/creator.py:823 msgid "No mount points found" -msgstr "" +msgstr "Δεν βρέθηκαν σημεία προσάρτησης" #: ../liveusb/creator.py:834 #, python-format msgid "Unmounting %(device)s" -msgstr "" +msgstr "Αποπροσάρτιση %(device)s" #: ../liveusb/creator.py:846 #, python-format msgid "Mount %s exists after unmounting" -msgstr "" +msgstr "Προσάρτιση %s παραμένει μετά την αποπροσάρτιση" #: ../liveusb/creator.py:883 ../liveusb/creator.py:1203 msgid "Verifying filesystem..."

1 0

r25855: {website} update lightning-bolt mirror per email, remove umbrellacorp (in website/trunk: . include)
by Andrew Lewman 29 Oct '12

29 Oct '12

Author: phobos Date: 2012-10-29 15:32:43 +0000 (Mon, 29 Oct 2012) New Revision: 25855 Modified: website/trunk/include/mirrors-table.wmi website/trunk/update-mirrors.pl Log: update lightning-bolt mirror per email, remove umbrellacorp mirror per email, update mirror status. Modified: website/trunk/include/mirrors-table.wmi =================================================================== --- website/trunk/include/mirrors-table.wmi 2012-10-28 15:56:07 UTC (rev 25854) +++ website/trunk/include/mirrors-table.wmi 2012-10-29 15:32:43 UTC (rev 25855) @@ -1,15 +1,15 @@ <tr> - <td>INT</td> + <td>CZ</td> - <td>CoralCDN</td> + <td>Lightning-bolt.net</td> <td>Up to date</td> <td> - </td> - <td><a href="http://www.torproject.org.nyud.net/dist/">http</a></td> - <td><a href="http://www.torproject.org.nyud.net/">http</a></td> + <td><a href="http://torproject.lightning-bolt.net/dist/">http</a></td> + <td><a href="http://torproject.lightning-bolt.net/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -18,15 +18,15 @@ <tr> - <td>NL</td> + <td>PT</td> - <td>CCC</td> + <td>5ª Coluna</td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.ccc.de/dist/">http</a></td> - <td><a href="http://tor.ccc.de/">http</a></td> + <td><a href="http://torproject.pt/dist/">http</a></td> + <td><a href="http://torproject.pt/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -35,15 +35,15 @@ <tr> - <td>FR</td> + <td>NL</td> - <td>LazyTiger</td> + <td>CCC</td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.taiga-san.net/dist/">http</a></td> - <td><a href="http://tor.taiga-san.net/">http</a></td> + <td><a href="http://tor.ccc.de/dist/">http</a></td> + <td><a href="http://tor.ccc.de/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -52,40 +52,6 @@ <tr> - <td>DE</td> - - <td></td> - - <td>Up to date</td> - - <td> - </td> - <td><a href="http://torproject.lightning-bolt.net/dist/">http</a></td> - <td><a href="http://torproject.lightning-bolt.net/">http</a></td> - <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - - <td>PT</td> - - <td>5ª Coluna</td> - - <td>Up to date</td> - - <td> - </td> - <td><a href="http://torproject.pt/dist/">http</a></td> - <td><a href="http://torproject.pt/">http</a></td> - <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - <td>IS</td> <td>torproject.is</td> @@ -205,19 +171,19 @@ <tr> - <td>IS</td> + <td>RO</td> - <td>myRL.net</td> + <td>me0w.cc</td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.myrl.net/dist/">http</a></td> - <td><a href="http://tor.myrl.net/">http</a></td> - <td><a href="https://tor.myrl.net/dist/">https</a></td> - <td><a href="https://tor.myrl.net/">https</a></td> + <td><a href="http://tor.me0w.cc/dist/">http</a></td> + <td><a href="http://tor.me0w.cc/">http</a></td> <td> - </td> <td> - </td> + <td> - </td> + <td> - </td> </tr> <tr> @@ -256,68 +222,34 @@ <tr> - <td>DE</td> + <td>UK</td> <td></td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.dev-random.de/dist/">http</a></td> - <td><a href="http://tor.dev-random.de/">http</a></td> - <td><a href="https://tor.dev-random.de/dist/">https</a></td> - <td><a href="https://tor.dev-random.de/">https</a></td> + <td><a href="http://tor.mage.me.uk/dist/">http</a></td> + <td><a href="http://tor.mage.me.uk/">http</a></td> <td> - </td> <td> - </td> -</tr> - -<tr> - - <td>FR</td> - - <td>BarkerJr</td> - - <td>Up to date</td> - <td> - </td> - <td><a href="http://www.oignon.net/dist/">http</a></td> - <td><a href="http://www.oignon.net/">http</a></td> - <td><a href="https://www.oignon.net/dist/">https</a></td> - <td><a href="https://www.oignon.net/">https</a></td> <td> - </td> - <td> - </td> </tr> <tr> - <td>AT</td> - - <td>cyberarmy</td> - - <td>Up to date</td> - - <td> - </td> - <td> - </td> - <td><a href="http://tor.cyberarmy.at/">http</a></td> - <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - <td>DE</td> - <td>factor.cc</td> + <td></td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.factor.cc/dist/">http</a></td> - <td><a href="http://tor.factor.cc/">http</a></td> - <td><a href="https://factor.cc/tor/dist/">https</a></td> - <td><a href="https://factor.cc/tor/">https</a></td> + <td><a href="http://tor.dev-random.de/dist/">http</a></td> + <td><a href="http://tor.dev-random.de/">http</a></td> + <td><a href="https://tor.dev-random.de/dist/">https</a></td> + <td><a href="https://tor.dev-random.de/">https</a></td> <td> - </td> <td> - </td> </tr> @@ -326,17 +258,17 @@ <td>FR</td> - <td></td> + <td>BarkerJr</td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.mirror.chekanov.net/dist/">http</a></td> - <td><a href="http://tor.mirror.chekanov.net/">http</a></td> + <td><a href="http://www.oignon.net/dist/">http</a></td> + <td><a href="http://www.oignon.net/">http</a></td> + <td><a href="https://www.oignon.net/dist/">https</a></td> + <td><a href="https://www.oignon.net/">https</a></td> <td> - </td> <td> - </td> - <td> - </td> - <td> - </td> </tr> <tr> @@ -358,40 +290,6 @@ <tr> - <td>US</td> - - <td></td> - - <td>Up to date</td> - - <td> - </td> - <td><a href="http://mirror.grwebhost.com/torproject.org/dist/">http</a></td> - <td><a href="http://mirror.grwebhost.com/torproject.org/">http</a></td> - <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - - <td>US</td> - - <td></td> - - <td>Up to date</td> - - <td> - </td> - <td><a href="http://tor.onthegetgo.com/dist/">http</a></td> - <td><a href="http://tor.onthegetgo.com/">http</a></td> - <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - <td>HU</td> <td>Unknown</td> @@ -494,6 +392,23 @@ <tr> + <td>GB</td> + + <td>torland</td> + + <td>Up to date</td> + + <td> - </td> + <td><a href="http://mirror.torland.me/torproject.org/dist/">http</a></td> + <td><a href="http://mirror.torland.me/torproject.org/">http</a></td> + <td><a href="https://mirror.torland.me/torproject.org/dist/">https</a></td> + <td><a href="https://mirror.torland.me/torproject.org/">https</a></td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + <td>IS</td> <td>TheOnionRouter</td> @@ -596,6 +511,23 @@ <tr> + <td>IS</td> + + <td>myRL.net</td> + + <td>Out of date</td> + + <td> - </td> + <td><a href="http://tor.myrl.net/dist/">http</a></td> + <td><a href="http://tor.myrl.net/">http</a></td> + <td><a href="https://tor.myrl.net/dist/">https</a></td> + <td><a href="https://tor.myrl.net/">https</a></td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + <td>AT</td> <td>FoDT</td> @@ -613,19 +545,19 @@ <tr> - <td>US</td> + <td>DE</td> - <td>hessmo</td> + <td>crazyhaze.de</td> <td>Out of date</td> <td> - </td> - <td><a href="http://mirror.hessmo.com/tor/dist/">http</a></td> - <td><a href="http://mirror.hessmo.com/tor/">http</a></td> + <td><a href="http://tor.crazyhaze.de/dist/">http</a></td> + <td><a href="http://tor.crazyhaze.de/">http</a></td> + <td><a href="https://tor.crazyhaze.de/dist/">https</a></td> + <td><a href="https://tor.crazyhaze.de/">https</a></td> <td> - </td> <td> - </td> - <td> - </td> - <td> - </td> </tr> <tr> @@ -647,19 +579,19 @@ <tr> - <td>UK</td> + <td>AT</td> - <td></td> + <td>cyberarmy</td> <td>Out of date</td> <td> - </td> - <td><a href="http://tor.mage.me.uk/dist/">http</a></td> - <td><a href="http://tor.mage.me.uk/">http</a></td> <td> - </td> + <td><a href="http://tor.cyberarmy.at/">http</a></td> <td> - </td> <td> - </td> <td> - </td> + <td> - </td> </tr> <tr> @@ -681,8 +613,76 @@ <tr> + <td>DE</td> + + <td>factor.cc</td> + + <td>Out of date</td> + + <td> - </td> + <td><a href="http://tor.factor.cc/dist/">http</a></td> + <td><a href="http://tor.factor.cc/">http</a></td> + <td><a href="https://factor.cc/tor/dist/">https</a></td> + <td><a href="https://factor.cc/tor/">https</a></td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + + <td>FR</td> + + <td></td> + + <td>Out of date</td> + + <td> - </td> + <td><a href="http://tor.mirror.chekanov.net/dist/">http</a></td> + <td><a href="http://tor.mirror.chekanov.net/">http</a></td> + <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + <td>US</td> + <td></td> + + <td>Out of date</td> + + <td> - </td> + <td><a href="http://tor.onthegetgo.com/dist/">http</a></td> + <td><a href="http://tor.onthegetgo.com/">http</a></td> + <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + + <td>US</td> + + <td>Xpdm</td> + + <td>Out of date</td> + + <td> - </td> + <td><a href="http://torproj.xpdm.us/dist/">http</a></td> + <td><a href="http://torproj.xpdm.us/">http</a></td> + <td><a href="https://torproj.xpdm.us/dist/">https</a></td> + <td><a href="https://torproj.xpdm.us/">https</a></td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + + <td>US</td> + <td>AskApache</td> <td>Out of date</td> @@ -698,6 +698,23 @@ <tr> + <td>FR</td> + + <td>LazyTiger</td> + + <td>Out of date</td> + + <td> - </td> + <td><a href="http://tor.taiga-san.net/dist/">http</a></td> + <td><a href="http://tor.taiga-san.net/">http</a></td> + <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + <td>SE</td> <td>homosu</td> @@ -749,19 +766,19 @@ <tr> - <td>DE</td> + <td>US</td> - <td>crazyhaze.de</td> + <td>hessmo</td> <td>Out of date</td> <td> - </td> - <td><a href="http://tor.crazyhaze.de/dist/">http</a></td> - <td><a href="http://tor.crazyhaze.de/">http</a></td> - <td><a href="https://tor.crazyhaze.de/dist/">https</a></td> - <td><a href="https://tor.crazyhaze.de/">https</a></td> + <td><a href="http://mirror.hessmo.com/tor/dist/">http</a></td> + <td><a href="http://mirror.hessmo.com/tor/">http</a></td> <td> - </td> <td> - </td> + <td> - </td> + <td> - </td> </tr> <tr> @@ -834,23 +851,6 @@ <tr> - <td>RO</td> - - <td>me0w.cc</td> - - <td>Unknown</td> - - <td> - </td> - <td><a href="http://tor.me0w.cc/dist/">http</a></td> - <td><a href="http://tor.me0w.cc/">http</a></td> - <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - <td>UA</td> <td></td> @@ -885,66 +885,49 @@ <tr> - <td>NL</td> + <td>US</td> <td></td> - <td>Out of date</td> + <td>Unknown</td> <td> - </td> + <td><a href="http://mirror.grwebhost.com/torproject.org/dist/">http</a></td> + <td><a href="http://mirror.grwebhost.com/torproject.org/">http</a></td> <td> - </td> <td> - </td> - <td><a href="https://www.coevoet.nl/tor/dist/">https</a></td> <td> - </td> <td> - </td> - <td> - </td> </tr> <tr> - <td>US</td> + <td>NL</td> - <td>Xpdm</td> + <td></td> - <td>Unknown</td> + <td>Out of date</td> <td> - </td> - <td><a href="http://torproj.xpdm.us/dist/">http</a></td> - <td><a href="http://torproj.xpdm.us/">http</a></td> - <td><a href="https://torproj.xpdm.us/dist/">https</a></td> - <td><a href="https://torproj.xpdm.us/">https</a></td> <td> - </td> <td> - </td> -</tr> - -<tr> - - <td>GB</td> - - <td>torland</td> - - <td>Unknown</td> - + <td><a href="https://www.coevoet.nl/tor/dist/">https</a></td> <td> - </td> - <td><a href="http://mirror.torland.me/torproject.org/dist/">http</a></td> - <td><a href="http://mirror.torland.me/torproject.org/">http</a></td> - <td><a href="https://mirror.torland.me/torproject.org/dist/">https</a></td> - <td><a href="https://mirror.torland.me/torproject.org/">https</a></td> <td> - </td> <td> - </td> </tr> <tr> - <td>US</td> + <td>INT</td> - <td></td> + <td>CoralCDN</td> <td>Unknown</td> <td> - </td> - <td><a href="http://torproject.umbrellacorporation.org.uk/dist/">http</a></td> - <td><a href="http://torproject.umbrellacorporation.org.uk/">http</a></td> + <td><a href="http://www.torproject.org.nyud.net/dist/">http</a></td> + <td><a href="http://www.torproject.org.nyud.net/">http</a></td> <td> - </td> <td> - </td> <td> - </td> Modified: website/trunk/update-mirrors.pl =================================================================== --- website/trunk/update-mirrors.pl 2012-10-28 15:56:07 UTC (rev 25854) +++ website/trunk/update-mirrors.pl 2012-10-29 15:32:43 UTC (rev 25855) @@ -909,30 +909,12 @@ rsyncDistMirror => "", hiddenServiceMirror => "", }, - mirror065 => { - adminContact => "", - orgName => "", - isoCC => "US", - subRegion => "", - region => "US", - ipv4 => "True", - ipv6 => "False", - loadBalanced => "No", - httpWebsiteMirror => "http://torproject.umbrellacorporation.org.uk/", - httpsWebsiteMirror => "", - rsyncWebsiteMirror => "", - ftpWebsiteMirror => "", - httpDistMirror => "http://torproject.umbrellacorporation.org.uk/dist/", - httpsDistMirror => "", - rsyncDistMirror => "", - hiddenServiceMirror => "", - }, mirror066 => { adminContact => "", - orgName => "", - isoCC => "DE", + orgName => "Lightning-bolt.net", + isoCC => "CZ", subRegion => "", - region => "DE", + region => "CZ", ipv4 => "True", ipv6 => "False", loadBalanced => "No",

1 0

[translation/tails-persistence-setup] Update translations for tails-persistence-setup
by translation＠torproject.org 29 Oct '12

29 Oct '12

commit 664fd202ed20a3f1a4e2387d22b420f1c9ad28d6 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Oct 29 13:16:03 2012 +0000 Update translations for tails-persistence-setup --- zh_CN/zh_CN.po | 318 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 318 insertions(+), 0 deletions(-) diff --git a/zh_CN/zh_CN.po b/zh_CN/zh_CN.po new file mode 100644 index 0000000..97c6d63 --- /dev/null +++ b/zh_CN/zh_CN.po @@ -0,0 +1,318 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR Tails developers +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: The Tor Project\n" +"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" +"POT-Creation-Date: 2012-10-03 16:16+0200\n" +"PO-Revision-Date: 2012-10-03 17:39+0000\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: LANGUAGE <LL(a)li.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: zh_CN\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 "" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:58 +msgid "GnuPG" +msgstr "" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:60 +msgid "GnuPG keyrings and configuration" +msgstr "" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:68 +msgid "SSH Client" +msgstr "" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:70 +msgid "SSH keys, configuration and known hosts" +msgstr "" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:78 +msgid "Pidgin" +msgstr "" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:80 +msgid "Pidgin profiles and OTR keyring" +msgstr "" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:88 +msgid "Claws Mail" +msgstr "" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:90 +msgid "Claws Mail profiles and locally stored email" +msgstr "" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:98 +msgid "GNOME Keyring" +msgstr "" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:100 +msgid "Secrets stored by GNOME Keyring" +msgstr "" + +#: ../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 "APT Packages" +msgstr "" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:120 +msgid "Packages downloaded by APT" +msgstr "" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:128 +msgid "APT Lists" +msgstr "" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:130 +msgid "Lists downloaded by APT" +msgstr "" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:138 +msgid "Dotfiles" +msgstr "" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:140 +msgid "" +"Symlink into $HOME every file or directory found in the `dotfiles' directory" +msgstr "" + +#: ../lib/Tails/Persistence/Setup.pm:259 +msgid "" +"The device Tails is running from cannot be found. Maybe you used the `toram'" +" option?" +msgstr "" + +#: ../lib/Tails/Persistence/Setup.pm:284 +msgid "'Unparseable partition path.'" +msgstr "" + +#: ../lib/Tails/Persistence/Setup.pm:298 +msgid "Setup Tails persistent volume" +msgstr "" + +#: ../lib/Tails/Persistence/Setup.pm:442 +#, perl-format +msgid "Device %s already has a persistent volume." +msgstr "" + +#: ../lib/Tails/Persistence/Setup.pm:450 +#, perl-format +msgid "Device %s has not enough unallocated space." +msgstr "" + +#: ../lib/Tails/Persistence/Setup.pm:458 ../lib/Tails/Persistence/Setup.pm:472 +#, perl-format +msgid "Device %s has no persistent volume." +msgstr "" + +#: ../lib/Tails/Persistence/Setup.pm:464 +msgid "" +"Cannot delete the persistent volume while in use. You should restart Tails " +"without persistence." +msgstr "" + +#: ../lib/Tails/Persistence/Setup.pm:483 +msgid "Persistence volume is not unlocked." +msgstr "" + +#: ../lib/Tails/Persistence/Setup.pm:488 +msgid "Persistence volume is not mounted." +msgstr "" + +#: ../lib/Tails/Persistence/Setup.pm:493 +msgid "Persistence volume is not readable. Permissions or ownership problems?" +msgstr "" + +#: ../lib/Tails/Persistence/Setup.pm:498 +msgid "Persistence volume is not writable. Maybe it was mounted read-only?" +msgstr "" + +#: ../lib/Tails/Persistence/Setup.pm:507 +#, perl-format +msgid "Tails is running from non-USB device %s." +msgstr "" + +#: ../lib/Tails/Persistence/Setup.pm:513 +#, perl-format +msgid "Device %s is optical." +msgstr "" + +#: ../lib/Tails/Persistence/Setup.pm:520 +#, perl-format +msgid "Device %s was not created using Tails USB installer." +msgstr "" + +#: ../lib/Tails/Persistence/Setup.pm:554 +msgid "Error" +msgstr "" + +#: ../lib/Tails/Persistence/Setup.pm:861 +msgid "Persistence wizard - Finished" +msgstr "" + +#: ../lib/Tails/Persistence/Setup.pm:864 +msgid "" +"Any changes you have made will only take effect after restarting Tails.\n" +"\n" +"You may now close this application." +msgstr "" + +#: ../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 %s %s device. Data on " +"this device will be stored in an encrypted form protected by a passphrase." +msgstr "" + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:66 +msgid "Create" +msgstr "" + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:110 +msgid "" +"Beware! 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 "" + +#: ../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:189 +msgid "Failed" +msgstr "" + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:269 +#: ../lib/Tails/Persistence/Step/Delete.pm:84 +msgid "Correcting attributes on Tails system partition." +msgstr "" + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:272 +#: ../lib/Tails/Persistence/Step/Delete.pm:87 +msgid "The attributes of the Tails system partition will be corrected." +msgstr "" + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:280 +msgid "Mounting Tails persistence partition." +msgstr "" + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:283 +msgid "The Tails persistence partition will be mounted." +msgstr "" + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:304 +msgid "Creating..." +msgstr "" + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:307 +msgid "Creating the persistent volume..." +msgstr "" + +#: ../lib/Tails/Persistence/Step/Configure.pm:60 +msgid "Persistence wizard - Persistent volume configuration" +msgstr "" + +#: ../lib/Tails/Persistence/Step/Configure.pm:63 +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:67 +#, perl-format +msgid "" +"The selected files will be stored in the encrypted partition %s (%s), on the" +" %s %s device." +msgstr "" + +#: ../lib/Tails/Persistence/Step/Configure.pm:73 +msgid "Save" +msgstr "" + +#: ../lib/Tails/Persistence/Step/Configure.pm:135 +msgid "Make custom directory persistent (absolute path):" +msgstr "" + +#: ../lib/Tails/Persistence/Step/Configure.pm:141 +msgid "Destination:" +msgstr "" + +#: ../lib/Tails/Persistence/Step/Configure.pm:204 +msgid "Saving..." +msgstr "" + +#: ../lib/Tails/Persistence/Step/Configure.pm:207 +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 %s %s device, will be deleted." +msgstr "" + +#: ../lib/Tails/Persistence/Step/Delete.pm:54 +msgid "Delete" +msgstr "" + +#: ../lib/Tails/Persistence/Step/Delete.pm:99 +msgid "Deleting..." +msgstr "" + +#: ../lib/Tails/Persistence/Step/Delete.pm:102 +msgid "Deleting the persistent volume..." +msgstr ""

1 0

[translation/torbirdy_completed] Update translations for torbirdy_completed
by translation＠torproject.org 29 Oct '12

29 Oct '12

commit a791115b9947c44dc25ec3fb933c2663294882fd Author: Translation commit bot <translation(a)torproject.org> Date: Mon Oct 29 12:46:00 2012 +0000 Update translations for torbirdy_completed --- zh_CN/torbirdy.dtd | 40 ++++++++++++++++++++++++++++++++++++++++ zh_CN/torbirdy.properties | 13 +++++++++++++ 2 files changed, 53 insertions(+), 0 deletions(-) diff --git a/zh_CN/torbirdy.dtd b/zh_CN/torbirdy.dtd new file mode 100644 index 0000000..b8e4a08 --- /dev/null +++ b/zh_CN/torbirdy.dtd @@ -0,0 +1,40 @@ +<!ENTITY torbirdy.accountprefs.title "帐户设置"> +<!ENTITY torbirdy.accountprefs.startup.label "在启动时检查新邮件"> +<!ENTITY torbirdy.accountprefs.startup.key "C"> +<!ENTITY torbirdy.accountprefs.minutes.label "检查所有的新邮件"> +<!ENTITY torbirdy.accountprefs.minutes.key "y"> +<!ENTITY torbirdy.accountprefs.minutes.trail.label "分"> +<!ENTITY torbirdy.accountprefs.cancel.button "取消"> +<!ENTITY torbirdy.accountprefs.save.button "保存"> +<!ENTITY torbirdy.accountprefs.save.key "S"> + +<!ENTITY torbirdy.prefs.title "TorBirdy 首选项"> +<!ENTITY torbirdy.prefs.save.button "保存"> +<!ENTITY torbirdy.prefs.save.key "s"> +<!ENTITY torbirdy.prefs.cancel.button "取消"> +<!ENTITY torbirdy.prefs.extra2.button "测试设置"> +<!ENTITY torbirdy.prefs.extra2.key "g"> +<!ENTITY torbirdy.prefs.proxy.label "代理设置"> +<!ENTITY torbirdy.prefs.privacy.label "隐私设置"> +<!ENTITY torbirdy.prefs.recommended.text "使用 TorBirdy（Tor）推荐的代理设置"> +<!ENTITY torbirdy.prefs.recommended.key "r"> +<!ENTITY torbirdy.prefs.anonservice.text "选择一个匿名服务"> +<!ENTITY torbirdy.prefs.anonservice.key "a"> +<!ENTITY torbirdy.prefs.customsettings.text "使用自定义代理设置"> +<!ENTITY torbirdy.prefs.customsettings.key "c"> +<!ENTITY torbirdy.prefs.socks_host.label "SOCKS 主机："> +<!ENTITY torbirdy.prefs.socks_host.key "h"> +<!ENTITY torbirdy.prefs.socks_port.label "端口"> +<!ENTITY torbirdy.prefs.socks_port.key "p"> +<!ENTITY torbirdy.prefs.torification.label "透明 Torification"> +<!ENTITY torbirdy.prefs.torification.key "t"> +<!ENTITY torbirdy.prefs.global "全球"> +<!ENTITY torbirdy.prefs.imap.label "启用 IMAP 帐户邮件推送支持[默认：禁用]"> +<!ENTITY torbirdy.prefs.imap.key "i"> +<!ENTITY torbirdy.prefs.startup_folder.label "启动时选择最后访问的邮件文件夹[默认：禁用，选择本地文件夹]"> +<!ENTITY torbirdy.prefs.startup_folder.key "l"> +<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "将收件人 key ID 放入加密邮件（默认：不放入）"> +<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "g"> +<!ENTITY torbirdy.prefs.account_specific "指定帐户"> +<!ENTITY torbirdy.prefs.select_account.key "C"> +<!ENTITY torbirdy.prefs.select_account.label "选择帐户："> diff --git a/zh_CN/torbirdy.properties b/zh_CN/torbirdy.properties new file mode 100644 index 0000000..0e8b29a --- /dev/null +++ b/zh_CN/torbirdy.properties @@ -0,0 +1,13 @@ +torbirdy.name=TorBirdy + +torbirdy.enabled.tor=TorBirdy 已启用：Tor +torbirdy.enabled.jondo=TorBirdy 已启用：JonDo +torbirdy.enabled.custom=TorBirdy 已启用：自定义代理 +torbirdy.enabled.torification=TorBirdy 已启用：透明 Torification +torbirdy.disabled=TorBirdy：已禁用！ + +torbirdy.email.prompt=TorBirdy 已禁用 Thunderbird's 自动配置向导以保护您的匿名性。\n\n这是 %S 推荐的安全设置。\n\n现在您可以手动配置其他的帐户设置。 + +torbirdy.email.advanced=请注意，不推荐您更改高级设置！\n\n如果您知道在做什么就请继续。 +torbirdy.email.advanced.nextwarning=下次显示此警告 +torbirdy.email.advanced.title=TorBirdy 高级设置

1 0

[translation/torbirdy] Update translations for torbirdy
by translation＠torproject.org 29 Oct '12

29 Oct '12

commit f2797f1228b27176cd1d2f7f0b7c1657a932339a Author: Translation commit bot <translation(a)torproject.org> Date: Mon Oct 29 12:45:57 2012 +0000 Update translations for torbirdy --- zh_CN/torbirdy.dtd | 40 ++++++++++++++++++++++++++++++++++++++++ zh_CN/torbirdy.properties | 20 ++++++++++---------- 2 files changed, 50 insertions(+), 10 deletions(-) diff --git a/zh_CN/torbirdy.dtd b/zh_CN/torbirdy.dtd new file mode 100644 index 0000000..b8e4a08 --- /dev/null +++ b/zh_CN/torbirdy.dtd @@ -0,0 +1,40 @@ +<!ENTITY torbirdy.accountprefs.title "帐户设置"> +<!ENTITY torbirdy.accountprefs.startup.label "在启动时检查新邮件"> +<!ENTITY torbirdy.accountprefs.startup.key "C"> +<!ENTITY torbirdy.accountprefs.minutes.label "检查所有的新邮件"> +<!ENTITY torbirdy.accountprefs.minutes.key "y"> +<!ENTITY torbirdy.accountprefs.minutes.trail.label "分"> +<!ENTITY torbirdy.accountprefs.cancel.button "取消"> +<!ENTITY torbirdy.accountprefs.save.button "保存"> +<!ENTITY torbirdy.accountprefs.save.key "S"> + +<!ENTITY torbirdy.prefs.title "TorBirdy 首选项"> +<!ENTITY torbirdy.prefs.save.button "保存"> +<!ENTITY torbirdy.prefs.save.key "s"> +<!ENTITY torbirdy.prefs.cancel.button "取消"> +<!ENTITY torbirdy.prefs.extra2.button "测试设置"> +<!ENTITY torbirdy.prefs.extra2.key "g"> +<!ENTITY torbirdy.prefs.proxy.label "代理设置"> +<!ENTITY torbirdy.prefs.privacy.label "隐私设置"> +<!ENTITY torbirdy.prefs.recommended.text "使用 TorBirdy（Tor）推荐的代理设置"> +<!ENTITY torbirdy.prefs.recommended.key "r"> +<!ENTITY torbirdy.prefs.anonservice.text "选择一个匿名服务"> +<!ENTITY torbirdy.prefs.anonservice.key "a"> +<!ENTITY torbirdy.prefs.customsettings.text "使用自定义代理设置"> +<!ENTITY torbirdy.prefs.customsettings.key "c"> +<!ENTITY torbirdy.prefs.socks_host.label "SOCKS 主机："> +<!ENTITY torbirdy.prefs.socks_host.key "h"> +<!ENTITY torbirdy.prefs.socks_port.label "端口"> +<!ENTITY torbirdy.prefs.socks_port.key "p"> +<!ENTITY torbirdy.prefs.torification.label "透明 Torification"> +<!ENTITY torbirdy.prefs.torification.key "t"> +<!ENTITY torbirdy.prefs.global "全球"> +<!ENTITY torbirdy.prefs.imap.label "启用 IMAP 帐户邮件推送支持[默认：禁用]"> +<!ENTITY torbirdy.prefs.imap.key "i"> +<!ENTITY torbirdy.prefs.startup_folder.label "启动时选择最后访问的邮件文件夹[默认：禁用，选择本地文件夹]"> +<!ENTITY torbirdy.prefs.startup_folder.key "l"> +<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "将收件人 key ID 放入加密邮件（默认：不放入）"> +<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "g"> +<!ENTITY torbirdy.prefs.account_specific "指定帐户"> +<!ENTITY torbirdy.prefs.select_account.key "C"> +<!ENTITY torbirdy.prefs.select_account.label "选择帐户："> diff --git a/zh_CN/torbirdy.properties b/zh_CN/torbirdy.properties index 59ef3a7..0e8b29a 100644 --- a/zh_CN/torbirdy.properties +++ b/zh_CN/torbirdy.properties @@ -1,13 +1,13 @@ -# torbirdy.name=TorBirdy +torbirdy.name=TorBirdy -# torbirdy.enabled.tor=TorBirdy Enabled: Tor -# torbirdy.enabled.jondo=TorBirdy Enabled: JonDo -# torbirdy.enabled.custom=TorBirdy Enabled: Custom Proxy -# torbirdy.enabled.torification=TorBirdy Enabled: Transparent Torification -# torbirdy.disabled=TorBirdy: Disabled! +torbirdy.enabled.tor=TorBirdy 已启用：Tor +torbirdy.enabled.jondo=TorBirdy 已启用：JonDo +torbirdy.enabled.custom=TorBirdy 已启用：自定义代理 +torbirdy.enabled.torification=TorBirdy 已启用：透明 Torification +torbirdy.disabled=TorBirdy：已禁用！ -# torbirdy.email.prompt=TorBirdy has disabled Thunderbird's auto-configuration wizard to protect your anonymity.\n\nThe recommended security settings for %S have been set.\n\nYou can now configure the other account settings manually. +torbirdy.email.prompt=TorBirdy 已禁用 Thunderbird's 自动配置向导以保护您的匿名性。\n\n这是 %S 推荐的安全设置。\n\n现在您可以手动配置其他的帐户设置。 -# torbirdy.email.advanced=Please note that changing the advanced settings of TorBirdy is NOT recommended.\n\nYou should only continue if you are sure of what you are doing. -# torbirdy.email.advanced.nextwarning=Show this warning next time -# torbirdy.email.advanced.title=TorBirdy Advanced Settings +torbirdy.email.advanced=请注意，不推荐您更改高级设置！\n\n如果您知道在做什么就请继续。 +torbirdy.email.advanced.nextwarning=下次显示此警告 +torbirdy.email.advanced.title=TorBirdy 高级设置

1 0