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

[meek/master] Change OPEN_BLOCKING|OPEN_UNBUFFERED to OPEN_BLOCKING.
by dcf＠torproject.org 10 Jun '14

10 Jun '14

commit 29eecdfae394f18ac0b631fca921f0a90d114623 Author: David Fifield <david(a)bamsoftware.com> Date: Mon Jun 9 21:05:48 2014 -0700 Change OPEN_BLOCKING|OPEN_UNBUFFERED to OPEN_BLOCKING. Georg reports that Mozilla is doing so internally anyway. We were never really getting OPEN_UNBUFFERED. https://trac.torproject.org/projects/tor/ticket/11183#comment:27 https://hg.mozilla.org/mozilla-central/file/fc70d6d9a9b0/netwerk/base/src/n… All OPEN_UNBUFFERED is supposed to do is guarantee that the stream support ReadSegments/WriteSegments/WriteFrom. It doesn't hurt if it does, but we don't use them. https://developer.mozilla.org/en-US/docs/Mozilla/Tech/XPCOM/Reference/Inter… https://developer.mozilla.org/en-US/docs/Mozilla/Tech/XPCOM/Reference/Inter… --- firefox/components/main.js | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/firefox/components/main.js b/firefox/components/main.js index a84b2d7..4265f97 100644 --- a/firefox/components/main.js +++ b/firefox/components/main.js @@ -226,8 +226,7 @@ MeekHTTPHelper.LocalConnectionHandler.prototype = { returnResponse: function(resp) { // dump("returnResponse " + JSON.stringify(resp) + "\n"); - outputStream = this.transport.openOutputStream( - Components.interfaces.nsITransport.OPEN_BLOCKING | Components.interfaces.nsITransport.OPEN_UNBUFFERED, 0, 0); + outputStream = this.transport.openOutputStream(Components.interfaces.nsITransport.OPEN_BLOCKING, 0, 0); var output = Components.classes["@mozilla.org/binaryoutputstream;1"] .createInstance(Components.interfaces.nsIBinaryOutputStream); output.setOutputStream(outputStream); @@ -284,8 +283,7 @@ MeekHTTPHelper.RequestReader = function(transport, callback) { this.callback = callback; this.curThread = Components.classes["@mozilla.org/thread-manager;1"].getService().currentThread; - this.inputStream = this.transport.openInputStream( - Components.interfaces.nsITransport.OPEN_BLOCKING | Components.interfaces.nsITransport.OPEN_UNBUFFERED, 0, 0); + this.inputStream = this.transport.openInputStream(Components.interfaces.nsITransport.OPEN_BLOCKING, 0, 0); this.state = this.STATE_READING_LENGTH; // Initially size the buffer to read the 4-byte length.

1 0

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

10 Jun '14

commit bc65f69ae295ab0bb393667332828da211490f09 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jun 10 03:15:35 2014 +0000 Update translations for tails-greeter_completed --- km/km.po | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/km/km.po b/km/km.po index 5c3b15e..ceb7ff6 100644 --- a/km/km.po +++ b/km/km.po @@ -3,15 +3,15 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# Sutha <sutha(a)open.org.kh>, 2014 -# khoemsokhem <sokhem(a)open.org.kh>, 2014 +# Seng Sutha <sutha(a)open.org.kh>, 2014 +# Sokhem Khoem <sokhem(a)open.org.kh>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-05-14 13:14+0200\n" -"PO-Revision-Date: 2014-05-17 14:36+0000\n" -"Last-Translator: khoemsokhem <sokhem(a)open.org.kh>\n" +"POT-Creation-Date: 2014-05-28 22:33+0200\n" +"PO-Revision-Date: 2014-06-10 02:50+0000\n" +"Last-Translator: Sokhem Khoem <sokhem(a)open.org.kh>\n" "Language-Team: Khmer (http://www.transifex.com/projects/p/torproject/language/km/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -103,13 +103,13 @@ msgstr "<a href=\"doc/first_steps/startup_options/windows_camouflage.en.html\"> #: ../glade/optionswindow.glade.h:12 msgid "" -"This option makes Tails look more like Microsoft Windows XP. This may be " +"This option makes Tails look more like Microsoft Windows 8. This may be " "useful in public places in order to avoid attracting suspicion." -msgstr "ជម្រើសនេះធ្វើឲ្យ Tails មានលក្ខណៈដូចជា Microsoft Windows XP ។ វាអាចផ្ដល់ប្រយោជន៍ជាសាធារណៈ ដើម្បីជៀសវាង attracting suspicion ។" +msgstr "ជម្រើសនេះធ្វើឲ្យ Tails មើលទៅដូច Microsoft Windows 8 ។ វាអាចមានប្រយោជន៍ក្នុងកន្លែងសាធារណៈដើម្បីចៀសវាងការសង្ស័យដែលទាក់ទាញ។" #: ../glade/optionswindow.glade.h:13 -msgid "Activate Microsoft Windows XP Camouflage" -msgstr "ធ្វើឲ្យ Microsoft Windows XP Camouflage សកម្ម" +msgid "Activate Microsoft Windows 8 Camouflage" +msgstr "ធ្វើឲ្យ Microsoft Windows 8 Camouflage សកម្ម" #: ../glade/optionswindow.glade.h:14 msgid "MAC address spoofing"

1 0

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

10 Jun '14

commit b577dfc3cd615b4158349f5030a1ee2907e9c28c Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jun 10 03:15:32 2014 +0000 Update translations for tails-greeter --- km/km.po | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/km/km.po b/km/km.po index f2fad12..ceb7ff6 100644 --- a/km/km.po +++ b/km/km.po @@ -3,15 +3,15 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# Sutha <sutha(a)open.org.kh>, 2014 -# khoemsokhem <sokhem(a)open.org.kh>, 2014 +# Seng Sutha <sutha(a)open.org.kh>, 2014 +# Sokhem Khoem <sokhem(a)open.org.kh>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-05-28 22:33+0200\n" -"PO-Revision-Date: 2014-05-29 08:53+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2014-06-10 02:50+0000\n" +"Last-Translator: Sokhem Khoem <sokhem(a)open.org.kh>\n" "Language-Team: Khmer (http://www.transifex.com/projects/p/torproject/language/km/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -105,11 +105,11 @@ msgstr "<a href=\"doc/first_steps/startup_options/windows_camouflage.en.html\"> msgid "" "This option makes Tails look more like Microsoft Windows 8. This may be " "useful in public places in order to avoid attracting suspicion." -msgstr "" +msgstr "ជម្រើសនេះធ្វើឲ្យ Tails មើលទៅដូច Microsoft Windows 8 ។ វាអាចមានប្រយោជន៍ក្នុងកន្លែងសាធារណៈដើម្បីចៀសវាងការសង្ស័យដែលទាក់ទាញ។" #: ../glade/optionswindow.glade.h:13 msgid "Activate Microsoft Windows 8 Camouflage" -msgstr "" +msgstr "ធ្វើឲ្យ Microsoft Windows 8 Camouflage សកម្ម" #: ../glade/optionswindow.glade.h:14 msgid "MAC address spoofing"

1 0

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

10 Jun '14

commit 4964d0ffea96f69e95a8c3009ac5a77a32461843 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jun 10 03:15:28 2014 +0000 Update translations for liveusb-creator_completed --- km/km.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/km/km.po b/km/km.po index 3d4aa97..e930c10 100644 --- a/km/km.po +++ b/km/km.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-05-28 16:00+0200\n" -"PO-Revision-Date: 2014-06-10 02:44+0000\n" +"PO-Revision-Date: 2014-06-10 02:50+0000\n" "Last-Translator: Sokhem Khoem <sokhem(a)open.org.kh>\n" "Language-Team: Khmer (http://www.transifex.com/projects/p/torproject/language/km/)\n" "MIME-Version: 1.0\n"

1 0

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

10 Jun '14

commit 2f82590edab0a88f9ae3fad3fff688a0e85bf670 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jun 10 03:15:26 2014 +0000 Update translations for liveusb-creator --- km/km.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/km/km.po b/km/km.po index 3d4aa97..e930c10 100644 --- a/km/km.po +++ b/km/km.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-05-28 16:00+0200\n" -"PO-Revision-Date: 2014-06-10 02:44+0000\n" +"PO-Revision-Date: 2014-06-10 02:50+0000\n" "Last-Translator: Sokhem Khoem <sokhem(a)open.org.kh>\n" "Language-Team: Khmer (http://www.transifex.com/projects/p/torproject/language/km/)\n" "MIME-Version: 1.0\n"

1 0

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 10 Jun '14

10 Jun '14

commit 9ee240002a0848896224dac6cf85d58ed43ef2c0 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jun 10 03:15:23 2014 +0000 Update translations for https_everywhere_completed --- km/ssl-observatory.dtd | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/km/ssl-observatory.dtd b/km/ssl-observatory.dtd index e3b4ee6..38d03d1 100644 --- a/km/ssl-observatory.dtd +++ b/km/ssl-observatory.dtd @@ -44,6 +44,12 @@ to turn it on?">--> <!ENTITY ssl-observatory.prefs.asn_tooltip "វានឹងទៅប្រមូលយក ហើយផ្ញើ "លេខប្រព័ន្ធអនាមិក" នៃបណ្ដាញរបស់អ្នក។ វានឹងជួយពួកយើងឲ្យរកឃើញការវាយប្រហារប្រឆាំង HTTPS, ហើយកំណត់ថាតើយើងមានការតាមដានពីបណ្ដាញនៅទីតាំងដូចជា Iran និង Syria ដែលជាការវាយប្រហារដោយប្រៀបធៀបទូទៅ។"> +<!ENTITY ssl-observatory.prefs.show_cert_warning +"Show a warning when the Observatory detects a revoked certificate not caught by your browser"> + +<!ENTITY ssl-observatory.prefs.show_cert_warning_tooltip +"This will check submitted certificates against known Certificate Revocation Lists. Unfortunately we cannot guarantee that we will flag every revoked certificate, but if you do see a warning there's a good chance something is wrong."> + <!ENTITY ssl-observatory.prefs.done "រួចរាល់"> <!ENTITY ssl-observatory.prefs.explanation @@ -87,7 +93,7 @@ www.something.com, ប៉ុន្តែអ្នកដែលមិន <!ENTITY ssl-observatory.warning.showcert "បង្ហាញខ្សែច្រវាក់វិញ្ញាបនបត្រ"> <!ENTITY ssl-observatory.warning.okay "ខ្ញុំយល់"> <!ENTITY ssl-observatory.warning.text "EFF's SSL Observatory បានចេញការព្រមានអំពីវិញ្ញាបនបត្រ HTTPS សម្រាប់តំបន់បណ្ដាញនេះ៖"> -<!ENTITY ssl-observatory.warning.defense "ប្រសិនបើអ្នកចូលក្នុងតំបន់បណ្ដាញនេះ, វាអាចគួរតែធ្វើការផ្លាស់ប្ដូរពាក្យសម្ងាត់របស់អ្នក នៅពេលអ្នកមានការតភ្ជាប់សុវត្ថិភាព។"> +<!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.)"> <!ENTITY ssl-observatory.prefs.self_signed "ដាក់ស្នើ ហើយពិនិត្យមើលវិញ្ញាបនបត្រដែលបានចុះហត្ថលេខា">

1 0

[translation/torcheck_completed] Update translations for torcheck_completed
by translation＠torproject.org 10 Jun '14

10 Jun '14

commit 02ff14b23cb997591287ff7bf0b819a34f626298 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jun 10 03:15:15 2014 +0000 Update translations for torcheck_completed --- km/torcheck.po | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/km/torcheck.po b/km/torcheck.po index 325e69a..0eec93e 100644 --- a/km/torcheck.po +++ b/km/torcheck.po @@ -2,13 +2,13 @@ # Copyright (C) 2008-2013 The Tor Project, Inc # # Translators: -# khoemsokhem <sokhem(a)open.org.kh>, 2014 +# Sokhem Khoem <sokhem(a)open.org.kh>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2014-01-21 04:11+0000\n" -"Last-Translator: khoemsokhem <sokhem(a)open.org.kh>\n" +"PO-Revision-Date: 2014-06-10 02:50+0000\n" +"Last-Translator: Sokhem Khoem <sokhem(a)open.org.kh>\n" "Language-Team: Khmer (http://www.transifex.com/projects/p/torproject/language/km/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -92,3 +92,6 @@ msgstr "JavaScript ត្រូវបានបើក។" msgid "JavaScript is disabled." msgstr "JavaScript ត្រូវបានបិទ។" + +msgid "However, it does not appear to be the Tor Browser Bundle." +msgstr "ទោះជាយ៉ាងណាក៏ដោយ វាមិនបង្ហាញថាជា Tor Browser Bundle ។"

1 0

[translation/torcheck] Update translations for torcheck
by translation＠torproject.org 10 Jun '14

10 Jun '14

commit fc8e3c87179735f03558235c0ffb795cf374006a Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jun 10 03:15:12 2014 +0000 Update translations for torcheck --- km/torcheck.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/km/torcheck.po b/km/torcheck.po index 3a851af..0eec93e 100644 --- a/km/torcheck.po +++ b/km/torcheck.po @@ -2,13 +2,13 @@ # Copyright (C) 2008-2013 The Tor Project, Inc # # Translators: -# khoemsokhem <sokhem(a)open.org.kh>, 2014 +# Sokhem Khoem <sokhem(a)open.org.kh>, 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-06-10 02:50+0000\n" +"Last-Translator: Sokhem Khoem <sokhem(a)open.org.kh>\n" "Language-Team: Khmer (http://www.transifex.com/projects/p/torproject/language/km/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -94,4 +94,4 @@ msgid "JavaScript is disabled." msgstr "JavaScript ត្រូវបានបិទ។" msgid "However, it does not appear to be the Tor Browser Bundle." -msgstr "" +msgstr "ទោះជាយ៉ាងណាក៏ដោយ វាមិនបង្ហាញថាជា Tor Browser Bundle ។"

1 0

[translation/bridgedb_completed] Update translations for bridgedb_completed
by translation＠torproject.org 10 Jun '14

10 Jun '14

commit 088bc5f3172b2576f08c8eb0a61e399acbc7d0cb Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jun 10 03:15:06 2014 +0000 Update translations for bridgedb_completed --- km/LC_MESSAGES/bridgedb.po | 374 +++++++++++++++++++++++++++++++++++++------- 1 file changed, 316 insertions(+), 58 deletions(-) diff --git a/km/LC_MESSAGES/bridgedb.po b/km/LC_MESSAGES/bridgedb.po index 8ae3ca8..95a26bc 100644 --- a/km/LC_MESSAGES/bridgedb.po +++ b/km/LC_MESSAGES/bridgedb.po @@ -1,18 +1,19 @@ # Translations template for BridgeDB. -# Copyright (C) 2013 ORGANIZATION +# Copyright (C) 2014 'The Tor Project, Inc.' # This file is distributed under the same license as the BridgeDB project. # # Translators: -# Translators: -# soksophea <sksophea(a)gmail.com>, 2014 -# soksophea <sksophea(a)gmail.com>, 2013 +# Seng Sutha <sutha(a)open.org.kh>, 2014 +# Sokhem Khoem <sokhem(a)open.org.kh>, 2014 +# Sok Sophea <sksophea(a)gmail.com>, 2014 +# Sok Sophea <sksophea(a)gmail.com>, 2013 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" -"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" -"POT-Creation-Date: 2013-03-27 21:41+0000\n" -"PO-Revision-Date: 2014-02-07 02:29+0000\n" -"Last-Translator: Sutha <sutha(a)open.org.kh>\n" +"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" +"POT-Creation-Date: 2014-06-06 21:46+0000\n" +"PO-Revision-Date: 2014-06-10 02:50+0000\n" +"Last-Translator: Sokhem Khoem <sokhem(a)open.org.kh>\n" "Language-Team: Khmer (http://www.transifex.com/projects/p/torproject/language/km/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -21,82 +22,339 @@ msgstr "" "Language: km\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: lib/bridgedb/templates/base.html:33 -msgid "What are bridges?" -msgstr "តើប្រ៊ីតជាអ្វី?" +#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in +#. any string (regardless of capitalization and/or punctuation): +#. "BridgeDB" +#. "pluggable transport" +#. "pluggable transports" +#. "obfs2" +#. "obfs3" +#. "scramblesuit" +#. "fteproxy" +#. "Tor" +#. "Tor Browser" +#: lib/bridgedb/HTTPServer.py:121 +msgid "Sorry! Something went wrong with your request." +msgstr "សូមទោស! អ្វីមួយមានកំហុសជាមួយសំណើរបស់អ្នក។" + +#: lib/bridgedb/strings.py:18 +msgid "[This is an automated message; please do not reply.]" +msgstr "[នេះជាសារស្វ័យប្រវត្តិ; សូមកុំឆ្លើយតប។]" + +#: lib/bridgedb/strings.py:20 +msgid "Here are your bridges:" +msgstr "នេះជាប៊្រីដ្យរបស់អ្នក៖" + +#: lib/bridgedb/strings.py:22 +#, 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 "You have exceeded the rate limit. Please slow down! The minimum time between\nemails is %s hours. All further emails during this time period will be ignored." + +#: lib/bridgedb/strings.py:25 +msgid "" +"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)" +msgstr "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)" + +#. TRANSLATORS: Please DO NOT translate the word "BridgeDB". +#: lib/bridgedb/strings.py:28 +msgid "Welcome to BridgeDB!" +msgstr "ស្វាគមន៍មកកាន់ BridgeDB!" + +#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE". +#: lib/bridgedb/strings.py:30 +msgid "Currently supported transport TYPEs:" +msgstr "បច្ចុប្បន្នករផ្ទេរបានគាំទ្រ TYPEs ៖" + +#: lib/bridgedb/strings.py:31 +#, python-format +msgid "Hey, %s!" +msgstr "ហេ, %s!" + +#: lib/bridgedb/strings.py:32 +msgid "Hello, friend!" +msgstr "សួស្ដី, មិត្តភ័ក្ដិ!" + +#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100 +msgid "Public Keys" +msgstr "សោសាធារណៈ" + +#. TRANSLATORS: This string will end up saying something like: +#. "This email was generated with rainbows, unicorns, and sparkles +#. for alice(a)example.com on Friday, 09 May, 2014 at 18:59:39." +#: lib/bridgedb/strings.py:37 +#, python-format +msgid "" +"This email was generated with rainbows, unicorns, and sparkles\n" +"for %s on %s at %s." +msgstr "អ៊ីមែលនេះត្រូវបានបង្កើតឡើងជាមួយ rainbows, unicorns, និង sparkles\nសម្រាប់ %s លើ %s នៅ %s ។" -#: lib/bridgedb/templates/base.html:34 +#. TRANSLATORS: Please DO NOT translate "BridgeDB". +#. TRANSLATORS: Please DO NOT translate "Pluggable Transports". +#. TRANSLATORS: Please DO NOT translate "Tor". +#. TRANSLATORS: Please DO NOT translate "Tor Network". +#: lib/bridgedb/strings.py:47 #, python-format msgid "" -"%s Bridge relays %s are Tor relays that help you circumvent censorship." -msgstr "%s ប្រ៊ីតបញ្ជូនបន្ត %s គឺ Tor បញ្ជូនបន្តដែលជួយអ្នកបញ្ចៀសការរិះគន់។" +"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n" +"which can help obfuscate your connections to the Tor Network, making it more\n" +"difficult for anyone watching your internet traffic to determine that you are\n" +"using Tor.\n" +"\n" +msgstr "BridgeDB មិនអាចផ្ដល់ប៊្រីដ្យជាមួយប្រភេទ %stypes មួយចំនួននៃ Pluggable Transports%s,\nដែលអាចជួយ obfuscate ការតភ្ជាប់របស់អ្នកទៅកាន់បណ្ដាញ Tor , ធ្វើឲ្យវាមានភាពពិបាកសម្រាប់មើលចរាចរណ៍របស់អ្នកក្នុងការកំណត់ថាអ្នកកំពុងប្រើ Tor ។\n\n" + +#. TRANSLATORS: Please DO NOT translate "Pluggable Transports". +#: lib/bridgedb/strings.py:54 +msgid "" +"Some bridges with IPv6 addresses are also available, though some Pluggable\n" +"Transports aren't IPv6 compatible.\n" +"\n" +msgstr "Some bridges with IPv6 addresses are also available, though some Pluggable\nTransports aren't IPv6 compatible.\n\n" -#: lib/bridgedb/templates/base.html:39 +#. TRANSLATORS: Please DO NOT translate "BridgeDB". +#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring, +#. regular, or unexciting". Like vanilla ice cream. It refers to bridges +#. which do not have Pluggable Transports, and only speak the regular, +#. boring Tor protocol. Translate it as you see fit. Have fun with it. +#: lib/bridgedb/strings.py:63 +#, python-format +msgid "" +"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n" +"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n" +"help to circumvent internet censorship in many cases.\n" +"\n" +msgstr "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\nPluggable Transports %s which maybe doesn't sound as cool, but they can still\nhelp to circumvent internet censorship in many cases.\n\n" + +#: lib/bridgedb/strings.py:76 +msgid "What are bridges?" +msgstr "តើប្រ៊ីដ្យជាអ្វី?" + +#: lib/bridgedb/strings.py:77 +#, python-format +msgid "%s Bridges %s are Tor relays that help you circumvent censorship." +msgstr "%s Bridges %s are Tor relays that help you circumvent censorship." + +#: lib/bridgedb/strings.py:82 msgid "I need an alternative way of getting bridges!" -msgstr "ខ្ញុំត្រូវការវិធីសាស្ត្រឆ្លាស់គ្នានៃការទទួលបានប្រ៊ីត!" +msgstr "ខ្ញុំត្រូវការវិធីសាស្ត្រឆ្លាស់គ្នានៃការទទួលបានប្រ៊ីដ្យ!" -#: lib/bridgedb/templates/base.html:40 +#: lib/bridgedb/strings.py:83 #, python-format msgid "" -"Another way to find public bridge addresses is to send an email (from a %s " -"or a %s address) to %s with the line 'get bridges' by itself in the body of " -"the mail." -msgstr "វិធីផ្សេងទៀតដើម្បីរកមើលអាសយដ្ឋានប្រ៊ីតសាធារណៈគឺ ការផ្ញើអ៊ីមែល (ពីអាសយដ្ឋាន %s ឬ %s) ទៅកាន់ %s ដែលមានបន្ទាត់អក្សរ 'get bridges' នៅក្នុងតួនៃអ៊ីមែល។" +"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 or %s." +msgstr "Another way to get bridges is to send an email to %s. Please note that you must\nsend the email using an address from one of the following email providers:\n%s or %s." -#: lib/bridgedb/templates/base.html:48 +#: lib/bridgedb/strings.py:90 msgid "My bridges don't work! I need help!" -msgstr "ប្រ៊ីតរបស់ខ្ញុំមិនដំណើរការ! ខ្ញុំត្រូវការជំនួយ!" +msgstr "ប្រ៊ីដ្យរបស់ខ្ញុំមិនដំណើរការ! ខ្ញុំត្រូវការជំនួយ!" -#: lib/bridgedb/templates/base.html:49 +#. TRANSLATORS: Please DO NOT translate "Tor". +#: lib/bridgedb/strings.py:92 #, python-format +msgid "If your Tor doesn't work, you should email %s." +msgstr "ប្រសិនបើ Tor របស់អ្នកមិនដំណើរការ, អ្នកគួរតែអ៊ីមែល %s ។" + +#. TRANSLATORS: Please DO NOT translate "Pluggable Transports". +#. TRANSLATORS: Please DO NOT translate "Tor Browser". +#. TRANSLATORS: Please DO NOT translate "Tor". +#: lib/bridgedb/strings.py:96 msgid "" -"If your Tor doesn't work, you should email %s. Try including as much info " -"about your case as you can, including the list of bridges you used, the " -"bundle filename/version you used, the messages that Tor gave out, etc." -msgstr "បើ Tor របស់អ្នកមិនដំណើរការទេ អ្នកគួរតែផ្ញើអ៊ីមែលទៅ %s។ ដោយព្យាយាមរួមបញ្ចូលព័ត៌មានអំពីករណីរបស់អ្នកឲ្យបានច្រើន រួមបញ្ចូលបញ្ជីប្រ៊ីតដែលអ្នកបានប្រើ បាច់ឈ្មោះឯកសារ/កំណែដែលអ្នកបានប្រើ សារដែល Tor បានបោះបង់។ល។" +"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 "Try including as much info about your case as you can, including the list of\nbridges and Pluggable Transports you tried to use, your Tor Browser version,\nand any messages which Tor gave out, etc." + +#: lib/bridgedb/strings.py:103 +msgid "Here are your bridge lines:" +msgstr "នេះជាតំណប៊្រីដ្យរបស់អ្នក៖" + +#: lib/bridgedb/strings.py:104 +msgid "Get Bridges!" +msgstr "ទទួលយកប៊្រីដ្យ!" + +#: lib/bridgedb/strings.py:108 +msgid "Please select options for bridge type:" +msgstr "សូមជ្រើសជម្រើសសម្រាប់ប្រភេទប៊្រីដ្យ៖" + +#: lib/bridgedb/strings.py:109 +msgid "Do you need IPv6 addresses?" +msgstr "តើអ្នកត្រូវការអាសយដ្ឋាន IPv6 ឬ?" + +#: lib/bridgedb/strings.py:110 +#, python-format +msgid "Do you need a %s?" +msgstr "តើអ្នកត្រូវការ %s?" -#: lib/bridgedb/templates/bridges.html:10 +#: lib/bridgedb/strings.py:114 +msgid "Your browser is not displaying images properly." +msgstr "កម្មវិធីអ៊ីនធឺណិតរបស់អ្នកមិនកំពុងបង្ហាញរូបភាពដោយត្រឹមត្រូវឡើយ។" + +#: lib/bridgedb/strings.py:115 +msgid "Enter the characters from the image above..." +msgstr "បញ្ចូលតួអក្សរពីរូបភាពខាងលើ..." + +#: lib/bridgedb/strings.py:119 +msgid "How to start using your bridges" +msgstr "របៀបចាប់ផ្ដើមប្រើប៊្រីដ្យរបស់អ្នក" + +#. TRANSLATORS: Please DO NOT translate "Tor Browser". +#: lib/bridgedb/strings.py:121 +#, python-format msgid "" -"To use the above lines, go to Vidalia's Network settings page, and click " -"\"My ISP blocks connections to the Tor network\". Then add each bridge " -"address one at a time." -msgstr "ដើម្បីប្រើបន្ទាត់អក្សរខាងលើ អ្នកត្រូវទៅកាន់ទំព័រការកំណត់បណ្ដាញរបស់ Vidalia រួចចុច \"ISP របស់ខ្ញុំទប់ស្កាត់ការតភ្ជាប់ទៅកាន់បណ្ដាញ Tor\" ។ បន្ទាប់មកបន្ថែមអាសយដ្ឋានប្រ៊ីតម្ដងមួយៗ។" +"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n" +"Browser download page %s to start Tor Browser." +msgstr "ដើម្បីបញ្ចូលប៊្រីដ្យទៅកាន់ Tor Browser, អនុវត្តសេចក្ដីណែនាំនៅលើទំព័រ %s Tor\nBrowser %s ដើម្បីចាប់ផ្ដើម Tor Browser ។" + +#. TRANSLATORS: Please DO NOT translate "Tor". +#: lib/bridgedb/strings.py:125 +msgid "" +"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n" +"the wizard until it asks:" +msgstr "នៅពេលប្រអប់ 'ការកំណត់បណ្ដាញ' លេចឡើង, ចុច 'កំណត់រចនាសម្ព័ន្ធ' និងអនុវត្តអ្នកជំនួយការរហូតដល់ភារកិច្ចរបស់អ្នក៖" + +#. TRANSLATORS: Please DO NOT translate "Tor". +#: lib/bridgedb/strings.py:129 +msgid "" +"Does your Internet Service Provider (ISP) block or otherwise censor connections\n" +"to the Tor network?" +msgstr "Does your Internet Service Provider (ISP) block or otherwise censor connections\nto the Tor network?" + +#. TRANSLATORS: Please DO NOT translate "Tor". +#: lib/bridgedb/strings.py:133 +msgid "" +"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n" +"paste the bridge lines into the text input box. Finally, click 'Connect', and\n" +"you should be good to go! If you experience trouble, try clicking the 'Help'\n" +"button in the 'Tor Network Settings' wizard for further assistance." +msgstr "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\npaste the bridge lines into the text input box. Finally, click 'Connect', and\nyou should be good to go! If you experience trouble, try clicking the 'Help'\nbutton in the 'Tor Network Settings' wizard for further assistance." + +#: lib/bridgedb/strings.py:141 +msgid "Displays this message." +msgstr "បង្ហាញសារនេះ។" + +#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the +#. same non-Pluggable Transport bridges described above as being +#. "plain-ol'-vanilla" bridges. +#: lib/bridgedb/strings.py:145 +msgid "Request vanilla bridges." +msgstr "ស្នើប៊្រីដ្យមូលដ្ឋាន។" + +#: lib/bridgedb/strings.py:146 +msgid "Request IPv6 bridges." +msgstr "ស្នើប៊្រីដ្យ IPv6 ។" + +#. TRANSLATORS: Please DO NOT translate the word the word "TYPE". +#: lib/bridgedb/strings.py:148 +msgid "Request a Pluggable Transport by TYPE." +msgstr "ស្នើការផ្ទេរដែលអាចដោតបានតាមរយៈ TYPE ។" + +#. TRANSLATORS: Please DO NOT translate "BridgeDB". +#. TRANSLATORS: Please DO NOT translate "GnuPG". +#: lib/bridgedb/strings.py:151 +msgid "Get a copy of BridgeDB's public GnuPG key." +msgstr "Get a copy of BridgeDB's public GnuPG key." + +#: lib/bridgedb/templates/base.html:91 +msgid "Report a Bug" +msgstr "របាយការណ៍កំហុស" + +#: lib/bridgedb/templates/base.html:93 +msgid "Source Code" +msgstr "កូដប្រភព" -#: lib/bridgedb/templates/bridges.html:13 -msgid "No bridges currently available" -msgstr "បច្ចុប្បន្នមិនមានប្រ៊ីត" +#: lib/bridgedb/templates/base.html:96 +msgid "Changelog" +msgstr "Changelog" -#: lib/bridgedb/templates/captcha.html:6 -msgid "Upgrade your browser to Firefox" -msgstr "ធ្វើបច្ចុប្បន្នភាពកម្មវិធីអ៊ីនធឺណិតរបស់អ្នកទៅ Firefox" +#: lib/bridgedb/templates/base.html:98 +msgid "Contact" +msgstr "ទំនាក់ទំនង" -#: lib/bridgedb/templates/captcha.html:8 -msgid "Type the two words" -msgstr "វាយពាក្យពីរ" +#. TRANSLATORS: Please translate this into some silly way to say +#. "There was a problem!" in your language. For example, +#. for Italian, you might translate this into "Mama mia!", +#. or for French: "Sacrebleu!". :) +#: lib/bridgedb/templates/bridges.html:66 +msgid "Uh oh, spaghettios!" +msgstr "Uh oh, spaghettios!" -#: lib/bridgedb/templates/index.html:6 -msgid "Step 1" -msgstr "ជំហានទី១" +#: lib/bridgedb/templates/bridges.html:72 +msgid "There currently aren't any bridges available..." +msgstr "បច្ចុប្បន្នមិនមានប៊្រីដ្យមួយចំនួនឡើយ..." -#: lib/bridgedb/templates/index.html:8 +#: lib/bridgedb/templates/bridges.html:73 #, python-format -msgid "Get %s Tor Browser Bundle %s" -msgstr "យក %s បាច់កម្មវិធីអ៊ីនធឺណិត Tor %s" +msgid "" +" Perhaps you should try %s going back %s and choosing a different bridge " +"type!" +msgstr " ប្រហែលជាអ្នកគួរតែព្យាយាម %s ត្រឡប់ទៅកាន់ %s ហើយជ្រើសប្រភេទប្រ៊ីដ្យផ្សេង!" + +#: lib/bridgedb/templates/index.html:11 +#, python-format +msgid "Step %s1%s" +msgstr "ជំហាន %s1%s" #: lib/bridgedb/templates/index.html:13 -msgid "Step 2" -msgstr "ជំហានទី២" +#, python-format +msgid "Download %s Tor Browser %s" +msgstr "ទាញយក %s Tor Browser %s" -#: lib/bridgedb/templates/index.html:15 +#: lib/bridgedb/templates/index.html:25 +#, python-format +msgid "Step %s2%s" +msgstr "ជំហាន %s2%s" + +#: lib/bridgedb/templates/index.html:27 #, python-format msgid "Get %s bridges %s" -msgstr "យក %s ប្រ៊ីត %s" +msgstr "យក %s ប្រ៊ីដ្យ %s" + +#: lib/bridgedb/templates/index.html:36 +#, python-format +msgid "Step %s3%s" +msgstr "ជំហាន %s3%s" -#: lib/bridgedb/templates/index.html:19 -msgid "Step 3" -msgstr "ជំហានទី៣" +#: lib/bridgedb/templates/index.html:38 +#, python-format +msgid "Now %s add the bridges to Tor Browser %s" +msgstr "ឥឡូវ %s បន្ថែមប៊្រីដ្យទៅកាន់ Tor Browser %s" + +#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the +#. beginning of words are present in your final translation. Thanks! +#. (These are used to insert HTML5 underlining tags, to mark accesskeys +#. for disabled users.) +#: lib/bridgedb/templates/options.html:38 +#, python-format +msgid "%sJ%sust give me bridges!" +msgstr "%sJ%sust ផ្ដល់ឲ្យខ្ញុំនូវប៊្រីដ្យ!" + +#: lib/bridgedb/templates/options.html:52 +msgid "Advanced Options" +msgstr "ជម្រើសកម្រិតខ្ពស់" + +#: lib/bridgedb/templates/options.html:88 +msgid "No" +msgstr "ទេ" + +#: lib/bridgedb/templates/options.html:89 +msgid "none" +msgstr "គ្មាន" + +#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the +#. beginning of words are present in your final translation. Thanks! +#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses." +#: lib/bridgedb/templates/options.html:130 +#, python-format +msgid "%sY%ses!" +msgstr "%sY%ses!" -#: lib/bridgedb/templates/index.html:21 +#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the +#. beginning of words are present in your final translation. Thanks! +#. TRANSLATORS: Please do NOT translate the word "bridge"! +#: lib/bridgedb/templates/options.html:154 #, python-format -msgid "Now %s add the bridges to Tor %s" -msgstr "ឥឡូវ %s បន្ថែមប្រ៊ីតទៅកាន់ Tor %s" +msgid "%sG%set Bridges" +msgstr "%sG%set ប៊្រីដ្យ"

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 10 Jun '14

10 Jun '14

commit 42da52cf8fab24b726cf454d435b02d79c0d49aa Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jun 10 03:15:03 2014 +0000 Update translations for bridgedb --- km/LC_MESSAGES/bridgedb.po | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/km/LC_MESSAGES/bridgedb.po b/km/LC_MESSAGES/bridgedb.po index e926f1a..95a26bc 100644 --- a/km/LC_MESSAGES/bridgedb.po +++ b/km/LC_MESSAGES/bridgedb.po @@ -4,6 +4,7 @@ # # Translators: # Seng Sutha <sutha(a)open.org.kh>, 2014 +# Sokhem Khoem <sokhem(a)open.org.kh>, 2014 # Sok Sophea <sksophea(a)gmail.com>, 2014 # Sok Sophea <sksophea(a)gmail.com>, 2013 msgid "" @@ -11,8 +12,8 @@ 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: 2014-06-06 21:46+0000\n" -"PO-Revision-Date: 2014-06-09 09:51+0000\n" -"Last-Translator: Seng Sutha <sutha(a)open.org.kh>\n" +"PO-Revision-Date: 2014-06-10 02:50+0000\n" +"Last-Translator: Sokhem Khoem <sokhem(a)open.org.kh>\n" "Language-Team: Khmer (http://www.transifex.com/projects/p/torproject/language/km/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -49,12 +50,12 @@ msgstr "នេះជាប៊្រីដ្យរបស់អ្ន 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 "You have exceeded the rate limit. Please slow down! The minimum time between\nemails is %s hours. All further emails during this time period will be ignored." #: lib/bridgedb/strings.py:25 msgid "" "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)" -msgstr "" +msgstr "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)" #. TRANSLATORS: Please DO NOT translate the word "BridgeDB". #: lib/bridgedb/strings.py:28 @@ -109,7 +110,7 @@ msgid "" "Some bridges with IPv6 addresses are also available, though some Pluggable\n" "Transports aren't IPv6 compatible.\n" "\n" -msgstr "" +msgstr "Some bridges with IPv6 addresses are also available, though some Pluggable\nTransports aren't IPv6 compatible.\n\n" #. TRANSLATORS: Please DO NOT translate "BridgeDB". #. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring, @@ -123,7 +124,7 @@ msgid "" "Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n" "help to circumvent internet censorship in many cases.\n" "\n" -msgstr "" +msgstr "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\nPluggable Transports %s which maybe doesn't sound as cool, but they can still\nhelp to circumvent internet censorship in many cases.\n\n" #: lib/bridgedb/strings.py:76 msgid "What are bridges?" @@ -132,7 +133,7 @@ msgstr "តើប្រ៊ីដ្យជាអ្វី?" #: lib/bridgedb/strings.py:77 #, python-format msgid "%s Bridges %s are Tor relays that help you circumvent censorship." -msgstr "" +msgstr "%s Bridges %s are Tor relays that help you circumvent censorship." #: lib/bridgedb/strings.py:82 msgid "I need an alternative way of getting bridges!" @@ -144,7 +145,7 @@ 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 or %s." -msgstr "" +msgstr "Another way to get bridges is to send an email to %s. Please note that you must\nsend the email using an address from one of the following email providers:\n%s or %s." #: lib/bridgedb/strings.py:90 msgid "My bridges don't work! I need help!" @@ -164,7 +165,7 @@ 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 "" +msgstr "Try including as much info about your case as you can, including the list of\nbridges and Pluggable Transports you tried to use, your Tor Browser version,\nand any messages which Tor gave out, etc." #: lib/bridgedb/strings.py:103 msgid "Here are your bridge lines:" @@ -219,7 +220,7 @@ msgstr "នៅពេលប្រអប់ 'ការកំណត់ msgid "" "Does your Internet Service Provider (ISP) block or otherwise censor connections\n" "to the Tor network?" -msgstr "" +msgstr "Does your Internet Service Provider (ISP) block or otherwise censor connections\nto the Tor network?" #. TRANSLATORS: Please DO NOT translate "Tor". #: lib/bridgedb/strings.py:133 @@ -228,7 +229,7 @@ msgid "" "paste the bridge lines into the text input box. Finally, click 'Connect', and\n" "you should be good to go! If you experience trouble, try clicking the 'Help'\n" "button in the 'Tor Network Settings' wizard for further assistance." -msgstr "" +msgstr "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\npaste the bridge lines into the text input box. Finally, click 'Connect', and\nyou should be good to go! If you experience trouble, try clicking the 'Help'\nbutton in the 'Tor Network Settings' wizard for further assistance." #: lib/bridgedb/strings.py:141 msgid "Displays this message." @@ -254,7 +255,7 @@ msgstr "ស្នើការផ្ទេរដែលអាចដ #. TRANSLATORS: Please DO NOT translate "GnuPG". #: lib/bridgedb/strings.py:151 msgid "Get a copy of BridgeDB's public GnuPG key." -msgstr "" +msgstr "Get a copy of BridgeDB's public GnuPG key." #: lib/bridgedb/templates/base.html:91 msgid "Report a Bug" @@ -278,7 +279,7 @@ msgstr "ទំនាក់ទំនង" #. or for French: "Sacrebleu!". :) #: lib/bridgedb/templates/bridges.html:66 msgid "Uh oh, spaghettios!" -msgstr "" +msgstr "Uh oh, spaghettios!" #: lib/bridgedb/templates/bridges.html:72 msgid "There currently aren't any bridges available..."

1 0