March 2015 - tor-commits - lists.torproject.org

[bridgedb/develop] Update English (en_GB) translations.
by isis＠torproject.org 20 Mar '15

20 Mar '15

commit 9a78d44b5807874b7298149115b16fdd5426f8af Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Mar 19 23:31:37 2015 +0000 Update English (en_GB) translations. * THANKS to Andi Chandler, Richard Shaylor, and ronnietse. --- lib/bridgedb/i18n/en_GB/LC_MESSAGES/bridgedb.po | 387 +++++++++++++++++++---- 1 file changed, 334 insertions(+), 53 deletions(-) diff --git a/lib/bridgedb/i18n/en_GB/LC_MESSAGES/bridgedb.po b/lib/bridgedb/i18n/en_GB/LC_MESSAGES/bridgedb.po index 589b1ed..9399e46 100644 --- a/lib/bridgedb/i18n/en_GB/LC_MESSAGES/bridgedb.po +++ b/lib/bridgedb/i18n/en_GB/LC_MESSAGES/bridgedb.po @@ -1,17 +1,18 @@ # Translations template for BridgeDB. -# Copyright (C) 2013 ORGANIZATION +# Copyright (C) 2015 'The Tor Project, Inc.' # This file is distributed under the same license as the BridgeDB project. # # Translators: -# Translators: -# richardshaylor <rshaylor(a)me.com>, 2014 +# Andi Chandler <andi(a)gowling.com>, 2014-2015 +# Richard Shaylor <rshaylor(a)me.com>, 2014 +# ronnietse <tseronnie(a)ymail.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-27 21:41+0000\n" -"PO-Revision-Date: 2014-01-21 22:00+0000\n" -"Last-Translator: richardshaylor <rshaylor(a)me.com>\n" +"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" +"POT-Creation-Date: 2015-02-03 03:24+0000\n" +"PO-Revision-Date: 2015-03-19 14:19+0000\n" +"Last-Translator: Andi Chandler <andi(a)gowling.com>\n" "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/torproject/language/en_GB/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,82 +21,362 @@ msgstr "" "Language: en_GB\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: lib/bridgedb/templates/base.html:33 +#. 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:122 +msgid "Sorry! Something went wrong with your request." +msgstr "Sorry! Something went wrong with your request." + +#: lib/bridgedb/strings.py:18 +msgid "[This is an automated message; please do not reply.]" +msgstr "[This is an automated message; please do not reply.]" + +#: lib/bridgedb/strings.py:20 +msgid "Here are your bridges:" +msgstr "Here are your bridges:" + +#: 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 "Welcome to BridgeDB!" + +#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE". +#: lib/bridgedb/strings.py:30 +msgid "Currently supported transport TYPEs:" +msgstr "Currently supported transport TYPEs:" + +#: lib/bridgedb/strings.py:31 +#, python-format +msgid "Hey, %s!" +msgstr "Hey, %s!" + +#: lib/bridgedb/strings.py:32 +msgid "Hello, friend!" +msgstr "Hello, friend!" + +#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100 +msgid "Public Keys" +msgstr "Public Keys" + +#. 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 "This email was generated with rainbows, unicorns, and sparkles\nfor %s on %s at %s." + +#. 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 "" +"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 can provide bridges with several %stypes of Pluggable Transports%s,\nwhich can help obfuscate your connections to the Tor Network, making it more\ndifficult for anyone watching your internet traffic to determine that you are\nusing Tor.\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" + +#. 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 old 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" + +#: lib/bridgedb/strings.py:76 msgid "What are bridges?" msgstr "What are bridges?" -#: lib/bridgedb/templates/base.html:34 +#: lib/bridgedb/strings.py:77 #, python-format -msgid "" -"%s Bridge relays %s are Tor relays that help you circumvent censorship." -msgstr "%s Bridge relays %s are Tor relays that help you circumvent censorship." +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/templates/base.html:39 +#: lib/bridgedb/strings.py:82 msgid "I need an alternative way of getting bridges!" msgstr "I need an alternative way of getting bridges!" -#: 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 "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." +"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 "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, %s or %s." -#: lib/bridgedb/templates/base.html:48 +#: lib/bridgedb/strings.py:90 msgid "My bridges don't work! I need help!" msgstr "My bridges don't work! I need help!" -#: 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 "If your Tor doesn't work, you should email %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 "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." +"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 "Here are your bridge lines:" + +#: lib/bridgedb/strings.py:104 +msgid "Get Bridges!" +msgstr "Get Bridges!" + +#: lib/bridgedb/strings.py:108 +msgid "Please select options for bridge type:" +msgstr "Please select options for bridge type:" + +#: lib/bridgedb/strings.py:109 +msgid "Do you need IPv6 addresses?" +msgstr "Do you need IPv6 addresses?" + +#: lib/bridgedb/strings.py:110 +#, python-format +msgid "Do you need a %s?" +msgstr "Do you need a %s?" + +#: lib/bridgedb/strings.py:114 +msgid "Your browser is not displaying images properly." +msgstr "Your browser is not displaying images properly." + +#: lib/bridgedb/strings.py:115 +msgid "Enter the characters from the image above..." +msgstr "Enter the characters from the image above..." + +#: lib/bridgedb/strings.py:119 +msgid "How to start using your bridges" +msgstr "How to start using your bridges" -#: lib/bridgedb/templates/bridges.html:10 +#. TRANSLATORS: Please DO NOT translate "Tor Browser". +#: lib/bridgedb/strings.py:121 +#, python-format +msgid "" +"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n" +"Browser download page %s to start Tor Browser." +msgstr "To enter bridges into Tor Browser, follow the instructions on the %s Tor\nBrowser download page %s to start 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 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\nthe wizard until it asks:" + +#. TRANSLATORS: Please DO NOT translate "Tor". +#: lib/bridgedb/strings.py:129 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 "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." +"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 "Displays this message." + +#. 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 "Request vanilla bridges." + +#: lib/bridgedb/strings.py:146 +msgid "Request IPv6 bridges." +msgstr "Request IPv6 bridges." + +#. TRANSLATORS: Please DO NOT translate the word the word "TYPE". +#: lib/bridgedb/strings.py:148 +msgid "Request a Pluggable Transport by TYPE." +msgstr "Request a Pluggable Transport by 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:89 +msgid "Report a Bug" +msgstr "Report a Bug" + +#: lib/bridgedb/templates/base.html:92 +msgid "Source Code" +msgstr "Source Code" + +#: lib/bridgedb/templates/base.html:95 +msgid "Changelog" +msgstr "Changelog" + +#: lib/bridgedb/templates/base.html:98 +msgid "Contact" +msgstr "Contact" + +#: lib/bridgedb/templates/bridges.html:81 +msgid "Select All" +msgstr "Select All" + +#: lib/bridgedb/templates/bridges.html:87 +msgid "Show QRCode" +msgstr "Show QRCode" -#: lib/bridgedb/templates/bridges.html:13 -msgid "No bridges currently available" -msgstr "No bridges currently available" +#: lib/bridgedb/templates/bridges.html:100 +msgid "QRCode for your bridge lines" +msgstr "QRCode for your bridge lines" -#: lib/bridgedb/templates/captcha.html:6 -msgid "Upgrade your browser to Firefox" -msgstr "Upgrade your browser to Firefox" +#. 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:115 +#: lib/bridgedb/templates/bridges.html:175 +msgid "Uh oh, spaghettios!" +msgstr "Uh oh, spaghettios!" -#: lib/bridgedb/templates/captcha.html:8 -msgid "Type the two words" -msgstr "Type the two words" +#: lib/bridgedb/templates/bridges.html:116 +msgid "It seems there was an error getting your QRCode." +msgstr "It seems there was an error getting your QRCode." -#: lib/bridgedb/templates/index.html:6 -msgid "Step 1" -msgstr "Step 1" +#: lib/bridgedb/templates/bridges.html:121 +msgid "" +"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy" +" your bridge lines onto mobile and other devices." +msgstr "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy your bridge lines onto mobile and other devices." + +#: lib/bridgedb/templates/bridges.html:181 +msgid "There currently aren't any bridges available..." +msgstr "There are no bridges available currently..." + +#: lib/bridgedb/templates/bridges.html:182 +#, python-format +msgid "" +" Perhaps you should try %s going back %s and choosing a different bridge " +"type!" +msgstr "Perhaps you should try %s going back %s and choosing a different bridge type!" -#: lib/bridgedb/templates/index.html:8 +#: lib/bridgedb/templates/index.html:11 #, python-format -msgid "Get %s Tor Browser Bundle %s" -msgstr "Get %s Tor Browser Bundle %s" +msgid "Step %s1%s" +msgstr "Step %s1%s" #: lib/bridgedb/templates/index.html:13 -msgid "Step 2" -msgstr "Step 2" +#, python-format +msgid "Download %s Tor Browser %s" +msgstr "Download %s Tor Browser %s" + +#: lib/bridgedb/templates/index.html:25 +#, python-format +msgid "Step %s2%s" +msgstr "Step %s2%s" -#: lib/bridgedb/templates/index.html:15 +#: lib/bridgedb/templates/index.html:27 #, python-format msgid "Get %s bridges %s" msgstr "Get %s bridges %s" -#: lib/bridgedb/templates/index.html:19 -msgid "Step 3" -msgstr "Step 3" +#: lib/bridgedb/templates/index.html:36 +#, python-format +msgid "Step %s3%s" +msgstr "Step %s3%s" + +#: lib/bridgedb/templates/index.html:38 +#, python-format +msgid "Now %s add the bridges to Tor Browser %s" +msgstr "Now %s add the bridges to 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 give me bridges!" + +#: lib/bridgedb/templates/options.html:52 +msgid "Advanced Options" +msgstr "Advanced Options" + +#: lib/bridgedb/templates/options.html:88 +msgid "No" +msgstr "No" + +#: lib/bridgedb/templates/options.html:89 +msgid "none" +msgstr "none" + +#. 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:127 +#, 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:151 #, python-format -msgid "Now %s add the bridges to Tor %s" -msgstr "Now %s add the bridges to Tor %s" +msgid "%sG%set Bridges" +msgstr "%sG%set Bridges"

1 0

[bridgedb/develop] Update Greek (el) translations.
by isis＠torproject.org 20 Mar '15

20 Mar '15

commit 47eb338371b00f1a558abe50741012edacca04b0 Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Mar 19 23:28:55 2015 +0000 Update Greek (el) translations. * THANKS to Adrian Pappas, andromeas, oahanx, isv31, aand kotkotkot. --- lib/bridgedb/i18n/el/LC_MESSAGES/bridgedb.po | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/lib/bridgedb/i18n/el/LC_MESSAGES/bridgedb.po b/lib/bridgedb/i18n/el/LC_MESSAGES/bridgedb.po index 6d2d260..bbbbe92 100644 --- a/lib/bridgedb/i18n/el/LC_MESSAGES/bridgedb.po +++ b/lib/bridgedb/i18n/el/LC_MESSAGES/bridgedb.po @@ -3,9 +3,9 @@ # This file is distributed under the same license as the BridgeDB project. # # Translators: -# Isis <isis(a)torproject.org>, 2014 # Adrian Pappas <pappasadrian(a)gmail.com>, 2014 # andromeas <andromeas(a)hotmail.com>, 2014 +# oahanx, 2014 # isv31 <ix4svs(a)gmail.com>, 2014 # kotkotkot <kotakota(a)gmail.com>, 2013 # kotkotkot <kotakota(a)gmail.com>, 2012 @@ -15,9 +15,9 @@ 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: 2014-06-06 21:46+0000\n" -"PO-Revision-Date: 2014-07-26 22:10+0000\n" -"Last-Translator: Isis <isis(a)torproject.org>\n" +"POT-Creation-Date: 2014-07-26 02:11+0000\n" +"PO-Revision-Date: 2014-10-15 17:11+0000\n" +"Last-Translator: oahanx\n" "Language-Team: Greek (http://www.transifex.com/projects/p/torproject/language/el/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -80,7 +80,7 @@ msgstr "Γειά σου, %s!" msgid "Hello, friend!" msgstr "Γεια σου, φίλε!" -#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100 +#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101 msgid "Public Keys" msgstr "Δημόσια Κλειδιά" @@ -149,7 +149,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, %s or %s." -msgstr "Εναλλακτικά, για να μάθετε γέφυρες, στείλτε email στο %s. Σημείωση: Το email πρέπει να σταλεί χρησιμοποιώντας έναν από τους παρακάτω παρόχους:\n%s, %s ή %s." +msgstr "Εναλλακτικά μπορείτε να λάβετε γέφυρες στελνοντας email στο %s. Πρέπει να στείλετε email χρησιμοποιώντας μία διευθυνση email από έναν από τους παρακάτω πάροχους:\n%s, %s or %s." #: lib/bridgedb/strings.py:90 msgid "My bridges don't work! I need help!" @@ -261,19 +261,19 @@ msgstr "Ζητήστε ένα Pluggable Transport βάσει TYPE." msgid "Get a copy of BridgeDB's public GnuPG key." msgstr "Λάβετε ένα αντίγραφο του δημοσίου GnuPG κλειδιού του BridgeDB." -#: lib/bridgedb/templates/base.html:91 +#: lib/bridgedb/templates/base.html:92 msgid "Report a Bug" msgstr "Αναφορά Προβλήματος" -#: lib/bridgedb/templates/base.html:93 +#: lib/bridgedb/templates/base.html:94 msgid "Source Code" msgstr "Πηγαίος Κώδικας" -#: lib/bridgedb/templates/base.html:96 +#: lib/bridgedb/templates/base.html:97 msgid "Changelog" msgstr "Αρχείο καταγραφής αλλαγών" -#: lib/bridgedb/templates/base.html:98 +#: lib/bridgedb/templates/base.html:99 msgid "Contact" msgstr "Επαφή"

1 0

[bridgedb/develop] Update Finnish (fi) translations.
by isis＠torproject.org 20 Mar '15

20 Mar '15

commit 83a90272bbcf1b8e64b99a8b56c3df90eacc76bf Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Mar 20 00:57:23 2015 +0000 Update Finnish (fi) translations. * THANKS to Jorma Karvonen, Spacha, Ossi Kallunki, Sami Kuusisto, viljaminojonen, and Finland355. --- lib/bridgedb/i18n/fi/LC_MESSAGES/bridgedb.po | 63 ++++++++++++++++++-------- 1 file changed, 44 insertions(+), 19 deletions(-) diff --git a/lib/bridgedb/i18n/fi/LC_MESSAGES/bridgedb.po b/lib/bridgedb/i18n/fi/LC_MESSAGES/bridgedb.po index 660be76..a2afaa5 100644 --- a/lib/bridgedb/i18n/fi/LC_MESSAGES/bridgedb.po +++ b/lib/bridgedb/i18n/fi/LC_MESSAGES/bridgedb.po @@ -1,20 +1,22 @@ # Translations template for BridgeDB. -# Copyright (C) 2014 'The Tor Project, Inc.' +# Copyright (C) 2015 'The Tor Project, Inc.' # This file is distributed under the same license as the BridgeDB project. # # Translators: -# Isis <isis(a)torproject.org>, 2014 -# karvjorm <karvonen.jorma(a)gmail.com>, 2014 +# Jorma Karvonen <karvonen.jorma(a)gmail.com>, 2015 +# Jorma Karvonen <karvonen.jorma(a)gmail.com>, 2014 +# Spacha <miikasikala96(a)gmail.com>, 2015 # Ossi Kallunki <ossikallunki(a)gmail.com>, 2013 +# Sami Kuusisto <sami(a)6sto.com>, 2014 # viljaminojonen <Viljami.Nojonen(a)live.com>, 2014 # Finland355 <ville.ehrukainen2(a)gmail.com>, 2014 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: 2014-06-06 21:46+0000\n" -"PO-Revision-Date: 2014-07-26 01:58+0000\n" -"Last-Translator: Isis <isis(a)torproject.org>\n" +"POT-Creation-Date: 2015-02-03 03:24+0000\n" +"PO-Revision-Date: 2015-03-03 18:01+0000\n" +"Last-Translator: Jorma Karvonen <karvonen.jorma(a)gmail.com>\n" "Language-Team: Finnish (http://www.transifex.com/projects/p/torproject/language/fi/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -34,7 +36,7 @@ msgstr "" #. "fteproxy" #. "Tor" #. "Tor Browser" -#: lib/bridgedb/HTTPServer.py:121 +#: lib/bridgedb/HTTPServer.py:122 msgid "Sorry! Something went wrong with your request." msgstr "Pyyntösi epäonnistui jostain syystä." @@ -51,7 +53,7 @@ msgstr "Tässä ovat sinun siltasi." 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 "Olet ylittänyt nopeusrajan. Hidasta hiukan! Minimiaika viestien välillä on %s tunnissa. Kaikki lisäviestit tämän ajan jälkeen ohitetaan." +msgstr "Olet ylittänyt nopeusrajan. Hidasta hiukan! Minimiaika viestien välillä on %s tunnissa. Kaikki lisäviestit tämän ajan kuluessa ohitetaan." #: lib/bridgedb/strings.py:25 msgid "" @@ -125,7 +127,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 "Lisäksi BridgeDB:llä on useita tavallisia siltoja %s ilman mitään irrotettavia\nPluggable Transports %s-siirtoja, jotka eivät ehkä kuulosta herkullisilta, mutta\nne voivat silti auttaa kiertämään internet-sensuuria monissa tapauksissa.\n" +msgstr "Lisäksi BridgeDB:llä on useita tavallisia siltoja %s ilman mitään irrotettavia\nPluggable Transports %s-siirtoja, jotka eivät ehkä kuulosta herkullisilta, mutta\nne voivat silti auttaa monissa tapauksissa kiertämään internet-sensuuria.\n" #: lib/bridgedb/strings.py:76 msgid "What are bridges?" @@ -150,7 +152,7 @@ msgstr "Toinen tapa siltojen hankkimiseen on lähettää sähköpostia osoittees #: lib/bridgedb/strings.py:90 msgid "My bridges don't work! I need help!" -msgstr "Siltani ei toimi! Tarvitsen apua!" +msgstr "Siltani eivät toimi! Tarvitsen apua!" #. TRANSLATORS: Please DO NOT translate "Tor". #: lib/bridgedb/strings.py:92 @@ -182,7 +184,7 @@ msgstr "Valitse valitsimet siltatyypille:" #: lib/bridgedb/strings.py:109 msgid "Do you need IPv6 addresses?" -msgstr "Tarvitsetko IPv6 osoitteita?" +msgstr "Tarvitsetko IPv6-osoitteita?" #: lib/bridgedb/strings.py:110 #, python-format @@ -258,15 +260,15 @@ msgstr "Pyydä TYPE-tyyppistä irrotettavaa Pluggable Transport-siirtoa." msgid "Get a copy of BridgeDB's public GnuPG key." msgstr "Hae kopio BridgeDB:n julkisesta GnuPG-avaimesta." -#: lib/bridgedb/templates/base.html:91 +#: lib/bridgedb/templates/base.html:89 msgid "Report a Bug" msgstr "Ilmoita ohjelmointivirheestä" -#: lib/bridgedb/templates/base.html:93 +#: lib/bridgedb/templates/base.html:92 msgid "Source Code" msgstr "Lähdekoodi" -#: lib/bridgedb/templates/base.html:96 +#: lib/bridgedb/templates/base.html:95 msgid "Changelog" msgstr "Muutosloki" @@ -274,19 +276,42 @@ msgstr "Muutosloki" msgid "Contact" msgstr "Yhteystieto" +#: lib/bridgedb/templates/bridges.html:81 +msgid "Select All" +msgstr "Valitse kaikki" + +#: lib/bridgedb/templates/bridges.html:87 +msgid "Show QRCode" +msgstr "Näytä QR-koodi" + +#: lib/bridgedb/templates/bridges.html:100 +msgid "QRCode for your bridge lines" +msgstr "Siltariviesi QR-koodi" + #. 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 +#: lib/bridgedb/templates/bridges.html:115 +#: lib/bridgedb/templates/bridges.html:175 msgid "Uh oh, spaghettios!" msgstr "Jossain on pulma!" -#: lib/bridgedb/templates/bridges.html:72 +#: lib/bridgedb/templates/bridges.html:116 +msgid "It seems there was an error getting your QRCode." +msgstr "Tapahtui virhe QR-koodia noudettassa." + +#: lib/bridgedb/templates/bridges.html:121 +msgid "" +"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy" +" your bridge lines onto mobile and other devices." +msgstr "Tämä QR-koodi sisältää siltarivisi. Skannaa se QR-koodinlukijalla kopioidaksesi siltarivit matkapuhelimeesi ja muihin laitteisiin." + +#: lib/bridgedb/templates/bridges.html:181 msgid "There currently aren't any bridges available..." msgstr "Tällä hetkellä ei ole yhtään siltaa saatavilla..." -#: lib/bridgedb/templates/bridges.html:73 +#: lib/bridgedb/templates/bridges.html:182 #, python-format msgid "" " Perhaps you should try %s going back %s and choosing a different bridge " @@ -347,7 +372,7 @@ msgstr "ei mitään" #. 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 +#: lib/bridgedb/templates/options.html:127 #, python-format msgid "%sY%ses!" msgstr "%sK%syllä!" @@ -355,7 +380,7 @@ msgstr "%sK%syllä!" #. 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 +#: lib/bridgedb/templates/options.html:151 #, python-format msgid "%sG%set Bridges" msgstr "%sH%sae sillat"

1 0

[bridgedb/develop] Update Spanish (es) translations.
by isis＠torproject.org 20 Mar '15

20 Mar '15

commit 4cf045d92c0bbea9ae9d32749b173010887289e5 Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Mar 19 23:32:59 2015 +0000 Update Spanish (es) translations. * THANKS to dark_yoshi, toypurina, BL, NinjaTuna, Noel Torres, Paola Falcon, strel, and Jonis. --- lib/bridgedb/i18n/es/LC_MESSAGES/bridgedb.po | 79 +++++++++++++++++--------- 1 file changed, 52 insertions(+), 27 deletions(-) diff --git a/lib/bridgedb/i18n/es/LC_MESSAGES/bridgedb.po b/lib/bridgedb/i18n/es/LC_MESSAGES/bridgedb.po index ec057f0..b681b88 100644 --- a/lib/bridgedb/i18n/es/LC_MESSAGES/bridgedb.po +++ b/lib/bridgedb/i18n/es/LC_MESSAGES/bridgedb.po @@ -1,22 +1,24 @@ # Translations template for BridgeDB. -# Copyright (C) 2014 'The Tor Project, Inc.' +# Copyright (C) 2015 'The Tor Project, Inc.' # This file is distributed under the same license as the BridgeDB project. # # Translators: -# Isis <isis(a)torproject.org>, 2014 # dark_yoshi <angelargi(a)yahoo.es>, 2014 +# toypurina <biolenta(a)riseup.net>, 2014 +# BL <tresemes3(a)gmail.com>, 2014 # NinjaTuna <nort0ngh0st(a)hotmail.com>, 2011 # Noel Torres <envite(a)rolamasao.org>, 2013 # Paola Falcon <cacoepy(a)gmail.com>, 2014 -# strel, 2013-2014 +# Jonis <srvial(a)hotmail.com>, 2014 +# strel, 2013-2015 # strel, 2012 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: 2014-06-06 21:46+0000\n" -"PO-Revision-Date: 2014-07-26 23:10+0000\n" -"Last-Translator: Isis <isis(a)torproject.org>\n" +"POT-Creation-Date: 2015-02-03 03:24+0000\n" +"PO-Revision-Date: 2015-02-14 13:50+0000\n" +"Last-Translator: strel\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/torproject/language/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -36,9 +38,9 @@ msgstr "" #. "fteproxy" #. "Tor" #. "Tor Browser" -#: lib/bridgedb/HTTPServer.py:121 +#: lib/bridgedb/HTTPServer.py:122 msgid "Sorry! Something went wrong with your request." -msgstr "¡Lo sentimos! Algo fue mal con su solicitud." +msgstr "¡Lo siento! Algo fue mal con tu solicitud." #: lib/bridgedb/strings.py:18 msgid "[This is an automated message; please do not reply.]" @@ -53,7 +55,7 @@ msgstr "Aquí están sus bridges:" 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 "Ha superado el límite. Por favor, ¡más despacio! El tiempo mínimo entre mensajes de correo\nelectrónico es %s horas. Se ignoran todos los correos adicionales durante este período de tiempo." +msgstr "Ha excedido el límite de velocidad. Por favor, ¡más despacio! El tiempo mínimo entre correos electrónicos es %s horas. Los siguientes correos durante este periodo de tiempo serán ignorados. " #: lib/bridgedb/strings.py:25 msgid "" @@ -68,7 +70,7 @@ msgstr "¡Bienvenido a BridgeDB!" #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE". #: lib/bridgedb/strings.py:30 msgid "Currently supported transport TYPEs:" -msgstr "TYPEs (tipos) de 'transport' (transportes) soportados:" +msgstr "Transport TYPEs actualmente soportados:" #: lib/bridgedb/strings.py:31 #, python-format @@ -91,7 +93,7 @@ msgstr "Claves públicas" msgid "" "This email was generated with rainbows, unicorns, and sparkles\n" "for %s on %s at %s." -msgstr "Este correo electrónico fue generado con arcos iris, unicornios, y centellas\npara %s el %s a las %s." +msgstr "Este correo fue generado con arcoiris, unicornios y chispitas para %s el %s a las %s." #. TRANSLATORS: Please DO NOT translate "BridgeDB". #. TRANSLATORS: Please DO NOT translate "Pluggable Transports". @@ -105,7 +107,7 @@ msgid "" "difficult for anyone watching your internet traffic to determine that you are\n" "using Tor.\n" "\n" -msgstr "BridgeDB (base de datos de repetidores puente) puede proporcionar bridges con\nvarios %stipos de Pluggable Transports%s (transportes conectables), que pueden\nayudar a ofuscar sus conexiones a la red Tor, haciendo que sea más difícil que\nalguien vea su tráfico de Internet para determinar que está utilizando Tor.\n" +msgstr "BridgeDB puede proveer bridges con varios %stipos de Pluggable Transports%s que pueden ayudar a ofuscar sus conexiones a la red Tor, haciendo que sea más difícil para alguien que esté viendo su tráfico en la red el determinar que ud. está usando Tor.\n" #. TRANSLATORS: Please DO NOT translate "Pluggable Transports". #: lib/bridgedb/strings.py:54 @@ -127,7 +129,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 "Además, BridgeDB tiene un montón de sencillos-clásicos-estándar (vanilla) bridges\n%s sin ningún Pluggable Transport %s, lo que tal vez no suena tan molón, pero que\ntodavía pueden ayudar a eludir la censura en Internet en muchos casos.\n\n" +msgstr "Además, BridgeDB tiene un montón de sencillos-clásicos-estándar (vanilla) bridges\n%s sin ningún Pluggable Transport %s, lo que tal vez no suena tan molón, pero que\naún pueden ayudar a eludir la censura en Internet en muchos casos.\n\n\n" #: lib/bridgedb/strings.py:76 msgid "What are bridges?" @@ -148,11 +150,11 @@ 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 "Otra forma de obtener bridges es enviar un correo a %s. Por favor observe que debe\nenviar el correo electrónico usando una dirección de uno de los siguientes proveedores\nde correo electrónico:\n%s, %s o %s" +msgstr "Otra forma de obtener repetidores puente (bridges) es enviar un correo electrónico a %s. Por favor observe que tiene que enviar el correo usando la dirección de uno de los siguientes proveedores de correo electrónico:\n%s, %s or %s." #: lib/bridgedb/strings.py:90 msgid "My bridges don't work! I need help!" -msgstr "¡Mis puentes no funcionan! ¡Necesito ayuda!" +msgstr "¡Mis bridges/puentes no funcionan! ¡Necesito ayuda!" #. TRANSLATORS: Please DO NOT translate "Tor". #: lib/bridgedb/strings.py:92 @@ -180,7 +182,7 @@ msgstr "¡Obtener bridges!" #: lib/bridgedb/strings.py:108 msgid "Please select options for bridge type:" -msgstr "Por favor, selecciona las opciones para el tipo de bridge:" +msgstr "Por favor, selecciona opciones para el tipo de bridge:" #: lib/bridgedb/strings.py:109 msgid "Do you need IPv6 addresses?" @@ -209,7 +211,7 @@ msgstr "Cómo comenzar a usar tus bridges" msgid "" "To enter bridges into Tor Browser, follow the instructions on the %s Tor\n" "Browser download page %s to start Tor Browser." -msgstr "Para introducir bridges (repetidores puente) en el Navegador Tor, sigue las\ninstrucciones de la %s página de descarga del Navegador Tor %s para iniciarlo." +msgstr "Para introducir bridges (repetidores puente) en el Tor Browser, sigue las\ninstrucciones de la %s página de descarga del Tor Browser %s para iniciarlo." #. TRANSLATORS: Please DO NOT translate "Tor". #: lib/bridgedb/strings.py:125 @@ -260,15 +262,15 @@ msgstr "Solicitar un Pluggable Transport por TYPE." msgid "Get a copy of BridgeDB's public GnuPG key." msgstr "Obtener una copia de la clave pública GnuPG de BridgeDB." -#: lib/bridgedb/templates/base.html:91 +#: lib/bridgedb/templates/base.html:89 msgid "Report a Bug" msgstr "Reportar una falla" -#: lib/bridgedb/templates/base.html:93 +#: lib/bridgedb/templates/base.html:92 msgid "Source Code" msgstr "Código fuente" -#: lib/bridgedb/templates/base.html:96 +#: lib/bridgedb/templates/base.html:95 msgid "Changelog" msgstr "Registro de cambios" @@ -276,19 +278,42 @@ msgstr "Registro de cambios" msgid "Contact" msgstr "Contactar" +#: lib/bridgedb/templates/bridges.html:81 +msgid "Select All" +msgstr "Seleccionar todos" + +#: lib/bridgedb/templates/bridges.html:87 +msgid "Show QRCode" +msgstr "Mostrar código QR" + +#: lib/bridgedb/templates/bridges.html:100 +msgid "QRCode for your bridge lines" +msgstr "Código QR para sus líneas de repetidores puente" + #. 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 +#: lib/bridgedb/templates/bridges.html:115 +#: lib/bridgedb/templates/bridges.html:175 msgid "Uh oh, spaghettios!" msgstr "Oh oh, ¡la liamos!" -#: lib/bridgedb/templates/bridges.html:72 +#: lib/bridgedb/templates/bridges.html:116 +msgid "It seems there was an error getting your QRCode." +msgstr "Parece que hubo un error al obtener su código QR." + +#: lib/bridgedb/templates/bridges.html:121 +msgid "" +"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy" +" your bridge lines onto mobile and other devices." +msgstr "Este código QR contiene sus líneas de repetidores puente (bridges). Escanéelo con un lector de códigos QR para copiar sus líneas de puentes a dispositivos móviles/celulares y otros dispositivos." + +#: lib/bridgedb/templates/bridges.html:181 msgid "There currently aren't any bridges available..." msgstr "Ahora mismo no hay ningún bridge disponible..." -#: lib/bridgedb/templates/bridges.html:73 +#: lib/bridgedb/templates/bridges.html:182 #, python-format msgid "" " Perhaps you should try %s going back %s and choosing a different bridge " @@ -303,7 +328,7 @@ msgstr "Paso %s1%s" #: lib/bridgedb/templates/index.html:13 #, python-format msgid "Download %s Tor Browser %s" -msgstr "Descargar el %s Navegador Tor %s" +msgstr "Descarga %s Tor Browser %s" #: lib/bridgedb/templates/index.html:25 #, python-format @@ -323,7 +348,7 @@ msgstr "Paso %s3%s" #: lib/bridgedb/templates/index.html:38 #, python-format msgid "Now %s add the bridges to Tor Browser %s" -msgstr "Ahora %s añada los bridges al Navegador Tor %s" +msgstr "Ahora %s añada los bridges al Tor Browser %s" #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the #. beginning of words are present in your final translation. Thanks! @@ -349,7 +374,7 @@ msgstr "ninguno" #. 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 +#: lib/bridgedb/templates/options.html:127 #, python-format msgid "%sY%ses!" msgstr "¡%sS%sí!" @@ -357,7 +382,7 @@ msgstr "¡%sS%sí!" #. 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 +#: lib/bridgedb/templates/options.html:151 #, python-format msgid "%sG%set Bridges" msgstr "%sO%sbtener bridges"

1 0

[bridgedb/develop] Update Farsi (fa) translations.
by isis＠torproject.org 20 Mar '15

20 Mar '15

commit b21e09cf0b3d99f38541cc81c993ae524c9d243c Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Mar 20 00:55:45 2015 +0000 Update Farsi (fa) translations. * THANKS to arashaalaei, signal89, ardeshir, Gilberto, johnholzer, Mohammad Hossein, perspolis, and Setareh. --- lib/bridgedb/i18n/fa/LC_MESSAGES/bridgedb.po | 63 ++++++++++++++++++-------- 1 file changed, 43 insertions(+), 20 deletions(-) diff --git a/lib/bridgedb/i18n/fa/LC_MESSAGES/bridgedb.po b/lib/bridgedb/i18n/fa/LC_MESSAGES/bridgedb.po index d3d1193..5e9ebc8 100644 --- a/lib/bridgedb/i18n/fa/LC_MESSAGES/bridgedb.po +++ b/lib/bridgedb/i18n/fa/LC_MESSAGES/bridgedb.po @@ -1,13 +1,13 @@ # Translations template for BridgeDB. -# Copyright (C) 2014 'The Tor Project, Inc.' +# Copyright (C) 2015 'The Tor Project, Inc.' # This file is distributed under the same license as the BridgeDB project. # # Translators: -# Isis <isis(a)torproject.org>, 2014 # arashaalaei <aalaeiarash(a)gmail.com>, 2011 # signal89 <ali.faraji90(a)gmail.com>, 2014 # ardeshir, 2013 -# Gilberto, 2014 +# Gilberto, 2014-2015 +# johnholzer <johnholtzer123(a)gmail.com>, 2014 # Mohammad Hossein <desmati(a)gmail.com>, 2014 # perspolis <rezarms(a)yahoo.com>, 2011 # Setareh <setareh.salehee(a)gmail.com>, 2014 @@ -15,9 +15,9 @@ 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: 2014-06-06 21:46+0000\n" -"PO-Revision-Date: 2014-07-26 01:58+0000\n" -"Last-Translator: Isis <isis(a)torproject.org>\n" +"POT-Creation-Date: 2015-02-03 03:24+0000\n" +"PO-Revision-Date: 2015-02-17 22:11+0000\n" +"Last-Translator: Gilberto\n" "Language-Team: Persian (http://www.transifex.com/projects/p/torproject/language/fa/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -37,7 +37,7 @@ msgstr "" #. "fteproxy" #. "Tor" #. "Tor Browser" -#: lib/bridgedb/HTTPServer.py:121 +#: lib/bridgedb/HTTPServer.py:122 msgid "Sorry! Something went wrong with your request." msgstr "متاسف هستیم، در رابطه با درخواست شما خطایی رخ داده است." @@ -132,12 +132,12 @@ msgstr "همچنین BridgeDB شامل تعداد زیادی پل های ابت #: lib/bridgedb/strings.py:76 msgid "What are bridges?" -msgstr "bridge ها چه هستند؟" +msgstr "پل ها چه هستند؟" #: lib/bridgedb/strings.py:77 #, python-format msgid "%s Bridges %s are Tor relays that help you circumvent censorship." -msgstr "%s پل ها %s هستند بازپخش کننده تور که کمک می کنند به شما برای دور زدن سانسور." +msgstr "%s پل ها %s هستند بازپخش کننده های تور هستند که به شما برای دور زدن سانسورکمک می کنند ." #: lib/bridgedb/strings.py:82 msgid "I need an alternative way of getting bridges!" @@ -149,11 +149,11 @@ 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 "یک راه دیگر برای دریافت پل ها ارسال ایمیل به آدرس %s است. توجه کنید ایمیلی که ارسال می کنید، حتماً از طریق یکی از شرکت های زیر باشد:\n%s, %s یا %s" +msgstr "یک طریق دیگری که میتوانید پلها را بگیرید, از طریق فزستادن یک ایمیل به %s میباشد. لطفا دقت فر مایید که شما باید ایمیل خود را حتما از یکی از فراهمکنند گان ایمیلی زیر بفرستیذ: %s %s و یا %s ." #: lib/bridgedb/strings.py:90 msgid "My bridges don't work! I need help!" -msgstr "به کمک احتیاج دارم! bridge های من کار نمی‌کنند!" +msgstr "به کمک احتیاج دارم! پل های من کار نمی‌کنند!" #. TRANSLATORS: Please DO NOT translate "Tor". #: lib/bridgedb/strings.py:92 @@ -261,15 +261,15 @@ msgstr "درخواست یک روش Transport جایگزین براساس TYPE" msgid "Get a copy of BridgeDB's public GnuPG key." msgstr "دریافت یک کپی از کلید عمومی BridgeDB" -#: lib/bridgedb/templates/base.html:91 +#: lib/bridgedb/templates/base.html:89 msgid "Report a Bug" msgstr "گزارش یک باگ" -#: lib/bridgedb/templates/base.html:93 +#: lib/bridgedb/templates/base.html:92 msgid "Source Code" msgstr "کد منبع" -#: lib/bridgedb/templates/base.html:96 +#: lib/bridgedb/templates/base.html:95 msgid "Changelog" msgstr "لیست تغییرات" @@ -277,19 +277,42 @@ msgstr "لیست تغییرات" msgid "Contact" msgstr "تماس" +#: lib/bridgedb/templates/bridges.html:81 +msgid "Select All" +msgstr "انتخاب همه" + +#: lib/bridgedb/templates/bridges.html:87 +msgid "Show QRCode" +msgstr "نمایش QRCode" + +#: lib/bridgedb/templates/bridges.html:100 +msgid "QRCode for your bridge lines" +msgstr "QRCode برای خطوط پل خود" + #. 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 +#: lib/bridgedb/templates/bridges.html:115 +#: lib/bridgedb/templates/bridges.html:175 msgid "Uh oh, spaghettios!" msgstr "اوه اوه، کنسرو اسپاگتی!" -#: lib/bridgedb/templates/bridges.html:72 +#: lib/bridgedb/templates/bridges.html:116 +msgid "It seems there was an error getting your QRCode." +msgstr "به نظر می رسد یک خطا در گرفتن QRCode شما وجود دارد." + +#: lib/bridgedb/templates/bridges.html:121 +msgid "" +"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy" +" your bridge lines onto mobile and other devices." +msgstr "این QRCode شامل خطوط پل خود. اسکن آن را با یک خواننده QRCode برای کپی خطوط پل خود بر روی تلفن همراه و دستگاه های دیگر." + +#: lib/bridgedb/templates/bridges.html:181 msgid "There currently aren't any bridges available..." msgstr "در حال حاضر هیچ پل ی در دسترس نیست" -#: lib/bridgedb/templates/bridges.html:73 +#: lib/bridgedb/templates/bridges.html:182 #, python-format msgid "" " Perhaps you should try %s going back %s and choosing a different bridge " @@ -314,7 +337,7 @@ msgstr "مرحله %s2%s" #: lib/bridgedb/templates/index.html:27 #, python-format msgid "Get %s bridges %s" -msgstr "دریافت %sbridge ها %s" +msgstr "دریافت %s پل‌ ها %s" #: lib/bridgedb/templates/index.html:36 #, python-format @@ -350,7 +373,7 @@ 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 +#: lib/bridgedb/templates/options.html:127 #, python-format msgid "%sY%ses!" msgstr "%sب%sله!" @@ -358,7 +381,7 @@ msgstr "%sب%sله!" #. 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 +#: lib/bridgedb/templates/options.html:151 #, python-format msgid "%sG%set Bridges" msgstr "%sد%sریافت پل‌ها"

1 0

[bridgedb/develop] Update French (fr_CA) translations.
by isis＠torproject.org 20 Mar '15

20 Mar '15

commit 7bf60fe53484168088db637158ce5b14f4d494c7 Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Mar 20 01:01:13 2015 +0000 Update French (fr_CA) translations. * THANKS to Lunar, mehditaileb, Onizuka, and yahoe.001. --- lib/bridgedb/i18n/fr_CA/LC_MESSAGES/bridgedb.po | 64 +++++++++++++++-------- 1 file changed, 43 insertions(+), 21 deletions(-) diff --git a/lib/bridgedb/i18n/fr_CA/LC_MESSAGES/bridgedb.po b/lib/bridgedb/i18n/fr_CA/LC_MESSAGES/bridgedb.po index 23d7226..740cfe3 100644 --- a/lib/bridgedb/i18n/fr_CA/LC_MESSAGES/bridgedb.po +++ b/lib/bridgedb/i18n/fr_CA/LC_MESSAGES/bridgedb.po @@ -1,20 +1,19 @@ # Translations template for BridgeDB. -# Copyright (C) 2014 'The Tor Project, Inc.' +# Copyright (C) 2015 'The Tor Project, Inc.' # This file is distributed under the same license as the BridgeDB project. # # Translators: -# Isis <isis(a)torproject.org>, 2014 # Lunar <lunar(a)torproject.org>, 2013 # mehditaileb <mehditaileb(a)liberte-info.net>, 2011 # Onizuka, 2013 -# yahoe.001, 2014 +# yahoe.001, 2014-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: 2014-06-06 21:46+0000\n" -"PO-Revision-Date: 2014-07-26 02:00+0000\n" -"Last-Translator: Isis <isis(a)torproject.org>\n" +"POT-Creation-Date: 2015-02-03 03:24+0000\n" +"PO-Revision-Date: 2015-02-14 13:41+0000\n" +"Last-Translator: yahoe.001\n" "Language-Team: French (Canada) (http://www.transifex.com/projects/p/torproject/language/fr_CA/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -34,7 +33,7 @@ msgstr "" #. "fteproxy" #. "Tor" #. "Tor Browser" -#: lib/bridgedb/HTTPServer.py:121 +#: lib/bridgedb/HTTPServer.py:122 msgid "Sorry! Something went wrong with your request." msgstr "Désolé! Quelque chose a mal tourné avec votre requête." @@ -111,7 +110,7 @@ msgid "" "Some bridges with IPv6 addresses are also available, though some Pluggable\n" "Transports aren't IPv6 compatible.\n" "\n" -msgstr "Des ponts avec des adresses IPv6 sont aussi disponibles, bien que des transports\nenfichables ne soient pas compatibles avec IPv6.\n\n" +msgstr "Des ponts avec des adresses IPv6 sont aussi proposés, bien que certains transports\nenfichables ne soient pas compatibles avec IPv6.\n\n" #. TRANSLATORS: Please DO NOT translate "BridgeDB". #. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring, @@ -146,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, %s or %s." -msgstr "Une autre façon d'obtenir des ponts est d'envoyer un courriel à %s. Veuillez prendre\nnote que vous devez utiliser une adresse d'un des fournisseurs de courriel suivants :\n%s, %s ou %s." +msgstr "Une autre façon d'obtenir des ponts est d'envoyer un courriel à %s. Veuillez prendre\nnote que vous devez envoyer le courriel en utilisant une adresse d'un des fournisseurs\nde courriel suivants :\n%s, %s ou %s." #: lib/bridgedb/strings.py:90 msgid "My bridges don't work! I need help!" @@ -170,7 +169,7 @@ msgstr "Essayez d'inclure autant d'infos sur votre cas que possible, incluant la #: lib/bridgedb/strings.py:103 msgid "Here are your bridge lines:" -msgstr "Voici vos lignes de ponts :" +msgstr "Voici vos lignes de pont :" #: lib/bridgedb/strings.py:104 msgid "Get Bridges!" @@ -214,7 +213,7 @@ msgstr "Pour saisir vos ponts dans le navigateur Tor, suivez les instructions\ns msgid "" "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n" "the wizard until it asks:" -msgstr "Quand la fenêtre « Paramètres réseau de Tor » s'affiche, cliquez sur « Configurer » et\nsuivez l'assistant jusqu'à ce qu'il demande :" +msgstr "Quand la fenêtre « Paramètres du réseau Tor » s'affiche, cliquez sur « Configurer » et\nsuivez l'assistant jusqu'à ce qu'il demande :" #. TRANSLATORS: Please DO NOT translate "Tor". #: lib/bridgedb/strings.py:129 @@ -230,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 "Sélectionnez « Oui » et ensuite cliquez sur « Suivant ». Pour configurer vos\nnouveaux ponts, copiez et collez vos lignes de ponts dans la boîte de saisie\nde texte. Enfin cliquez sur « Connecter » et vous devriez avoir fini! Si vous éprouvez\ndes problèmes, essayez de cliquez sur le bouton « Aide » dans l'assistant des\n« Paramètres du réseau Tor » pour un un soutien supplémentaire." +msgstr "Sélectionnez « Oui » et ensuite cliquez sur « Suivant ». Pour configurer vos\nnouveaux ponts, copiez et collez vos lignes de pont dans la boîte de saisie\nde texte. Enfin cliquez sur « Connecter » et vous devriez avoir fini! Si vous éprouvez\ndes problèmes, essayez de cliquez sur le bouton « Aide » dans l'assistant des\n« Paramètres du réseau Tor » pour un un soutien supplémentaire." #: lib/bridgedb/strings.py:141 msgid "Displays this message." @@ -258,15 +257,15 @@ msgstr "Demander un transport enfichable par TYPE." msgid "Get a copy of BridgeDB's public GnuPG key." msgstr "Obtenir une copie de la clef GnuPG publique de BridgeDB." -#: lib/bridgedb/templates/base.html:91 +#: lib/bridgedb/templates/base.html:89 msgid "Report a Bug" msgstr "Rapporter un bogue" -#: lib/bridgedb/templates/base.html:93 +#: lib/bridgedb/templates/base.html:92 msgid "Source Code" msgstr "Code source" -#: lib/bridgedb/templates/base.html:96 +#: lib/bridgedb/templates/base.html:95 msgid "Changelog" msgstr "Journal des changements" @@ -274,19 +273,42 @@ msgstr "Journal des changements" msgid "Contact" msgstr "Contact" +#: lib/bridgedb/templates/bridges.html:81 +msgid "Select All" +msgstr "Tout sélectionner" + +#: lib/bridgedb/templates/bridges.html:87 +msgid "Show QRCode" +msgstr "Montrer le code QR" + +#: lib/bridgedb/templates/bridges.html:100 +msgid "QRCode for your bridge lines" +msgstr "Code QR de vos lignes de pont" + #. 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 +#: lib/bridgedb/templates/bridges.html:115 +#: lib/bridgedb/templates/bridges.html:175 msgid "Uh oh, spaghettios!" msgstr "Une erreur est survenue!" -#: lib/bridgedb/templates/bridges.html:72 +#: lib/bridgedb/templates/bridges.html:116 +msgid "It seems there was an error getting your QRCode." +msgstr "Il semble avoir eu une erreur de récupération de votre code QR." + +#: lib/bridgedb/templates/bridges.html:121 +msgid "" +"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy" +" your bridge lines onto mobile and other devices." +msgstr "Ce code QR contient vos lignes de pont. Balayez-le avec un lecteur de codes QR pour copier vos lignes de pont sur votre appareil." + +#: lib/bridgedb/templates/bridges.html:181 msgid "There currently aren't any bridges available..." -msgstr "Il n'y a présentement aucun pont disponible..." +msgstr "Aucun pont n'est disponible présentement..." -#: lib/bridgedb/templates/bridges.html:73 +#: lib/bridgedb/templates/bridges.html:182 #, python-format msgid "" " Perhaps you should try %s going back %s and choosing a different bridge " @@ -347,7 +369,7 @@ msgstr "aucun" #. 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 +#: lib/bridgedb/templates/options.html:127 #, python-format msgid "%sY%ses!" msgstr "%sO%sui!" @@ -355,7 +377,7 @@ msgstr "%sO%sui!" #. 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 +#: lib/bridgedb/templates/options.html:151 #, python-format msgid "%sG%set Bridges" msgstr "%sO%sbtenir des ponts"

1 0

[bridgedb/develop] Update French (fr) translations.
by isis＠torproject.org 20 Mar '15

20 Mar '15

commit 51ff2e038f3276323379c0214b1d427fe7ef114f Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Mar 20 00:59:02 2015 +0000 Update French (fr) translations. * THANKS to apaddlingduck, fayçal fatihi, Boubou, Cryptie, Frisson Reynald, hpatte, Lucas Leroy, Lunar, Onizuka, and mehditaileb. --- lib/bridgedb/i18n/fr/LC_MESSAGES/bridgedb.po | 61 ++++++++++++++++++-------- 1 file changed, 43 insertions(+), 18 deletions(-) diff --git a/lib/bridgedb/i18n/fr/LC_MESSAGES/bridgedb.po b/lib/bridgedb/i18n/fr/LC_MESSAGES/bridgedb.po index 109c360..58eef87 100644 --- a/lib/bridgedb/i18n/fr/LC_MESSAGES/bridgedb.po +++ b/lib/bridgedb/i18n/fr/LC_MESSAGES/bridgedb.po @@ -1,13 +1,15 @@ # Translations template for BridgeDB. -# Copyright (C) 2014 'The Tor Project, Inc.' +# Copyright (C) 2015 'The Tor Project, Inc.' # This file is distributed under the same license as the BridgeDB project. # # Translators: -# Isis <isis(a)torproject.org>, 2014 # apaddlingduck, 2014 -# fayçal fatihi <ofaycal.geo.x(a)gmail.com>, 2014 +# Boubou <cece31840(a)gmail.com>, 2015 +# Cryptie <cryptie(a)fsfe.org>, 2014 +# fayçal fatihi, 2014 # Frisson Reynald <frissonreynald(a)yahoo.fr>, 2014 # hpatte <hadrien.44(a)gmail.com>, 2014 +# Lucas Leroy <lerlucas(a)rocketmail.com>, 2014 # Lunar <lunar(a)torproject.org>, 2013 # Onizuka, 2013 # mehditaileb <mehditaileb(a)liberte-info.net>, 2011 @@ -19,9 +21,9 @@ 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: 2014-06-06 21:46+0000\n" -"PO-Revision-Date: 2014-07-26 01:59+0000\n" -"Last-Translator: Isis <isis(a)torproject.org>\n" +"POT-Creation-Date: 2015-02-03 03:24+0000\n" +"PO-Revision-Date: 2015-02-14 18:31+0000\n" +"Last-Translator: Boubou <cece31840(a)gmail.com>\n" "Language-Team: French (http://www.transifex.com/projects/p/torproject/language/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -41,9 +43,9 @@ msgstr "" #. "fteproxy" #. "Tor" #. "Tor Browser" -#: lib/bridgedb/HTTPServer.py:121 +#: lib/bridgedb/HTTPServer.py:122 msgid "Sorry! Something went wrong with your request." -msgstr "Désolé ! Quelque chose n'allait pas avec votre demande." +msgstr "Désolé ! Un problème est survenu suite à votre requête." #: lib/bridgedb/strings.py:18 msgid "[This is an automated message; please do not reply.]" @@ -82,7 +84,7 @@ msgstr "Salut, %s!" #: lib/bridgedb/strings.py:32 msgid "Hello, friend!" -msgstr "Bonjour, ami !" +msgstr "Bonjour, l'ami !" #: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100 msgid "Public Keys" @@ -96,7 +98,7 @@ msgstr "Les clés publiques" msgid "" "This email was generated with rainbows, unicorns, and sparkles\n" "for %s on %s at %s." -msgstr "Ce courriel a été généré avec des arcs en ciel, des licornes, et des étincelles pour %s sur %s à%s." +msgstr "Ce courriel a été généré avec des arcs en ciel, des licornes, et des étincelles pour %s, %s à %s." #. TRANSLATORS: Please DO NOT translate "BridgeDB". #. TRANSLATORS: Please DO NOT translate "Pluggable Transports". @@ -265,15 +267,15 @@ msgstr "Demander un Pluggable Transport par TYPE." msgid "Get a copy of BridgeDB's public GnuPG key." msgstr "Obtenir une copie de la clef GnuPG publique BridgeDB." -#: lib/bridgedb/templates/base.html:91 +#: lib/bridgedb/templates/base.html:89 msgid "Report a Bug" msgstr "Faire un rapport de Bug" -#: lib/bridgedb/templates/base.html:93 +#: lib/bridgedb/templates/base.html:92 msgid "Source Code" msgstr "Le code source" -#: lib/bridgedb/templates/base.html:96 +#: lib/bridgedb/templates/base.html:95 msgid "Changelog" msgstr "Changelog" @@ -281,19 +283,42 @@ msgstr "Changelog" msgid "Contact" msgstr "Contact" +#: lib/bridgedb/templates/bridges.html:81 +msgid "Select All" +msgstr "Tout sélectionner" + +#: lib/bridgedb/templates/bridges.html:87 +msgid "Show QRCode" +msgstr "Montrer QRCode" + +#: lib/bridgedb/templates/bridges.html:100 +msgid "QRCode for your bridge lines" +msgstr "QRCode pour vos bridge lines" + #. 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 +#: lib/bridgedb/templates/bridges.html:115 +#: lib/bridgedb/templates/bridges.html:175 msgid "Uh oh, spaghettios!" msgstr "Houlà!" -#: lib/bridgedb/templates/bridges.html:72 +#: lib/bridgedb/templates/bridges.html:116 +msgid "It seems there was an error getting your QRCode." +msgstr "Il semblerait qu'il y ai eu une erreur en chargeant votre QRCode." + +#: lib/bridgedb/templates/bridges.html:121 +msgid "" +"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy" +" your bridge lines onto mobile and other devices." +msgstr "Ce QRCode contient vos bridge lines. Scannez le avec un lecteur de QRCode pour copier vos bridge lines dans votre mobile ou d'autres appareils." + +#: lib/bridgedb/templates/bridges.html:181 msgid "There currently aren't any bridges available..." msgstr "Il n'y a pas de bridges disponibles en ce moment…" -#: lib/bridgedb/templates/bridges.html:73 +#: lib/bridgedb/templates/bridges.html:182 #, python-format msgid "" " Perhaps you should try %s going back %s and choosing a different bridge " @@ -354,7 +379,7 @@ msgstr "aucun" #. 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 +#: lib/bridgedb/templates/options.html:127 #, python-format msgid "%sY%ses!" msgstr "%sO%sui!" @@ -362,7 +387,7 @@ msgstr "%sO%sui!" #. 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 +#: lib/bridgedb/templates/options.html:151 #, python-format msgid "%sG%set Bridges" msgstr "%sO%sbtenir Bridges"

1 0

[tor-browser-bundle/master] Bug 14688: Create Desktop and Start Menu shortcuts for Windows
by mikeperry＠torproject.org 20 Mar '15

20 Mar '15

commit dad9a582b97d8720f788881461ead2284281eea8 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Mar 19 17:54:09 2015 -0700 Bug 14688: Create Desktop and Start Menu shortcuts for Windows This is on by default, but can be turned of in a checkbox on the installer. We also switch back to Moritz's NSIS repo and gpg key with this. Unfortunately, he tagged the same version as mcs did, but that's not a big deal. --- gitian/fetch-inputs.sh | 2 +- gitian/gpg/tbb-windows-installer.gpg | Bin 1213 -> 15689 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index e58c4d3..3b3c43a 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -247,7 +247,7 @@ cd inputs while read dir url tag; do update_git "$dir" "$url" "$tag" done << EOF -tbb-windows-installer https://github.com/MarkCSmith/tbb-windows-installer.git $NSIS_TAG +tbb-windows-installer https://github.com/moba/tbb-windows-installer.git $NSIS_TAG zlib https://github.com/madler/zlib.git $ZLIB_TAG libevent https://github.com/libevent/libevent.git $LIBEVENT_TAG tor https://git.torproject.org/tor.git $TOR_TAG diff --git a/gitian/gpg/tbb-windows-installer.gpg b/gitian/gpg/tbb-windows-installer.gpg index e753e57..fab3a99 100644 Binary files a/gitian/gpg/tbb-windows-installer.gpg and b/gitian/gpg/tbb-windows-installer.gpg differ

1 0

[tor-browser-bundle/master] Bug 14959: Download missing MAR files for incrementals
by mikeperry＠torproject.org 20 Mar '15

20 Mar '15

commit 803049749f966e63e7c4f86dd556c49fa0fdd48d Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Mar 16 18:49:43 2015 +0100 Bug 14959: Download missing MAR files for incrementals --- gitian/Makefile | 6 ++- gitian/gpg/torbrowser.gpg | Bin 0 -> 6015 bytes tools/update-responses/config.yml | 3 ++ tools/update-responses/download_missing_versions | 1 + tools/update-responses/update_responses | 58 +++++++++++++++++++++- 5 files changed, 65 insertions(+), 3 deletions(-) diff --git a/gitian/Makefile b/gitian/Makefile index ea82151..8f89bca 100644 --- a/gitian/Makefile +++ b/gitian/Makefile @@ -29,10 +29,12 @@ build-alpha: ./mkbundle-mac.sh versions.alpha incrementals: - ../tools/update-responses/gen_incrementals release || echo 'Warning: could not generate incremental MARs.' >&2 + $(TORSOCKS) ../tools/update-responses/download_missing_versions release + ../tools/update-responses/gen_incrementals release incrementals-alpha: - ../tools/update-responses/gen_incrementals alpha || echo 'Warning: could not generate incremental MARs.' >&2 + $(TORSOCKS) ../tools/update-responses/download_missing_versions alpha + ../tools/update-responses/gen_incrementals alpha signmars: ./signmars.sh versions diff --git a/gitian/gpg/torbrowser.gpg b/gitian/gpg/torbrowser.gpg new file mode 100644 index 0000000..7267d4d Binary files /dev/null and b/gitian/gpg/torbrowser.gpg differ diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index a338745..403be5c 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-responses/config.yml @@ -1,4 +1,7 @@ --- +download: + archive_url: https://archive.torproject.org/tor-package-archive/torbrowser + gpg_keyring: ../../gitian/gpg/torbrowser.gpg build_targets: linux32: Linux_x86-gcc3 linux64: Linux_x86_64-gcc3 diff --git a/tools/update-responses/download_missing_versions b/tools/update-responses/download_missing_versions new file mode 120000 index 0000000..3766925 --- /dev/null +++ b/tools/update-responses/download_missing_versions @@ -0,0 +1 @@ +update_responses \ No newline at end of file diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses index 8b8c217..07efc7c 100755 --- a/tools/update-responses/update_responses +++ b/tools/update-responses/update_responses @@ -6,9 +6,10 @@ use English; use FindBin; use YAML qw(LoadFile); use File::Slurp; -use Digest::SHA; +use Digest::SHA qw(sha256_hex); use XML::Writer; use Cwd; +use File::Copy; use File::Temp; use File::Find; use File::Which; @@ -408,6 +409,55 @@ sub check_update_responses_channel { } } +sub download_version { + my ($config, $version) = @_; + my $tmpdir = File::Temp->newdir(); + my $destdir = "$releases_dir/$version"; + my $urldir = "$config->{download}{archive_url}/$version"; + print "Downloading version $version\n"; + foreach my $file (qw(sha256sums.txt sha256sums.txt.asc)) { + if (getstore("$urldir/$file", "$tmpdir/$file") != 200) { + exit_error "Error downloading $urldir/$file"; + } + } + if (system('gpg', '--no-default-keyring', '--keyring', + $config->{download}{gpg_keyring}, '--verify', + "$tmpdir/sha256sums.txt.asc", "$tmpdir/sha256sums.txt")) { + exit_error "Error checking gpg signature for version $version"; + } + mkdir $destdir; + move "$tmpdir/sha256sums.txt.asc", "$destdir/sha256sums.txt.asc"; + move "$tmpdir/sha256sums.txt", "$destdir/sha256sums.txt"; + my %sums = map { chomp; reverse split ' ', $_ } read_file "$destdir/sha256sums.txt"; + foreach my $file (sort grep { $_ =~ m/\.mar$/ } keys %sums) { + print "Downloading $file\n"; + exit_error "Error downloading $urldir/$file\n" + unless getstore("$urldir/$file", "$tmpdir/$file") == 200; + if ($sums{$file} ne sha256_hex(read_file("$tmpdir/$file"))) { + exit_error "Error unsigning $file" + if system('signmar', '-r', "$tmpdir/$file", "$tmpdir/$file.u"); + exit_error "Wrong checksum for $file" + unless $sums{$file} eq sha256_hex(read_file("$tmpdir/$file.u")); + move "$tmpdir/$file.u", "$tmpdir/$file"; + } + move "$tmpdir/$file", "$destdir/$file"; + } +} + +sub download_missing_versions { + my ($config, @channels) = @_; + foreach my $channel (@channels) { + exit_error "Unknown channel $channel" + unless $config->{channels}{$channel}; + my $cversion = $config->{channels}{$channel}; + next unless $config->{versions}{$cversion}{incremental_from}; + foreach my $version (@{$config->{versions}{$cversion}{incremental_from}}) { + next if -d "$releases_dir/$version"; + download_version($config, $version); + } + } +} + sub check_update_responses { my ($config) = @_; exit_error "usage: $PROGRAM_NAME <base_url> [channels...]" unless @ARGV; @@ -453,6 +503,12 @@ my %actions = ( create_incremental_mars_for_version($config, $version); } }, + download_missing_versions => sub { + my ($config) = @_; + my @channels = @ARGV ? @ARGV : keys %{$config->{channels}}; + extract_martools; + download_missing_versions($config, @channels); + }, check_update_responses_deployement => \&check_update_responses, );

1 0

[bridgedb/develop] Update bridgedb.pot file with changed BridgeDB strings for translation.
by isis＠torproject.org 19 Mar '15

19 Mar '15

commit 4ad7667f12607731fa0996821f1e4824f5c1972b Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Mar 19 22:16:18 2015 +0000 Update bridgedb.pot file with changed BridgeDB strings for translation. --- lib/bridgedb/i18n/templates/bridgedb.pot | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/lib/bridgedb/i18n/templates/bridgedb.pot b/lib/bridgedb/i18n/templates/bridgedb.pot index 276841e..160c2ba 100644 --- a/lib/bridgedb/i18n/templates/bridgedb.pot +++ b/lib/bridgedb/i18n/templates/bridgedb.pot @@ -6,12 +6,12 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: bridgedb 0.2.4-3-ge333d91\n" +"Project-Id-Version: bridgedb 0.2.4-234-g193c80a-dirty\n" "Report-Msgid-Bugs-To: " "'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…" "=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n" -"POT-Creation-Date: 2015-02-03 03:24+0000\n" -"PO-Revision-Date: 2015-02-03 03:24+0000\n" +"POT-Creation-Date: 2015-03-19 22:13+0000\n" +"PO-Revision-Date: 2015-03-19 22:13+0000\n" "Last-Translator: Isis Lovecruft <isis(a)torproject.org>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -30,7 +30,7 @@ msgstr "" #. "fteproxy" #. "Tor" #. "Tor Browser" -#: lib/bridgedb/HTTPServer.py:122 +#: lib/bridgedb/HTTPServer.py:107 msgid "Sorry! Something went wrong with your request." msgstr "" @@ -205,12 +205,13 @@ msgstr "" #: lib/bridgedb/strings.py:121 #, python-format msgid "" -"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n" -"Browser download page %s to start Tor Browser." +"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n" +"page %s and then follow the instructions there for downloading and starting\n" +"Tor Browser." msgstr "" #. TRANSLATORS: Please DO NOT translate "Tor". -#: lib/bridgedb/strings.py:125 +#: lib/bridgedb/strings.py:126 msgid "" "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and " "follow\n" @@ -218,7 +219,7 @@ msgid "" msgstr "" #. TRANSLATORS: Please DO NOT translate "Tor". -#: lib/bridgedb/strings.py:129 +#: lib/bridgedb/strings.py:130 msgid "" "Does your Internet Service Provider (ISP) block or otherwise censor " "connections\n" @@ -226,7 +227,7 @@ msgid "" msgstr "" #. TRANSLATORS: Please DO NOT translate "Tor". -#: lib/bridgedb/strings.py:133 +#: lib/bridgedb/strings.py:134 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" @@ -235,29 +236,29 @@ msgid "" "button in the 'Tor Network Settings' wizard for further assistance." msgstr "" -#: lib/bridgedb/strings.py:141 +#: lib/bridgedb/strings.py:142 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 +#: lib/bridgedb/strings.py:146 msgid "Request vanilla bridges." msgstr "" -#: lib/bridgedb/strings.py:146 +#: lib/bridgedb/strings.py:147 msgid "Request IPv6 bridges." msgstr "" #. TRANSLATORS: Please DO NOT translate the word the word "TYPE". -#: lib/bridgedb/strings.py:148 +#: lib/bridgedb/strings.py:149 msgid "Request a Pluggable Transport by TYPE." msgstr "" #. TRANSLATORS: Please DO NOT translate "BridgeDB". #. TRANSLATORS: Please DO NOT translate "GnuPG". -#: lib/bridgedb/strings.py:151 +#: lib/bridgedb/strings.py:152 msgid "Get a copy of BridgeDB's public GnuPG key." msgstr ""

1 0