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

[stem/master] Subdirectories for integ and unit tests
by atagar＠torproject.org 08 Oct '11

08 Oct '11

commit d38b8830804e78cd0921333c39c5e9a2ee8ad42f Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Oct 8 13:10:38 2011 -0700 Subdirectories for integ and unit tests Unit and integration tests will be separate subdirectories of test. --- run_tests.py | 4 +- test/__init__.py | 2 +- test/integ/__init__.py | 6 ++ test/unit/__init__.py | 6 ++ test/unit/version.py | 121 ++++++++++++++++++++++++++++++++++++++++++++++++ test/version.py | 121 ------------------------------------------------ 6 files changed, 136 insertions(+), 124 deletions(-) diff --git a/run_tests.py b/run_tests.py index 0fe6365..9debfc2 100755 --- a/run_tests.py +++ b/run_tests.py @@ -5,9 +5,9 @@ Runs unit and integration tests. """ import unittest -import test.version +import test.unit.version if __name__ == '__main__': - suite = unittest.TestLoader().loadTestsFromTestCase(test.version.TestVerionFunctions) + suite = unittest.TestLoader().loadTestsFromTestCase(test.unit.version.TestVerionFunctions) unittest.TextTestRunner(verbosity=2).run(suite) diff --git a/test/__init__.py b/test/__init__.py index 6d651bb..031299c 100644 --- a/test/__init__.py +++ b/test/__init__.py @@ -2,5 +2,5 @@ Unit and integration tests for the stem library. """ -__all__ = ["version"] +__all__ = [] diff --git a/test/integ/__init__.py b/test/integ/__init__.py new file mode 100644 index 0000000..b96692a --- /dev/null +++ b/test/integ/__init__.py @@ -0,0 +1,6 @@ +""" +Integration tests for the stem library. +""" + +__all__ = [] + diff --git a/test/unit/__init__.py b/test/unit/__init__.py new file mode 100644 index 0000000..d7db1bd --- /dev/null +++ b/test/unit/__init__.py @@ -0,0 +1,6 @@ +""" +Unit tests for the stem library. +""" + +__all__ = ["version"] + diff --git a/test/unit/version.py b/test/unit/version.py new file mode 100644 index 0000000..fd32886 --- /dev/null +++ b/test/unit/version.py @@ -0,0 +1,121 @@ +""" +Unit tests for types functions and classes. +""" + +import unittest +import stem.types + +class TestVerionFunctions(unittest.TestCase): + """ + Tests methods and functions related to 'types.Version'. + """ + + def test_parsing(self): + """ + Tests parsing by the 'get_version' function. + """ + + # valid versions with various number of compontents to the version + version = stem.types.get_version("0.1.2.3-tag") + self.assert_versions_match(version, 0, 1, 2, 3, "tag") + + version = stem.types.get_version("0.1.2.3") + self.assert_versions_match(version, 0, 1, 2, 3, None) + + version = stem.types.get_version("0.1.2-tag") + self.assert_versions_match(version, 0, 1, 2, None, "tag") + + version = stem.types.get_version("0.1.2") + self.assert_versions_match(version, 0, 1, 2, None, None) + + # checks an empty tag + version = stem.types.get_version("0.1.2.3-") + self.assert_versions_match(version, 0, 1, 2, 3, "") + + version = stem.types.get_version("0.1.2-") + self.assert_versions_match(version, 0, 1, 2, None, "") + + # checks invalid version strings + self.assertRaises(ValueError, stem.types.get_version, "") + self.assertRaises(ValueError, stem.types.get_version, "1.2.3.4nodash") + self.assertRaises(ValueError, stem.types.get_version, "1.2.3.a") + self.assertRaises(ValueError, stem.types.get_version, "1.2.a.4") + self.assertRaises(ValueError, stem.types.get_version, "12.3") + self.assertRaises(ValueError, stem.types.get_version, "1.-2.3") + + def test_comparison(self): + """ + Tests comparision between Version instances. + """ + + # check for basic incrementing in each portion + self.assert_version_is_greater("1.1.2.3-tag", "0.1.2.3-tag") + self.assert_version_is_greater("0.2.2.3-tag", "0.1.2.3-tag") + self.assert_version_is_greater("0.1.3.3-tag", "0.1.2.3-tag") + self.assert_version_is_greater("0.1.2.4-tag", "0.1.2.3-tag") + self.assert_version_is_greater("0.1.2.3-ugg", "0.1.2.3-tag") + self.assert_version_is_equal("0.1.2.3-tag", "0.1.2.3-tag") + + # checks that a missing patch level equals zero + self.assert_version_is_equal("0.1.2", "0.1.2.0") + self.assert_version_is_equal("0.1.2-tag", "0.1.2.0-tag") + + # checks for missing patch or status + self.assert_version_is_greater("0.1.2.3-tag", "0.1.2.3") + self.assert_version_is_greater("0.1.2.3-tag", "0.1.2-tag") + self.assert_version_is_greater("0.1.2.3-tag", "0.1.2") + + self.assert_version_is_equal("0.1.2.3", "0.1.2.3") + self.assert_version_is_equal("0.1.2", "0.1.2") + + def test_string(self): + """ + Tests the Version -> string conversion. + """ + + # checks conversion with various numbers of arguments + + self.assert_string_matches("0.1.2.3-tag") + self.assert_string_matches("0.1.2.3") + self.assert_string_matches("0.1.2") + + def assert_versions_match(self, version, major, minor, micro, patch, status): + """ + Asserts that the values for a types.Version instance match the given + values. + """ + + self.assertEqual(version.major, major) + self.assertEqual(version.minor, minor) + self.assertEqual(version.micro, micro) + self.assertEqual(version.patch, patch) + self.assertEqual(version.status, status) + + def assert_version_is_greater(self, firstVersion, secondVersion): + """ + Asserts that the parsed version of the first version is greate than the + second (also checking the inverse). + """ + + version1 = stem.types.get_version(firstVersion) + version2 = stem.types.get_version(secondVersion) + self.assertEqual(version1 > version2, True) + self.assertEqual(version1 < version2, False) + + def assert_version_is_equal(self, firstVersion, secondVersion): + """ + Asserts that the parsed version of the first version equals the second. + """ + + version1 = stem.types.get_version(firstVersion) + version2 = stem.types.get_version(secondVersion) + self.assertEqual(version1, version2) + + def assert_string_matches(self, version): + """ + Parses the given version string then checks that its string representation + matches the input. + """ + + self.assertEqual(version, str(stem.types.get_version(version))) + diff --git a/test/version.py b/test/version.py deleted file mode 100644 index fd32886..0000000 --- a/test/version.py +++ /dev/null @@ -1,121 +0,0 @@ -""" -Unit tests for types functions and classes. -""" - -import unittest -import stem.types - -class TestVerionFunctions(unittest.TestCase): - """ - Tests methods and functions related to 'types.Version'. - """ - - def test_parsing(self): - """ - Tests parsing by the 'get_version' function. - """ - - # valid versions with various number of compontents to the version - version = stem.types.get_version("0.1.2.3-tag") - self.assert_versions_match(version, 0, 1, 2, 3, "tag") - - version = stem.types.get_version("0.1.2.3") - self.assert_versions_match(version, 0, 1, 2, 3, None) - - version = stem.types.get_version("0.1.2-tag") - self.assert_versions_match(version, 0, 1, 2, None, "tag") - - version = stem.types.get_version("0.1.2") - self.assert_versions_match(version, 0, 1, 2, None, None) - - # checks an empty tag - version = stem.types.get_version("0.1.2.3-") - self.assert_versions_match(version, 0, 1, 2, 3, "") - - version = stem.types.get_version("0.1.2-") - self.assert_versions_match(version, 0, 1, 2, None, "") - - # checks invalid version strings - self.assertRaises(ValueError, stem.types.get_version, "") - self.assertRaises(ValueError, stem.types.get_version, "1.2.3.4nodash") - self.assertRaises(ValueError, stem.types.get_version, "1.2.3.a") - self.assertRaises(ValueError, stem.types.get_version, "1.2.a.4") - self.assertRaises(ValueError, stem.types.get_version, "12.3") - self.assertRaises(ValueError, stem.types.get_version, "1.-2.3") - - def test_comparison(self): - """ - Tests comparision between Version instances. - """ - - # check for basic incrementing in each portion - self.assert_version_is_greater("1.1.2.3-tag", "0.1.2.3-tag") - self.assert_version_is_greater("0.2.2.3-tag", "0.1.2.3-tag") - self.assert_version_is_greater("0.1.3.3-tag", "0.1.2.3-tag") - self.assert_version_is_greater("0.1.2.4-tag", "0.1.2.3-tag") - self.assert_version_is_greater("0.1.2.3-ugg", "0.1.2.3-tag") - self.assert_version_is_equal("0.1.2.3-tag", "0.1.2.3-tag") - - # checks that a missing patch level equals zero - self.assert_version_is_equal("0.1.2", "0.1.2.0") - self.assert_version_is_equal("0.1.2-tag", "0.1.2.0-tag") - - # checks for missing patch or status - self.assert_version_is_greater("0.1.2.3-tag", "0.1.2.3") - self.assert_version_is_greater("0.1.2.3-tag", "0.1.2-tag") - self.assert_version_is_greater("0.1.2.3-tag", "0.1.2") - - self.assert_version_is_equal("0.1.2.3", "0.1.2.3") - self.assert_version_is_equal("0.1.2", "0.1.2") - - def test_string(self): - """ - Tests the Version -> string conversion. - """ - - # checks conversion with various numbers of arguments - - self.assert_string_matches("0.1.2.3-tag") - self.assert_string_matches("0.1.2.3") - self.assert_string_matches("0.1.2") - - def assert_versions_match(self, version, major, minor, micro, patch, status): - """ - Asserts that the values for a types.Version instance match the given - values. - """ - - self.assertEqual(version.major, major) - self.assertEqual(version.minor, minor) - self.assertEqual(version.micro, micro) - self.assertEqual(version.patch, patch) - self.assertEqual(version.status, status) - - def assert_version_is_greater(self, firstVersion, secondVersion): - """ - Asserts that the parsed version of the first version is greate than the - second (also checking the inverse). - """ - - version1 = stem.types.get_version(firstVersion) - version2 = stem.types.get_version(secondVersion) - self.assertEqual(version1 > version2, True) - self.assertEqual(version1 < version2, False) - - def assert_version_is_equal(self, firstVersion, secondVersion): - """ - Asserts that the parsed version of the first version equals the second. - """ - - version1 = stem.types.get_version(firstVersion) - version2 = stem.types.get_version(secondVersion) - self.assertEqual(version1, version2) - - def assert_string_matches(self, version): - """ - Parses the given version string then checks that its string representation - matches the input. - """ - - self.assertEqual(version, str(stem.types.get_version(version))) -

1 0

[stem/master] Using Pascal Case styling (unscores) for variables
by atagar＠torproject.org 08 Oct '11

08 Oct '11

commit 39e10eed903c1920a50a175803726035b8448712 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Oct 8 14:03:08 2011 -0700 Using Pascal Case styling (unscores) for variables According to PEP8 [1] both functions and variable names should use the underscore naming convention (ie, 'my_var') rather than camel case ('myVar'). This is a little weird for me and python standard libraries use both, but I see a readability advantage to this for functions and my previous approach of using camel case just for variables is kinda weird. Hence switching to the 'right' convention while the codebase is still tiny. As an added bonus this conforms with torctl... [1] http://www.python.org/dev/peps/pep-0008/ --- stem/types.py | 24 ++++++++++++------------ test/unit/version.py | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/stem/types.py b/stem/types.py index 0f7030b..58845fe 100644 --- a/stem/types.py +++ b/stem/types.py @@ -55,23 +55,23 @@ class Version: raise ValueError("types.Version can only be compared with other Version instances") for attr in ("major", "minor", "micro", "patch"): - myVersion = max(0, self.__dict__[attr]) - otherVersion = max(0, other.__dict__[attr]) + my_version = max(0, self.__dict__[attr]) + other_version = max(0, other.__dict__[attr]) - if myVersion > otherVersion: return 1 - elif myVersion < otherVersion: return -1 + if my_version > other_version: return 1 + elif my_version < other_version: return -1 - myStatus = self.status if self.status else "" - otherStatus = other.status if other.status else "" + my_status = self.status if self.status else "" + other_status = other.status if other.status else "" - return cmp(myStatus, otherStatus) + return cmp(my_status, other_status) -def get_version(versionStr): +def get_version(version_str): """ Parses a version string, providing back a types.Version instance. Arguments: - versionStr (str) - string representing a tor version (ex. "0.2.2.23-alpha") + version_str (str) - representation of a tor version (ex. "0.2.2.23-alpha") Returns: types.Version instance @@ -80,10 +80,10 @@ def get_version(versionStr): ValueError if input isn't a valid tor version """ - if not isinstance(versionStr, str): + if not isinstance(version_str, str): raise ValueError("argument is not a string") - m = re.match(r'^([0-9]+).([0-9]+).([0-9]+)(.[0-9]+)?(-\S*)?$', versionStr) + m = re.match(r'^([0-9]+).([0-9]+).([0-9]+)(.[0-9]+)?(-\S*)?$', version_str) if m: major, minor, micro, patch, status = m.groups() @@ -95,5 +95,5 @@ def get_version(versionStr): if status: status = status[1:] return Version(int(major), int(minor), int(micro), patch, status) - else: raise ValueError("'%s' isn't a properly formatted tor version" % versionStr) + else: raise ValueError("'%s' isn't a properly formatted tor version" % version_str) diff --git a/test/unit/version.py b/test/unit/version.py index fd32886..f241a8c 100644 --- a/test/unit/version.py +++ b/test/unit/version.py @@ -91,24 +91,24 @@ class TestVerionFunctions(unittest.TestCase): self.assertEqual(version.patch, patch) self.assertEqual(version.status, status) - def assert_version_is_greater(self, firstVersion, secondVersion): + def assert_version_is_greater(self, first_version, second_version): """ Asserts that the parsed version of the first version is greate than the second (also checking the inverse). """ - version1 = stem.types.get_version(firstVersion) - version2 = stem.types.get_version(secondVersion) + version1 = stem.types.get_version(first_version) + version2 = stem.types.get_version(second_version) self.assertEqual(version1 > version2, True) self.assertEqual(version1 < version2, False) - def assert_version_is_equal(self, firstVersion, secondVersion): + def assert_version_is_equal(self, first_version, second_version): """ Asserts that the parsed version of the first version equals the second. """ - version1 = stem.types.get_version(firstVersion) - version2 = stem.types.get_version(secondVersion) + version1 = stem.types.get_version(first_version) + version2 = stem.types.get_version(second_version) self.assertEqual(version1, version2) def assert_string_matches(self, version):

1 0

[stem/master] Running tests based on input arguments
by atagar＠torproject.org 08 Oct '11

08 Oct '11

commit 3dd9ea0d9222ddf22e63c7f5dcf8e7032e6fb494 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Oct 8 16:04:08 2011 -0700 Running tests based on input arguments Making the test runner accept arguments for the type of tests to be ran. The integration tests especially will take a while when they're implemented so letting the user specify the use cases for those. This included copying and refactoring some basic utilities from arm for enumerations and terminal text attributes. --- run_tests.py | 102 ++++++++++++++++++++++++++++++++- stem/types.py | 2 +- stem/util/__init__.py | 6 ++ stem/util/enum.py | 150 +++++++++++++++++++++++++++++++++++++++++++++++++ stem/util/term.py | 57 +++++++++++++++++++ 5 files changed, 314 insertions(+), 3 deletions(-) diff --git a/run_tests.py b/run_tests.py index 9debfc2..e1c0811 100755 --- a/run_tests.py +++ b/run_tests.py @@ -4,10 +4,108 @@ Runs unit and integration tests. """ +import sys +import getopt import unittest import test.unit.version +from stem.util import enum, term + +OPT = "uit:h" +OPT_EXPANDED = ["unit", "integ", "targets=", "help"] +DIVIDER = "=" * 80 + +# Configurations that the intergration tests can be ran with. Attributs are +# tuples of the test runner and description. +TARGETS = enum.Enum(*[(v, v) for v in ("NONE", "NO_CONTROL", "NO_AUTH", "COOKIE", "PASSWORD", "SOCKET")]) +TARGET_ATTR = { + TARGETS.NONE: (None, "No running tor instance."), + TARGETS.NO_CONTROL: (None, "Basic client, no control port or socket."), + TARGETS.NO_AUTH: (None, "Basic client, control port with no authenticaion."), + TARGETS.COOKIE: (None, "Basic client, control port with cookie authenticaion."), + TARGETS.PASSWORD: (None, "Basic client, control port wiht password authentication."), + TARGETS.SOCKET: (None, "Basic client, control socket."), +} + +HELP_MSG = """Usage runTests.py [OPTION] +Runs tests for the stem library. + + -u, --unit runs unit tests + -i, --integ runs integration tests + -t, --target comma separated list of tor configurations to use for the + integration tests (all are used by default) + -h, --help presents this help + + Integration targets: + %s +""" + if __name__ == '__main__': - suite = unittest.TestLoader().loadTestsFromTestCase(test.unit.version.TestVerionFunctions) - unittest.TextTestRunner(verbosity=2).run(suite) + run_unit_tests = False + run_integ_tests = False + integ_targets = TARGETS.values() + + # parses user input, noting any issues + try: + opts, args = getopt.getopt(sys.argv[1:], OPT, OPT_EXPANDED) + except getopt.GetoptError, exc: + print str(exc) + " (for usage provide --help)" + sys.exit(1) + + for opt, arg in opts: + if opt in ("-u", "--unit"): run_unit_tests = True + elif opt in ("-i", "--integ"): run_integ_tests = True + elif opt in ("-t", "--targets"): + integ_targets = arg.split(",") + + # validates the targets + if not integ_targets: + print "No targets provided" + sys.exit(1) + + for target in integ_targets: + if not target in TARGETS.values(): + print "Invalid integration target: %s" % target + sys.exit(1) + elif opt in ("-h", "--help"): + # Prints usage information and quits. This includes a listing of the + # valid integration targets. + + # gets the longest target length so we can show the entries in columns + target_name_length = max([len(name) for name in TARGETS.values()]) + description_format = "%%-%is - %%s" % target_name_length + + target_lines = [] + for target in TARGETS.values(): + target_lines.append(description_format % (target, TARGET_ATTR[target][1])) + + print HELP_MSG % "\n ".join(target_lines) + sys.exit() + + if not run_unit_tests and not run_integ_tests: + print "Nothing to run (for usage provide --help)\n" + sys.exit() + + if run_unit_tests: + print "%s\nUnit Tests\n%s\n" % (DIVIDER, DIVIDER) + + suite = unittest.TestLoader().loadTestsFromTestCase(test.unit.version.TestVerionFunctions) + unittest.TextTestRunner(verbosity=2).run(suite) + + print "" + + if run_integ_tests: + print "%s\nIntegration Tests\n%s\n" % (DIVIDER, DIVIDER) + + for target in integ_targets: + runner, description = TARGET_ATTR[target] + + print "Configuration: %s - %s" % (target, description) + + if runner: + pass # TODO: implement + else: + print " %s" % term.format("Unimplemented", term.Color.RED, term.Attr.BOLD) + + print "" diff --git a/stem/types.py b/stem/types.py index 58845fe..f4583e3 100644 --- a/stem/types.py +++ b/stem/types.py @@ -76,7 +76,7 @@ def get_version(version_str): Returns: types.Version instance - Throws: + Raises: ValueError if input isn't a valid tor version """ diff --git a/stem/util/__init__.py b/stem/util/__init__.py new file mode 100644 index 0000000..e079d62 --- /dev/null +++ b/stem/util/__init__.py @@ -0,0 +1,6 @@ +""" +Utility functions used by the stem library. +""" + +__all__ = ["enum", "term"] + diff --git a/stem/util/enum.py b/stem/util/enum.py new file mode 100644 index 0000000..d7745ec --- /dev/null +++ b/stem/util/enum.py @@ -0,0 +1,150 @@ +""" +Basic enumeration, providing ordered types for collections. These can be +constructed as simple type listings, ie: +>>> insects = Enum("ANT", "WASP", "LADYBUG", "FIREFLY") +>>> insects.ANT +'Ant' +>>> insects.values() +['Ant', 'Wasp', 'Ladybug', 'Firefly'] + +with overwritten string counterparts: +>>> pets = Enum(("DOG", "Skippy"), "CAT", ("FISH", "Nemo")) +>>> pets.DOG +'Skippy' +>>> pets.CAT +'Cat' + +or with entirely custom string components as an unordered enum with: +>>> pets = LEnum(DOG="Skippy", CAT="Kitty", FISH="Nemo") +>>> pets.CAT +'Kitty' +""" + +def to_camel_case(label, word_divider = " "): + """ + Converts the given string to camel case, ie: + >>> to_camel_case("I_LIKE_PEPPERJACK!") + 'I Like Pepperjack!' + + Arguments: + label (str) - input string to be converted + word_divider (str) - string used to replace underscores + """ + + words = [] + for entry in label.split("_"): + if len(entry) == 0: words.append("") + elif len(entry) == 1: words.append(entry.upper()) + else: words.append(entry[0].upper() + entry[1:].lower()) + + return word_divider.join(words) + +class Enum: + """ + Basic enumeration. + """ + + def __init__(self, *args): + # ordered listings of our keys and values + keys, values = [], [] + + for entry in args: + if isinstance(entry, str): + key, val = entry, to_camel_case(entry) + elif isinstance(entry, tuple) and len(entry) == 2: + key, val = entry + else: raise ValueError("Unrecognized input: %s" % args) + + keys.append(key) + values.append(val) + self.__dict__[key] = val + + self._keys = tuple(keys) + self._values = tuple(values) + + def keys(self): + """ + Provides an ordered listing of the enumeration keys in this set. + + Returns: + tuple with our enum keys + """ + + return self._keys + + def values(self): + """ + Provides an ordered listing of the enumerations in this set. + + Returns: + tuple with our enum values + """ + + return self._values + + def index_of(self, value): + """ + Provides the index of the given value in the collection. + + Arguments: + value - entry to be looked up + + Returns: + integer index of the given entry + + Raises: + ValueError if no such element exists + """ + + return self._values.index(value) + + def next(self, value): + """ + Provides the next enumeration after the given value. + + Arguments: + value - enumeration for which to get the next entry + + Returns: + enum value following the given entry + + Raises: + ValueError if no such element exists + """ + + if not value in self._values: + raise ValueError("No such enumeration exists: %s (options: %s)" % (value, ", ".join(self._values))) + + next_index = (self._values.index(value) + 1) % len(self._values) + return self._values[next_index] + + def previous(self, value): + """ + Provides the previous enumeration before the given value. + + Arguments: + value - enumeration for which to get the previous entry + + Returns: + enum value proceeding the given entry + + Raises: + ValueError if no such element exists + """ + + if not value in self._values: + raise ValueError("No such enumeration exists: %s (options: %s)" % (value, ", ".join(self._values))) + + prev_index = (self._values.index(value) - 1) % len(self._values) + return self._values[prev_index] + +class LEnum(Enum): + """ + Enumeration that accepts custom string mappings. + """ + + def __init__(self, **args): + Enum.__init__(self) + self.__dict__.update(args) + self._values = sorted(args.values()) + diff --git a/stem/util/term.py b/stem/util/term.py new file mode 100644 index 0000000..7f3449e --- /dev/null +++ b/stem/util/term.py @@ -0,0 +1,57 @@ +""" +Utilities for working with the terminal. +""" + +import enum + +TERM_COLORS = ("BLACK", "RED", "GREEN", "YELLOW", "BLUE", "MAGENTA", "CYAN", "WHITE") + +Color = enum.Enum(*TERM_COLORS) +BgColor = enum.Enum(*["BG_" + color for color in TERM_COLORS]) +Attr = enum.Enum("BOLD", "UNDERLINE", "HILIGHT") + +# mappings of terminal attribute enums to their ANSI escape encoding +FG_ENCODING = dict([(Color.values()[i], str(30 + i)) for i in range(8)]) +BG_ENCODING = dict([(BgColor.values()[i], str(40 + i)) for i in range(8)]) +ATTR_ENCODING = {Attr.BOLD: "1", Attr.UNDERLINE: "4", Attr.HILIGHT: "7"} + +CSI = "\x1B[%sm" +RESET = CSI % "0" + +def format(msg, *attr): + """ + Simple terminal text formatting, using ANSI escape sequences from: + https://secure.wikimedia.org/wikipedia/en/wiki/ANSI_escape_code#CSI_codes + + toolkits providing similar capabilities: + * django.utils.termcolors + https://code.djangoproject.com/browser/django/trunk/django/utils/termcolors… + + * termcolor + http://pypi.python.org/pypi/termcolor + + * colorama + http://pypi.python.org/pypi/colorama + + Arguments: + msg (str) - string to be formatted + attr (str) - text attributes, this can be Color, BgColor, or Attr enums and + are case insensitive (so strings like "red" are fine) + + Returns: + string wrapped with ANSI escape encodings, starting with the given + attributes and ending with a reset + """ + + encodings = [] + for text_attr in attr: + text_attr, encoding = enum.to_camel_case(text_attr), None + encoding = FG_ENCODING.get(text_attr, encoding) + encoding = BG_ENCODING.get(text_attr, encoding) + encoding = ATTR_ENCODING.get(text_attr, encoding) + if encoding: encodings.append(encoding) + + if encodings: + return (CSI % ";".join(encodings)) + msg + RESET + else: return msg +

1 0

[stem/master] Adding gitignore for pyc and vim swap files
by atagar＠torproject.org 08 Oct '11

08 Oct '11

commit 88921da126612d90a2dbf002f37ba236da047cd4 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Oct 8 16:15:48 2011 -0700 Adding gitignore for pyc and vim swap files --- .gitignore | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..0e16dd0 --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +*.pyc +*.swp +

1 0

[tor-cloud/master] Set up automatic package upgrades with the unattended-upgrades package
by runa＠torproject.org 08 Oct '11

08 Oct '11

commit 56efc8f6da2a2d677b80132faa5c2d68f88972cc Author: Runa A. Sandvik <runa.sandvik(a)gmail.com> Date: Sat Oct 8 22:01:51 2011 +0100 Set up automatic package upgrades with the unattended-upgrades package --- ec2-prep.sh | 49 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 48 insertions(+), 1 deletions(-) diff --git a/ec2-prep.sh b/ec2-prep.sh index 7ad1a9c..a1b1e99 100644 --- a/ec2-prep.sh +++ b/ec2-prep.sh @@ -10,12 +10,55 @@ SOURCES="/etc/apt/sources.list"; CONFIG="$1"; CONFIG_FILE="/etc/tor/torrc"; RESERVATION="`curl -m 5 http://169.254.169.254/latest/meta-data/reservation-id | sed 's/-//'`"; +PERIODIC="/etc/apt/apt.conf.d/10periodic" +UNATTENDED_UPGRADES="/etc/apt/apt.conf.d/50unattended-upgrades" +# Make sure that we are root if [ "$USER" != "root" ]; then echo "root required; re-run with sudo"; exit 1; fi +# Install and configure unattended-upgrades. The system will +# automatically download, install and configure all packages, and reboot +# if necessary. +echo "Installing unattended-upgrades..." +aptitude install unattended-upgrades + +# Back up the original configuration +mv /etc/apt/apt.conf.d/10periodic /etc/apt/apt.conf.d/10periodic.bkp +mv /etc/apt/apt.conf.d/50unattended-upgrades /etc/apt/apt.conf.d/50unattended-upgrades.bkp + +echo "Configuring the unattended-upgrades package..." + +# Choose what to upgrade in 10periodic +cat << EOF > $PERIODIC +# Update the package list, download, and install available upgrades +# every day. The local archive is cleaned once a week. +APT::Periodic::Enable "1"; +APT::Periodic::Update-Package-Lists "1"; +APT::Periodic::Download-Upgradeable-Packages "1"; +APT::Periodic::AutocleanInterval "7"; +APT::Periodic::Unattended-Upgrade "1"; +EOF + +# Enable automatic package updates in 50unattended-upgrades +cat << EOF > $UNATTENDED_UPGRADES +// Automatically upgrade packages from these (origin, archive) pairs +Unattended-Upgrade::Allowed-Origins { + "Ubuntu lucid"; + "Ubuntu lucid-security"; + "Ubuntu lucid-updates"; + "Tor lucid"; + "Tor experimental-lucid"; +}; + +// Automatically reboot *WITHOUT CONFIRMATION* if the file +// /var/run/reboot-required is found after the upgrade +Unattended-Upgrade::Automatic-Reboot "true"; +EOF + +# Choose how to configure Tor case "$CONFIG" in "bridge" ) echo "selecting $CONFIG config...";; "privatebridge" ) echo "selecting $CONFIG config...";; @@ -30,21 +73,25 @@ exit 2; ;; esac +# Add deb.torproject.org to /etc/apt/sources.list echo "Adding Tor's repo for $DISTRO..."; cat << EOF >> $SOURCES deb http://deb.torproject.org/torproject.org $DISTRO main deb http://deb.torproject.org/torproject.org experimental-$DISTRO main EOF +# Install Tor's GPG key echo "Installing Tor's gpg key..."; gpg --keyserver keys.gnupg.net --recv 886DDD89 gpg --export A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89 | apt-key add - +# Install Tor echo "Installing Tor..."; aptitude safe-upgrade -y apt-get -y update apt-get -y install tor tor-geoipdb +# Configure Tor echo "Configuring Tor..."; cp /etc/tor/torrc /etc/tor/torrc.bkp @@ -98,4 +145,4 @@ echo "Restarting Tor..."; sudo update-rc.d tor enable echo "echo 'Tor Cloud Starting...'" > /etc/ec2-prep.sh -sudo reboot \ No newline at end of file +sudo reboot

1 0

[tor-cloud/master] Fixed the path to the repo in the README
by runa＠torproject.org 08 Oct '11

08 Oct '11

commit ad664225488408fe7b2da1f21b2be51dfc121979 Author: Runa A. Sandvik <runa.sandvik(a)gmail.com> Date: Sat Oct 8 17:34:48 2011 +0100 Fixed the path to the repo in the README --- README | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/README b/README index 8ac1690..9dfe2be 100644 --- a/README +++ b/README @@ -6,5 +6,4 @@ All tickets related to this project can be found under the "Tor Cloud" component on trac.torproject.org. The code was hosted by Expression Tech on github.com/inf0/Tor-Cloud/, -but was moved to gitweb.torproject.org/user/runa/tor-cloud.git on -October 8, 2011. +but was moved to gitweb.torproject.org/tor-cloud.git on October 8, 2011.

1 0

[tor-cloud/master] Move build instructions to BUILD, write a new README and remove the
by runa＠torproject.org 08 Oct '11

08 Oct '11

commit 6de0bea435e848868d16e1a6bfbf859acf6fe1e1 Author: Runa A. Sandvik <runa.sandvik(a)gmail.com> Date: Sat Oct 8 17:33:26 2011 +0100 Move build instructions to BUILD, write a new README and remove the tor-cloud file --- BUILD | 41 ++++++++++++++++++++++++++++++++ README | 47 ++++++------------------------------ tor-cloud | 78 ------------------------------------------------------------- 3 files changed, 49 insertions(+), 117 deletions(-) diff --git a/BUILD b/BUILD new file mode 100644 index 0000000..5866339 --- /dev/null +++ b/BUILD @@ -0,0 +1,41 @@ + +Installation: + + 1) Install ec2-api-tools on your laptop or build machine + 2) Generate and save your private keys: + export EC2_PRIVATE_KEY=~/keys/pk.cert + export EC2_CERT=~./keys/cert.pem + 3) Test your ec2-api-tools: + root@inf0:~/Tor-Cloud# ec2-describe-regions + REGION eu-west-1 ec2.eu-west-1.amazonaws.com + REGION us-east-1 ec2.us-east-1.amazonaws.com + REGION ap-northeast-1 ec2.ap-northeast-1.amazonaws.com + REGION us-west-1 ec2.us-west-1.amazonaws.com + REGION ap-southeast-1 ec2.ap-southeast-1.amazonaws.com + + 4) Generate private keys for each region: + for example: ec2-add-keypair --region us-east-1 tor-cloud-east-1 + and save the key in: ~/keys/tor-cloud-east-1.pem, don't forget to run chmod 600 ~/keys/* + + Your folder should look like this: + root@inf0:~/Tor-Cloud# ls /home/architect/keys/ -lh + -rw------- 1 root root 1.7K 2011-09-12 19:11 tor-cloud-ap-northeast-1.pem + -rw------- 1 root root 1.7K 2011-09-12 19:13 tor-cloud-ap-southeast-1.pem + -rw------- 1 root root 1.7K 2011-09-12 19:14 tor-cloud-eu-west-1.pem + -rw------- 1 root root 1.7K 2011-09-12 19:09 tor-cloud-us-east-1.pem + -rw------- 1 root root 1.7K 2011-09-12 19:09 tor-cloud-us-west-1.pem + + 5) Create a Security Group called "tor-cloud-build" and allow SSH inbound traffic. + + 6) You are now ready to build Bridge AMIs: + For example, to build in "ap-southeast-1" region run: + ./build.sh bridge ap-southeast-1 /home/architect/keys/tor-cloud-ap-southeast-1.pem tor-cloud-ap-southeast-1 + + TIP: You can run the build command for all the regions at the same time. Use screen or & to send the process to background! + + + + + + + diff --git a/README b/README index 5866339..8ac1690 100644 --- a/README +++ b/README @@ -1,41 +1,10 @@ +The Tor Cloud Project is a collaboration between Expression Technologies +and the Tor Project, Inc. The goal of this project is to provide +bridge-by-default images for Amazon EC2. -Installation: +All tickets related to this project can be found under the "Tor Cloud" +component on trac.torproject.org. - 1) Install ec2-api-tools on your laptop or build machine - 2) Generate and save your private keys: - export EC2_PRIVATE_KEY=~/keys/pk.cert - export EC2_CERT=~./keys/cert.pem - 3) Test your ec2-api-tools: - root@inf0:~/Tor-Cloud# ec2-describe-regions - REGION eu-west-1 ec2.eu-west-1.amazonaws.com - REGION us-east-1 ec2.us-east-1.amazonaws.com - REGION ap-northeast-1 ec2.ap-northeast-1.amazonaws.com - REGION us-west-1 ec2.us-west-1.amazonaws.com - REGION ap-southeast-1 ec2.ap-southeast-1.amazonaws.com - - 4) Generate private keys for each region: - for example: ec2-add-keypair --region us-east-1 tor-cloud-east-1 - and save the key in: ~/keys/tor-cloud-east-1.pem, don't forget to run chmod 600 ~/keys/* - - Your folder should look like this: - root@inf0:~/Tor-Cloud# ls /home/architect/keys/ -lh - -rw------- 1 root root 1.7K 2011-09-12 19:11 tor-cloud-ap-northeast-1.pem - -rw------- 1 root root 1.7K 2011-09-12 19:13 tor-cloud-ap-southeast-1.pem - -rw------- 1 root root 1.7K 2011-09-12 19:14 tor-cloud-eu-west-1.pem - -rw------- 1 root root 1.7K 2011-09-12 19:09 tor-cloud-us-east-1.pem - -rw------- 1 root root 1.7K 2011-09-12 19:09 tor-cloud-us-west-1.pem - - 5) Create a Security Group called "tor-cloud-build" and allow SSH inbound traffic. - - 6) You are now ready to build Bridge AMIs: - For example, to build in "ap-southeast-1" region run: - ./build.sh bridge ap-southeast-1 /home/architect/keys/tor-cloud-ap-southeast-1.pem tor-cloud-ap-southeast-1 - - TIP: You can run the build command for all the regions at the same time. Use screen or & to send the process to background! - - - - - - - +The code was hosted by Expression Tech on github.com/inf0/Tor-Cloud/, +but was moved to gitweb.torproject.org/user/runa/tor-cloud.git on +October 8, 2011. diff --git a/tor-cloud b/tor-cloud deleted file mode 100644 index 73bf8de..0000000 --- a/tor-cloud +++ /dev/null @@ -1,78 +0,0 @@ -Tor Cloud - -Users on the Internet are being introduced to many cloud-based services. -Amazon Web Service offers a cloud based hosting service called EC2. Users are -able to launch virtual machines and pay only for what they use. Tor network can -always use more bandwidth and more nodes in different places around the globe. -Spot Instances are a new way to purchase and consume Amazon EC2 Instances at -discounted rates. They allow customers to bid on unused Amazon EC2 capacity and -run those instances for as long as their bid exceeds the current Spot Price. - -We can take advantage of these savings and offer people a way to run relays and -bridges on the Amazon cloud with little or no technical experties. -The Tor project would maintain it's own AMI on Amaozn S3 which public can -launch and quickly add capacity to the Tor network. - -We should offer a number of Pricing and Bandwidth tiers. We can have packages -as low as $10/month. (needs to be re-calculated and tested) - - -AMI - Ubuntu on Amazon EC2 -Canonical, the corporation behind Ubuntu operating system maintains an updated -AMI of the latest versions of Ubuntu operating system. We can create our scripts -to work with these official nodes: http://cloud.ubuntu.com/ami/ - -There AMIs are total of 5 datacenters in 4 countries in the world, we should -come up with a plan to distribute our Amazon cloud nodes among all 5 locations: - -Countires: -USA, Ireland, Tokyo, Singapore - -Datacenteres: -- asia pacific northeast-1 -- asia pacific southeast-1 -- europe-west-1 -- us-east-1 -- us-west-1 - - -TODO: we must change the design, so each instance is owned by a separate Amazon account, rather than having them all -under one dev-pay account! - -Amazon Dev-Pay - easy billing and payment processing - -We can take advantage of Amazon Dev-Pay in order to make the process of -launching Tor nodes seamless to the user. -We will create a webpage with a few options to launch Tor Cloud AMIs. -We will have 1 option creted for lowest possible dollar amount and 2 or -more with higher bandwidth and resources. Tor can add a surcharge to this -product in order to also generate income, while growing the Tor network. -At minimum we should charge the cost of dev-pay which is about 3%. - - -We want to minimize the number of steps to enhance the usability of this -service, Proposed steps: - -1. Login to cloud.torproject.org -2. Select desired Tor image. -3. login with amazon account/signup for amazon account -4. Start Node. -5. Stop/Paus Node. - - - -Requirements: - -- Dedicated amazon account for dev-pay purpose only -- Build machines -- Sign up for dev-pay with amazon -- register a product -- create AMI -- associate AMI with product -- create website at: cloud.torproject.org - - -Design: 20 hours of design -Programming: 40 hours -Testing: 20 hours -

1 0

[translation/vidalia_installer] Update translations for vidalia_installer
by translation＠torproject.org 08 Oct '11

08 Oct '11

commit a3b8d66d6cca8654d1f9a5a3a9a1a4c3632af6cd Author: Translation commit bot <translation(a)torproject.org> Date: Sat Oct 8 15:01:23 2011 +0000 Update translations for vidalia_installer --- hu/vidalia_hu.po | 43 +++++++++++++++++++++++++++++++++++++------ 1 files changed, 37 insertions(+), 6 deletions(-) diff --git a/hu/vidalia_hu.po b/hu/vidalia_hu.po index 4906fbd..c65e9db 100755 --- a/hu/vidalia_hu.po +++ b/hu/vidalia_hu.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2008-07-12 05:29+0000\n" -"PO-Revision-Date: 2011-10-08 14:13+0000\n" +"PO-Revision-Date: 2011-10-08 14:55+0000\n" "Last-Translator: vargaviktor <viktor.varga(a)gmail.com>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -17,7 +17,7 @@ msgstr "" msgctxt "BundleSetupCaption" msgid "${BUNDLE_NAME} setup" -msgstr "$ {} BUNDLE_NAME telepítő" +msgstr "${BUNDLE_NAME} telepítő" msgctxt "BundleWelcomeText" msgid "" @@ -33,6 +33,17 @@ msgid "" "\n" "$_CLICK" msgstr "" +"Ez a varázsló végigvezeti a Tor, Vidalia, Polipo és Torbutton szoftverek telepítésén.\n" +"\n" +"A Tor egy olyan rendszer, amivel a névtelenül használhatja az Internetet, segítségével névtelenül böngészhet és publikálhat, cseveghet, használhat IRC-t és egyéb szolgáltatásokat. A Vidalia egy grafikus felület a Tor kezeléséhez, felügyeletéhez és beállításához.\n" +"\n" +"A Polipo egy gyorsítótáras web proxy aminek a segítségével megnövelheti a Tor kapcsolat során a böngészés teljesítményét.\n" +"\n" +"A Torbutton egy Firefox kiegészítő, ami lehetővé teszi, hogy gyorsan ki és bekapcsolja a névtelen böngészést.\n" +"\n" +"Ha korábban telepítette a Tor, Vidalia, Polipo és Firefox szoftvereket, kérjük ellenőrizze, hogy ne fussanak, mielőtt folytatná a telepítést.\n" +"\n" +"$_CLICK" msgctxt "BundleWelcomeTitle" msgid "Welcome to the ${BUNDLE_NAME} Setup Wizard" @@ -78,10 +89,13 @@ msgid "" "\n" "$_CLICK" msgstr "" +"Ez a varázsló végigvezeti a telepítésén a Vidalia szoftvernk, ami egy " +"grafikus felület, a Tor szoftver kezeléséhez, felügyeletéhez és " +"beállításához." msgctxt "VidaliaWelcomeTitle" msgid "Welcome to the ${VIDALIA_NAME} Setup Wizard" -msgstr "" +msgstr "Üdvözöljük a ${VIDALIA_NAME} telepítő varázslóban" msgctxt "VidaliaLinkText" msgid "${VIDALIA_NAME} homepage" @@ -119,6 +133,9 @@ msgid "" "Tor is a system for using the Internet anonymously, helping you anonymize " "Web browsing and publishing, instant messaging, IRC, and more." msgstr "" +"A Tor egy olyan rendszer, amivel névtelenül érheti el az Internetet, segít a" +" névtelenül igénybe venni a web böngészés és publikálást, az üzenetküldést, " +"az IRC-t, és más szolgáltatásokat." msgctxt "TorUninstDesc" msgid "Remove ${TOR_DESC}." @@ -159,6 +176,8 @@ msgid "" "Polipo is a caching web proxy that increases performance of web browsing " "through Tor." msgstr "" +"A Polipo egy gyorsítótáras web proxy, ami növeli a a teljesítményt a Tor " +"kapcsolat alatt végzett web böngészésnél. " msgctxt "PolipoUninstDesc" msgid "Remove ${POLIPO_DESC}." @@ -182,13 +201,15 @@ msgstr "Futtatás indításkor" msgctxt "PolipoStartupDesc" msgid "Automatically run ${POLIPO_NAME} at startup." -msgstr "" +msgstr "${POLIPO_NAME} automatikus indítása a rendszer indulásakor." msgctxt "TorbuttonGroupDesc" msgid "" "Torbutton is a Firefox extension that allows you to quickly enable or " "disable anonymous web browsing." msgstr "" +"A Torbutton egy Firefox kiegészítő, ami lehetővé teszi, hogy gyorsan ki és " +"bekapcsolja a névtelen böngészést." msgctxt "TorbuttonUninstDesc" msgid "Remove ${TORBUTTON_DESC}." @@ -204,11 +225,12 @@ msgstr "Hozzáadás a Firefox-hoz" msgctxt "TorbuttonAddToFirefoxDesc" msgid "Add the ${TORBUTTON_DESC} extension to Firefox." -msgstr "" +msgstr "A ${TORBUTTON_DESC} hozzáadása a Firefox-hoz." msgctxt "TorbuttonFirefoxNotFound" msgid "Firefox was not found on your system. Not installing Torbutton." msgstr "" +"A Firefox nincs a gépen telepítve. A Torbutton nem került telepítésre." msgctxt "AppData" msgid "Application Data" @@ -216,7 +238,7 @@ msgstr "Alkalmazás adat" msgctxt "AppDataUninstDesc" msgid "Remove saved application data and configuration files." -msgstr "" +msgstr "A mentett alkalmazás adatok és konfigurációs állományok eltávolítása." msgctxt "LanguageCode" msgid "en" @@ -230,6 +252,8 @@ msgctxt "FirefoxWarningPageSubtitle" msgid "" "We recommend that you install Firefox before continuing, for best safety." msgstr "" +"Javasoltjuk, hogy telepítse a Firefox böngészőt a folytatás előtt a legjobb " +"biztonság érdekében." msgctxt "FirefoxWarningPageUpperText" msgid "" @@ -241,6 +265,10 @@ msgid "" "If you would like to install Firefox, please press Cancel, then go\n" "to the Firefox download page at" msgstr "" +"A Mozilla Firefox Web böngésző nincs a számítógépére telepítve.\n" +"A Tor működik más böngészőkkel, mint például az Internet Explorer, de könnyebb a Firefox böngészővel együtt a használat, ami egyébként is jobban védi a névtelenségét.\n" +"\n" +"Ha szeretné telepíteni a Firefox-ot, akkor most nyomja meg a Mégsem gombot, majd látogasson el a Firefox letöltési oldalára, a következő címre:" msgctxt "FirefoxWarningPageLowerText" msgid "" @@ -250,5 +278,8 @@ msgid "" "Or, if you would prefer to install Tor without Firefox, simply\n" "press Next to continue." msgstr "" +"Ha telepítette a Firefox böngészőt, indítsa el újra a Tor telepítőjét.\n" +"\n" +"Vagy ha mégis a Firefox telepítése nélkül szeretné telepíteni a Tor-t, akkor csak nyomjon a Tovább gombra."

1 0

[translation/vidalia_installer] Update translations for vidalia_installer
by translation＠torproject.org 08 Oct '11

08 Oct '11

commit f0e42829a98bd270357d9eeb89551287515a1d2b Author: Translation commit bot <translation(a)torproject.org> Date: Sat Oct 8 14:31:58 2011 +0000 Update translations for vidalia_installer --- hu/vidalia_hu.po | 21 +++++++++++++-------- 1 files changed, 13 insertions(+), 8 deletions(-) diff --git a/hu/vidalia_hu.po b/hu/vidalia_hu.po index c4ff995..4906fbd 100755 --- a/hu/vidalia_hu.po +++ b/hu/vidalia_hu.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2008-07-12 05:29+0000\n" -"PO-Revision-Date: 2011-10-02 16:56+0000\n" +"PO-Revision-Date: 2011-10-08 14:13+0000\n" "Last-Translator: vargaviktor <viktor.varga(a)gmail.com>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -90,6 +90,8 @@ msgstr "${VIDALIA_NAME} honlap" msgctxt "VidaliaAppDesc" msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor." msgstr "" +"A Vidalia egy grafikus felület, amivel irányíthatja, felügyelheti és " +"konfigurálhatja a Tor-t." msgctxt "VidaliaStartup" msgid "Run At Startup" @@ -132,14 +134,17 @@ msgid "" "$\n" "Do you want to overwrite it with the default sample configuration file?" msgstr "" +"Már van egy Tor konfigurációs fájlja.$\n" +"$\n" +"Szeretné felülírni azt, az alapértelmezett minta konfigurációs fájllal?" msgctxt "TorDocumentation" msgid "Documentation" -msgstr "" +msgstr "Dokumentáció" msgctxt "TorDocumentationDesc" msgid "Install ${TOR_NAME} documentation." -msgstr "" +msgstr "${TOR_NAME} dokumentáció telepítése." msgctxt "TorShortcuts" msgid "Add to Start Menu" @@ -157,11 +162,11 @@ msgstr "" msgctxt "PolipoUninstDesc" msgid "Remove ${POLIPO_DESC}." -msgstr "" +msgstr "${POLIPO_DESC} eltávolítása." msgctxt "PolipoAppDesc" msgid "Install ${POLIPO_DESC}." -msgstr "" +msgstr "${POLIPO_DESC} telepítése." msgctxt "PolipoShortcuts" msgid "Add to Start Menu" @@ -187,15 +192,15 @@ msgstr "" msgctxt "TorbuttonUninstDesc" msgid "Remove ${TORBUTTON_DESC}." -msgstr "" +msgstr "${TORBUTTON_DESC} eltávolítása." msgctxt "TorbuttonAppDesc" msgid "Install ${TORBUTTON_DESC}." -msgstr "" +msgstr "${TORBUTTON_DESC} telepítése." msgctxt "TorbuttonAddToFirefox" msgid "Add to Firefox" -msgstr "" +msgstr "Hozzáadás a Firefox-hoz" msgctxt "TorbuttonAddToFirefoxDesc" msgid "Add the ${TORBUTTON_DESC} extension to Firefox."

1 0

[translation/vidalia_help] Update translations for vidalia_help
by translation＠torproject.org 08 Oct '11

08 Oct '11

commit cf74806d117cd417e8197f96516a712f5daf315d Author: Translation commit bot <translation(a)torproject.org> Date: Sat Oct 8 14:31:04 2011 +0000 Update translations for vidalia_help --- hu/troubleshooting.po | 24 +++++++++++++++++++++++- 1 files changed, 23 insertions(+), 1 deletions(-) diff --git a/hu/troubleshooting.po b/hu/troubleshooting.po index 05e656a..02d134d 100644 --- a/hu/troubleshooting.po +++ b/hu/troubleshooting.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2010-08-03 15:49-0300\n" -"PO-Revision-Date: 2011-10-08 11:48+0000\n" +"PO-Revision-Date: 2011-10-08 14:06+0000\n" "Last-Translator: vargaviktor <viktor.varga(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -216,6 +216,14 @@ msgid "" "Tor. Vidalia generates a random password, but it is different than the saved" " password in the Tor service." msgstr "" +"Korábban beállította a Tor-t, hogy szolgáltatásként fusson. Ha a Tor " +"szolgáltatásként fut, akkor elindul a rendszer indításával egy időben. Ha a " +"Tor-t úgy állította be, hogy Vidalia-n keresztül indított szolgáltatás " +"legyen, akkor egy véletlen jelszó lett beállítva és mentve a Tor-ban. Amikor" +" újraindul, a tor elindul, és a korábban mentett véletlen jelszót használja." +" Amikor belép a gépbe és elindítja a Vidalia-t, akkor a Vidalia megpróbál " +"kommunikálni a már futó Tor-ra. A Vidalie generál egy véletlen jelszót, " +"azonban az különböző a mentett szolgáltatás jelszótól." # type: Content of: <html><body><ul><li> #: en/troubleshooting.html:114 @@ -225,6 +233,11 @@ msgid "" "href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService\">" " Tor as a service</a> for more information on how to remove the Tor service." msgstr "" +"A Tor-t át kell konfigurálnia, hogy ne szolgáltatásként fusson. Tekintse meg" +" a Tor wiki oldalt a <a " +"href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService\">" +" Tor szolgáltatásként futtatásáról</a> a további információért, és " +"útmutatásért, hogyan távolíthatja el azt." # type: Content of: <html><body> #: en/troubleshooting.html:122 @@ -268,6 +281,11 @@ msgid "" "operating systems, the ps command can help you find the other Tor " "process." msgstr "" +"Ha a fentihez hasonló hibaüzenetet kap, akkor le kell állítani a másik futó " +"Tor folyamatot, mielőtt egy újat indít a Vidaliával. Ez Windows esetén a " +"Feladatkezelőben a tor.exe leállítását jelenti. Más operációs " +"rendszereken a ps parancs segíthet megkeresni a másik futó Tor " +"folyamatot." # type: Content of: <html><body> #: en/troubleshooting.html:141 @@ -277,6 +295,10 @@ msgid "" " information about any errors Tor experienced before it exited. Such errors " "will be highlighted in either red or yellow." msgstr "" +"Ha a Tor egy ideig jól futott (és az több mint néhány másodperc) akkor meg " +"kell néznie a <a href=\"log.html\">log üzeneteket</a>, hogy információt " +"kapjon a hibákról, amik a Tor kiléését előzték meg. Ezek a hibák sárgával " +"vagy pirossal kerülnek ott kiemelésre." # type: Content of: <html><body> #: en/troubleshooting.html:147

1 0