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

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

16 Apr '14

commit 6d0cc0dee2f477543fa3eb89522cab3d1c2aebe6 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 16 13:15:30 2014 +0000 Update translations for tails-greeter --- pa/pa.po | 61 +++++++++++++++++++++++++++++++------------------------------ 1 file changed, 31 insertions(+), 30 deletions(-) diff --git a/pa/pa.po b/pa/pa.po index 2aec2ae..8a08790 100644 --- a/pa/pa.po +++ b/pa/pa.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# A S Alam <apreet.alam(a)gmail.com>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-03-06 17:16+0100\n" -"PO-Revision-Date: 2014-03-07 08:52+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"POT-Creation-Date: 2014-03-17 13:54+0100\n" +"PO-Revision-Date: 2014-04-16 13:15+0000\n" +"Last-Translator: A S Alam <apreet.alam(a)gmail.com>\n" "Language-Team: Panjabi (Punjabi) (http://www.transifex.com/projects/p/torproject/language/pa/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,57 +20,57 @@ msgstr "" #: ../glade/persistencewindow.glade.h:1 msgid "Forward" -msgstr "" +msgstr "ਅੱਗੇ" #: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1 msgid "Login" -msgstr "" +msgstr "ਲਾਗਇਨ" #: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2 msgid "Welcome to Tails" -msgstr "" +msgstr "ਟੇਲਜ਼ ਵਲੋਂ ਜੀ ਆਇਆਂ ਨੂੰ" #: ../glade/persistencewindow.glade.h:4 msgid "Use persistence?" -msgstr "" +msgstr "ਅਟੱਲਤਾ ਵਰਤਣੀ ਹੈ?" #: ../glade/persistencewindow.glade.h:5 msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>" -msgstr "" +msgstr "<a href=\"doc/first_steps/persistence/use.en.html\">ਦਸਤਾਵੇਜ਼</a>" #: ../glade/persistencewindow.glade.h:6 msgid "Yes" -msgstr "" +msgstr "ਹਾਂ" #: ../glade/persistencewindow.glade.h:7 msgid "No" -msgstr "" +msgstr "ਨਹੀਂ" #: ../glade/persistencewindow.glade.h:8 msgid "Passphrase:" -msgstr "" +msgstr "ਵਾਕ:" #: ../glade/persistencewindow.glade.h:9 msgid "Read-Only?" -msgstr "" +msgstr "ਕੇਵਲ ਪੜ੍ਹਨ ਲਈ?" #: ../glade/persistencewindow.glade.h:10 msgid "Wrong passphrase. Please try again." -msgstr "" +msgstr "ਗਲਤ ਵਾਕ ਹੈ। ਫੇਰ ਕੋਸ਼ਿਸ਼ ਕਰੋ ਜੀ।" #: ../glade/persistencewindow.glade.h:11 msgid "More options?" -msgstr "" +msgstr "ਹੋਰ ਚੋਣਾਂ?" #: ../glade/optionswindow.glade.h:3 msgid "Administration password" -msgstr "" +msgstr "ਪ੍ਰਸ਼ਾਸ਼ਕੀ ਪਾਸਵਰਡ" #: ../glade/optionswindow.glade.h:4 msgid "" "<a " "href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>" -msgstr "" +msgstr "<a href=\"doc/first_steps/startup_options/administration_password.en.html\">ਦਸਤਾਵੇਜ਼</a>" #: ../glade/optionswindow.glade.h:5 msgid "" @@ -79,35 +80,35 @@ msgstr "" #: ../glade/optionswindow.glade.h:7 msgid "Password:" -msgstr "" +msgstr "ਪਾਸਵਰਡ:" #: ../glade/optionswindow.glade.h:8 msgid "Verify Password:" -msgstr "" +msgstr "ਪਾਸਵਰਡ ਪੁਸ਼ਟੀ:" #: ../glade/optionswindow.glade.h:9 msgid "Passwords do not match" -msgstr "" +msgstr "ਪਾਸਵਰਡ ਮਿਲਦਾ ਨਹੀਂ ਹੈ" #: ../glade/optionswindow.glade.h:10 msgid "Windows camouflage" -msgstr "" +msgstr "ਵਿੰਡੋਜ਼ ਕਮੋਉਫਲੇਜ਼" #: ../glade/optionswindow.glade.h:11 msgid "" "<a " "href=\"doc/first_steps/startup_options/windows_camouflage.en.html\">Documentation</a>" -msgstr "" +msgstr "<a href=\"doc/first_steps/startup_options/windows_camouflage.en.html\">ਦਸਤਾਵੇਜ਼</a>" #: ../glade/optionswindow.glade.h:12 msgid "" "This option makes Tails look more like Microsoft Windows XP. This may be " "useful in public places in order to avoid attracting suspicion." -msgstr "" +msgstr "ਇਹ ਚੋਣ ਕਰਨ ਨਾਲ ਟੇਲਜ਼ ਮਾਈਕਰੋਸਾਫਟ ਵਿੰਡੋਜ਼ XP ਵਰਗਾ ਲੱਗੇਗਾ। ਇਹ ਸ਼ੱਕ ਪੈਣ ਤੋਂ ਬਚਣ ਲਈ ਜਨਤਕ ਥਾਵਾਂ ਉੱਤੇ ਫਾਇਦੇਮੰਦ ਹੋ ਸਕਦਾ ਹੈ।" #: ../glade/optionswindow.glade.h:13 msgid "Activate Microsoft Windows XP Camouflage" -msgstr "" +msgstr "Microsoft Windows XP ਕਮੋਉਫਲੇਜ਼ ਸਰਗਰਮ ਕਰੋ" #: ../glade/optionswindow.glade.h:14 msgid "MAC address spoofing" @@ -117,7 +118,7 @@ msgstr "" msgid "" "<a " "href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>" -msgstr "" +msgstr "<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">ਦਸਤਾਵੇਜ਼</a>" #: ../glade/optionswindow.glade.h:16 msgid "" @@ -137,13 +138,13 @@ msgstr "" #: ../glade/optionswindow.glade.h:19 msgid "Network configuration" -msgstr "" +msgstr "ਨੈੱਟਵਰਕ ਸੰਰਚਨਾ" #: ../glade/optionswindow.glade.h:20 msgid "" "<a " "href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>" -msgstr "" +msgstr "<a href=\"doc/first_steps/startup_options/network_configuration.en.html\">ਦਸਤਾਵੇਜ਼</a>" #: ../glade/optionswindow.glade.h:21 msgid "" @@ -159,7 +160,7 @@ msgstr "" #: ../glade/langpanel.glade.h:1 msgid " " -msgstr "" +msgstr " " #: ../glade/langpanel.glade.h:2 ../GdmGreeter/langpanel.py:42 msgid "Language" @@ -167,11 +168,11 @@ msgstr "ਭਾਸ਼ਾ" #: ../glade/langpanel.glade.h:3 msgid "Locale" -msgstr "" +msgstr "ਲੋਕੇਲ" #: ../glade/langpanel.glade.h:4 msgid "Layout" -msgstr "" +msgstr "ਲੇਆਉਟ" #: ../GdmGreeter/persistence.py:59 #, python-format @@ -199,4 +200,4 @@ msgstr "" #: ../GdmGreeter/langpanel.py:124 ../GdmGreeter/langpanel.py:148 #: ../GdmGreeter/langpanel.py:181 msgid "Other..." -msgstr "" +msgstr "ਹੋਰ..."

1 0

[translation/tails-persistence-setup] Update translations for tails-persistence-setup
by translation＠torproject.org 16 Apr '14

16 Apr '14

commit bf40a92db7d4c2e5a29a692a3cf7054ff1096244 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 16 13:15:26 2014 +0000 Update translations for tails-persistence-setup --- pa/pa.po | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/pa/pa.po b/pa/pa.po index e875cc0..2c546b7 100644 --- a/pa/pa.po +++ b/pa/pa.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" -"POT-Creation-Date: 2013-11-07 16:37+0100\n" -"PO-Revision-Date: 2013-11-15 09:19+0000\n" +"POT-Creation-Date: 2014-01-18 21:00+0100\n" +"PO-Revision-Date: 2014-04-16 13:10+0000\n" "Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" "Language-Team: Panjabi (Punjabi) (http://www.transifex.com/projects/p/torproject/language/pa/)\n" "MIME-Version: 1.0\n" @@ -118,67 +118,67 @@ msgstr "" msgid "Setup Tails persistent volume" msgstr "" -#: ../lib/Tails/Persistence/Setup.pm:331 +#: ../lib/Tails/Persistence/Setup.pm:337 #, perl-format msgid "Device %s already has a persistent volume." msgstr "" -#: ../lib/Tails/Persistence/Setup.pm:339 +#: ../lib/Tails/Persistence/Setup.pm:345 #, perl-format msgid "Device %s has not enough unallocated space." msgstr "" -#: ../lib/Tails/Persistence/Setup.pm:347 ../lib/Tails/Persistence/Setup.pm:361 +#: ../lib/Tails/Persistence/Setup.pm:353 ../lib/Tails/Persistence/Setup.pm:367 #, perl-format msgid "Device %s has no persistent volume." msgstr "" -#: ../lib/Tails/Persistence/Setup.pm:353 +#: ../lib/Tails/Persistence/Setup.pm:359 msgid "" "Cannot delete the persistent volume while in use. You should restart Tails " "without persistence." msgstr "" -#: ../lib/Tails/Persistence/Setup.pm:372 +#: ../lib/Tails/Persistence/Setup.pm:378 msgid "Persistence volume is not unlocked." msgstr "" -#: ../lib/Tails/Persistence/Setup.pm:377 +#: ../lib/Tails/Persistence/Setup.pm:383 msgid "Persistence volume is not mounted." msgstr "" -#: ../lib/Tails/Persistence/Setup.pm:382 +#: ../lib/Tails/Persistence/Setup.pm:388 msgid "Persistence volume is not readable. Permissions or ownership problems?" msgstr "" -#: ../lib/Tails/Persistence/Setup.pm:387 +#: ../lib/Tails/Persistence/Setup.pm:393 msgid "Persistence volume is not writable. Maybe it was mounted read-only?" msgstr "" -#: ../lib/Tails/Persistence/Setup.pm:396 +#: ../lib/Tails/Persistence/Setup.pm:402 #, perl-format msgid "Tails is running from non-USB / non-SDIO device %s." msgstr "" -#: ../lib/Tails/Persistence/Setup.pm:402 +#: ../lib/Tails/Persistence/Setup.pm:408 #, perl-format msgid "Device %s is optical." msgstr "" -#: ../lib/Tails/Persistence/Setup.pm:409 +#: ../lib/Tails/Persistence/Setup.pm:415 #, perl-format msgid "Device %s was not created using Tails USB installer." msgstr "" -#: ../lib/Tails/Persistence/Setup.pm:444 +#: ../lib/Tails/Persistence/Setup.pm:450 msgid "Error" -msgstr "" +msgstr "ਗਲਤੀ:" -#: ../lib/Tails/Persistence/Setup.pm:680 +#: ../lib/Tails/Persistence/Setup.pm:670 msgid "Persistence wizard - Finished" msgstr "" -#: ../lib/Tails/Persistence/Setup.pm:683 +#: ../lib/Tails/Persistence/Setup.pm:673 msgid "" "Any changes you have made will only take effect after restarting Tails.\n" "\n" @@ -287,28 +287,28 @@ msgstr "" msgid "Saving persistence configuration..." msgstr "" -#: ../lib/Tails/Persistence/Step/Delete.pm:40 +#: ../lib/Tails/Persistence/Step/Delete.pm:41 msgid "Persistence wizard - Persistent volume deletion" msgstr "" -#: ../lib/Tails/Persistence/Step/Delete.pm:43 +#: ../lib/Tails/Persistence/Step/Delete.pm:44 msgid "Your persistent data will be deleted." msgstr "" -#: ../lib/Tails/Persistence/Step/Delete.pm:47 +#: ../lib/Tails/Persistence/Step/Delete.pm:48 #, perl-format msgid "" "The persistent volume %s (%s), on the %s %s device, will be deleted." msgstr "" -#: ../lib/Tails/Persistence/Step/Delete.pm:53 +#: ../lib/Tails/Persistence/Step/Delete.pm:54 msgid "Delete" msgstr "" -#: ../lib/Tails/Persistence/Step/Delete.pm:91 +#: ../lib/Tails/Persistence/Step/Delete.pm:101 msgid "Deleting..." msgstr "" -#: ../lib/Tails/Persistence/Step/Delete.pm:94 +#: ../lib/Tails/Persistence/Step/Delete.pm:104 msgid "Deleting the persistent volume..." msgstr ""

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 16 Apr '14

16 Apr '14

commit b156ea678fdb6e944b48bc773451e598e3ec2e58 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 16 13:15:19 2014 +0000 Update translations for https_everywhere --- pa/https-everywhere.dtd | 2 +- pa/ssl-observatory.dtd | 95 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 96 insertions(+), 1 deletion(-) diff --git a/pa/https-everywhere.dtd b/pa/https-everywhere.dtd index a50a580..e40251d 100644 --- a/pa/https-everywhere.dtd +++ b/pa/https-everywhere.dtd @@ -20,7 +20,7 @@ <!ENTITY https-everywhere.prefs.enable_all "Enable All"> <!ENTITY https-everywhere.prefs.disable_all "Disable All"> <!ENTITY https-everywhere.prefs.reset_defaults "Reset to Defaults"> -<!ENTITY https-everywhere.prefs.search "Search"> +<!ENTITY https-everywhere.prefs.search "ਖੋਜ"> <!ENTITY https-everywhere.prefs.site "Site"> <!ENTITY https-everywhere.prefs.notes "Notes"> <!ENTITY https-everywhere.prefs.list_caption "Which HTTPS redirection rules should apply?"> diff --git a/pa/ssl-observatory.dtd b/pa/ssl-observatory.dtd new file mode 100644 index 0000000..36ec588 --- /dev/null +++ b/pa/ssl-observatory.dtd @@ -0,0 +1,95 @@ + +<!ENTITY ssl-observatory.popup.details "Details and Privacy Information"> +<!ENTITY ssl-observatory.popup.later "Ask Me Later"> +<!ENTITY ssl-observatory.popup.no "No"> + +<!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.title +"Should HTTPS Everywhere use the SSL Observatory?"> + +<!ENTITY ssl-observatory.popup.yes "Yes"> + + + +<!ENTITY ssl-observatory.prefs.adv_priv_opts1 +"It is safe to enable this, unless you use a very +intrusive corporate network:"> + +<!ENTITY ssl-observatory.prefs.adv_priv_opts2 +"Safe, unless you use a corporate network with secret intranet server names:"> + +<!ENTITY ssl-observatory.prefs.alt_roots +"Submit and check certificates signed by non-standard root CAs"> + +<!ENTITY ssl-observatory.prefs.alt_roots_tooltip +"It is safe (and a good idea) to enable this option, unless you use an intrusive corporate network or Kaspersky antivirus software that monitors your browsing with a TLS proxy and a private root Certificate Authority. If enabled on such a network, this option might publish evidence of which https:// domains were being visited through that proxy, because of the unique certificates it would produce. So we leave it off by default."> + +<!ENTITY ssl-observatory.prefs.anonymous "Check certificates using Tor for anonymity"> +<!ENTITY ssl-observatory.prefs.anonymous_unavailable +"Check certificates using Tor for anonymity (requires Tor)"> +<!ENTITY ssl-observatory.prefs.anonymous_tooltip +"This option requires Tor to be installed and running"> + +<!ENTITY ssl-observatory.prefs.asn +"When you see a new certificate, tell the Observatory which ISP you are connected to"> + +<!ENTITY ssl-observatory.prefs.asn_tooltip +"This will fetch and send the "Autonomous System number" of your network. This will help us locate attacks against HTTPS, and to determine whether we have observations from networks in places like Iran and Syria where attacks are comparatively common."> + +<!ENTITY ssl-observatory.prefs.done "ਮੁਕੰਮਲ"> + +<!ENTITY ssl-observatory.prefs.explanation +"HTTPS Everywhere can use EFF's SSL Observatory. This does two things: (1) +sends copies of HTTPS certificates to the Observatory, to help us +detect 'man in the middle' attacks and improve the Web's security; and (2) +lets us warn you about insecure connections or attacks on your browser."> + + + +<!ENTITY ssl-observatory.prefs.explanation2 + +"For example, when you visit https://www.something.com, the certificate +received by the Observatory will indicate that somebody visited +www.something.com, but not who visited the site, or what specific page they +looked at. Mouseover the options for further details:"> + +<!ENTITY ssl-observatory.prefs.hide "Hide advanced options"> + +<!ENTITY ssl-observatory.prefs.nonanon +"Check certificates even if Tor is not available"> + +<!ENTITY ssl-observatory.prefs.nonanon_tooltip +"We will still try to keep the data anonymous, but this option is less secure"> + +<!ENTITY ssl-observatory.prefs.priv_dns +"Submit and check certificates for non-public DNS names"> + +<!ENTITY ssl-observatory.prefs.priv_dns_tooltip +"Unless this option is checked, the Observatory will not record certificates for names that it cannot resolve through the DNS system."> + +<!ENTITY ssl-observatory.prefs.show "Show advanced options"> + +<!ENTITY ssl-observatory.prefs.title "SSL Observatory Preferences"> + +<!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.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."> + +<!ENTITY ssl-observatory.prefs.self_signed +"Submit and check self-signed certificates"> +<!ENTITY ssl-observatory.prefs.self_signed_tooltip +"This is recommended; cryptographic problems are especially common in self-signed embedded devices">

1 0

[translation/whisperback] Update translations for whisperback
by translation＠torproject.org 16 Apr '14

16 Apr '14

commit 2f32a50f17204f576a6f6ca98d5a0ed04f020501 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 16 13:15:11 2014 +0000 Update translations for whisperback --- pa/pa.po | 61 +++++++++++++++++++++++++++++++------------------------------ 1 file changed, 31 insertions(+), 30 deletions(-) diff --git a/pa/pa.po b/pa/pa.po index 42367f3..7f0d76b 100644 --- a/pa/pa.po +++ b/pa/pa.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# A S Alam <apreet.alam(a)gmail.com>, 2014 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-26 15:50+0100\n" -"PO-Revision-Date: 2012-02-26 16:11+0000\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2014-03-17 17:40+0100\n" +"PO-Revision-Date: 2014-04-16 13:10+0000\n" +"Last-Translator: A S Alam <apreet.alam(a)gmail.com>\n" "Language-Team: Panjabi (Punjabi) (http://www.transifex.com/projects/p/torproject/language/pa/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -39,40 +40,40 @@ msgid "" "/etc/whisperback/config.py, ~/.whisperback/config.py, ./config.py" msgstr "" -#: ../whisperBack/gui.py:151 +#: ../whisperBack/gui.py:154 msgid "Unable to load a valid configuration." msgstr "" -#: ../whisperBack/gui.py:217 +#: ../whisperBack/gui.py:220 msgid "Sending mail..." -msgstr "" +msgstr "...ਮੇਲ ਭੇਜੀ ਜਾ ਰਹੀ ਹੈ" -#: ../whisperBack/gui.py:218 +#: ../whisperBack/gui.py:221 msgid "Sending mail" -msgstr "" +msgstr "ਮੇਲ ਭੇਜੀ ਜਾ ਰਹੀ ਹੈ" #. pylint: disable=C0301 -#: ../whisperBack/gui.py:220 +#: ../whisperBack/gui.py:223 msgid "This could take a while..." -msgstr "" +msgstr "...ਇਸ ਨੂੰ ਕੁਝ ਸਮਾਂ ਲੱਗ ਸਕਦਾ ਹੈ" -#: ../whisperBack/gui.py:234 +#: ../whisperBack/gui.py:237 msgid "The contact email adress doesn't seem valid." msgstr "" -#: ../whisperBack/gui.py:251 +#: ../whisperBack/gui.py:254 msgid "Unable to send the mail: SMTP error." msgstr "" -#: ../whisperBack/gui.py:253 +#: ../whisperBack/gui.py:256 msgid "Unable to connect to the server." msgstr "" -#: ../whisperBack/gui.py:255 +#: ../whisperBack/gui.py:258 msgid "Unable to create or to send the mail." msgstr "" -#: ../whisperBack/gui.py:258 +#: ../whisperBack/gui.py:261 msgid "" "\n" "\n" @@ -81,21 +82,21 @@ msgid "" "If it does not work, you will be offered to save the bug report." msgstr "" -#: ../whisperBack/gui.py:271 +#: ../whisperBack/gui.py:274 msgid "Your message has been sent." msgstr "" -#: ../whisperBack/gui.py:278 +#: ../whisperBack/gui.py:281 msgid "An error occured during encryption." msgstr "" -#: ../whisperBack/gui.py:298 +#: ../whisperBack/gui.py:301 #, python-format msgid "Unable to save %s." msgstr "" #. XXX: fix string -#: ../whisperBack/gui.py:322 +#: ../whisperBack/gui.py:325 #, python-format msgid "" "The bug report could not be sent, likely due to network problems.\n" @@ -105,27 +106,27 @@ msgid "" "Do you want to save the bug report to a file?" msgstr "" -#: ../whisperBack/gui.py:386 ../data/whisperback.ui.h:21 +#: ../whisperBack/gui.py:389 ../data/whisperback.ui.h:21 msgid "WhisperBack" msgstr "" -#: ../whisperBack/gui.py:387 ../data/whisperback.ui.h:2 +#: ../whisperBack/gui.py:390 ../data/whisperback.ui.h:2 msgid "Send feedback in an encrypted mail." msgstr "" -#: ../whisperBack/gui.py:390 +#: ../whisperBack/gui.py:393 msgid "Copyright © 2009-2012 Tails developpers (tails(a)boum.org)" msgstr "" -#: ../whisperBack/gui.py:391 +#: ../whisperBack/gui.py:394 msgid "Tails developers <tails(a)boum.org>" msgstr "" -#: ../whisperBack/gui.py:392 +#: ../whisperBack/gui.py:395 msgid "translator-credits" msgstr "" -#: ../whisperBack/gui.py:419 +#: ../whisperBack/gui.py:422 msgid "This doesn't seem to be a valid URL or OpenPGP key." msgstr "" @@ -135,7 +136,7 @@ msgstr "" #: ../data/whisperback.ui.h:3 msgid "https://tails.boum.org/" -msgstr "" +msgstr "https://tails.boum.org/" #: ../data/whisperback.ui.h:4 msgid "" @@ -164,7 +165,7 @@ msgstr "" #: ../data/whisperback.ui.h:22 msgid "Summary" -msgstr "" +msgstr "ਸਾਰ" #: ../data/whisperback.ui.h:23 msgid "Bug description" @@ -180,7 +181,7 @@ msgstr "" #: ../data/whisperback.ui.h:26 msgid "Technical details to include" -msgstr "" +msgstr "ਤਕਨੀਕੀ ਵੇਰਵਾ ਸ਼ਾਮਿਲ ਕਰੋ" #: ../data/whisperback.ui.h:27 msgid "headers" @@ -196,4 +197,4 @@ msgstr "ਸਹਾਇਤਾ" #: ../data/whisperback.ui.h:30 msgid "Send" -msgstr "" +msgstr "ਭੇਜੋ"

1 0

[meek/master] Add a "FIXME"
by dcf＠torproject.org 16 Apr '14

16 Apr '14

commit 85a6dad5b27b2588b28426e25df2ac111ca7510b Author: Chang Lan <changlan9(a)gmail.com> Date: Thu Mar 27 18:15:47 2014 -0700 Add a "FIXME" --- chrome/app/background.js | 3 +-- chrome/extension/background.js | 4 ---- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/chrome/app/background.js b/chrome/app/background.js index 818ba9e..a4ccf98 100644 --- a/chrome/app/background.js +++ b/chrome/app/background.js @@ -5,11 +5,10 @@ chrome.alarms.onAlarm.addListener(function(alarm) { console.info("alarm name = " const IP = "127.0.0.1"; const PORT = 7000; -const EXTENSION_ID = "epmfkpbifhkdhcedgfppmeeoonjenkee"; +const EXTENSION_ID = "epmfkpbifhkdhcedgfppmeeoonjenkee"; //FIXME: Hardcoded extension ID const STATE_READING_LENGTH = 1; const STATE_READING_OBJECT = 2; -const STATE_DONE = 3; var serverSocketId; var state = STATE_READING_LENGTH; diff --git a/chrome/extension/background.js b/chrome/extension/background.js index 2e48212..5d337fb 100644 --- a/chrome/extension/background.js +++ b/chrome/extension/background.js @@ -65,7 +65,3 @@ chrome.runtime.onMessageExternal.addListener(function(request, header, sendRespo xhr.send(body); }); - -function onReceiveXHR(xhr) { - console.log(xhr.responseText); -}

1 0

[meek/master] Debug info.
by dcf＠torproject.org 16 Apr '14

16 Apr '14

commit 5938a5b41833d691ea2debcd4c6b030b895ab09d Author: Chang Lan <changlan9(a)gmail.com> Date: Mon Mar 31 18:14:42 2014 -0700 Debug info. --- chrome/app/background.js | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/chrome/app/background.js b/chrome/app/background.js index a4ccf98..4355266 100644 --- a/chrome/app/background.js +++ b/chrome/app/background.js @@ -20,6 +20,7 @@ chrome.sockets.tcpServer.create({}, function(createInfo) { }); function listenAndAccept(socketId) { + console.log("listenAndAccept " + socketId); chrome.sockets.tcpServer.listen(socketId, IP, PORT, function(resultCode) { onListenCallback(socketId, resultCode) @@ -27,6 +28,7 @@ function listenAndAccept(socketId) { } function onListenCallback(socketId, resultCode) { + console.log("onListenCallback " + socketId); if (resultCode < 0) { console.log("Error listening:" + chrome.runtime.lastError.message); @@ -37,9 +39,10 @@ function onListenCallback(socketId, resultCode) { } function onAccept(info) { + console.log("onAccept " + JSON.stringify(info)); if (info.socketId != serverSocketId) return; - console.log("Client connected."); + chrome.sockets.tcp.onReceive.addListener(onReceive); chrome.sockets.tcp.setPaused(info.clientSocketId, false); } @@ -52,7 +55,7 @@ function readIntoBuf(data) { } function onReceive(info) { - console.log("Data received."); + console.log("onReceive " + JSON.stringify(info)); var data = info.data; switch (state) { case STATE_READING_LENGTH: @@ -102,7 +105,7 @@ function returnResponse(response, client_socket) { chrome.sockets.tcp.send(client_socket, buf.buffer, function(info) { if (info.resultCode != 0) - console.log("Send failed"); + console.log("Send failed " + info.resultCode); }); }

1 0

[meek/master] Add a Chrome packaged app and extension.
by dcf＠torproject.org 16 Apr '14

16 Apr '14

commit 41267cf007565d3fae1b0a5e2244dde55414dfae Author: Chang Lan <changlan9(a)gmail.com> Date: Thu Mar 27 17:59:50 2014 -0700 Add a Chrome packaged app and extension. We use Chrome `webRequest` API to modify the `Host` header. However, this API is for extensions only. Chrome extensions cannot listen to sockets, which is supposed to be done by packaged apps. Therefore, the communication channel is a little bit hacky: meek-client --(Socket)-- app --(Message)-- extension --(HTTPS)-- www.google.com Caveat: the `webRequest` does not handle SPDY connection properly. We need to disable SPDY in Chrome. --- chrome/app/background.js | 124 ++++++++++++++++++++++++++++++++++++++++ chrome/app/manifest.json | 26 +++++++++ chrome/extension/background.js | 71 +++++++++++++++++++++++ chrome/extension/manifest.json | 19 ++++++ 4 files changed, 240 insertions(+) diff --git a/chrome/app/background.js b/chrome/app/background.js new file mode 100644 index 0000000..818ba9e --- /dev/null +++ b/chrome/app/background.js @@ -0,0 +1,124 @@ +// attempt to keep app from going inactive + +chrome.alarms.create("ping", {when: 5000, periodInMinutes: 1 }); +chrome.alarms.onAlarm.addListener(function(alarm) { console.info("alarm name = " + alarm.name); }); + +const IP = "127.0.0.1"; +const PORT = 7000; +const EXTENSION_ID = "epmfkpbifhkdhcedgfppmeeoonjenkee"; + +const STATE_READING_LENGTH = 1; +const STATE_READING_OBJECT = 2; +const STATE_DONE = 3; + +var serverSocketId; +var state = STATE_READING_LENGTH; +var buf = new Uint8Array(4); +var bytesToRead = buf.length; + +chrome.sockets.tcpServer.create({}, function(createInfo) { + listenAndAccept(createInfo.socketId); +}); + +function listenAndAccept(socketId) { + chrome.sockets.tcpServer.listen(socketId, + IP, PORT, function(resultCode) { + onListenCallback(socketId, resultCode) + }); +} + +function onListenCallback(socketId, resultCode) { + if (resultCode < 0) { + console.log("Error listening:" + + chrome.runtime.lastError.message); + return; + } + serverSocketId = socketId; + chrome.sockets.tcpServer.onAccept.addListener(onAccept); +} + +function onAccept(info) { + if (info.socketId != serverSocketId) + return; + console.log("Client connected."); + chrome.sockets.tcp.onReceive.addListener(onReceive); + chrome.sockets.tcp.setPaused(info.clientSocketId, false); +} + +function readIntoBuf(data) { + var n = Math.min(data.byteLength, bytesToRead); + buf.subarray(buf.length - bytesToRead, n).set(new Uint8Array(data.slice(0, n))); + bytesToRead -= n; + return data.slice(n); +} + +function onReceive(info) { + console.log("Data received."); + var data = info.data; + switch (state) { + case STATE_READING_LENGTH: + data = readIntoBuf(data); + if (bytesToRead > 0) + return; + + var b = buf; + bytesToRead = (b[0] << 24) | (b[1] << 16) | (b[2] << 8) | b[3]; + console.log(bytesToRead); + buf = new Uint8Array(bytesToRead); + state = STATE_READING_OBJECT; + + case STATE_READING_OBJECT: + data = readIntoBuf(data); + if (bytesToRead > 0) + return; + + var str = ab2str(buf); + console.log(str); + var request = JSON.parse(str); + makeRequest(request, info.socketId); + + state = STATE_READING_LENGTH; + buf = new Uint8Array(4); + bytesToRead = buf.length; + } +} + +function makeRequest(request, client_socket) { + chrome.runtime.sendMessage(EXTENSION_ID, request, function(response) { + returnResponse(response, client_socket); + }); +} + +function returnResponse(response, client_socket) { + var str = JSON.stringify(response); + var b = str2ab(str); + + var buf = new Uint8Array(4 + b.byteLength); + var len = b.byteLength; + buf[0] = (len >> 24) & 0xff; + buf[1] = (len >> 16) & 0xff; + buf[2] = (len >> 8) & 0xff; + buf[3] = len & 0xff; + buf.set(new Uint8Array(b), 4); + + chrome.sockets.tcp.send(client_socket, buf.buffer, function(info) { + if (info.resultCode != 0) + console.log("Send failed"); + }); +} + +function ab2str(buffer) { + var encodedString = String.fromCharCode.apply(null, buffer), + decodedString = decodeURIComponent(escape(encodedString)); + return decodedString; +} + +function str2ab(string) { + var string = unescape(encodeURIComponent(string)), + charList = string.split(''), + buf = []; + for (var i = 0; i < charList.length; i++) { + buf.push(charList[i].charCodeAt(0)); + } + return (new Uint8Array(buf)).buffer; +} diff --git a/chrome/app/manifest.json b/chrome/app/manifest.json new file mode 100644 index 0000000..6c288d2 --- /dev/null +++ b/chrome/app/manifest.json @@ -0,0 +1,26 @@ +{ + "manifest_version": 2, + "name": "meek-browser-app", + "minimum_chrome_version": "24", + "version": "0.1", + + "permissions": [ + "alarms" + ], + + "sockets": { + "tcp": { + "connect": "*" + }, + "tcpServer": { + "listen": "127.0.0.1:7000" + } + }, + + "app": { + "background": { + "scripts": ["background.js"], + "persistent": true + } + } +} diff --git a/chrome/extension/background.js b/chrome/extension/background.js new file mode 100644 index 0000000..2e48212 --- /dev/null +++ b/chrome/extension/background.js @@ -0,0 +1,71 @@ +// attempt to keep app from going inactive + +chrome.alarms.create("ping", {when: 5000, periodInMinutes: 1 }); +chrome.alarms.onAlarm.addListener(function(alarm) { console.info("alarm name = " + alarm.name); }); + +var host = 'meek-reflect.appspot.com'; + +function onBeforeSendHeadersCallback(details) { + var did_set = false; + for (var i = 0; i < details.requestHeaders.length; ++i) { + if (details.requestHeaders[i].name === 'Host') { + details.requestHeaders[i].value = host; + did_set = true; + } + } + if (!did_set) { + details.requestHeaders.push({ + name: 'Host', + value: host + }); + } + return { requestHeaders: details.requestHeaders }; +} + +chrome.runtime.onMessageExternal.addListener(function(request, header, sendResponse) { + var timeout = 2000; + var xhr = new XMLHttpRequest(); + xhr.ontimeout = function() { + console.error(url + "timed out."); + chrome.webRequest.onBeforeSendHeaders.removeListener(onBeforeSendHeadersCallback); + }; + xhr.onerror = function() { + chrome.webRequest.onBeforeSendHeaders.removeListener(onBeforeSendHeadersCallback); + var response = { error: xhr.statusText }; + sendResponse(response); + }; + xhr.onreadystatechange = function() { + if (xhr.readyState == 4) { + chrome.webRequest.onBeforeSendHeaders.removeListener(onBeforeSendHeadersCallback); + var response = {status: xhr.status, body: xhr.responseText }; + sendResponse(response); + } + }; + var requestMethod = request.method; + var url = request.url; + xhr.open(requestMethod, url); + if (request.header != undefined) { + for (var key in request.header) { + if (key != "Host") { // TODO: Add more restricted header fields + xhr.setRequestHeader(key, request.header[key]); + } else { + host = request.header[key]; + } + } + } + var body = null; + if (request.body != undefined) { + body = request.body; + } + + chrome.webRequest.onBeforeSendHeaders.addListener(onBeforeSendHeadersCallback, { + urls: [url], + types: ['xmlhttprequest'] + }, ['requestHeaders', 'blocking']); + + xhr.send(body); +}); + +function onReceiveXHR(xhr) { + console.log(xhr.responseText); +} diff --git a/chrome/extension/manifest.json b/chrome/extension/manifest.json new file mode 100644 index 0000000..0e245db --- /dev/null +++ b/chrome/extension/manifest.json @@ -0,0 +1,19 @@ +{ + "manifest_version": 2, + "name": "meek-browser-extension", + "minimum_chrome_version": "24", + "version": "0.1", + + "permissions": [ + "notifications", + "alarms", + "webRequest", + "webRequestBlocking", + "<all_urls>" + ], + + "background": { + "scripts": ["background.js"], + "persistent": true + } +}

1 0

[meek/master] Fix lots of bugs.
by dcf＠torproject.org 16 Apr '14

16 Apr '14

commit f91ea0d4fbf8c776b73dda345d60239b353abd25 Author: Chang Lan <changlan9(a)gmail.com> Date: Sun Apr 6 01:27:40 2014 -0700 Fix lots of bugs. --- chrome/app/background.js | 33 ++++++++--- chrome/extension/background.js | 122 +++++++++++++++++++++++++++------------- 2 files changed, 109 insertions(+), 46 deletions(-) diff --git a/chrome/app/background.js b/chrome/app/background.js index 4355266..1ce4d32 100644 --- a/chrome/app/background.js +++ b/chrome/app/background.js @@ -36,6 +36,13 @@ function onListenCallback(socketId, resultCode) { } serverSocketId = socketId; chrome.sockets.tcpServer.onAccept.addListener(onAccept); + chrome.sockets.tcpServer.onAcceptError.addListener(function(info) { + console.log("onAcceptError " + JSON.stringify(info)); + }); + chrome.sockets.tcp.onReceive.addListener(onReceive); + chrome.sockets.tcp.onReceiveError.addListener(function(info) { + console.log("onReceiveError " + JSON.stringify(info)); + }); } function onAccept(info) { @@ -43,19 +50,19 @@ function onAccept(info) { if (info.socketId != serverSocketId) return; - chrome.sockets.tcp.onReceive.addListener(onReceive); chrome.sockets.tcp.setPaused(info.clientSocketId, false); } function readIntoBuf(data) { + console.log("readIntoBuf " + "bytesToRead: " + bytesToRead + ", datalen: " + data.byteLength + ", buflen: " + buf.length); var n = Math.min(data.byteLength, bytesToRead); - buf.subarray(buf.length - bytesToRead, n).set(new Uint8Array(data.slice(0, n))); + buf.set(new Uint8Array(data.slice(0, n)), buf.length - bytesToRead); bytesToRead -= n; return data.slice(n); } function onReceive(info) { - console.log("onReceive " + JSON.stringify(info)); + console.log("onReceive " + JSON.stringify(info) + " len: " + info.data.byteLength); var data = info.data; switch (state) { case STATE_READING_LENGTH: @@ -85,13 +92,22 @@ function onReceive(info) { } } -function makeRequest(request, client_socket) { - chrome.runtime.sendMessage(EXTENSION_ID, request, function(response) { - returnResponse(response, client_socket); +function makeRequest(request, socketId) { + console.log("makeRequest " + JSON.stringify(request)); + + port = chrome.runtime.connect(EXTENSION_ID); + port.onMessage.addListener(function(response) { + returnResponse(response, socketId); + port.disconnect(); + }); + port.onDisconnect.addListener(function() { + console.log("onDisconnect"); }); + port.postMessage(request); } -function returnResponse(response, client_socket) { +function returnResponse(response, socketId) { + console.log("returnResponse " + JSON.stringify(response)); var str = JSON.stringify(response); var b = str2ab(str); @@ -103,7 +119,8 @@ function returnResponse(response, client_socket) { buf[3] = len & 0xff; buf.set(new Uint8Array(b), 4); - chrome.sockets.tcp.send(client_socket, buf.buffer, function(info) { + chrome.sockets.tcp.send(socketId, buf.buffer, function(info) { + console.log("send " + socketId); if (info.resultCode != 0) console.log("Send failed " + info.resultCode); }); diff --git a/chrome/extension/background.js b/chrome/extension/background.js index edb99ee..ecadac5 100644 --- a/chrome/extension/background.js +++ b/chrome/extension/background.js @@ -22,48 +22,94 @@ function onBeforeSendHeadersCallback(details) { return { requestHeaders: details.requestHeaders }; } -chrome.runtime.onMessageExternal.addListener(function(request, header, sendResponse) { - var timeout = 2000; - var xhr = new XMLHttpRequest(); - xhr.ontimeout = function() { - console.error(url + "timed out."); - chrome.webRequest.onBeforeSendHeaders.removeListener(onBeforeSendHeadersCallback); - }; - xhr.onerror = function() { - chrome.webRequest.onBeforeSendHeaders.removeListener(onBeforeSendHeadersCallback); - var response = { error: xhr.statusText }; - sendResponse(response); - }; - xhr.onreadystatechange = function() { - if (xhr.readyState == 4) { +chrome.runtime.onConnectExternal.addListener(function(port) { + console.log("onConnectExternal"); + port.onMessage.addListener(function(request) { + console.log("onMessage"); + var timeout = 2000; + var xhr = new XMLHttpRequest(); + xhr.responseType = "arraybuffer"; + xhr.ontimeout = function() { + console.error(url + "timed out."); chrome.webRequest.onBeforeSendHeaders.removeListener(onBeforeSendHeadersCallback); - var response = {status: xhr.status, body: btoa(xhr.responseText) }; + }; + xhr.onerror = function() { + chrome.webRequest.onBeforeSendHeaders.removeListener(onBeforeSendHeadersCallback); + var response = { error: xhr.statusText }; sendResponse(response); - } - }; - var requestMethod = request.method; - var url = request.url; - xhr.open(requestMethod, url); - if (request.header != undefined) { - for (var key in request.header) { - if (key != "Host") { // TODO: Add more restricted header fields - xhr.setRequestHeader(key, request.header[key]); - } else { - host = request.header[key]; + }; + xhr.onload = function() { + console.log("onload " + xhr.response.byteLength); + chrome.webRequest.onBeforeSendHeaders.removeListener(onBeforeSendHeadersCallback); + var response = { + status: xhr.status, + body: _arrayBufferToBase64(xhr.response) + }; + port.postMessage(response); + console.log("postMessage " + JSON.stringify(response)); + }; + var requestMethod = request.method; + var url = request.url; + xhr.open(requestMethod, url); + if (request.header != undefined) { + for (var key in request.header) { + if (key != "Host") { // TODO: Add more restricted header fields + xhr.setRequestHeader(key, request.header[key]); + } else { + host = request.header[key]; + } } } - } - var body = null; - if (request.body != undefined) { - body = atob(request.body); - xhr.setRequestHeader("Content-Type", "application/octet-stream"); - console.log(body); - } + var body = null; + if (request.body != undefined) { + body = _base64ToArrayBuffer(request.body); + xhr.overrideMimeType("Content-Type", "application/octet-stream"); + console.log(body); + } - chrome.webRequest.onBeforeSendHeaders.addListener(onBeforeSendHeadersCallback, { - urls: [url], - types: ['xmlhttprequest'] - }, ['requestHeaders', 'blocking']); + chrome.webRequest.onBeforeSendHeaders.addListener(onBeforeSendHeadersCallback, { + urls: [url], + types: ['xmlhttprequest'] + }, ['requestHeaders', 'blocking']); - xhr.send(body); + xhr.send(body); + }); }); + +function _base64ToArrayBuffer(base64) { + var binary_string = atob(base64); + var len = binary_string.length; + var bytes = new Uint8Array(len); + for (var i = 0; i < len; i++) { + bytes[i] = binary_string.charCodeAt(i); + } + return bytes; +} + +function _arrayBufferToBase64(buf) { + var bytes = new Uint8Array(buf); + console.log(JSON.stringify(buf)); + var base64 = ''; + var encodings = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/='; + var chr1, chr2, chr3, enc1, enc2, enc3, enc4; + var i = 0; + while (i < bytes.length) { + chr1 = bytes[i++]; + chr2 = i < bytes.length ? bytes[i++] : Number.NaN; + chr3 = i < bytes.length ? bytes[i++] : Number.NaN; + + enc1 = chr1 >> 2; + enc2 = ((chr1 & 3) << 4) | (chr2 >> 4); + enc3 = ((chr2 & 15) << 2) | (chr3 >> 6); + enc4 = chr3 & 63; + + if (isNaN(chr2)) { + enc3 = enc4 = 64; + } else if (isNaN(chr3)) { + enc4 = 64; + } + base64 += encodings.charAt(enc1) + encodings.charAt(enc2) + + encodings.charAt(enc3) + encodings.charAt(enc4); + } + return base64; +}

1 0

[meek/master] base64 decode/encode
by dcf＠torproject.org 16 Apr '14

16 Apr '14

commit 5f1c753f9fbe9812a79a27ca4bf00696fae64dbd Author: Chang Lan <changlan9(a)gmail.com> Date: Mon Mar 31 18:15:20 2014 -0700 base64 decode/encode --- chrome/extension/background.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/chrome/extension/background.js b/chrome/extension/background.js index 5d337fb..edb99ee 100644 --- a/chrome/extension/background.js +++ b/chrome/extension/background.js @@ -37,7 +37,7 @@ chrome.runtime.onMessageExternal.addListener(function(request, header, sendRespo xhr.onreadystatechange = function() { if (xhr.readyState == 4) { chrome.webRequest.onBeforeSendHeaders.removeListener(onBeforeSendHeadersCallback); - var response = {status: xhr.status, body: xhr.responseText }; + var response = {status: xhr.status, body: btoa(xhr.responseText) }; sendResponse(response); } }; @@ -55,7 +55,9 @@ chrome.runtime.onMessageExternal.addListener(function(request, header, sendRespo } var body = null; if (request.body != undefined) { - body = request.body; + body = atob(request.body); + xhr.setRequestHeader("Content-Type", "application/octet-stream"); + console.log(body); } chrome.webRequest.onBeforeSendHeaders.addListener(onBeforeSendHeadersCallback, {

1 0

[meek/master] Merge branch 'chrome'
by dcf＠torproject.org 16 Apr '14

16 Apr '14

commit e22a4bbd65feeab977e0611fb9d249cda39e66e2 Merge: f5d9da2 f3361a5 Author: David Fifield <david(a)bamsoftware.com> Date: Tue Apr 15 21:11:49 2014 -0700 Merge branch 'chrome' chrome/app/background.js | 149 ++++++++++++++++++++++++++++++++++++++++ chrome/app/manifest.json | 26 +++++++ chrome/extension/background.js | 126 +++++++++++++++++++++++++++++++++ chrome/extension/manifest.json | 20 ++++++ 4 files changed, 321 insertions(+)

1 0