- tor-commits - lists.torproject.org

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 03 Apr '16

03 Apr '16

commit 761f7ba91586a0b78b5bc719e6a48770c18efd87 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Apr 2 13:15:02 2016 +0000 Update translations for bridgedb --- vi/LC_MESSAGES/bridgedb.po | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/vi/LC_MESSAGES/bridgedb.po b/vi/LC_MESSAGES/bridgedb.po index 572c6a7..2f57816 100644 --- a/vi/LC_MESSAGES/bridgedb.po +++ b/vi/LC_MESSAGES/bridgedb.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2015-07-25 03:40+0000\n" -"PO-Revision-Date: 2016-04-02 12:26+0000\n" +"PO-Revision-Date: 2016-04-02 13:11+0000\n" "Last-Translator: lvnam96\n" "Language-Team: Vietnamese (http://www.transifex.com/otf/torproject/language/vi/)\n" "MIME-Version: 1.0\n" @@ -102,7 +102,7 @@ msgstr "Bước %s1%s" #: bridgedb/https/templates/index.html:13 #, python-format msgid "Download %s Tor Browser %s" -msgstr "Tải xuống %s Trình duyệt Tor %s" +msgstr "Tải xuống %s Tor Browser %s" #: bridgedb/https/templates/index.html:25 #, python-format @@ -122,7 +122,7 @@ msgstr "Bước %s3%s" #: bridgedb/https/templates/index.html:38 #, python-format msgid "Now %s add the bridges to Tor Browser %s" -msgstr "Bây giờ thì %s thêm bridges đó vào Trình duyệt Tor %s" +msgstr "Bây giờ thì %s thêm bridges đó vào Tor Browser %s" #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the #. beginning of words are present in your final translation. Thanks! @@ -252,16 +252,16 @@ msgstr "" #: bridgedb/strings.py:101 msgid "What are bridges?" -msgstr "" +msgstr "Bridges là gì?" #: bridgedb/strings.py:102 #, python-format msgid "%s Bridges %s are Tor relays that help you circumvent censorship." -msgstr "" +msgstr "%s Bridges %s là những sự ngưng trệ của Tor -Tor relays- nhằm giúp tránh né sự kiểm duyệt." #: bridgedb/strings.py:107 msgid "I need an alternative way of getting bridges!" -msgstr "" +msgstr "Tôi cần một cách khác để lấy bridges!" #: bridgedb/strings.py:108 #, python-format @@ -269,17 +269,17 @@ msgid "" "Another way to get bridges is to send an email to %s. Please note that you must\n" "send the email using an address from one of the following email providers:\n" "%s, %s or %s." -msgstr "" +msgstr "Cách khác để lấy bridges là gửi một email tới %s. Hãy lưu ý rằng bạn phải gửi một email\nsử dụng đỉa chỉ từ một trong những nhà cung cấp email sau:\n%s, %s hoặc %s." #: bridgedb/strings.py:115 msgid "My bridges don't work! I need help!" -msgstr "" +msgstr "Bridges của tôi không hoạt động! Tôi cần giúp đỡ!" #. TRANSLATORS: Please DO NOT translate "Tor". #: bridgedb/strings.py:117 #, python-format msgid "If your Tor doesn't work, you should email %s." -msgstr "" +msgstr "Nếu Tor của bạn không hoạt động, bạn nên gửi email cho %s." #. TRANSLATORS: Please DO NOT translate "Pluggable Transports". #. TRANSLATORS: Please DO NOT translate "Tor Browser". @@ -289,28 +289,28 @@ msgid "" "Try including as much info about your case as you can, including the list of\n" "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n" "and any messages which Tor gave out, etc." -msgstr "Cố gắng cung cấp càng nhiều thông tin về trường hợp của bạn nếu có thể, bao gồm danh sách những\ncầu và Pluggable Transports mà bạn đã cố gắng sử dụng, phiên bản của trình duyệt Tor, và bất kỳ thông điệp nào mà Tor đươc ra, v.v" +msgstr "Cố gắng cung cấp càng nhiều thông tin về trường hợp của bạn nếu có thể,\nbao gồm danh sách những bridges và Pluggable Transports bạn đã thử sử\ndụng, phiên bản của Tor Browser, và bất kỳ thông điệp nào mà Tor đưa ra\ncho bạn, v.v..." #: bridgedb/strings.py:128 msgid "Here are your bridge lines:" -msgstr "" +msgstr "Bridge lines của bạn đây:" #: bridgedb/strings.py:129 msgid "Get Bridges!" -msgstr "" +msgstr "Lấy Bridges!" #: bridgedb/strings.py:133 msgid "Please select options for bridge type:" -msgstr "" +msgstr "Hãy chọn các tùy chọn cho bridge type:" #: bridgedb/strings.py:134 msgid "Do you need IPv6 addresses?" -msgstr "" +msgstr "Bạn có cần các địa chỉ IPv6?" #: bridgedb/strings.py:135 #, python-format msgid "Do you need a %s?" -msgstr "" +msgstr "Bạn có cần một %s?" #: bridgedb/strings.py:139 msgid "Your browser is not displaying images properly."

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 02 Apr '16

02 Apr '16

commit f09c77b8883ad1832749d220878d12ef57d24b0c Author: Translation commit bot <translation(a)torproject.org> Date: Sat Apr 2 12:45:03 2016 +0000 Update translations for bridgedb --- vi/LC_MESSAGES/bridgedb.po | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/vi/LC_MESSAGES/bridgedb.po b/vi/LC_MESSAGES/bridgedb.po index fec6d02..572c6a7 100644 --- a/vi/LC_MESSAGES/bridgedb.po +++ b/vi/LC_MESSAGES/bridgedb.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2015-07-25 03:40+0000\n" -"PO-Revision-Date: 2016-04-02 12:13+0000\n" +"PO-Revision-Date: 2016-04-02 12:26+0000\n" "Last-Translator: lvnam96\n" "Language-Team: Vietnamese (http://www.transifex.com/otf/torproject/language/vi/)\n" "MIME-Version: 1.0\n" @@ -62,7 +62,7 @@ msgstr "Hiển thị Mã QR" #: bridgedb/https/templates/bridges.html:52 msgid "QRCode for your bridge lines" -msgstr "Mã QR cho đường truyền kết nối của bạn" +msgstr "Mã QR cho các bridge lines của bạn" #. TRANSLATORS: Please translate this into some silly way to say #. "There was a problem!" in your language. For example, @@ -81,18 +81,18 @@ msgstr "Có vẻ chúng ta đã gặp lỗi khi lấy mã QR." msgid "" "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy" " your bridge lines onto mobile and other devices." -msgstr "Mã QR chứa đường kết nối của bạn. Quét (scan) nó bằng một trình đọc mã QR và copy đường kết nối lên điện thoại và các thiết bị khác." +msgstr "Mã QR chứa bridge lines của bạn. Scan nó bằng một trình đọc mã QR và sao chép bridge lines lên điện thoại và các thiết bị khác." #: bridgedb/https/templates/bridges.html:131 msgid "There currently aren't any bridges available..." -msgstr "Hiện tại không có đường kết nối nào có sẵn đâu..." +msgstr "Hiện tại không có sẵn bridges nào đâu..." #: bridgedb/https/templates/bridges.html:132 #, python-format msgid "" " Perhaps you should try %s going back %s and choosing a different bridge " "type!" -msgstr "Có lẽ bạn nên thử %s going back %s" +msgstr "Có lẽ bạn nên thử %s quay lại %s và chọn một loại bridge khác!" #: bridgedb/https/templates/index.html:11 #, python-format @@ -112,7 +112,7 @@ msgstr "Bước %s2%s" #: bridgedb/https/templates/index.html:27 #, python-format msgid "Get %s bridges %s" -msgstr "" +msgstr "Chọn %sbridges%s" #: bridgedb/https/templates/index.html:36 #, python-format @@ -122,7 +122,7 @@ msgstr "Bước %s3%s" #: bridgedb/https/templates/index.html:38 #, python-format msgid "Now %s add the bridges to Tor Browser %s" -msgstr "Bây giờ thì %s thêm đường kết nối đó vào Trình duyệt Tor %s" +msgstr "Bây giờ thì %s thêm bridges đó vào Trình duyệt Tor %s" #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the #. beginning of words are present in your final translation. Thanks! @@ -131,7 +131,7 @@ msgstr "Bây giờ thì %s thêm đường kết nối đó vào Trình #: bridgedb/https/templates/options.html:38 #, python-format msgid "%sJ%sust give me bridges!" -msgstr "%sC%shỉ cần cho tôi đường kết nối!" +msgstr "%sC%shỉ cần đưa cho tôi bridges!" #: bridgedb/https/templates/options.html:51 msgid "Advanced Options" @@ -159,7 +159,7 @@ msgstr "%sV%sâng!" #: bridgedb/https/templates/options.html:147 #, python-format msgid "%sG%set Bridges" -msgstr "%sL%sấy Các Đường Kết Nối" +msgstr "%sL%sấy Bridges" #: bridgedb/strings.py:43 msgid "[This is an automated message; please do not reply.]" @@ -167,7 +167,7 @@ msgstr "[Đây là tin nhắn tự động; xin đừng trả lời.]" #: bridgedb/strings.py:45 msgid "Here are your bridges:" -msgstr "Các đường kết nối của bạn đây:" +msgstr "Bridges của bạn đây:" #: bridgedb/strings.py:47 #, python-format @@ -189,7 +189,7 @@ msgstr "Chào mừng đến với BridgeDB!" #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE". #: bridgedb/strings.py:55 msgid "Currently supported transport TYPEs:" -msgstr "Các loại \"transport\" được hỗ trợ hiện thời:" +msgstr "Các transport TYPE được hỗ trợ hiện thời:" #: bridgedb/strings.py:56 #, python-format

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 02 Apr '16

02 Apr '16

commit 487cc7a829ee83b4fcbd3d224a17ec44facd60f0 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Apr 2 12:15:03 2016 +0000 Update translations for bridgedb --- vi/LC_MESSAGES/bridgedb.po | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/vi/LC_MESSAGES/bridgedb.po b/vi/LC_MESSAGES/bridgedb.po index ab31ddf..fec6d02 100644 --- a/vi/LC_MESSAGES/bridgedb.po +++ b/vi/LC_MESSAGES/bridgedb.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2015-07-25 03:40+0000\n" -"PO-Revision-Date: 2016-04-02 04:26+0000\n" +"PO-Revision-Date: 2016-04-02 12:13+0000\n" "Last-Translator: lvnam96\n" "Language-Team: Vietnamese (http://www.transifex.com/otf/torproject/language/vi/)\n" "MIME-Version: 1.0\n" @@ -34,7 +34,7 @@ msgstr "" #. "Tor Browser" #: bridgedb/https/server.py:167 msgid "Sorry! Something went wrong with your request." -msgstr "Xin lỗi! Có vấn đề với yêu cầu của bạn." +msgstr "Xin lỗi! Có vấn đề với yêu cầu của bạn." #: bridgedb/https/templates/base.html:79 msgid "Report a Bug" @@ -97,17 +97,17 @@ msgstr "Có lẽ bạn nên thử %s going back %s" #: bridgedb/https/templates/index.html:11 #, python-format msgid "Step %s1%s" -msgstr "" +msgstr "Bước %s1%s" #: bridgedb/https/templates/index.html:13 #, python-format msgid "Download %s Tor Browser %s" -msgstr "" +msgstr "Tải xuống %s Trình duyệt Tor %s" #: bridgedb/https/templates/index.html:25 #, python-format msgid "Step %s2%s" -msgstr "" +msgstr "Bước %s2%s" #: bridgedb/https/templates/index.html:27 #, python-format @@ -117,12 +117,12 @@ msgstr "" #: bridgedb/https/templates/index.html:36 #, python-format msgid "Step %s3%s" -msgstr "" +msgstr "Bước %s3%s" #: bridgedb/https/templates/index.html:38 #, python-format msgid "Now %s add the bridges to Tor Browser %s" -msgstr "" +msgstr "Bây giờ thì %s thêm đường kết nối đó vào Trình duyệt Tor %s" #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the #. beginning of words are present in your final translation. Thanks! @@ -131,11 +131,11 @@ msgstr "" #: bridgedb/https/templates/options.html:38 #, python-format msgid "%sJ%sust give me bridges!" -msgstr "" +msgstr "%sC%shỉ cần cho tôi đường kết nối!" #: bridgedb/https/templates/options.html:51 msgid "Advanced Options" -msgstr "" +msgstr "Các Tùy Chọn Nâng Cao" #: bridgedb/https/templates/options.html:86 msgid "No" @@ -143,7 +143,7 @@ msgstr "Không" #: bridgedb/https/templates/options.html:87 msgid "none" -msgstr "" +msgstr "rỗng" #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the #. beginning of words are present in your final translation. Thanks! @@ -151,7 +151,7 @@ msgstr "" #: bridgedb/https/templates/options.html:124 #, python-format msgid "%sY%ses!" -msgstr "" +msgstr "%sV%sâng!" #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the #. beginning of words are present in your final translation. Thanks! @@ -159,27 +159,27 @@ msgstr "" #: bridgedb/https/templates/options.html:147 #, python-format msgid "%sG%set Bridges" -msgstr "" +msgstr "%sL%sấy Các Đường Kết Nối" #: bridgedb/strings.py:43 msgid "[This is an automated message; please do not reply.]" -msgstr "[Đây là thông điệp tự động; xin đừng trả lời]" +msgstr "[Đây là tin nhắn tự động; xin đừng trả lời.]" #: bridgedb/strings.py:45 msgid "Here are your bridges:" -msgstr "" +msgstr "Các đường kết nối của bạn đây:" #: bridgedb/strings.py:47 #, python-format msgid "" "You have exceeded the rate limit. Please slow down! The minimum time between\n" "emails is %s hours. All further emails during this time period will be ignored." -msgstr "" +msgstr "Bạn đã vượt quá giới hạn tốc độ. Cứ từ từ thôi! Khoảng thời gian dãn cách giữa các email là %s tiếng đồng hồ. Tất cả các email khác trong khoảng thời gian này đều sẽ bị bỏ qua." #: bridgedb/strings.py:50 msgid "" "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)" -msgstr "" +msgstr "Các LỆNH: (kết hợp đồng thời nhiều LỆNH để chỉ định nhiều lựa chọn)" #. TRANSLATORS: Please DO NOT translate the word "BridgeDB". #: bridgedb/strings.py:53 @@ -189,12 +189,12 @@ msgstr "Chào mừng đến với BridgeDB!" #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE". #: bridgedb/strings.py:55 msgid "Currently supported transport TYPEs:" -msgstr "transport TYPEs được hỗ trợ hiện thời:" +msgstr "Các loại \"transport\" được hỗ trợ hiện thời:" #: bridgedb/strings.py:56 #, python-format msgid "Hey, %s!" -msgstr "Hây, %s!" +msgstr "Này, %s!" #: bridgedb/strings.py:57 msgid "Hello, friend!" @@ -202,7 +202,7 @@ msgstr "Chào bạn!" #: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90 msgid "Public Keys" -msgstr "Các khoá Công cộng" +msgstr "Các Chìa Khóa Công Cộng" #. TRANSLATORS: This string will end up saying something like: #. "This email was generated with rainbows, unicorns, and sparkles @@ -212,7 +212,7 @@ msgstr "Các khoá Công cộng" msgid "" "This email was generated with rainbows, unicorns, and sparkles\n" "for %s on %s at %s." -msgstr "Email này được tạo bởi cầu vồng, kỳ lân và ánh sáng lấp lánh cho %s vào %s lúc %s." +msgstr "Email này được tạo bởi cầu vồng, kỳ lân và ánh sáng lấp lánh cho %s vào %s lúc %s." #. TRANSLATORS: Please DO NOT translate "BridgeDB". #. TRANSLATORS: Please DO NOT translate "Pluggable Transports". @@ -226,7 +226,7 @@ msgid "" "difficult for anyone watching your internet traffic to determine that you are\n" "using Tor.\n" "\n" -msgstr "" +msgstr "BridgeDB có thể cung cấp các đường kết nối với nhiều %sloại Pluggable Transports%s,\nchúng có thể giúp che giấu đường truyền của bạn đến Mạng Lưới Tor, làm đường truyền\ninternet của bạn khó bị người khác theo dõi hơn để xác định bạn có đang sử dụng Tor\nhay không.\n\n" #. TRANSLATORS: Please DO NOT translate "Pluggable Transports". #: bridgedb/strings.py:79 @@ -234,7 +234,7 @@ msgid "" "Some bridges with IPv6 addresses are also available, though some Pluggable\n" "Transports aren't IPv6 compatible.\n" "\n" -msgstr "Một vài cầu với địa chỉ IPv6 cũng đang có sẵn, mặc dù một vài Pluggable\nTransports không tương thích với IPv6.\n\n" +msgstr "Một vài đường kết nối với địa chỉ IPv6 cũng đang có sẵn, mặc dù một vài Pluggable\nTransports không tương thích với IPv6.\n\n" #. TRANSLATORS: Please DO NOT translate "BridgeDB". #. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,

1 0

[translation/tails-onioncircuits] Update translations for tails-onioncircuits
by translation＠torproject.org 02 Apr '16

02 Apr '16

commit 5ead3b18afa9b44be618ae705eb8a0b2dda4a6aa Author: Translation commit bot <translation(a)torproject.org> Date: Sat Apr 2 10:46:47 2016 +0000 Update translations for tails-onioncircuits --- sv/onioncircuits.pot | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/sv/onioncircuits.pot b/sv/onioncircuits.pot index 7142066..acbc19c 100644 --- a/sv/onioncircuits.pot +++ b/sv/onioncircuits.pot @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Anders Nilsson <locally(a)devode.se>, 2016 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-26 00:31+0100\n" -"PO-Revision-Date: 2016-03-30 03:31+0000\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"POT-Creation-Date: 2016-03-31 21:31+0200\n" +"PO-Revision-Date: 2016-04-02 10:19+0000\n" +"Last-Translator: Anders Nilsson <locally(a)devode.se>\n" "Language-Team: Swedish (http://www.transifex.com/otf/torproject/language/sv/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,7 +21,7 @@ msgstr "" #: ../onioncircuits:81 msgid "" "Cannot connect to the Tor daemon. Onion Circuits will try to reconnect..." -msgstr "" +msgstr "Kan inte ansluta till Tor-demonen. Onion Circuits kommer försöka återansluta..." #: ../onioncircuits:94 msgid "Onion Circuits" @@ -57,12 +58,12 @@ msgstr "" #: ../onioncircuits:314 msgid "Building..." -msgstr "" +msgstr "Bygger..." #: ../onioncircuits:339 #, c-format msgid "%s: %s" -msgstr "" +msgstr "%s: %s" #: ../onioncircuits:564 msgid "Fingerprint:" @@ -70,16 +71,16 @@ msgstr "Fingeravtryck:" #: ../onioncircuits:565 msgid "Published:" -msgstr "" +msgstr "Publicerad:" #: ../onioncircuits:566 msgid "IP:" -msgstr "" +msgstr "IP:" #: ../onioncircuits:566 #, c-format msgid "%s (%s)" -msgstr "" +msgstr "%s (%s)" #: ../onioncircuits:567 msgid "Bandwidth:" @@ -88,4 +89,4 @@ msgstr "Bandbredd:" #: ../onioncircuits:567 #, c-format msgid "%.2f Mb/s" -msgstr "" +msgstr "%.2f Mb/s"

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 02 Apr '16

02 Apr '16

commit 449e05585e835b0827e552e13c50251468383e4d Author: Translation commit bot <translation(a)torproject.org> Date: Sat Apr 2 04:45:02 2016 +0000 Update translations for bridgedb --- vi/LC_MESSAGES/bridgedb.po | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/vi/LC_MESSAGES/bridgedb.po b/vi/LC_MESSAGES/bridgedb.po index 35164ea..ab31ddf 100644 --- a/vi/LC_MESSAGES/bridgedb.po +++ b/vi/LC_MESSAGES/bridgedb.po @@ -4,14 +4,15 @@ # # Translators: # Khanh Nguyen <nguyenduykhanh85(a)gmail.com>, 2015 +# lvnam96, 2016 # Tuan Duc Dang <inactive+721411(a)transifex.com>, 2015 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2015-07-25 03:40+0000\n" -"PO-Revision-Date: 2016-03-21 16:27+0000\n" -"Last-Translator: Khanh Nguyen <nguyenduykhanh85(a)gmail.com>\n" +"PO-Revision-Date: 2016-04-02 04:26+0000\n" +"Last-Translator: lvnam96\n" "Language-Team: Vietnamese (http://www.transifex.com/otf/torproject/language/vi/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -37,19 +38,19 @@ msgstr "Xin lỗi! Có vấn đề với yêu cầu của bạn." #: bridgedb/https/templates/base.html:79 msgid "Report a Bug" -msgstr "" +msgstr "Báo cáo Lỗi" #: bridgedb/https/templates/base.html:82 msgid "Source Code" -msgstr "" +msgstr "Mã Nguồn" #: bridgedb/https/templates/base.html:85 msgid "Changelog" -msgstr "" +msgstr "Lịch sử thay đổi" #: bridgedb/https/templates/base.html:88 msgid "Contact" -msgstr "" +msgstr "Liên hệ" #: bridgedb/https/templates/bridges.html:35 msgid "Select All" @@ -57,11 +58,11 @@ msgstr "Chọn Tất cả" #: bridgedb/https/templates/bridges.html:40 msgid "Show QRCode" -msgstr "" +msgstr "Hiển thị Mã QR" #: bridgedb/https/templates/bridges.html:52 msgid "QRCode for your bridge lines" -msgstr "" +msgstr "Mã QR cho đường truyền kết nối của bạn" #. TRANSLATORS: Please translate this into some silly way to say #. "There was a problem!" in your language. For example, @@ -70,28 +71,28 @@ msgstr "" #: bridgedb/https/templates/bridges.html:67 #: bridgedb/https/templates/bridges.html:125 msgid "Uh oh, spaghettios!" -msgstr "" +msgstr "Ừ, ờ, quẩy thôi!" #: bridgedb/https/templates/bridges.html:68 msgid "It seems there was an error getting your QRCode." -msgstr "" +msgstr "Có vẻ chúng ta đã gặp lỗi khi lấy mã QR." #: bridgedb/https/templates/bridges.html:73 msgid "" "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy" " your bridge lines onto mobile and other devices." -msgstr "" +msgstr "Mã QR chứa đường kết nối của bạn. Quét (scan) nó bằng một trình đọc mã QR và copy đường kết nối lên điện thoại và các thiết bị khác." #: bridgedb/https/templates/bridges.html:131 msgid "There currently aren't any bridges available..." -msgstr "" +msgstr "Hiện tại không có đường kết nối nào có sẵn đâu..." #: bridgedb/https/templates/bridges.html:132 #, python-format msgid "" " Perhaps you should try %s going back %s and choosing a different bridge " "type!" -msgstr "" +msgstr "Có lẽ bạn nên thử %s going back %s" #: bridgedb/https/templates/index.html:11 #, python-format

1 0

[translation/tails-onioncircuits_completed] Update translations for tails-onioncircuits_completed
by translation＠torproject.org 02 Apr '16

02 Apr '16

commit c7dc00f4ea183b1ca806f2ccbf3c7e7ea1e374ac Author: Translation commit bot <translation(a)torproject.org> Date: Sat Apr 2 01:46:54 2016 +0000 Update translations for tails-onioncircuits_completed --- id/onioncircuits.pot | 93 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 93 insertions(+) diff --git a/id/onioncircuits.pot b/id/onioncircuits.pot new file mode 100644 index 0000000..b29c9db --- /dev/null +++ b/id/onioncircuits.pot @@ -0,0 +1,93 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# Al Kautsar <nurudduja(a)gmail.com>, 2016 +# sony wiliyanto <sonywiliyanto(a)hotmail.com>, 2016 +msgid "" +msgstr "" +"Project-Id-Version: The Tor Project\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2016-03-31 21:31+0200\n" +"PO-Revision-Date: 2016-04-02 01:45+0000\n" +"Last-Translator: sony wiliyanto <sonywiliyanto(a)hotmail.com>\n" +"Language-Team: Indonesian (http://www.transifex.com/otf/torproject/language/id/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: id\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#: ../onioncircuits:81 +msgid "" +"Cannot connect to the Tor daemon. Onion Circuits will try to reconnect..." +msgstr "Tidak dapat terhubung ke Tor daemon. Sirkuit Onion akan mencoba menghubungkan ...." + +#: ../onioncircuits:94 +msgid "Onion Circuits" +msgstr "Sirkuit Onion" + +#: ../onioncircuits:95 +msgid "Display Tor circuits and streams" +msgstr "Tampilan Sirkuit Tor dan sungai" + +#: ../onioncircuits:107 +msgid "OK" +msgstr "OK" + +#: ../onioncircuits:124 +msgid "Path" +msgstr "Path" + +#: ../onioncircuits:125 +msgid "Status" +msgstr "Status" + +#: ../onioncircuits:141 +msgid "Click on a path to get details" +msgstr "klik pada path untuk mendapatkan detail" + +#: ../onioncircuits:215 +msgid "" +"Lost connection to the Tor daemon. Onion Circuits will try to reconnect..." +msgstr "Kehilangan koneksi ke Tor daemon. Sirkuit Onion akan mencoba menghubungkan..." + +#: ../onioncircuits:232 +msgid "Connected to the Tor daemon! You can use now Onion Circuits." +msgstr "Terhubung ke Tor daemon! anda dapat menggunakan sirkuit Onion" + +#: ../onioncircuits:314 +msgid "Building..." +msgstr "Membangun ...." + +#: ../onioncircuits:339 +#, c-format +msgid "%s: %s" +msgstr "%s: %s" + +#: ../onioncircuits:564 +msgid "Fingerprint:" +msgstr "Sidik jari:" + +#: ../onioncircuits:565 +msgid "Published:" +msgstr "Diterbitkan:" + +#: ../onioncircuits:566 +msgid "IP:" +msgstr "IP:" + +#: ../onioncircuits:566 +#, c-format +msgid "%s (%s)" +msgstr "%s (%s)" + +#: ../onioncircuits:567 +msgid "Bandwidth:" +msgstr "Bandwidth:" + +#: ../onioncircuits:567 +#, c-format +msgid "%.2f Mb/s" +msgstr "%.2f Mb/detik"

1 0

[translation/tails-onioncircuits] Update translations for tails-onioncircuits
by translation＠torproject.org 02 Apr '16

02 Apr '16

commit 6cad3014223db86261be7d968978a302757a24b2 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Apr 2 01:46:50 2016 +0000 Update translations for tails-onioncircuits --- id/onioncircuits.pot | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/id/onioncircuits.pot b/id/onioncircuits.pot index 6a17112..b29c9db 100644 --- a/id/onioncircuits.pot +++ b/id/onioncircuits.pot @@ -4,13 +4,14 @@ # # Translators: # Al Kautsar <nurudduja(a)gmail.com>, 2016 +# sony wiliyanto <sonywiliyanto(a)hotmail.com>, 2016 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-03-31 21:31+0200\n" -"PO-Revision-Date: 2016-04-01 16:40+0000\n" -"Last-Translator: Al Kautsar <nurudduja(a)gmail.com>\n" +"PO-Revision-Date: 2016-04-02 01:45+0000\n" +"Last-Translator: sony wiliyanto <sonywiliyanto(a)hotmail.com>\n" "Language-Team: Indonesian (http://www.transifex.com/otf/torproject/language/id/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -21,15 +22,15 @@ msgstr "" #: ../onioncircuits:81 msgid "" "Cannot connect to the Tor daemon. Onion Circuits will try to reconnect..." -msgstr "" +msgstr "Tidak dapat terhubung ke Tor daemon. Sirkuit Onion akan mencoba menghubungkan ...." #: ../onioncircuits:94 msgid "Onion Circuits" -msgstr "" +msgstr "Sirkuit Onion" #: ../onioncircuits:95 msgid "Display Tor circuits and streams" -msgstr "" +msgstr "Tampilan Sirkuit Tor dan sungai" #: ../onioncircuits:107 msgid "OK" @@ -45,16 +46,16 @@ msgstr "Status" #: ../onioncircuits:141 msgid "Click on a path to get details" -msgstr "" +msgstr "klik pada path untuk mendapatkan detail" #: ../onioncircuits:215 msgid "" "Lost connection to the Tor daemon. Onion Circuits will try to reconnect..." -msgstr "" +msgstr "Kehilangan koneksi ke Tor daemon. Sirkuit Onion akan mencoba menghubungkan..." #: ../onioncircuits:232 msgid "Connected to the Tor daemon! You can use now Onion Circuits." -msgstr "" +msgstr "Terhubung ke Tor daemon! anda dapat menggunakan sirkuit Onion" #: ../onioncircuits:314 msgid "Building..." @@ -63,7 +64,7 @@ msgstr "Membangun ...." #: ../onioncircuits:339 #, c-format msgid "%s: %s" -msgstr "" +msgstr "%s: %s" #: ../onioncircuits:564 msgid "Fingerprint:"

1 0

[nyx/master] Merge expand_path.py test into init
by atagar＠torproject.org 02 Apr '16

02 Apr '16

commit 1b65342dffffa3cadc3f1cf62a549c5b565c1c9e Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Apr 1 10:47:15 2016 -0700 Merge expand_path.py test into init This only had a single test for an __init__.py util. Good start for a module that tests all util fuctions there. --- test/__init__.py | 22 ++++++++++++++++++++++ test/expand_path.py | 21 --------------------- 2 files changed, 22 insertions(+), 21 deletions(-) diff --git a/test/__init__.py b/test/__init__.py index 99ed76f..05acdaa 100644 --- a/test/__init__.py +++ b/test/__init__.py @@ -2,6 +2,12 @@ Unit tests for nyx. """ +import unittest + +from nyx import expand_path, uses_settings + +from mock import patch, Mock + __all__ = [ 'arguments', 'expand_path', @@ -9,3 +15,19 @@ __all__ = [ 'log', 'tracker', ] + + +class TestBaseUtil(unittest.TestCase): + @patch('nyx.tor_controller') + @patch('stem.util.system.cwd', Mock(return_value = '/your_cwd')) + @uses_settings + def test_expand_path(self, tor_controller_mock, config): + tor_controller_mock().get_pid.return_value = 12345 + self.assertEqual('/absolute/path/to/torrc', expand_path('/absolute/path/to/torrc')) + self.assertEqual('/your_cwd/torrc', expand_path('torrc')) + + config.set('tor.chroot', '/chroot') + self.assertEqual('/chroot/absolute/path/to/torrc', expand_path('/absolute/path/to/torrc')) + self.assertEqual('/chroot/your_cwd/torrc', expand_path('torrc')) + + config.set('tor.chroot', None) diff --git a/test/expand_path.py b/test/expand_path.py deleted file mode 100644 index 559712a..0000000 --- a/test/expand_path.py +++ /dev/null @@ -1,21 +0,0 @@ -import unittest - -from nyx import expand_path, uses_settings - -from mock import patch, Mock - - -class TestExpandPath(unittest.TestCase): - @patch('nyx.tor_controller') - @patch('stem.util.system.cwd', Mock(return_value = '/your_cwd')) - @uses_settings - def test_expand_path(self, tor_controller_mock, config): - tor_controller_mock().get_pid.return_value = 12345 - self.assertEqual('/absolute/path/to/torrc', expand_path('/absolute/path/to/torrc')) - self.assertEqual('/your_cwd/torrc', expand_path('torrc')) - - config.set('tor.chroot', '/chroot') - self.assertEqual('/chroot/absolute/path/to/torrc', expand_path('/absolute/path/to/torrc')) - self.assertEqual('/chroot/your_cwd/torrc', expand_path('torrc')) - - config.set('tor.chroot', None)

1 0

[nyx/master] Unit test join() util
by atagar＠torproject.org 02 Apr '16

02 Apr '16

commit 7eb3ff2b705e0fa0419b892b4d2b1128c91e2c0e Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Apr 1 11:01:04 2016 -0700 Unit test join() util Just some quick tests for our join() utility. Really tempted to drop this function since it's soley used by the graph and log panels but not nice alternative isn't coming to mind. :/ --- test/__init__.py | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/test/__init__.py b/test/__init__.py index 05acdaa..e64593c 100644 --- a/test/__init__.py +++ b/test/__init__.py @@ -4,7 +4,7 @@ Unit tests for nyx. import unittest -from nyx import expand_path, uses_settings +from nyx import expand_path, join, uses_settings from mock import patch, Mock @@ -31,3 +31,14 @@ class TestBaseUtil(unittest.TestCase): self.assertEqual('/chroot/your_cwd/torrc', expand_path('torrc')) config.set('tor.chroot', None) + + def test_join(self): + # check our pydoc examples + + self.assertEqual('This is a looooong', join(['This', 'is', 'a', 'looooong', 'message'], size = 18)) + self.assertEqual('This is a', join(['This', 'is', 'a', 'looooong', 'message'], size = 17)) + self.assertEqual('', join(['This', 'is', 'a', 'looooong', 'message'], size = 2)) + + # include a joining character + + self.assertEqual('Download: 5 MB, Upload: 3 MB', join(['Download: 5 MB', 'Upload: 3 MB', 'Other: 2 MB'], ', ', 30))

1 0

[nyx/master] Copyright headers
by atagar＠torproject.org 02 Apr '16

02 Apr '16

commit 1957eb4e54f7e1232e33f8c8e88eca4e5e9e59e4 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Apr 1 18:06:44 2016 -0700 Copyright headers Adding headers to our files. Opting to start everything with 2016 (obviously goes back a lot further, but not worth while to dig through history to figure out the years - tricky due to renames). --- nyx/__init__.py | 3 +++ nyx/arguments.py | 3 +++ nyx/controller.py | 3 +++ nyx/curses.py | 3 +++ nyx/demo_glyphs.py | 2 +- nyx/log.py | 3 +++ nyx/menu/__init__.py | 3 +++ nyx/menu/actions.py | 3 +++ nyx/menu/item.py | 3 +++ nyx/menu/menu.py | 3 +++ nyx/panel/__init__.py | 3 +++ nyx/panel/config.py | 3 +++ nyx/panel/connection.py | 3 +++ nyx/panel/graph.py | 3 +++ nyx/panel/header.py | 3 +++ nyx/panel/log.py | 3 +++ nyx/panel/torrc.py | 3 +++ nyx/popups.py | 3 +++ nyx/starter.py | 3 +++ nyx/tracker.py | 3 +++ nyx/uninstall | 3 +++ run_nyx | 2 +- run_tests.py | 2 +- 23 files changed, 63 insertions(+), 3 deletions(-) diff --git a/nyx/__init__.py b/nyx/__init__.py index abb8aea..33656f1 100644 --- a/nyx/__init__.py +++ b/nyx/__init__.py @@ -1,3 +1,6 @@ +# Copyright 2016, Damian Johnson and The Tor Project +# See LICENSE for licensing information + """ Tor curses monitoring application. """ diff --git a/nyx/arguments.py b/nyx/arguments.py index b758640..a01ebb9 100644 --- a/nyx/arguments.py +++ b/nyx/arguments.py @@ -1,3 +1,6 @@ +# Copyright 2016, Damian Johnson and The Tor Project +# See LICENSE for licensing information + """ Commandline argument parsing for nyx. """ diff --git a/nyx/controller.py b/nyx/controller.py index b70b218..1d1730a 100644 --- a/nyx/controller.py +++ b/nyx/controller.py @@ -1,3 +1,6 @@ +# Copyright 2016, Damian Johnson and The Tor Project +# See LICENSE for licensing information + """ Main interface loop for nyx, periodically redrawing the screen and issuing user input to the proper panels. diff --git a/nyx/curses.py b/nyx/curses.py index 8e41bb3..909a055 100644 --- a/nyx/curses.py +++ b/nyx/curses.py @@ -1,3 +1,6 @@ +# Copyright 2016, Damian Johnson and The Tor Project +# See LICENSE for licensing information + """ Toolkit for working with curses. Curses earns its name, and this abstracts away its usage providing us more easy to use high level functions. This abstraction diff --git a/nyx/demo_glyphs.py b/nyx/demo_glyphs.py index 7781139..7ca68ee 100755 --- a/nyx/demo_glyphs.py +++ b/nyx/demo_glyphs.py @@ -1,5 +1,5 @@ #!/usr/bin/env python -# Copyright 2014, Damian Johnson and The Tor Project +# Copyright 2016, Damian Johnson and The Tor Project # See LICENSE for licensing information """ diff --git a/nyx/log.py b/nyx/log.py index aeae399..f461937 100644 --- a/nyx/log.py +++ b/nyx/log.py @@ -1,3 +1,6 @@ +# Copyright 2016, Damian Johnson and The Tor Project +# See LICENSE for licensing information + """ Logging utilities, primiarily short aliases for logging a message at various runlevels. diff --git a/nyx/menu/__init__.py b/nyx/menu/__init__.py index 54644fe..c195054 100644 --- a/nyx/menu/__init__.py +++ b/nyx/menu/__init__.py @@ -1,3 +1,6 @@ +# Copyright 2016, Damian Johnson and The Tor Project +# See LICENSE for licensing information + """ Resources for displaying the menu. """ diff --git a/nyx/menu/actions.py b/nyx/menu/actions.py index d37a9f6..a1199aa 100644 --- a/nyx/menu/actions.py +++ b/nyx/menu/actions.py @@ -1,3 +1,6 @@ +# Copyright 2016, Damian Johnson and The Tor Project +# See LICENSE for licensing information + """ Generates the menu for nyx, binding options with their related actions. """ diff --git a/nyx/menu/item.py b/nyx/menu/item.py index 026f14a..ef5e359 100644 --- a/nyx/menu/item.py +++ b/nyx/menu/item.py @@ -1,3 +1,6 @@ +# Copyright 2016, Damian Johnson and The Tor Project +# See LICENSE for licensing information + """ Menu item, representing an option in the drop-down menu. """ diff --git a/nyx/menu/menu.py b/nyx/menu/menu.py index 9b0dc20..5b719bb 100644 --- a/nyx/menu/menu.py +++ b/nyx/menu/menu.py @@ -1,3 +1,6 @@ +# Copyright 2016, Damian Johnson and The Tor Project +# See LICENSE for licensing information + """ Display logic for presenting the menu. """ diff --git a/nyx/panel/__init__.py b/nyx/panel/__init__.py index 34a6af1..0ae3fdb 100644 --- a/nyx/panel/__init__.py +++ b/nyx/panel/__init__.py @@ -1,3 +1,6 @@ +# Copyright 2016, Damian Johnson and The Tor Project +# See LICENSE for licensing information + """ Panels consisting the nyx interface. """ diff --git a/nyx/panel/config.py b/nyx/panel/config.py index dbbe65b..6de9e61 100644 --- a/nyx/panel/config.py +++ b/nyx/panel/config.py @@ -1,3 +1,6 @@ +# Copyright 2016, Damian Johnson and The Tor Project +# See LICENSE for licensing information + """ Panel presenting the configuration state for tor or nyx. Options can be edited and the resulting configuration files saved. diff --git a/nyx/panel/connection.py b/nyx/panel/connection.py index 76d123f..a26c0d2 100644 --- a/nyx/panel/connection.py +++ b/nyx/panel/connection.py @@ -1,3 +1,6 @@ +# Copyright 2016, Damian Johnson and The Tor Project +# See LICENSE for licensing information + """ Listing of the currently established connections tor has made. """ diff --git a/nyx/panel/graph.py b/nyx/panel/graph.py index b092ecc..4ef9af3 100644 --- a/nyx/panel/graph.py +++ b/nyx/panel/graph.py @@ -1,3 +1,6 @@ +# Copyright 2016, Damian Johnson and The Tor Project +# See LICENSE for licensing information + """ Graphs of tor related statistics. For example... diff --git a/nyx/panel/header.py b/nyx/panel/header.py index 065ade1..7e83501 100644 --- a/nyx/panel/header.py +++ b/nyx/panel/header.py @@ -1,3 +1,6 @@ +# Copyright 2016, Damian Johnson and The Tor Project +# See LICENSE for licensing information + """ Top panel for every page, containing basic system and tor related information. This expands the information it presents to two columns if there's room diff --git a/nyx/panel/log.py b/nyx/panel/log.py index fc11aee..e2d7676 100644 --- a/nyx/panel/log.py +++ b/nyx/panel/log.py @@ -1,3 +1,6 @@ +# Copyright 2016, Damian Johnson and The Tor Project +# See LICENSE for licensing information + """ Panel providing a chronological log of events its been configured to listen for. This provides prepopulation from the log file and supports filtering by diff --git a/nyx/panel/torrc.py b/nyx/panel/torrc.py index 1e08742..23c86d3 100644 --- a/nyx/panel/torrc.py +++ b/nyx/panel/torrc.py @@ -1,3 +1,6 @@ +# Copyright 2016, Damian Johnson and The Tor Project +# See LICENSE for licensing information + """ Panel displaying the torrc or nyxrc with the validation done against it. """ diff --git a/nyx/popups.py b/nyx/popups.py index b01815c..06241a3 100644 --- a/nyx/popups.py +++ b/nyx/popups.py @@ -1,3 +1,6 @@ +# Copyright 2016, Damian Johnson and The Tor Project +# See LICENSE for licensing information + """ Functions for displaying popups in the interface. """ diff --git a/nyx/starter.py b/nyx/starter.py index 09f5057..b13190f 100644 --- a/nyx/starter.py +++ b/nyx/starter.py @@ -1,3 +1,6 @@ +# Copyright 2016, Damian Johnson and The Tor Project +# See LICENSE for licensing information + """ Command line application for monitoring Tor relays, providing real time status information. This starts the application, parsing arguments and getting a Tor diff --git a/nyx/tracker.py b/nyx/tracker.py index a772ff9..a5a4f00 100644 --- a/nyx/tracker.py +++ b/nyx/tracker.py @@ -1,3 +1,6 @@ +# Copyright 2016, Damian Johnson and The Tor Project +# See LICENSE for licensing information + """ Background tasks for gathering information about the tor process. diff --git a/nyx/uninstall b/nyx/uninstall index d3e7f41..5f72d4d 100755 --- a/nyx/uninstall +++ b/nyx/uninstall @@ -1,4 +1,7 @@ #!/bin/sh +# Copyright 2016, Damian Johnson and The Tor Project +# See LICENSE for licensing information + files="/usr/bin/nyx /usr/share/man/man1/nyx.1.gz /usr/share/nyx" for i in $files diff --git a/run_nyx b/run_nyx index 866e050..b6c7b94 100755 --- a/run_nyx +++ b/run_nyx @@ -1,5 +1,5 @@ #!/usr/bin/env python -# Copyright 2014, Damian Johnson and The Tor Project +# Copyright 2016, Damian Johnson and The Tor Project # See LICENSE for licensing information import nyx diff --git a/run_tests.py b/run_tests.py index ae587bf..1c52132 100755 --- a/run_tests.py +++ b/run_tests.py @@ -1,5 +1,5 @@ #!/usr/bin/env python -# Copyright 2013, Damian Johnson and The Tor Project +# Copyright 2016, Damian Johnson and The Tor Project # See LICENSE for licensing information """

1 0