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

[tor/master] Exit test-network with status of chutney verify
by nickm＠torproject.org 08 Oct '14

08 Oct '14

commit c0794d22a2fc25c8764615428f08dc0efb4df2bd Author: teor <teor2345(a)gmail.com> Date: Sun Oct 5 09:59:27 2014 +1100 Exit test-network with status of chutney verify Preserve previous semantics of src/test/test-network.sh by exiting with the exit status of chutney verify, even though the latest version ends with chutney stop. --- src/test/test-network.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/test/test-network.sh b/src/test/test-network.sh index d7fdb35..fb33842 100755 --- a/src/test/test-network.sh +++ b/src/test/test-network.sh @@ -45,6 +45,8 @@ n=$BOOTSTRAP_TIME; while [ $n -gt 0 ]; do sleep 1; n=$(expr $n - 1); echo -n . done; echo "" ./chutney verify $CHUTNEY_NETWORK +VERIFY_EXIT_STATUS=$? # work around a bug/feature in make -j2 (or more) # where make hangs if any child processes are still alive ./chutney stop $CHUTNEY_NETWORK +exit $VERIFY_EXIT_STATUS

1 0

[trunnel/master] Add more todo items based on an email I sent; bump version to 1.4-pre
by nickm＠torproject.org 08 Oct '14

08 Oct '14

commit 599017a1bf98fe824691509ee6df9f4922460054 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 8 15:37:17 2014 -0400 Add more todo items based on an email I sent; bump version to 1.4-pre --- TODO | 23 ++++++++++++++++++++++- lib/trunnel/__init__.py | 2 +- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/TODO b/TODO index 243f991..371845c 100644 --- a/TODO +++ b/TODO @@ -7,7 +7,7 @@ FOR VERSION 1 o Windows support (msvc, mingw) -FOR VERSION 1.1 OR LATER +FOR VERSION 2 OR LATER - Correctness: - Allow union case statements to contain ranges that involve named @@ -26,4 +26,25 @@ FOR VERSION 1.1 OR LATER - Code quality: - Simplify huge union case statements. +MORE IDEAS FOR PEOPLE WHO WOULD LIKE TO HACK ON TRUNNEL + + * It would be cool to have a formal specification of trunnel's input +language, and maybe even a proof of some parts of trunnel's +correctness. + + * The code is not as clean as it could be, in spite of its level of +coverage. It would be good to identity refactoring opportunities. + + * There are probably more tests we could do. + + * It might be interesting to provide a mechanism to plug in external +data types and transformations. + + * If you use Trunnel for a while yourself, you will probably find +other things that should be improved in it. (This might be the best +way to proceed: use-motivated changes are probably much smarter than +theory-motivated ones.) + + * It might be interesting to write something that can take trunnel +grammars and output a fuzzer for alleged parsers of those formats. diff --git a/lib/trunnel/__init__.py b/lib/trunnel/__init__.py index 8dcc7ff..b39d47a 100644 --- a/lib/trunnel/__init__.py +++ b/lib/trunnel/__init__.py @@ -3,4 +3,4 @@ # a package. # -__version__ = "1.3" +__version__ = "1.4-pre"

1 0

[metrics-db/master] Ignore turtles when warning about missing descriptors.
by karsten＠torproject.org 08 Oct '14

08 Oct '14

commit 52d817fa5b97afcfc17b101cefaa7154c99b3975 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Oct 8 12:21:42 2014 +0200 Ignore turtles when warning about missing descriptors. turtles doesn't participate in the consensus for a couple of days now, and it times out on our connections. There's no way how we can fetch all descriptors referenced from its vote, so there's a new warning every hour. Ignore. --- src/org/torproject/ernie/db/relaydescs/ArchiveWriter.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/org/torproject/ernie/db/relaydescs/ArchiveWriter.java b/src/org/torproject/ernie/db/relaydescs/ArchiveWriter.java index ffe3dbc..521f877 100644 --- a/src/org/torproject/ernie/db/relaydescs/ArchiveWriter.java +++ b/src/org/torproject/ernie/db/relaydescs/ArchiveWriter.java @@ -654,8 +654,12 @@ public class ArchiveWriter extends Thread { } else { sb.append(", 0/0 E"); } - if (voteFoundServerDescs * 1000 < voteAllServerDescs * 995 || - voteFoundExtraInfos * 1000 < voteAllExtraInfos * 995) { + String fingerprint = v.getKey(); + /* Ignore turtles when warning about missing descriptors. */ + if (!fingerprint.equalsIgnoreCase( + "27B6B5996C426270A5C95488AA5BCEB6BCC86956") && + (voteFoundServerDescs * 1000 < voteAllServerDescs * 995 || + voteFoundExtraInfos * 1000 < voteAllExtraInfos * 995)) { missingDescriptors = true; } }

1 0

[trunnel/master] Add support for remembering a position within the input stream
by nickm＠torproject.org 08 Oct '14

08 Oct '14

commit 879255e21821087a438f418b79e8ad7977832797 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 8 10:42:02 2014 -0400 Add support for remembering a position within the input stream --- doc/trunnel.md | 22 +++++++++ lib/trunnel/CodeGen.py | 37 ++++++++++++++ lib/trunnel/Grammar.py | 29 ++++++++++- test/Makefile | 6 +++ test/c/test.c | 1 + test/c/test.h | 1 + test/c/test_positions.c | 111 ++++++++++++++++++++++++++++++++++++++++++ test/failing/badptr.trunnel | 5 ++ test/valid/positions.trunnel | 10 ++++ 9 files changed, 221 insertions(+), 1 deletion(-) diff --git a/doc/trunnel.md b/doc/trunnel.md index 2ffbab8..eaf768a 100644 --- a/doc/trunnel.md +++ b/doc/trunnel.md @@ -281,6 +281,28 @@ In newly constructed structures, all variable-length arrays are empty. It's an error to try to encode a variable-length array with a length field if that array's length field doesn't match its actual length. +### Structure members: zero-length indices into the input + +Sometimes you need to record the position in the input the corresponds to +a position in the structure. You can use an `@ptr` field to record +a position within a structure when parsing it: + + struct s { + nulterm unsigned_header; + @ptr start_of_signed_material; + u32 bodylen; + u8 body[bodylen]; + u64 flags; + @ptr end_of_signed_material; + u16 signature_len; + u8 signature[signature_len]; + } + +When an object of this type is parsed, then `start_of_signed_material` +and `end_of_signed_material` will get set to pointers into the input. +These pointers are only set when the input is parsed; you don't need +to set them to encode the object. + ### Structure members: unions You can specify that different elements should be parsed based on some diff --git a/lib/trunnel/CodeGen.py b/lib/trunnel/CodeGen.py index 5867fd0..5a5f070 100644 --- a/lib/trunnel/CodeGen.py +++ b/lib/trunnel/CodeGen.py @@ -338,6 +338,9 @@ class Checker(ASTVisitor): def visitSMString(self, sms): self.addMemberName(sms.name) + def visitSMPosition(self, smp): + self.addMemberName(smp.name) + def visitSMLenConstrained(self, sml): if sml.lengthfield != None: self.checkIntField( @@ -544,6 +547,9 @@ class Annotator(ASTVisitor): def visitSMString(self, ss): self.annotateMember(ss) + def visitSMPosition(self, smp): + self.annotateMember(smp) + def visitSMLenConstrained(self, sml): sml.lengthfieldmember = None if sml.lengthfield is not None: @@ -781,6 +787,11 @@ class DeclarationGenerationVisitor(CodeGenerator): self.w("char *%s;\n" % (ss.c_name)) + def visitSMPosition(self, smp): + if smp.annotation != None: + self.w(smp.annotation) + self.w("const uint8_t *%s;\n" % smp.c_name) + def visitSMLenConstrained(self, sml): sml.visitChildren(self) @@ -1072,6 +1083,9 @@ class FreeFnGenerator(CodeGenerator): self.w("trunnel_wipestr(obj->%s);\n" % (ss.c_name)) self.w("trunnel_free(obj->%s);\n" % (ss.c_name)) + def visitSMPosition(self, smp): + pass + def visitSMLenConstrained(self, sml): sml.visitChildren(self) @@ -1579,6 +1593,17 @@ class AccessorFnGenerator(CodeGenerator): return 0; }}""", c_name=sms.c_name) + def visitSMPosition(self, smp): + st = self.structName + nm = smp.c_fn_name + self.docstring("Return the position for %s when we parsed " + "this object"%nm) + self.declaration("const uint8_t *", + "%s_get_%s(const %s_t *inp)" % (st,nm,st)) + self.format(""" + {{ + return inp->{nm}; + }}""", nm = smp.c_name) def iterateOverFixedArray(generator, sfa, body, extraDecl=""): """Helper: write the code needed to iterate over every element of a @@ -1739,6 +1764,9 @@ class CheckFnGenerator(CodeGenerator): self.w('if (NULL == obj->%s)\n return "Missing %s";\n' % (ss.c_name, ss.c_name)) + def visitSMPosition(self, smp): + pass + def visitSMLenConstrained(self, sml): # To check a SMlenConstrained, check its children. sml.visitChildren(self) @@ -1872,6 +1900,9 @@ class EncodedLenFnGenerator(CodeGenerator): self.eltHeader(ss) self.w("result += strlen(obj->%s) + 1;\n" % ss.c_name) + def visitSMPosition(self, smp): + pass + def visitSMLenConstrained(self, sml): sml.visitChildren(self) @@ -2191,6 +2222,9 @@ class EncodeFnGenerator(CodeGenerator): ptr += len + 1; written += len + 1; }}""", c_name=ss.c_name) + def visitSMPosition(self, smp): + pass + def visitSMLenConstrained(self, sml): # To encode a length-constained field of a structure, # remember the position at which we began writing to the union. @@ -2643,6 +2677,9 @@ class ParseFnGenerator(CodeGenerator): remaining -= memlen; ptr += memlen; }}""", c_name=ss.c_name, truncated=self.truncatedLabel) + def visitSMPosition(self, smp): + self.format("obj->{c_name} = ptr;", c_name=smp.c_name); + def visitSMLenConstrained(self, sml): # To parse a length-constrained region, make sure that at # least that many bytes remain in the structure. Then, diff --git a/lib/trunnel/Grammar.py b/lib/trunnel/Grammar.py index 0de7fa7..25dc53a 100644 --- a/lib/trunnel/Grammar.py +++ b/lib/trunnel/Grammar.py @@ -113,7 +113,7 @@ class Lexer(trunnel.spark.GenericScanner, object): trunnel.spark.GenericScanner.tokenize(self, input) return self.rv - @pattern(r"(?:[;{}\[\]\-=,:]|\.\.\.|\.\.|\.)") + @pattern(r"(?:[;{}@\[\]\-=,:]|\.\.\.|\.\.|\.)") def t_punctuation(self, s): self.rv.append(Token(s, self.lineno)) @@ -570,6 +570,15 @@ class SMIgnore(StructMember): ignored.""" pass +class SMPosition(StructMember): + """ A struct member: notes that we should store a pointer to this point + in the input when we """ + def __init__(self, name): + StructMember.__init__(self, name) + + def __str__(self): + return "@" + self.name + class IDReference(AST): @@ -778,6 +787,10 @@ class Parser(trunnel.spark.GenericParser, object): def p_StructMember_4(self, info): return info[0] + @rule(" StructMember ::= SMPosition ") + def p_StructMember_5(self, info): + return info[0] + @rule(" SMInteger ::= IntType ID OptIntConstraint ") def p_SMInteger(self, info): return SMInteger(info[0], str(info[1]), info[2]) @@ -997,6 +1010,10 @@ class Parser(trunnel.spark.GenericParser, object): def p_UnionField_5(self, info): return info[0] + @rule(" UnionField ::= SMSPosition ") + def p_UnionField_6(self, info): + return info[0] + @rule(" ContextDecl ::= context ID { ContextMembers } ") def p_ContextDecl(self, info): return StructDecl(str(info[1]), info[3], isContext=True) @@ -1017,6 +1034,16 @@ class Parser(trunnel.spark.GenericParser, object): def p_ContextMember(self, info): return SMInteger(info[0], str(info[1]), None) + @rule(" SMPosition ::= @ PtrKW ID ") + def p_SMPosition(self, info): + return SMPosition(str(info[2])) + + @rule(" PtrKW ::= ID ") + def p_PtrKW(self, info): + if str(info[0]) != 'ptr': + raise SyntaxError("Expected 'ptr' at %s" % info[0].lineno) + return None + if __name__ == '__main__': print ("===== Here is our actual grammar, extracted from Grammar.py\n") diff --git a/test/Makefile b/test/Makefile index ba70e8d..603526f 100644 --- a/test/Makefile +++ b/test/Makefile @@ -31,6 +31,7 @@ TEST_OBJS = \ c/test_contexts_varsize2.o \ c/test_contexts_complex.o \ c/test_remainder_repeats.o \ + c/test_positions.o \ c/test_util.o BOILERPLATE_FILES=\ @@ -44,6 +45,7 @@ OBJS=tinytest/tinytest.o \ valid/opaque.o \ valid/leftover.o \ valid/contexts.o \ + valid/positions.o \ ./include/trunnel.o \ $(TEST_OBJS) @@ -69,6 +71,7 @@ valid/derived.o: valid/derived.h valid/derived.c valid/opaque.o: valid/opaque.h valid/opaque.h valid/leftover.o: valid/leftover.h valid/leftover.c valid/contexts.o: valid/contexts.h +valid/positions.o: valid/positions.h $(TEST_OBJS) : tinytest/tinytest.h tinytest/tinytest_macros.h valid/simple.h valid/derived.h $(OBJS) : include/trunnel.h include/trunnel-impl.h tinytest/tinytest.o: tinytest/tinytest.h tinytest/tinytest_macros.h @@ -88,5 +91,8 @@ valid/leftover.c valid/leftover.h: valid/leftover.trunnel ../lib/trunnel/*py valid/contexts.c valid/contexts.h: valid/contexts.trunnel ../lib/trunnel/*py PYTHONPATH=../lib:${PYTHONPATH} python -m trunnel valid/contexts.trunnel +valid/positions.c valid/positions.h: valid/positions.trunnel ../lib/trunnel/*py + PYTHONPATH=../lib:${PYTHONPATH} python -m trunnel valid/positions.trunnel + $(BOILERPLATE_FILES): ../lib/trunnel/*py ../lib/trunnel/data/*.[ch] PYTHONPATH=../lib:${PYTHONPATH} python -m trunnel --target-dir=./include --write-c-files diff --git a/test/c/test.c b/test/c/test.c index 534ae69..cd9c803 100644 --- a/test/c/test.c +++ b/test/c/test.c @@ -21,6 +21,7 @@ struct testgroup_t test_groups[] = { { "contexts/varsize/", contexts_varsize_tests }, { "contexts/varsize2/", contexts_varsize2_tests }, { "contexts/complex/", contexts_complex_tests }, + { "positions/", positions_tests }, END_OF_GROUPS, }; diff --git a/test/c/test.h b/test/c/test.h index 36fbde8..44242e1 100644 --- a/test/c/test.h +++ b/test/c/test.h @@ -31,6 +31,7 @@ extern struct testcase_t contexts_uniontag_tests[]; extern struct testcase_t contexts_varsize_tests[]; extern struct testcase_t contexts_varsize2_tests[]; extern struct testcase_t contexts_complex_tests[]; +extern struct testcase_t positions_tests[]; ssize_t unhex(uint8_t *out, size_t outlen, const char *in); const uint8_t *ux(const char *in); diff --git a/test/c/test_positions.c b/test/c/test_positions.c new file mode 100644 index 0000000..60ede17 --- /dev/null +++ b/test/c/test_positions.c @@ -0,0 +1,111 @@ +#include "test.h" + +#include "valid/positions.h" + +static void +test_pos_invalid(void *arg) +{ + haspos_t *hp = NULL, *hp2 = NULL; + uint8_t buf[64]; + int i; + (void)arg; + + /* Encode invalid */ + tt_int_op(-1, ==, haspos_encode(buf, sizeof(buf), NULL)); + hp = haspos_new(); + tt_int_op(-1, ==, haspos_encode(buf, sizeof(buf), hp)); + haspos_set_s1(hp, "Foo"); + tt_int_op(-1, ==, haspos_encode(buf, sizeof(buf), hp)); + haspos_set_s2(hp, "Bar"); + tt_int_op(12, ==, haspos_encode(buf, sizeof(buf), hp)); + + /* Encode truncated */ + for (i = 0; i < 12; ++i) + tt_int_op(-2, ==, haspos_encode(buf, i, hp)); + tt_int_op(12, ==, haspos_encode(buf, 12, hp)); + + /* Parse truncated */ + for (i = 0; i < 12; ++i) + tt_int_op(-2, ==, haspos_parse(&hp2, buf, i)); + + end: + haspos_free(hp); +} + +static void +test_pos_encdec(void *arg) +{ + haspos_t *hp = NULL, *hp2 = NULL; + uint8_t buf[64]; + (void)arg; + + hp = haspos_new(); + haspos_set_s1(hp, "hello"); + haspos_set_s2(hp, "world"); + haspos_set_x(hp, 3); + tt_int_op(16, ==, haspos_encode(buf, sizeof(buf), hp)); + tt_mem_op("hello\0world\0\0\0\0\x03", ==, buf, 16); + + tt_int_op(16, ==, haspos_parse(&hp2, buf, sizeof(buf))); + tt_str_op("hello", ==, haspos_get_s1(hp2)); + tt_str_op("world", ==, haspos_get_s2(hp2)); + tt_int_op(3, ==, haspos_get_x(hp)); + tt_ptr_op(buf + 6, ==, haspos_get_pos1(hp2)); + tt_ptr_op(buf + 12, ==, haspos_get_pos2(hp2)); + + end: + haspos_free(hp); + haspos_free(hp2); +} + +static void +test_pos_allocfail(void *arg) +{ +#ifdef ALLOCFAIL + haspos_t *hp = NULL; + const uint8_t inp[] = "hello\0world\0\0\0\0\x03"; + uint8_t buf[32]; + (void)arg; + + set_alloc_fail(1); + tt_ptr_op(NULL, ==, haspos_new()); + + set_alloc_fail(1); + tt_int_op(-1, ==, haspos_parse(&hp, inp, sizeof(inp))); + + set_alloc_fail(2); + tt_int_op(-1, ==, haspos_parse(&hp, inp, sizeof(inp))); + + set_alloc_fail(3); + tt_int_op(-1, ==, haspos_parse(&hp, inp, sizeof(inp))); + + hp = haspos_new(); + tt_assert(hp); + set_alloc_fail(1); + tt_int_op(-1, ==, haspos_set_s1(hp,"Hi")); + tt_int_op(0, ==, haspos_set_s1(hp,"Hi")); + + set_alloc_fail(1); + tt_int_op(-1, ==, haspos_set_s2(hp,"Hi")); + tt_int_op(0, ==, haspos_set_s2(hp,"Hi")); + + tt_int_op(-1, ==, haspos_encode(buf, sizeof(buf), hp)); + haspos_clear_errors(hp); + tt_int_op(10, ==, haspos_encode(buf, sizeof(buf), hp)); + + haspos_free(hp); hp = NULL; + + end: + haspos_free(hp); +#else + (void)arg; + tt_skip(); +#endif +} + +struct testcase_t positions_tests[] = { + { "invalid", test_pos_invalid, 0, NULL, NULL }, + { "encdec", test_pos_encdec, 0, NULL, NULL }, + { "allocfail", test_pos_allocfail, 0, NULL, NULL }, + END_OF_TESTCASES +}; diff --git a/test/failing/badptr.trunnel b/test/failing/badptr.trunnel new file mode 100644 index 0000000..14e55da --- /dev/null +++ b/test/failing/badptr.trunnel @@ -0,0 +1,5 @@ + +struct s { + nulterm s; + @foo bar; +} \ No newline at end of file diff --git a/test/valid/positions.trunnel b/test/valid/positions.trunnel new file mode 100644 index 0000000..497ebb0 --- /dev/null +++ b/test/valid/positions.trunnel @@ -0,0 +1,10 @@ + +struct haspos { + nulterm s1; + /** Position right after the first NUL. */ + @ptr pos1; + nulterm s2; + @ptr pos2; + u32 x; +} +

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 08 Oct '14

08 Oct '14

commit 05f6380060d6fdf7b6f2ed9884001755c0907934 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Oct 8 10:16:32 2014 +0000 Update translations for tails-misc --- vi.po | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/vi.po b/vi.po index 92a095e..861fd2f 100644 --- a/vi.po +++ b/vi.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-05-29 00:14+0200\n" -"PO-Revision-Date: 2014-05-29 08:50+0000\n" +"POT-Creation-Date: 2014-08-31 21:41+0200\n" +"PO-Revision-Date: 2014-10-08 09:51+0000\n" "Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" "Language-Team: Vietnamese (http://www.transifex.com/projects/p/torproject/language/vi/)\n" "MIME-Version: 1.0\n" @@ -409,32 +409,32 @@ msgstr "" msgid "Failed to setup chroot." msgstr "" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:175 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:182 #: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:1 msgid "Unsafe Browser" msgstr "" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:215 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:204 msgid "Shutting down the Unsafe Browser..." msgstr "" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:216 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:205 msgid "" "This may take a while, and you may not restart the Unsafe Browser until it " "is properly shut down." msgstr "" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:228 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:217 msgid "Failed to restart Tor." msgstr "" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:236 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:225 msgid "" "Another Unsafe Browser is currently running, or being cleaned up. Please " "retry in a while." msgstr "" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:249 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:238 msgid "" "No DNS server was obtained through DHCP or manually configured in " "NetworkManager."

1 0

[translation/mat-gui] Update translations for mat-gui
by translation＠torproject.org 08 Oct '14

08 Oct '14

commit 5b10ff7201aaa90ee9d92549548b7b35feaf9b6b Author: Translation commit bot <translation(a)torproject.org> Date: Wed Oct 8 10:16:03 2014 +0000 Update translations for mat-gui --- vi.po | 73 +++++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 37 insertions(+), 36 deletions(-) diff --git a/vi.po b/vi.po index 2ce6822..d153643 100644 --- a/vi.po +++ b/vi.po @@ -4,13 +4,14 @@ # # Translators: # Translators: +# Hoang Thu Giang <hoanggiang0811(a)yahoo.com>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-01-19 14:48+0000\n" -"PO-Revision-Date: 2014-10-08 09:26+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2014-10-08 10:00+0000\n" +"Last-Translator: Hoang Thu Giang <hoanggiang0811(a)yahoo.com>\n" "Language-Team: Vietnamese (http://www.transifex.com/projects/p/torproject/language/vi/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,19 +21,19 @@ msgstr "" #: mat-gui:61 mat-gui:403 mat-gui:422 msgid "Ready" -msgstr "" +msgstr "Sẵn sàng" #: mat-gui:128 msgid "Choose files" -msgstr "" +msgstr "Chọn tệp" #: mat-gui:135 msgid "All files" -msgstr "" +msgstr "Tất cả các tệp" #: mat-gui:142 msgid "Supported files" -msgstr "" +msgstr "Các tệp được hỗ trợ" #: mat-gui:157 msgid "No metadata found" @@ -40,11 +41,11 @@ msgstr "" #: mat-gui:158 mat-gui:398 mat-gui:420 msgid "Clean" -msgstr "" +msgstr "Quét sạch" #: mat-gui:160 mat-gui:400 msgid "Dirty" -msgstr "" +msgstr "Bẩn" #: mat-gui:165 #, python-format @@ -57,23 +58,23 @@ msgstr "" #: mat-gui:181 msgid "Website" -msgstr "" +msgstr "Trang web" #: mat-gui:207 data/mat.ui:107 msgid "Preferences" -msgstr "" +msgstr "Cài đặt" #: mat-gui:220 msgid "Reduce PDF quality" -msgstr "" +msgstr "Giảm chất lượng PDF" #: mat-gui:223 msgid "Reduce the produced PDF size and quality" -msgstr "" +msgstr "Giảm kích cỡ và chất lượng của sản phẩm PDF" #: mat-gui:226 msgid "Add unsupported file to archives" -msgstr "" +msgstr "Thêm các tệp không được hỗ trợ vào lưu trữ" #: mat-gui:229 msgid "Add non-supported (and so non-anonymised) file to output archive" @@ -85,7 +86,7 @@ msgstr "Không biết" #: mat-gui:310 msgid "Not-supported" -msgstr "" +msgstr "Không được hỗ trợ" #: mat-gui:324 msgid "Harmless fileformat" @@ -93,11 +94,11 @@ msgstr "" #: mat-gui:326 msgid "Fileformat not supported" -msgstr "" +msgstr "Định dạng tệp không được hỗ trợ" #: mat-gui:329 msgid "These files can not be processed:" -msgstr "" +msgstr "Các tệp này không thể bị xử lý:" #: mat-gui:334 mat-gui:363 data/mat.ui:292 msgid "Filename" @@ -105,11 +106,11 @@ msgstr "Tên tệp" #: mat-gui:336 msgid "Reason" -msgstr "" +msgstr "Lý do" #: mat-gui:348 msgid "Non-supported files in archive" -msgstr "" +msgstr "Các tệp không được hỗ trợ ở lưu trữ" #: mat-gui:349 data/mat.ui:227 msgid "Scour" @@ -117,46 +118,46 @@ msgstr "" #: mat-gui:362 msgid "Include" -msgstr "" +msgstr "Bao gồm" #: mat-gui:378 #, python-format msgid "MAT is not able to clean the following files, found in the %s archive" -msgstr "" +msgstr "MAT không loại bỏ được những tệp sau, tìm thấy ở %s lưu trữ" #: mat-gui:394 #, python-format msgid "Checking %s" -msgstr "" +msgstr "Đang kiểm tra %s" #: mat-gui:409 #, python-format msgid "Cleaning %s" -msgstr "" +msgstr "Đang dọn %s" #: data/mat.ui:63 msgid "_File" -msgstr "" +msgstr "_Tệp" #: data/mat.ui:99 msgid "_Edit" -msgstr "" +msgstr "_Chỉnh sửa" #: data/mat.ui:118 data/mat.ui:253 msgid "Clear" -msgstr "Rõ ràng" +msgstr "Xóa" #: data/mat.ui:134 msgid "_Process" -msgstr "" +msgstr "_Xử lý" #: data/mat.ui:168 msgid "_Help" -msgstr "" +msgstr "_Giúp" #: data/mat.ui:214 msgid "Add" -msgstr "" +msgstr "Thêm vào" #: data/mat.ui:240 msgid "Check" @@ -164,7 +165,7 @@ msgstr "Kiểm Tra" #: data/mat.ui:309 msgid "State" -msgstr "" +msgstr "Trạng thái" #: data/mat.ui:347 data/mat.ui:499 msgid "Metadata" @@ -172,28 +173,28 @@ msgstr "" #: data/mat.ui:376 msgid "Name" -msgstr "Name" +msgstr "Tên" #: data/mat.ui:390 msgid "Content" -msgstr "" +msgstr "Nội dung" #: data/mat.ui:452 msgid "Supported formats" -msgstr "" +msgstr "Các định dạng được hỗ trợ" #: data/mat.ui:486 msgid "Support" -msgstr "" +msgstr "Hỗ trợ" #: data/mat.ui:512 msgid "Method" -msgstr "" +msgstr "Phương pháp" #: data/mat.ui:525 msgid "Remaining" -msgstr "" +msgstr "Phần còn lại" #: data/mat.ui:560 msgid "Fileformat" -msgstr "" +msgstr "Định dạng tệp"

1 0

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

08 Oct '14

commit 3ee1a434d4b8fb5fa1a0c2e007b72b75f881cd57 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Oct 8 10:15:45 2014 +0000 Update translations for liveusb-creator --- vi/vi.po | 57 +++++++++++++++++++++++++++++---------------------------- 1 file changed, 29 insertions(+), 28 deletions(-) diff --git a/vi/vi.po b/vi/vi.po index d5c3369..290d071 100644 --- a/vi/vi.po +++ b/vi/vi.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Hoang Thu Giang <hoanggiang0811(a)yahoo.com>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-01 22:11+0200\n" -"PO-Revision-Date: 2014-07-02 08:55+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"POT-Creation-Date: 2014-08-31 10:31+0200\n" +"PO-Revision-Date: 2014-10-08 10:11+0000\n" +"Last-Translator: Hoang Thu Giang <hoanggiang0811(a)yahoo.com>\n" "Language-Team: Vietnamese (http://www.transifex.com/projects/p/torproject/language/vi/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -37,7 +38,7 @@ msgstr "" msgid "%(vendor)s %(model)s (%(details)s) - %(device)s" msgstr "" -#: ../liveusb/creator.py:1047 +#: ../liveusb/creator.py:1059 #, python-format msgid "%s already bootable" msgstr "" @@ -94,12 +95,12 @@ msgid "" "persist after a reboot." msgstr "" -#: ../liveusb/creator.py:1146 ../liveusb/creator.py:1409 +#: ../liveusb/creator.py:1158 ../liveusb/creator.py:1421 #, python-format msgid "Calculating the SHA1 of %s" msgstr "" -#: ../liveusb/creator.py:1357 +#: ../liveusb/creator.py:1369 msgid "Cannot find" msgstr "" @@ -150,7 +151,7 @@ msgstr "" msgid "Downloading %s..." msgstr "" -#: ../liveusb/creator.py:1142 +#: ../liveusb/creator.py:1154 msgid "Drive is a loopback, skipping MBR reset" msgstr "" @@ -159,7 +160,7 @@ msgstr "" msgid "Entering unmount_device for '%(device)s'" msgstr "" -#: ../liveusb/creator.py:1222 +#: ../liveusb/creator.py:1234 msgid "Error probing device" msgstr "" @@ -179,7 +180,7 @@ msgstr "" msgid "Extracting live image to the target device..." msgstr "" -#: ../liveusb/creator.py:1090 +#: ../liveusb/creator.py:1102 #, python-format msgid "Formatting %(device)s as FAT32" msgstr "" @@ -215,7 +216,7 @@ msgstr "" msgid "Installation was completed. Press OK to close this program." msgstr "" -#: ../liveusb/creator.py:947 ../liveusb/creator.py:1263 +#: ../liveusb/creator.py:959 ../liveusb/creator.py:1275 msgid "Installing bootloader..." msgstr "" @@ -223,13 +224,13 @@ msgstr "" msgid "LiveUSB creation failed!" msgstr "" -#: ../liveusb/creator.py:1358 +#: ../liveusb/creator.py:1370 msgid "" "Make sure to extract the entire liveusb-creator zip file before running this" " program." msgstr "" -#: ../liveusb/creator.py:1234 +#: ../liveusb/creator.py:1246 msgid "" "Make sure your USB key is plugged in and formatted with the FAT filesystem" msgstr "" @@ -285,7 +286,7 @@ msgstr "" msgid "Releases updated!" msgstr "" -#: ../liveusb/creator.py:954 ../liveusb/creator.py:1281 +#: ../liveusb/creator.py:966 ../liveusb/creator.py:1293 #, python-format msgid "Removing %(file)s" msgstr "" @@ -294,7 +295,7 @@ msgstr "" msgid "Removing existing Live OS" msgstr "" -#: ../liveusb/creator.py:1136 +#: ../liveusb/creator.py:1148 #, python-format msgid "Resetting Master Boot Record of %s" msgstr "" @@ -319,7 +320,7 @@ msgid "" "Source type does not support verification of ISO MD5 checksum, skipping" msgstr "" -#: ../liveusb/creator.py:1170 +#: ../liveusb/creator.py:1182 msgid "Synchronizing data on disk..." msgstr "" @@ -331,7 +332,7 @@ msgstr "" msgid "" "The selected file is unreadable. Please fix its permissions or select " "another file." -msgstr "" +msgstr "Tệp được chọn không thể đọc được. Làm ơn sửa quyền hoặc chọn một tệp khác" #: ../liveusb/creator.py:345 #, python-format @@ -371,11 +372,11 @@ msgstr "" msgid "This is the status console, where all messages get written to." msgstr "" -#: ../liveusb/creator.py:910 +#: ../liveusb/creator.py:922 msgid "Trying to continue anyway." -msgstr "" +msgstr "Cứ tiếp tục." -#: ../liveusb/creator.py:942 +#: ../liveusb/creator.py:954 #, python-format msgid "Unable to change volume label: %(message)s" msgstr "" @@ -394,15 +395,15 @@ msgstr "" msgid "Unable to find any USB drive" msgstr "" -#: ../liveusb/creator.py:1224 +#: ../liveusb/creator.py:1236 msgid "Unable to find any supported device" msgstr "" -#: ../liveusb/creator.py:1067 +#: ../liveusb/creator.py:1079 msgid "Unable to find partition" msgstr "" -#: ../liveusb/creator.py:1304 +#: ../liveusb/creator.py:1316 msgid "" "Unable to get Win32_LogicalDisk; win32com query did not return any results" msgstr "" @@ -426,7 +427,7 @@ msgstr "" msgid "Unable to remove file from previous LiveOS: %(message)s" msgstr "" -#: ../liveusb/creator.py:1139 +#: ../liveusb/creator.py:1151 msgid "" "Unable to reset MBR. You may not have the `syslinux` package installed." msgstr "" @@ -451,7 +452,7 @@ msgstr "" msgid "Unknown dbus exception while trying to mount device: %(message)s" msgstr "" -#: ../liveusb/creator.py:779 ../liveusb/creator.py:921 +#: ../liveusb/creator.py:779 ../liveusb/creator.py:933 msgid "Unknown filesystem. Your device may need to be reformatted." msgstr "" @@ -470,12 +471,12 @@ msgstr "" msgid "Unmounting mounted filesystems on '%(device)s'" msgstr "" -#: ../liveusb/creator.py:907 +#: ../liveusb/creator.py:919 #, python-format msgid "Unsupported device '%(device)s', please report a bug." msgstr "" -#: ../liveusb/creator.py:784 ../liveusb/creator.py:924 +#: ../liveusb/creator.py:784 ../liveusb/creator.py:936 #, python-format msgid "Unsupported filesystem: %s" msgstr "" @@ -487,7 +488,7 @@ msgid "" "In case you are trying to upgrade a manually installed Tails system (that is, if it was installed without this installer), this option is not supported: you need to install it anew to start with, e.g. by choosing the \"Clone & Install\" action instead." msgstr "" -#: ../liveusb/creator.py:1237 +#: ../liveusb/creator.py:1249 #, python-format msgid "" "Unsupported filesystem: %s\n" @@ -519,7 +520,7 @@ msgstr "" msgid "Verifying SHA256 checksum of LiveCD image..." msgstr "" -#: ../liveusb/creator.py:918 ../liveusb/creator.py:1230 +#: ../liveusb/creator.py:930 ../liveusb/creator.py:1242 msgid "Verifying filesystem..." msgstr ""

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 08 Oct '14

08 Oct '14

commit f7e26b2d426b97bad7acf0be93f03e4d05325157 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Oct 8 10:15:31 2014 +0000 Update translations for https_everywhere --- vi/ssl-observatory.dtd | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/vi/ssl-observatory.dtd b/vi/ssl-observatory.dtd index b9780fe..5a93328 100644 --- a/vi/ssl-observatory.dtd +++ b/vi/ssl-observatory.dtd @@ -3,9 +3,9 @@ <!ENTITY ssl-observatory.popup.later "Hỏi sau"> <!ENTITY ssl-observatory.popup.no "Không"> -<!ENTITY ssl-observatory.popup.text "HTTPS Everywhere can detect attacks -against your browser by sending the certificates you receive to the -Observatory. Turn this on?"> +<!ENTITY ssl-observatory.popup.text "HTTPS Everywhere có thể dò ra các cuộc tấn công +vào trình duyệt của bạn bằng cách gửi các chứng chỉ mà bạn nhận được +đến Observatory, đài quan sát. Bật lên?"> <!--<!ENTITY ssl-observatory.popup.text "EFF's SSL Observatory can detect attacks against HTTPS websites by collecting @@ -91,7 +91,7 @@ looked at. Mouseover the options for further details:"> <!ENTITY ssl-observatory.prefs.use "Use the Observatory?"> <!ENTITY ssl-observatory.warning.title "WARNING from EFF's SSL Observatory"> <!ENTITY ssl-observatory.warning.showcert "Show the certificate chain"> -<!ENTITY ssl-observatory.warning.okay "I understand"> +<!ENTITY ssl-observatory.warning.okay "Tôi hiểu"> <!ENTITY ssl-observatory.warning.text "EFF's SSL Observatory has issued a warning about the HTTPS certificiate(s) for this site:"> <!ENTITY ssl-observatory.warning.defense "If you are logged in to this site, it may be advisable to change your password once you have a safe connection. (These warnings can be disabled in the "SSL Observatory" tab of the HTTPS Everywhere preferences dialog.)">

1 0

[translation/torcheck] Update translations for torcheck
by translation＠torproject.org 08 Oct '14

08 Oct '14

commit 7f64f0eab9704314f85216d2f1a1c5ffce9bcc7b Author: Translation commit bot <translation(a)torproject.org> Date: Wed Oct 8 10:15:12 2014 +0000 Update translations for torcheck --- vi/torcheck.po | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/vi/torcheck.po b/vi/torcheck.po index 2c9dba2..0c60fab 100644 --- a/vi/torcheck.po +++ b/vi/torcheck.po @@ -2,13 +2,14 @@ # Copyright (C) 2008-2013 The Tor Project, Inc # # Translators: -# heliter, 2014 +# Hoang Thu Giang <hoanggiang0811(a)yahoo.com>, 2014 +# Quoc Hoa, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2014-05-06 08:21+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2014-10-08 10:11+0000\n" +"Last-Translator: Hoang Thu Giang <hoanggiang0811(a)yahoo.com>\n" "Language-Team: Vietnamese (http://www.transifex.com/projects/p/torproject/language/vi/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -24,7 +25,7 @@ msgid "" "Please refer to the <a href=\"https://www.torproject.org/\">Tor website</a> " "for further information about using Tor safely. You are now free to browse " "the Internet anonymously." -msgstr "" +msgstr "Làm ơn hãy sử dụng <a href=\"https://www.torproject.org/\"> trang web Tor</a> để có thêm thông tin về sử dụng Tor một cách an toàn. Bây giờ bạn có thể lướt Internet ẩn danh." msgid "There is a security update available for the Tor Browser Bundle." msgstr "" @@ -73,13 +74,13 @@ msgid "Learn More »" msgstr "" msgid "Go" -msgstr "" +msgstr "Đi" msgid "Short User Manual" msgstr "" msgid "Donate to Support Tor" -msgstr "" +msgstr "Đóng góp để hỗ trợ Tor" msgid "Tor Q&A Site" msgstr "Trang Hỏi & Đáp của Tor" @@ -94,4 +95,4 @@ msgid "JavaScript is disabled." msgstr "Javascript đã bị vô hiệu hoá." msgid "However, it does not appear to be the Tor Browser Bundle." -msgstr "" +msgstr "Tuy nhiên, nó không xuất hiện ở Tor Browser Bundle"

1 0

[translation/torbutton-branddtd] Update translations for torbutton-branddtd
by translation＠torproject.org 08 Oct '14

08 Oct '14

commit e94303e411f258273bcb948adbeeab9d9826a5d7 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Oct 8 09:47:17 2014 +0000 Update translations for torbutton-branddtd --- vi/brand.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vi/brand.dtd b/vi/brand.dtd index 59f665e..49ca087 100644 --- a/vi/brand.dtd +++ b/vi/brand.dtd @@ -4,5 +4,5 @@ <!ENTITY brandShortName "Tor Browser"> <!ENTITY brandFullName "Tor Browser"> -<!ENTITY vendorShortName "Tor Project"> +<!ENTITY vendorShortName "Dự án Tor"> <!ENTITY trademarkInfo.part1 "Firefox and the Firefox logos are trademarks of the Mozilla Foundation.">

1 0