tor-commits July 2015

tor-commits@lists.torproject.org

18 participants
1250 discussions

[translation/whisperback_completed] Update translations for whisperback_completed
by translation＠torproject.org 23 Jul '15

23 Jul '15

commit 2fc377a1b67b70e8e3afb15116b4c7b6d55480dd Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jul 23 20:15:46 2015 +0000 Update translations for whisperback_completed --- el/el.po | 2 +- hr_HR/hr_HR.po | 2 +- id/id.po | 9 +++++---- lv/lv.po | 48 ++++++++++++++++++++++++------------------------ uk/uk.po | 6 +++--- 5 files changed, 34 insertions(+), 33 deletions(-) diff --git a/el/el.po b/el/el.po index 82b7aea..e3055d8 100644 --- a/el/el.po +++ b/el/el.po @@ -13,7 +13,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-03-17 17:40+0100\n" -"PO-Revision-Date: 2015-04-23 21:40+0000\n" +"PO-Revision-Date: 2015-07-21 08:21+0000\n" "Last-Translator: metamec\n" "Language-Team: Greek (http://www.transifex.com/projects/p/torproject/language/el/)\n" "MIME-Version: 1.0\n" diff --git a/hr_HR/hr_HR.po b/hr_HR/hr_HR.po index 1a949d3..56440a9 100644 --- a/hr_HR/hr_HR.po +++ b/hr_HR/hr_HR.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-03-17 17:40+0100\n" -"PO-Revision-Date: 2015-02-18 13:11+0000\n" +"PO-Revision-Date: 2015-07-22 11:05+0000\n" "Last-Translator: skiddiep <lyricaltumor(a)gmail.com>\n" "Language-Team: Croatian (Croatia) (http://www.transifex.com/projects/p/torproject/language/hr_HR/)\n" "MIME-Version: 1.0\n" diff --git a/id/id.po b/id/id.po index aa1b053..701aa4d 100644 --- a/id/id.po +++ b/id/id.po @@ -8,6 +8,7 @@ # Fathan Imanudin <night.ataraxia(a)gmail.com>, 2014 # hermawan <hermawanadhis(a)gmail.com>, 2014 # Lucas Susanto <susantolucas(a)yahoo.com>, 2015 +# Mark Hiro <akmalgaul(a)gmail.com>, 2015 # Se7enTime <se7entime(a)tutanota.com>, 2013 # Rendiyono Wahyu Saputro <rendi.7936(a)gmail.com>, 2015 # Zamani Karmana <zamani.karmana(a)gmail.com>, 2015 @@ -16,8 +17,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-03-17 17:40+0100\n" -"PO-Revision-Date: 2015-06-29 14:36+0000\n" -"Last-Translator: Zamani Karmana <zamani.karmana(a)gmail.com>\n" +"PO-Revision-Date: 2015-07-12 19:37+0000\n" +"Last-Translator: Mark Hiro <akmalgaul(a)gmail.com>\n" "Language-Team: Indonesian (http://www.transifex.com/projects/p/torproject/language/id/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -131,11 +132,11 @@ msgstr "Pengembang Tails <tails(a)boum.org>" #: ../whisperBack/gui.py:395 msgid "translator-credits" -msgstr "pustaka-penerjemah" +msgstr "Kredit-Translator" #: ../whisperBack/gui.py:422 msgid "This doesn't seem to be a valid URL or OpenPGP key." -msgstr "Ini tidak terlihat sebagai URL yang benar atau kunci OpenPGP." +msgstr "Ini tidak terlihat sebagai URL atau kunci OpenPGP yang valid." #: ../data/whisperback.ui.h:1 msgid "Copyright © 2009-2012 tails(a)boum.org" diff --git a/lv/lv.po b/lv/lv.po index f6ab420..720ca8f 100644 --- a/lv/lv.po +++ b/lv/lv.po @@ -3,14 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# Ojars Balcers <ojars.balcers(a)gmail.com>, 2012 -# Ojars Balcers <ojars.balcers(a)gmail.com>, 2013 +# Ojārs Balcers <ojars.balcers(a)gmail.com>, 2012 +# Ojārs Balcers <ojars.balcers(a)gmail.com>, 2013 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" -"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" -"POT-Creation-Date: 2013-03-26 15:50+0100\n" -"PO-Revision-Date: 2013-06-24 22:52+0000\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2014-03-17 17:40+0100\n" +"PO-Revision-Date: 2015-07-20 10:45+0000\n" "Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" "Language-Team: Latvian (http://www.transifex.com/projects/p/torproject/language/lv/)\n" "MIME-Version: 1.0\n" @@ -41,40 +41,40 @@ msgid "" "/etc/whisperback/config.py, ~/.whisperback/config.py, ./config.py" msgstr "Mainīgais %s netika atrasts nevienā no konfigurācijas datnēm /etc/whisperback/config.py, ~/.whisperback/config.py, ./config.py" -#: ../whisperBack/gui.py:151 +#: ../whisperBack/gui.py:154 msgid "Unable to load a valid configuration." msgstr "Nespēj ielādēt derīgu konfigurāciju." -#: ../whisperBack/gui.py:217 +#: ../whisperBack/gui.py:220 msgid "Sending mail..." msgstr "Sūta e-pastu..." -#: ../whisperBack/gui.py:218 +#: ../whisperBack/gui.py:221 msgid "Sending mail" msgstr "Sūta e-pastu" #. pylint: disable=C0301 -#: ../whisperBack/gui.py:220 +#: ../whisperBack/gui.py:223 msgid "This could take a while..." msgstr "Tas varētu aizņemt kādu brītiņu..." -#: ../whisperBack/gui.py:234 +#: ../whisperBack/gui.py:237 msgid "The contact email adress doesn't seem valid." msgstr "Šķiet, ka saziņas e-pasta adrese nav derīga." -#: ../whisperBack/gui.py:251 +#: ../whisperBack/gui.py:254 msgid "Unable to send the mail: SMTP error." msgstr "Nespēj nosūtīt e-pastu: SMTP kļūda." -#: ../whisperBack/gui.py:253 +#: ../whisperBack/gui.py:256 msgid "Unable to connect to the server." msgstr "Nespēj izveidot savienojumu ar serveri." -#: ../whisperBack/gui.py:255 +#: ../whisperBack/gui.py:258 msgid "Unable to create or to send the mail." msgstr "Nespēj izveidot vai nosūtīt e-pastu." -#: ../whisperBack/gui.py:258 +#: ../whisperBack/gui.py:261 msgid "" "\n" "\n" @@ -83,21 +83,21 @@ msgid "" "If it does not work, you will be offered to save the bug report." msgstr "\n\nKļūdu ziņojumu nebija iespējams nosūtīt, ticami, ar tīklu saistītu kļūmju dēļ. Lūdzu, mēģiniet atkārtoti pievienoties tīklam un nospiediet SŪTĪT vēlreiz.\n\nJa tas nelīdzēs, tiks piedāvāts saglabāt kļūdu ziņojumu." -#: ../whisperBack/gui.py:271 +#: ../whisperBack/gui.py:274 msgid "Your message has been sent." msgstr "Jūsu vēstījums ir nosūtīts." -#: ../whisperBack/gui.py:278 +#: ../whisperBack/gui.py:281 msgid "An error occured during encryption." msgstr "Šifrēšanas laikā notika kļūda." -#: ../whisperBack/gui.py:298 +#: ../whisperBack/gui.py:301 #, python-format msgid "Unable to save %s." msgstr "Nespēj saglabāt %s." #. 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" @@ -107,27 +107,27 @@ msgid "" "Do you want to save the bug report to a file?" msgstr "Kļūdu ziņojumu nebija iespējams nosūtīt, ticami, ar tīklu saistītu kļūmju dēļ.\n\nAizstājējrisinājums ir saglabāt kļūdu ziņojumu datnē vai zibatmiņā jeb USB diskā, tad mēģināt nosūtīt ziņojumu mums uz %s no sava e-pasta, bet izmantojot citu sistēmu. Ievērojiet, ka tā darot kļūdu ziņojums nebūs anonīms, ja vien pats neveiksit atbilstīgus pasākumus (piem., lietot Tor ar citādi nelietojamu e-pastu).\n\nVai vēlaties saglabāt kļūdu ziņojumu datnē?" -#: ../whisperBack/gui.py:386 ../data/whisperback.ui.h:21 +#: ../whisperBack/gui.py:389 ../data/whisperback.ui.h:21 msgid "WhisperBack" msgstr "WhisperBack" -#: ../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 "Sūtīt atsauksmes šifrētā e-pastā." -#: ../whisperBack/gui.py:390 +#: ../whisperBack/gui.py:393 msgid "Copyright © 2009-2012 Tails developpers (tails(a)boum.org)" msgstr "Autortiesības © 2009-2012 Tails developpers (tails(a)boum.org)" -#: ../whisperBack/gui.py:391 +#: ../whisperBack/gui.py:394 msgid "Tails developers <tails(a)boum.org>" msgstr "Tails izstrādātāji <tails(a)boum.org>" -#: ../whisperBack/gui.py:392 +#: ../whisperBack/gui.py:395 msgid "translator-credits" msgstr "tulkotāji" -#: ../whisperBack/gui.py:419 +#: ../whisperBack/gui.py:422 msgid "This doesn't seem to be a valid URL or OpenPGP key." msgstr "Šis nešķiet esam derīgs URL vai OpenPGP atslēga." diff --git a/uk/uk.po b/uk/uk.po index 375831a..ac8bf77 100644 --- a/uk/uk.po +++ b/uk/uk.po @@ -4,13 +4,13 @@ # # Translators: # LinuxChata, 2014 -# Lomil_da <lomil97(a)gmail.com>, 2013 +# Pinro Lomil <lomil97(a)gmail.com>, 2013 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-08-01 15:36+0200\n" -"PO-Revision-Date: 2014-02-19 20:40+0000\n" +"POT-Creation-Date: 2014-03-17 17:40+0100\n" +"PO-Revision-Date: 2015-07-13 16:50+0000\n" "Last-Translator: LinuxChata\n" "Language-Team: Ukrainian (http://www.transifex.com/projects/p/torproject/language/uk/)\n" "MIME-Version: 1.0\n"

1 0

[translation/whisperback] Update translations for whisperback
by translation＠torproject.org 23 Jul '15

23 Jul '15

commit ca733f4f8a2e83c13756bcf4126d74cac9656cdd Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jul 23 20:15:39 2015 +0000 Update translations for whisperback --- el/el.po | 2 +- hr_HR/hr_HR.po | 2 +- id/id.po | 7 ++++--- lv/lv.po | 48 ++++++++++++++++++++++++------------------------ te/te.po | 6 +++--- uk/uk.po | 6 +++--- 6 files changed, 36 insertions(+), 35 deletions(-) diff --git a/el/el.po b/el/el.po index 82b7aea..e3055d8 100644 --- a/el/el.po +++ b/el/el.po @@ -13,7 +13,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-03-17 17:40+0100\n" -"PO-Revision-Date: 2015-04-23 21:40+0000\n" +"PO-Revision-Date: 2015-07-21 08:21+0000\n" "Last-Translator: metamec\n" "Language-Team: Greek (http://www.transifex.com/projects/p/torproject/language/el/)\n" "MIME-Version: 1.0\n" diff --git a/hr_HR/hr_HR.po b/hr_HR/hr_HR.po index 1a949d3..56440a9 100644 --- a/hr_HR/hr_HR.po +++ b/hr_HR/hr_HR.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-03-17 17:40+0100\n" -"PO-Revision-Date: 2015-02-18 13:11+0000\n" +"PO-Revision-Date: 2015-07-22 11:05+0000\n" "Last-Translator: skiddiep <lyricaltumor(a)gmail.com>\n" "Language-Team: Croatian (Croatia) (http://www.transifex.com/projects/p/torproject/language/hr_HR/)\n" "MIME-Version: 1.0\n" diff --git a/id/id.po b/id/id.po index ebc5e33..701aa4d 100644 --- a/id/id.po +++ b/id/id.po @@ -8,6 +8,7 @@ # Fathan Imanudin <night.ataraxia(a)gmail.com>, 2014 # hermawan <hermawanadhis(a)gmail.com>, 2014 # Lucas Susanto <susantolucas(a)yahoo.com>, 2015 +# Mark Hiro <akmalgaul(a)gmail.com>, 2015 # Se7enTime <se7entime(a)tutanota.com>, 2013 # Rendiyono Wahyu Saputro <rendi.7936(a)gmail.com>, 2015 # Zamani Karmana <zamani.karmana(a)gmail.com>, 2015 @@ -16,8 +17,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-03-17 17:40+0100\n" -"PO-Revision-Date: 2015-06-29 14:52+0000\n" -"Last-Translator: Zamani Karmana <zamani.karmana(a)gmail.com>\n" +"PO-Revision-Date: 2015-07-12 19:37+0000\n" +"Last-Translator: Mark Hiro <akmalgaul(a)gmail.com>\n" "Language-Team: Indonesian (http://www.transifex.com/projects/p/torproject/language/id/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -131,7 +132,7 @@ msgstr "Pengembang Tails <tails(a)boum.org>" #: ../whisperBack/gui.py:395 msgid "translator-credits" -msgstr "" +msgstr "Kredit-Translator" #: ../whisperBack/gui.py:422 msgid "This doesn't seem to be a valid URL or OpenPGP key." diff --git a/lv/lv.po b/lv/lv.po index f6ab420..720ca8f 100644 --- a/lv/lv.po +++ b/lv/lv.po @@ -3,14 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# Ojars Balcers <ojars.balcers(a)gmail.com>, 2012 -# Ojars Balcers <ojars.balcers(a)gmail.com>, 2013 +# Ojārs Balcers <ojars.balcers(a)gmail.com>, 2012 +# Ojārs Balcers <ojars.balcers(a)gmail.com>, 2013 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" -"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" -"POT-Creation-Date: 2013-03-26 15:50+0100\n" -"PO-Revision-Date: 2013-06-24 22:52+0000\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2014-03-17 17:40+0100\n" +"PO-Revision-Date: 2015-07-20 10:45+0000\n" "Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" "Language-Team: Latvian (http://www.transifex.com/projects/p/torproject/language/lv/)\n" "MIME-Version: 1.0\n" @@ -41,40 +41,40 @@ msgid "" "/etc/whisperback/config.py, ~/.whisperback/config.py, ./config.py" msgstr "Mainīgais %s netika atrasts nevienā no konfigurācijas datnēm /etc/whisperback/config.py, ~/.whisperback/config.py, ./config.py" -#: ../whisperBack/gui.py:151 +#: ../whisperBack/gui.py:154 msgid "Unable to load a valid configuration." msgstr "Nespēj ielādēt derīgu konfigurāciju." -#: ../whisperBack/gui.py:217 +#: ../whisperBack/gui.py:220 msgid "Sending mail..." msgstr "Sūta e-pastu..." -#: ../whisperBack/gui.py:218 +#: ../whisperBack/gui.py:221 msgid "Sending mail" msgstr "Sūta e-pastu" #. pylint: disable=C0301 -#: ../whisperBack/gui.py:220 +#: ../whisperBack/gui.py:223 msgid "This could take a while..." msgstr "Tas varētu aizņemt kādu brītiņu..." -#: ../whisperBack/gui.py:234 +#: ../whisperBack/gui.py:237 msgid "The contact email adress doesn't seem valid." msgstr "Šķiet, ka saziņas e-pasta adrese nav derīga." -#: ../whisperBack/gui.py:251 +#: ../whisperBack/gui.py:254 msgid "Unable to send the mail: SMTP error." msgstr "Nespēj nosūtīt e-pastu: SMTP kļūda." -#: ../whisperBack/gui.py:253 +#: ../whisperBack/gui.py:256 msgid "Unable to connect to the server." msgstr "Nespēj izveidot savienojumu ar serveri." -#: ../whisperBack/gui.py:255 +#: ../whisperBack/gui.py:258 msgid "Unable to create or to send the mail." msgstr "Nespēj izveidot vai nosūtīt e-pastu." -#: ../whisperBack/gui.py:258 +#: ../whisperBack/gui.py:261 msgid "" "\n" "\n" @@ -83,21 +83,21 @@ msgid "" "If it does not work, you will be offered to save the bug report." msgstr "\n\nKļūdu ziņojumu nebija iespējams nosūtīt, ticami, ar tīklu saistītu kļūmju dēļ. Lūdzu, mēģiniet atkārtoti pievienoties tīklam un nospiediet SŪTĪT vēlreiz.\n\nJa tas nelīdzēs, tiks piedāvāts saglabāt kļūdu ziņojumu." -#: ../whisperBack/gui.py:271 +#: ../whisperBack/gui.py:274 msgid "Your message has been sent." msgstr "Jūsu vēstījums ir nosūtīts." -#: ../whisperBack/gui.py:278 +#: ../whisperBack/gui.py:281 msgid "An error occured during encryption." msgstr "Šifrēšanas laikā notika kļūda." -#: ../whisperBack/gui.py:298 +#: ../whisperBack/gui.py:301 #, python-format msgid "Unable to save %s." msgstr "Nespēj saglabāt %s." #. 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" @@ -107,27 +107,27 @@ msgid "" "Do you want to save the bug report to a file?" msgstr "Kļūdu ziņojumu nebija iespējams nosūtīt, ticami, ar tīklu saistītu kļūmju dēļ.\n\nAizstājējrisinājums ir saglabāt kļūdu ziņojumu datnē vai zibatmiņā jeb USB diskā, tad mēģināt nosūtīt ziņojumu mums uz %s no sava e-pasta, bet izmantojot citu sistēmu. Ievērojiet, ka tā darot kļūdu ziņojums nebūs anonīms, ja vien pats neveiksit atbilstīgus pasākumus (piem., lietot Tor ar citādi nelietojamu e-pastu).\n\nVai vēlaties saglabāt kļūdu ziņojumu datnē?" -#: ../whisperBack/gui.py:386 ../data/whisperback.ui.h:21 +#: ../whisperBack/gui.py:389 ../data/whisperback.ui.h:21 msgid "WhisperBack" msgstr "WhisperBack" -#: ../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 "Sūtīt atsauksmes šifrētā e-pastā." -#: ../whisperBack/gui.py:390 +#: ../whisperBack/gui.py:393 msgid "Copyright © 2009-2012 Tails developpers (tails(a)boum.org)" msgstr "Autortiesības © 2009-2012 Tails developpers (tails(a)boum.org)" -#: ../whisperBack/gui.py:391 +#: ../whisperBack/gui.py:394 msgid "Tails developers <tails(a)boum.org>" msgstr "Tails izstrādātāji <tails(a)boum.org>" -#: ../whisperBack/gui.py:392 +#: ../whisperBack/gui.py:395 msgid "translator-credits" msgstr "tulkotāji" -#: ../whisperBack/gui.py:419 +#: ../whisperBack/gui.py:422 msgid "This doesn't seem to be a valid URL or OpenPGP key." msgstr "Šis nešķiet esam derīgs URL vai OpenPGP atslēga." diff --git a/te/te.po b/te/te.po index dc68099..88b2cee 100644 --- a/te/te.po +++ b/te/te.po @@ -6,9 +6,9 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" -"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" -"POT-Creation-Date: 2013-08-01 15:36+0200\n" -"PO-Revision-Date: 2013-09-17 13:13+0000\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2014-03-17 17:40+0100\n" +"PO-Revision-Date: 2015-07-21 07:40+0000\n" "Last-Translator: Tor Project <support-team-private(a)lists.torproject.org>\n" "Language-Team: Telugu (http://www.transifex.com/projects/p/torproject/language/te/)\n" "MIME-Version: 1.0\n" diff --git a/uk/uk.po b/uk/uk.po index 375831a..ac8bf77 100644 --- a/uk/uk.po +++ b/uk/uk.po @@ -4,13 +4,13 @@ # # Translators: # LinuxChata, 2014 -# Lomil_da <lomil97(a)gmail.com>, 2013 +# Pinro Lomil <lomil97(a)gmail.com>, 2013 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-08-01 15:36+0200\n" -"PO-Revision-Date: 2014-02-19 20:40+0000\n" +"POT-Creation-Date: 2014-03-17 17:40+0100\n" +"PO-Revision-Date: 2015-07-13 16:50+0000\n" "Last-Translator: LinuxChata\n" "Language-Team: Ukrainian (http://www.transifex.com/projects/p/torproject/language/uk/)\n" "MIME-Version: 1.0\n"

1 0

[translation/gettor] Update translations for gettor
by translation＠torproject.org 23 Jul '15

23 Jul '15

commit e7c47bcffb67ca09083cceb8c7f4354b06184f0d Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jul 23 20:15:25 2015 +0000 Update translations for gettor --- es_CO/gettor.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/es_CO/gettor.po b/es_CO/gettor.po index 77900a3..1705ee2 100644 --- a/es_CO/gettor.po +++ b/es_CO/gettor.po @@ -3,14 +3,15 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Andres Felipe Torres <felipetorresh(a)hotmail.com>, 2015 # William Beltrán <wbeltranc(a)gmail.com>, 2015 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-01-19 13:40+0100\n" -"PO-Revision-Date: 2015-06-19 17:36+0000\n" -"Last-Translator: William Beltrán <wbeltranc(a)gmail.com>\n" +"PO-Revision-Date: 2015-07-18 19:15+0000\n" +"Last-Translator: Andres Felipe Torres <felipetorresh(a)hotmail.com>\n" "Language-Team: Spanish (Colombia) (http://www.transifex.com/projects/p/torproject/language/es_CO/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,7 +21,7 @@ msgstr "" #: lib/gettor/i18n.py:27 msgid "Hello, This is the \"GetTor\" robot." -msgstr "" +msgstr "Hola, este es el robot \"GetTor\" " #: lib/gettor/i18n.py:29 msgid "Thank you for your request."

1 0

[translation/bridgedb_completed] Update translations for bridgedb_completed
by translation＠torproject.org 23 Jul '15

23 Jul '15

commit 7d8ae1a741c98d12f7269b45fdfb30add20ffab8 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jul 23 20:15:21 2015 +0000 Update translations for bridgedb_completed --- ar/LC_MESSAGES/bridgedb.po | 44 +++++++++++++++++++++-------------------- hr_HR/LC_MESSAGES/bridgedb.po | 30 ++++++++++++++-------------- lv/LC_MESSAGES/bridgedb.po | 2 +- uk/LC_MESSAGES/bridgedb.po | 33 ++++++++++++++++--------------- 4 files changed, 56 insertions(+), 53 deletions(-) diff --git a/ar/LC_MESSAGES/bridgedb.po b/ar/LC_MESSAGES/bridgedb.po index 55be4b5..e29c1c0 100644 --- a/ar/LC_MESSAGES/bridgedb.po +++ b/ar/LC_MESSAGES/bridgedb.po @@ -3,6 +3,7 @@ # This file is distributed under the same license as the BridgeDB project. # # Translators: +# A. Hassan <a_hassan(a)outlook.com>, 2015 # Ahmad Gharbeia <gharbeia(a)gmail.com>, 2014 # allamiro <allamiro(a)gmail.com>, 2011 # Ash <ali.shatrieh(a)gmail.com>, 2014 @@ -12,6 +13,7 @@ # 0xidz <ghoucine(a)gmail.com>, 2014 # KACIMI LAMINE <k_lamine27(a)yahoo.fr>, 2015 # محمد الحرقان <malham1(a)gmail.com>, 2011 +# Nudroid A <Nudroid(a)outlook.com>, 2015 # Sherief Alaa <sheriefalaa.w(a)gmail.com>, 2013-2014 # Sherief Alaa <sheriefalaa.w(a)gmail.com>, 2013 # Valetudinarian <themcnx(a)gmail.com>, 2014 @@ -20,10 +22,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: 2015-02-03 03:24+0000\n" -"PO-Revision-Date: 2015-04-06 22:51+0000\n" -"Last-Translator: debo debo <a.adeebo(a)yahoo.com>\n" +"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'POT-Creation-Date: 2015-03-19 22:13+0000\n" +"PO-Revision-Date: 2015-07-22 16:42+0000\n" +"Last-Translator: A. Hassan <a_hassan(a)outlook.com>\n" "Language-Team: Arabic (http://www.transifex.com/projects/p/torproject/language/ar/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -43,7 +44,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 "عذراً! حدث خطأ في طلبك." @@ -214,26 +215,27 @@ msgstr "كيف تبدأ باستعمال الـbridges" #: 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 "لادخال الـbridges في Tor Browser، قم بأتباع التعليمات علي %s صفحة التحميل الخاصة بـTor Browser %s" +"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 "لتتمكن من إدخال جسور إلى المتصفح ، أذهب إلى %s صفحة تحميلات المتصفح %s وأتبع التعليمات المذكورة بها لتحميل وبدء المتصفح " #. 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" "the wizard until it asks:" msgstr "عند ظهور شاشة 'إعدادات شبكة Tor'، اضغط علي 'تكوين' و اتبع التعليمات حتي تسألك عن:" #. 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" "to the Tor network?" msgstr "هل يقوم مزود خدمة الإنترنت (ISP) الخاص بك بمنع الاتصالات بشبكة Tor أو مراقبتها بطريقة أخرى؟" #. 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\n" @@ -241,29 +243,29 @@ msgid "" "button in the 'Tor Network Settings' wizard for further assistance." msgstr "اختار 'نعم' ثم 'Next' ثم قم بلصق الـbridges الجديدة في المربع. ثم اختار 'اتصال' و اذا واجهتك مشكلة اضغط علي 'مساعدة' في نافذة اعداد Tor." -#: 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 "أطلب bridges عادية." -#: lib/bridgedb/strings.py:146 +#: lib/bridgedb/strings.py:147 msgid "Request IPv6 bridges." msgstr "أطلب IPv6 bridges" #. 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 "أطلب Pluggable Transport بـ TYPE" #. 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 "احصل على نسخة من مفتاح GnuPG العام الخاص بـBridgeDB" @@ -285,15 +287,15 @@ msgstr "اتصل بنا" #: lib/bridgedb/templates/bridges.html:81 msgid "Select All" -msgstr "اختر الكل" +msgstr "حدد البرامج" #: lib/bridgedb/templates/bridges.html:87 msgid "Show QRCode" -msgstr "اظهار ال QRكود" +msgstr "أظهر الرمز المربّع" #: lib/bridgedb/templates/bridges.html:100 msgid "QRCode for your bridge lines" -msgstr "كود الQR التابع لخطوط جسرك" +msgstr "الرمز المربّع التابع لخطوط جسرك" #. TRANSLATORS: Please translate this into some silly way to say #. "There was a problem!" in your language. For example, @@ -306,13 +308,13 @@ msgstr "للأسف لم يتم العثور علي ما طلبت" #: lib/bridgedb/templates/bridges.html:116 msgid "It seems there was an error getting your QRCode." -msgstr "يبدو أن هناك خطأ في الحصول على الQRكود الخاص بك." +msgstr "يبدو أن هناك خطأ في الحصول على الرمز المربّع الخاص بك." #: 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 "الQRكود هذا يحتوي على خطوط جسرك .امسح هذا الكود بقارئ الQR لنسخ خطوط جسرك الى الهاتف الجوال او أجهزة اخرى." +msgstr "هذا الرمز المربّع يحتوي على خطوط جسرك .اقرأ الرمز بقارئ الرموز المربعة لنسخ خطوط جسرك الى الهاتف الجوال او أجهزة اخرى." #: lib/bridgedb/templates/bridges.html:181 msgid "There currently aren't any bridges available..." diff --git a/hr_HR/LC_MESSAGES/bridgedb.po b/hr_HR/LC_MESSAGES/bridgedb.po index 3d6ccbf..e75971a 100644 --- a/hr_HR/LC_MESSAGES/bridgedb.po +++ b/hr_HR/LC_MESSAGES/bridgedb.po @@ -11,9 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" -"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" -"POT-Creation-Date: 2015-02-03 03:24+0000\n" -"PO-Revision-Date: 2015-02-16 12:31+0000\n" +"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'POT-Creation-Date: 2015-03-19 22:13+0000\n" +"PO-Revision-Date: 2015-07-22 11:41+0000\n" "Last-Translator: skiddiep <lyricaltumor(a)gmail.com>\n" "Language-Team: Croatian (Croatia) (http://www.transifex.com/projects/p/torproject/language/hr_HR/)\n" "MIME-Version: 1.0\n" @@ -34,7 +33,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 "Oprostite! Nešto je pošlo po krivu s Vašim zahtjevom." @@ -205,26 +204,27 @@ msgstr "Kako početi koristite Vaše mostove" #: 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 "Kako bi unijeli mostove u Tor Browser, slijedite upute na %s Tor\nBrowser download stranici %s da bi pokrenuli 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 "Kako bi unijeli mostove u Tor Preglednik, prvo odite na %s Tor Preglednik stranicu\nza preuzimanje %s te zatim slijedite upute za preuzimanje i pokretanje\nTor Preglednika." #. 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" "the wizard until it asks:" msgstr "Kad iskoči prozorčić 'Tor Mrežne Postavke', kliknite 'Konfiguriraj' i slijedite\nčarobnjaka dok ne upita:" #. 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" "to the Tor network?" msgstr "Blokira li vaš Internet Service Provider (ISP - pružatelj internet usluge) ili ikako drugačije cenzurira veze\ns Tor mrežom?" #. 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\n" @@ -232,29 +232,29 @@ msgid "" "button in the 'Tor Network Settings' wizard for further assistance." msgstr "Odaberite 'Da', a zatim 'Sljedeće'. Da bi konfigurirali vaše nove mostove, kopirajte i \nzalijepite linije mostova u kućicu za unos teksta. Na kraju, kliknite 'Spoji se', i \nsve bi trebalo biti u redu! Ako naiđete na probleme, probajte kliknuti dugme 'Pomoć'\nu 'Tor Mrežne Postavke' čarobnjaku za daljnju pomoć." -#: lib/bridgedb/strings.py:141 +#: lib/bridgedb/strings.py:142 msgid "Displays this message." msgstr "Prikazuje ovu poruku." #. 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 "Zatraži dobre, stare mostove." -#: lib/bridgedb/strings.py:146 +#: lib/bridgedb/strings.py:147 msgid "Request IPv6 bridges." msgstr "Zatraži IPv6 mostove." #. 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 "Zatraži Pluggable Transport po TYPE." #. 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 "Dobij kopiju BridgeDB javnog GnuPG ključa." diff --git a/lv/LC_MESSAGES/bridgedb.po b/lv/LC_MESSAGES/bridgedb.po index f88ed28..f437b31 100644 --- a/lv/LC_MESSAGES/bridgedb.po +++ b/lv/LC_MESSAGES/bridgedb.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'POT-Creation-Date: 2015-03-19 22:13+0000\n" -"PO-Revision-Date: 2015-04-19 21:21+0000\n" +"PO-Revision-Date: 2015-07-20 10:46+0000\n" "Last-Translator: Ojārs Balcers <ojars.balcers(a)gmail.com>\n" "Language-Team: Latvian (http://www.transifex.com/projects/p/torproject/language/lv/)\n" "MIME-Version: 1.0\n" diff --git a/uk/LC_MESSAGES/bridgedb.po b/uk/LC_MESSAGES/bridgedb.po index 3d5a428..5a99cbc 100644 --- a/uk/LC_MESSAGES/bridgedb.po +++ b/uk/LC_MESSAGES/bridgedb.po @@ -7,14 +7,14 @@ # LinuxChata, 2014-2015 # Oleksii Golub <sclub2018(a)yandex.ua>, 2015 # Oleksii Golub <sclub2018(a)yandex.ua>, 2013 +# Yasha <yasha88888(a)hotmail.com>, 2015 # Андрій Бандура <andriykopanytsia(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: 2015-02-03 03:24+0000\n" -"PO-Revision-Date: 2015-03-20 23:00+0000\n" -"Last-Translator: LinuxChata\n" +"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'POT-Creation-Date: 2015-03-19 22:13+0000\n" +"PO-Revision-Date: 2015-07-13 17:46+0000\n" +"Last-Translator: Yasha <yasha88888(a)hotmail.com>\n" "Language-Team: Ukrainian (http://www.transifex.com/projects/p/torproject/language/uk/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -34,7 +34,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,26 +205,27 @@ 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." -msgstr "Для введення bridges у браузері Tor, дотримуйтесь інструкцій %s на сторінці \nзавантаження браузера Tor %s для запуску браузера Tor." +"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 "Щоб додати ретранслятори у Tor Browser, спочатку ідіть на %s сторінку завантаження Tor Browser %s а потім слідуйте інструкціям для скачування і запуску Tor Browser." #. 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" "the wizard until it asks:" msgstr "Коли діалог \"Налаштування мережі Tor\" відкриється, натисніть \"Налаштувати\" і дотримуйтесь\nпідказкам майстра, допоки він не запросить:" #. 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" "to the Tor network?" msgstr "Вашій інтернет-провайдер (ISP) блокує або цензурує з'єднання\nдо мережі Tor?" #. 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\n" @@ -232,29 +233,29 @@ msgid "" "button in the 'Tor Network Settings' wizard for further assistance." msgstr "Виберіть \"Так\", а потім натисніть \"Далі\". Для налаштування нових bridges, скопіюйте і\nвставте лінії bridge у поле для введення тексту. Потім, натисніть 'Підключатися', і\nвсе повинно працювати! Якщо у Вас виникли проблеми, спробуйте натиснути \"Довідка\" \nв майстрові \"Мережеві параметри Tor' для отримання додаткової допомоги." -#: 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 "Запит на отримання vanilla bridges." -#: lib/bridgedb/strings.py:146 +#: lib/bridgedb/strings.py:147 msgid "Request IPv6 bridges." msgstr "Запит на отримання IPv6 bridges." #. 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 "Запит на отримання Pluggable Transport по TYPE." #. 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 "Отримати копію відкритого GnuPG ключа для BridgeDB."

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 23 Jul '15

23 Jul '15

commit ed4788b8bee6ced6cec4fe4e304df8b4ae9f49e2 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jul 23 20:15:12 2015 +0000 Update translations for bridgedb --- ar/LC_MESSAGES/bridgedb.po | 9 +++++---- el/LC_MESSAGES/bridgedb.po | 2 +- es_AR/LC_MESSAGES/bridgedb.po | 43 +++++++++++++++++++++-------------------- es_CO/LC_MESSAGES/bridgedb.po | 15 +++++++------- eu/LC_MESSAGES/bridgedb.po | 11 ++++++----- hr_HR/LC_MESSAGES/bridgedb.po | 6 +++--- lv/LC_MESSAGES/bridgedb.po | 2 +- uk/LC_MESSAGES/bridgedb.po | 7 ++++--- 8 files changed, 50 insertions(+), 45 deletions(-) diff --git a/ar/LC_MESSAGES/bridgedb.po b/ar/LC_MESSAGES/bridgedb.po index 5445545..e29c1c0 100644 --- a/ar/LC_MESSAGES/bridgedb.po +++ b/ar/LC_MESSAGES/bridgedb.po @@ -3,6 +3,7 @@ # This file is distributed under the same license as the BridgeDB project. # # Translators: +# A. Hassan <a_hassan(a)outlook.com>, 2015 # Ahmad Gharbeia <gharbeia(a)gmail.com>, 2014 # allamiro <allamiro(a)gmail.com>, 2011 # Ash <ali.shatrieh(a)gmail.com>, 2014 @@ -22,8 +23,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'POT-Creation-Date: 2015-03-19 22:13+0000\n" -"PO-Revision-Date: 2015-06-16 15:44+0000\n" -"Last-Translator: Nudroid A <Nudroid(a)outlook.com>\n" +"PO-Revision-Date: 2015-07-22 16:42+0000\n" +"Last-Translator: A. Hassan <a_hassan(a)outlook.com>\n" "Language-Team: Arabic (http://www.transifex.com/projects/p/torproject/language/ar/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -217,7 +218,7 @@ msgid "" "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 "" +msgstr "لتتمكن من إدخال جسور إلى المتصفح ، أذهب إلى %s صفحة تحميلات المتصفح %s وأتبع التعليمات المذكورة بها لتحميل وبدء المتصفح " #. TRANSLATORS: Please DO NOT translate "Tor". #: lib/bridgedb/strings.py:126 @@ -286,7 +287,7 @@ msgstr "اتصل بنا" #: lib/bridgedb/templates/bridges.html:81 msgid "Select All" -msgstr "اختر الكل" +msgstr "حدد البرامج" #: lib/bridgedb/templates/bridges.html:87 msgid "Show QRCode" diff --git a/el/LC_MESSAGES/bridgedb.po b/el/LC_MESSAGES/bridgedb.po index 0f451a8..755ed18 100644 --- a/el/LC_MESSAGES/bridgedb.po +++ b/el/LC_MESSAGES/bridgedb.po @@ -16,7 +16,7 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'POT-Creation-Date: 2015-03-19 22:13+0000\n" -"PO-Revision-Date: 2015-06-09 21:11+0000\n" +"PO-Revision-Date: 2015-07-21 08:23+0000\n" "Last-Translator: LOUKAS SKOUROLIAKOS\n" "Language-Team: Greek (http://www.transifex.com/projects/p/torproject/language/el/)\n" "MIME-Version: 1.0\n" diff --git a/es_AR/LC_MESSAGES/bridgedb.po b/es_AR/LC_MESSAGES/bridgedb.po index 0b623e3..15fbab7 100644 --- a/es_AR/LC_MESSAGES/bridgedb.po +++ b/es_AR/LC_MESSAGES/bridgedb.po @@ -5,14 +5,15 @@ # Translators: # cametiope <aldohcasa(a)hotmail.com>, 2014 # angelica14 <angmarmt13(a)gmail.com>, 2014 +# Daniel Gray, 2015 # José Fabián <ar.jfabian+transifex(a)gmail.com>, 2014 # ezemelano <melanoeze(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…'POT-Creation-Date: 2015-03-19 22:13+0000\n" -"PO-Revision-Date: 2015-04-19 08:23+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2015-07-16 02:59+0000\n" +"Last-Translator: Daniel Gray\n" "Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/torproject/language/es_AR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -101,7 +102,7 @@ msgid "" "difficult for anyone watching your internet traffic to determine that you are\n" "using Tor.\n" "\n" -msgstr "" +msgstr "BridgeDB puede proveerle puentes de red con varios %stipos de Transportes Conectables%s, que pueden ayudar a ofuscar sus conexiones a la Red de Tor, haciendo más difícil que alguien que observe su tráfico de internet determine que usted está usando Tor.\n" #. TRANSLATORS: Please DO NOT translate "Pluggable Transports". #: lib/bridgedb/strings.py:54 @@ -109,7 +110,7 @@ msgid "" "Some bridges with IPv6 addresses are also available, though some Pluggable\n" "Transports aren't IPv6 compatible.\n" "\n" -msgstr "" +msgstr "Algunos puentes de red con direcciones IPv6 también están disponibles, aunque algunos Transportes Conectables no son compatibles con IPv6.\n" #. TRANSLATORS: Please DO NOT translate "BridgeDB". #. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring, @@ -123,7 +124,7 @@ msgid "" "Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n" "help to circumvent internet censorship in many cases.\n" "\n" -msgstr "" +msgstr "Adicionalmente, BridgeDB tiene varios puentes de red comunes y corrientes %s sin Transportes Conectables %s que tal vez no suenen tan genial, pero aún pueden ayudar a burlar la censura de internet en muchos casos.\n" #: lib/bridgedb/strings.py:76 msgid "What are bridges?" @@ -132,7 +133,7 @@ msgstr "¿Qué son los puentes de red?" #: lib/bridgedb/strings.py:77 #, python-format msgid "%s Bridges %s are Tor relays that help you circumvent censorship." -msgstr "" +msgstr "%s Los Puentes de Red %s son nodos de retransmisión de Tor que le ayudan a evitar la censura." #: lib/bridgedb/strings.py:82 msgid "I need an alternative way of getting bridges!" @@ -144,7 +145,7 @@ msgid "" "Another way to get bridges is to send an email to %s. Please note that you must\n" "send the email using an address from one of the following email providers:\n" "%s, %s or %s." -msgstr "" +msgstr "Otra manera de obtener puentes de red es enviando un correo electrónico a %s. Por favor note que debe enviar el correo usando una dirección de uno de los siguientes proveedores de correo electrónico: %s, %s o %s." #: lib/bridgedb/strings.py:90 msgid "My bridges don't work! I need help!" @@ -164,19 +165,19 @@ msgid "" "Try including as much info about your case as you can, including the list of\n" "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n" "and any messages which Tor gave out, etc." -msgstr "" +msgstr "Intente incluir toda la información posible sobre su caso, incluyendo la lista de puentes de red y Transportes Conectables que intentó usar, la versión de su Navegador Tor, y cualquier mensaje que Tor haya presentado, etc." #: lib/bridgedb/strings.py:103 msgid "Here are your bridge lines:" -msgstr "" +msgstr "Aquí están sus líneas de puentes de red:" #: lib/bridgedb/strings.py:104 msgid "Get Bridges!" -msgstr "" +msgstr "Obtenga Puentes de Red!" #: lib/bridgedb/strings.py:108 msgid "Please select options for bridge type:" -msgstr "" +msgstr "Por favor seleccione opciones para su tipo de puente de red:" #: lib/bridgedb/strings.py:109 msgid "Do you need IPv6 addresses?" @@ -206,21 +207,21 @@ msgid "" "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 "" +msgstr "Para introducir puentes de red a su Navegador Tor, primeramente vaya a %s la página de descarga del Navegador Tor %s y siga las instrucciones ahí para descargar y ejecutar el Navegador Tor." #. TRANSLATORS: Please DO NOT translate "Tor". #: lib/bridgedb/strings.py:126 msgid "" "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n" "the wizard until it asks:" -msgstr "" +msgstr "Cuando el diálogo de 'Configuración de Red de Tor' aparezca, haga click en 'Configurar' y continúe con los pasos del asistente hasta que pregunte:" #. TRANSLATORS: Please DO NOT translate "Tor". #: lib/bridgedb/strings.py:130 msgid "" "Does your Internet Service Provider (ISP) block or otherwise censor connections\n" "to the Tor network?" -msgstr "" +msgstr "¿Su Proveedor de Servicios de Internet (ISP) bloquea o de algún modo censura conexiones a la red Tor?" #. TRANSLATORS: Please DO NOT translate "Tor". #: lib/bridgedb/strings.py:134 @@ -229,7 +230,7 @@ msgid "" "paste the bridge lines into the text input box. Finally, click 'Connect', and\n" "you should be good to go! If you experience trouble, try clicking the 'Help'\n" "button in the 'Tor Network Settings' wizard for further assistance." -msgstr "" +msgstr "Seleccione 'Sí' y luego haga click en 'Siguiente'. Para configurar sus nuevos puentes, copie y pegue las líneas de sus puentes de red al cuadro de texto. Finalmente, haga click en 'Conectar' y, ¡eso debería de ser todo! Si experimenta algún problema, intenté hacer click en el botón 'Ayuda' del asistente de 'Configuración de la Red Tor' para recibir más asistencia." #: lib/bridgedb/strings.py:142 msgid "Displays this message." @@ -240,7 +241,7 @@ msgstr "Mostrar el mensaje." #. "plain-ol'-vanilla" bridges. #: lib/bridgedb/strings.py:146 msgid "Request vanilla bridges." -msgstr "" +msgstr "Pedir puentes de red normales." #: lib/bridgedb/strings.py:147 msgid "Request IPv6 bridges." @@ -249,13 +250,13 @@ msgstr "Solicitar puentes de red IPv6." #. TRANSLATORS: Please DO NOT translate the word the word "TYPE". #: lib/bridgedb/strings.py:149 msgid "Request a Pluggable Transport by TYPE." -msgstr "" +msgstr "Pedir un Transporte Conectable por TIPO." #. TRANSLATORS: Please DO NOT translate "BridgeDB". #. TRANSLATORS: Please DO NOT translate "GnuPG". #: lib/bridgedb/strings.py:152 msgid "Get a copy of BridgeDB's public GnuPG key." -msgstr "" +msgstr "Obtener una copia de la llave pública GnuPG de BridgeDB." #: lib/bridgedb/templates/base.html:89 msgid "Report a Bug" @@ -275,15 +276,15 @@ msgstr "Contacto" #: lib/bridgedb/templates/bridges.html:81 msgid "Select All" -msgstr "" +msgstr "Seleccionar Todos" #: lib/bridgedb/templates/bridges.html:87 msgid "Show QRCode" -msgstr "" +msgstr "Mostrar Código QR" #: lib/bridgedb/templates/bridges.html:100 msgid "QRCode for your bridge lines" -msgstr "" +msgstr "Código QR para sus líneas de puentes de red" #. TRANSLATORS: Please translate this into some silly way to say #. "There was a problem!" in your language. For example, diff --git a/es_CO/LC_MESSAGES/bridgedb.po b/es_CO/LC_MESSAGES/bridgedb.po index 165f34c..87e90bd 100644 --- a/es_CO/LC_MESSAGES/bridgedb.po +++ b/es_CO/LC_MESSAGES/bridgedb.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the BridgeDB project. # # Translators: +# Andres Felipe Torres <felipetorresh(a)hotmail.com>, 2015 # William Beltrán <wbeltranc(a)gmail.com>, 2015 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'POT-Creation-Date: 2015-03-19 22:13+0000\n" -"PO-Revision-Date: 2015-06-19 17:36+0000\n" -"Last-Translator: William Beltrán <wbeltranc(a)gmail.com>\n" +"PO-Revision-Date: 2015-07-18 19:15+0000\n" +"Last-Translator: Andres Felipe Torres <felipetorresh(a)hotmail.com>\n" "Language-Team: Spanish (Colombia) (http://www.transifex.com/projects/p/torproject/language/es_CO/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -39,7 +40,7 @@ msgstr "[Este es un mensaje automatizado, por favor no responda.]" #: lib/bridgedb/strings.py:20 msgid "Here are your bridges:" -msgstr "" +msgstr "Aquí están tus puentes. " #: lib/bridgedb/strings.py:22 #, python-format @@ -51,12 +52,12 @@ msgstr "" #: lib/bridgedb/strings.py:25 msgid "" "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)" -msgstr "" +msgstr "COMANDOs (combina COMANDOs para especificar opciones múltiples simultáneamente) " #. TRANSLATORS: Please DO NOT translate the word "BridgeDB". #: lib/bridgedb/strings.py:28 msgid "Welcome to BridgeDB!" -msgstr "" +msgstr "Bienvenido a BrigdeDB! " #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE". #: lib/bridgedb/strings.py:30 @@ -74,7 +75,7 @@ msgstr "" #: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100 msgid "Public Keys" -msgstr "" +msgstr "Llaves publicas " #. TRANSLATORS: This string will end up saying something like: #. "This email was generated with rainbows, unicorns, and sparkles @@ -361,7 +362,7 @@ msgstr "No" #: lib/bridgedb/templates/options.html:89 msgid "none" -msgstr "" +msgstr "Ninguno" #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the #. beginning of words are present in your final translation. Thanks! diff --git a/eu/LC_MESSAGES/bridgedb.po b/eu/LC_MESSAGES/bridgedb.po index b76365f..fa14576 100644 --- a/eu/LC_MESSAGES/bridgedb.po +++ b/eu/LC_MESSAGES/bridgedb.po @@ -7,12 +7,13 @@ # Antxon Baldarra <baldarra(a)bitmessage.ch>, 2011, 2012 # Egoitz Rodriguez Obieta <egoitzro(a)gmail.com>, 2014 # Eneko, 2015 +# javikitz <javikitz(a)protonmail.com>, 2015 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'POT-Creation-Date: 2015-03-19 22:13+0000\n" -"PO-Revision-Date: 2015-06-27 16:07+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2015-07-12 15:59+0000\n" +"Last-Translator: javikitz <javikitz(a)protonmail.com>\n" "Language-Team: Basque (http://www.transifex.com/projects/p/torproject/language/eu/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -189,7 +190,7 @@ msgstr "%s behar duzu?" #: lib/bridgedb/strings.py:114 msgid "Your browser is not displaying images properly." -msgstr "" +msgstr "Zure nabigatzaileak ez ditu irudiak behar bezala erakusten." #: lib/bridgedb/strings.py:115 msgid "Enter the characters from the image above..." @@ -271,7 +272,7 @@ msgstr "" #: lib/bridgedb/templates/base.html:98 msgid "Contact" -msgstr "" +msgstr "Kontaktuan jarri." #: lib/bridgedb/templates/bridges.html:81 msgid "Select All" @@ -279,7 +280,7 @@ msgstr "Hautatu dena" #: lib/bridgedb/templates/bridges.html:87 msgid "Show QRCode" -msgstr "" +msgstr "Erakutsi QR Kodea" #: lib/bridgedb/templates/bridges.html:100 msgid "QRCode for your bridge lines" diff --git a/hr_HR/LC_MESSAGES/bridgedb.po b/hr_HR/LC_MESSAGES/bridgedb.po index 27ae811..e75971a 100644 --- a/hr_HR/LC_MESSAGES/bridgedb.po +++ b/hr_HR/LC_MESSAGES/bridgedb.po @@ -12,8 +12,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'POT-Creation-Date: 2015-03-19 22:13+0000\n" -"PO-Revision-Date: 2015-04-19 08:23+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2015-07-22 11:41+0000\n" +"Last-Translator: skiddiep <lyricaltumor(a)gmail.com>\n" "Language-Team: Croatian (Croatia) (http://www.transifex.com/projects/p/torproject/language/hr_HR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -207,7 +207,7 @@ msgid "" "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 "" +msgstr "Kako bi unijeli mostove u Tor Preglednik, prvo odite na %s Tor Preglednik stranicu\nza preuzimanje %s te zatim slijedite upute za preuzimanje i pokretanje\nTor Preglednika." #. TRANSLATORS: Please DO NOT translate "Tor". #: lib/bridgedb/strings.py:126 diff --git a/lv/LC_MESSAGES/bridgedb.po b/lv/LC_MESSAGES/bridgedb.po index f88ed28..f437b31 100644 --- a/lv/LC_MESSAGES/bridgedb.po +++ b/lv/LC_MESSAGES/bridgedb.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'POT-Creation-Date: 2015-03-19 22:13+0000\n" -"PO-Revision-Date: 2015-04-19 21:21+0000\n" +"PO-Revision-Date: 2015-07-20 10:46+0000\n" "Last-Translator: Ojārs Balcers <ojars.balcers(a)gmail.com>\n" "Language-Team: Latvian (http://www.transifex.com/projects/p/torproject/language/lv/)\n" "MIME-Version: 1.0\n" diff --git a/uk/LC_MESSAGES/bridgedb.po b/uk/LC_MESSAGES/bridgedb.po index 2d29529..5a99cbc 100644 --- a/uk/LC_MESSAGES/bridgedb.po +++ b/uk/LC_MESSAGES/bridgedb.po @@ -7,13 +7,14 @@ # LinuxChata, 2014-2015 # Oleksii Golub <sclub2018(a)yandex.ua>, 2015 # Oleksii Golub <sclub2018(a)yandex.ua>, 2013 +# Yasha <yasha88888(a)hotmail.com>, 2015 # Андрій Бандура <andriykopanytsia(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…'POT-Creation-Date: 2015-03-19 22:13+0000\n" -"PO-Revision-Date: 2015-06-27 16:37+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2015-07-13 17:46+0000\n" +"Last-Translator: Yasha <yasha88888(a)hotmail.com>\n" "Language-Team: Ukrainian (http://www.transifex.com/projects/p/torproject/language/uk/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -207,7 +208,7 @@ msgid "" "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 "" +msgstr "Щоб додати ретранслятори у Tor Browser, спочатку ідіть на %s сторінку завантаження Tor Browser %s а потім слідуйте інструкціям для скачування і запуску Tor Browser." #. TRANSLATORS: Please DO NOT translate "Tor". #: lib/bridgedb/strings.py:126

1 0

[tor/master] Bump version (and explain how)
by nickm＠torproject.org 23 Jul '15

23 Jul '15

commit a8accd55f251b9be5da7a80894e6d76b6496e1ab Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 23 13:48:13 2015 -0400 Bump version (and explain how) --- configure.ac | 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- doc/HACKING | 4 ++++ src/win32/orconfig.h | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 214b7e6..b57b433 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ dnl Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson dnl Copyright (c) 2007-2015, The Tor Project, Inc. dnl See LICENSE for licensing information -AC_INIT([tor],[0.2.7.1-alpha-dev]) +AC_INIT([tor],[0.2.7.2-alpha]) AC_CONFIG_SRCDIR([src/or/main.c]) AC_CONFIG_MACRO_DIR([m4]) AM_INIT_AUTOMAKE diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in index 928aced..3eaff6b 100644 --- a/contrib/win32build/tor-mingw.nsi.in +++ b/contrib/win32build/tor-mingw.nsi.in @@ -8,7 +8,7 @@ !include "LogicLib.nsh" !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.2.7.1-alpha-dev" +!define VERSION "0.2.7.2-alpha" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/" !define LICENSE "LICENSE" diff --git a/doc/HACKING b/doc/HACKING index d94e0a9..6a484c9 100644 --- a/doc/HACKING +++ b/doc/HACKING @@ -572,6 +572,10 @@ git branches too. scripts/maint/updateVersions.pl to update version numbers in other places, and commit. Then merge maint-0.2.x into release-0.2.x. + (NOTE: TO bump the version number, edit configure.ac, and then run + either make, or 'perl scripts/maint/updateVersions.pl', depending on + your version.) + 5) Make dist, put the tarball up somewhere, and tell #tor about it. Wait a while to see if anybody has problems building it. Try to get Sebastian or somebody to try building it on Windows. diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index af3c5f5..6bb0cbc 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -232,7 +232,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.2.7.1-alpha-dev" +#define VERSION "0.2.7.2-alpha"

1 0

[torspec/master] Add new prop 249-large-create-cells.txt. Fix date on 248.
by nickm＠torproject.org 23 Jul '15

23 Jul '15

commit 69f0faec555d3c7d627aa1de73dafee8f8d63f84 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 23 12:19:34 2015 -0400 Add new prop 249-large-create-cells.txt. Fix date on 248. --- proposals/000-index.txt | 2 + proposals/248-removing-rsa-identities.txt | 2 +- proposals/249-large-create-cells.txt | 162 +++++++++++++++++++++++++++++ 3 files changed, 165 insertions(+), 1 deletion(-) diff --git a/proposals/000-index.txt b/proposals/000-index.txt index 2a63b04..ea312f4 100644 --- a/proposals/000-index.txt +++ b/proposals/000-index.txt @@ -169,6 +169,7 @@ Proposals by number: 246 Merging Hidden Service Directories and Introduction Points [OPEN] 247 Defending Against Guard Discovery Attacks using Vanguards [DRAFT] 248 Remove all RSA identity keys [DRAFT] +249 Allow CREATE cells with >505 bytes of handshake data [DRAFT] Proposals by status: @@ -198,6 +199,7 @@ Proposals by status: 245 Deprecating and removing the TAP circuit extension protocol 247 Defending Against Guard Discovery Attacks using Vanguards 248 Remove all RSA identity keys + 249 Allow CREATE cells with >505 bytes of handshake data NEEDS-REVISION: 131 Help users to verify they are using Tor 190 Bridge Client Authorization Based on a Shared Secret diff --git a/proposals/248-removing-rsa-identities.txt b/proposals/248-removing-rsa-identities.txt index 81bad3f..f949538 100644 --- a/proposals/248-removing-rsa-identities.txt +++ b/proposals/248-removing-rsa-identities.txt @@ -1,7 +1,7 @@ Filename: 248-removing-rsa-identities.txt Title: Remove all RSA identity keys Authors: Nick Mathewson -Created: 15 August 2015 +Created: 15 July 2015 Status: Draft 1. Summary diff --git a/proposals/249-large-create-cells.txt b/proposals/249-large-create-cells.txt new file mode 100644 index 0000000..793ea92 --- /dev/null +++ b/proposals/249-large-create-cells.txt @@ -0,0 +1,162 @@ +Filename: 249-large-create-cells.txt +Title: Allow CREATE cells with >505 bytes of handshake data +Authors: Nick Mathewson +Created: 23 July 15 +Status: Draft + +1. Summary + + There have been multiple proposals over the last year or so for + adding post-quantum cryptography to Tor's circuit extension + handshakes. (See for example https://eprint.iacr.org/2015/008 or + https://eprint.iacr.org/2015/287 .) These proposals share the property + that the request and reply for a handshake message do not fit in a + single RELAY cell. + + In this proposal I describe a new CREATE2V cell for handshakes that + don't fit in a 505-byte CREATE2 cell's HDATA section, and a means for + fragmenting these CREATE2V cells across multiple EXTEND2 cells. I + also discuss replies, migration, and DoS-mitigation strategies. + +2. CREATE2V and CREATED2V + + First, we add two variable-width cell types, CREATE2V and CREATED2V. + + These cell formats are nearly the same as CREATE2 and CREATED2. (Here + specified using Trunnel.) + + struct create2v_cell_body { + /* Handshake type */ + u16 htype; + /* Length of handshake data */ + u16 hlen; + /* Handshake data */ + u8 hdata[hlen]; + /* Padding data to be ignored */ + u8 ignored[]; + }; + + struct created2v_cell_body { + /* Handshake replay length */ + u16 hlen; + /* Handshake reply data */ + u8 hdata[hlen]; + /* Padding data to be ignored */ + u8 ignored[]; + }; + + The 'ignored' fields, which extend to the end of the variable-length + cells, are reserved. Initiators MAY set them to any length, but MUST + fill them with zero-valued bytes. Responders MUST ignore them, + regardless of what they contain. When a CREATE2V cell is generated + in response to a set of EXTEND2 cells, these fields are set by the + relay that receives the EXTEND2 cells. + + (The purpose of the 'ignored' fields here is future-proofing and + padding.) + +3. Fragmented EXTEND2 cells + + Without changing the current EXTEND2 cell format, we change its + semantics: + + If the 'HLEN' field in an EXTEND2 cell describes a handshake data + section that would be too long to fit in the EXTEND2 cell's payload, + the handshake data of the EXTEND2 cell is to be continued in one or + more subsequent EXTEND2 cells. These subsequent cells MUST have zero + link specifiers, handshake type 0xFFFF, and handshake data length + field set to zero. + + Similarly, if the 'HLEN' field in an EXTENDED2 cell would be too long + to fit into the EXTENDED2 cell's payload, the handshake reply data of + the EXTENDED2 cell is to be continued in one or more subsequent + EXTENDED2 cells. These subsequent cells must have the handshake data + length field set to zero. + + These cells must be sent on the circuit with no intervening cells. + If any intervening cells are received, the receiver SHOULD destroy + the circuit. + +4. Example + + So for example, if we are a client, and we need to send a 2000-byte + handshake to extend a circuit from relay X to relay Y, we might send + cells as follows: + + EXTEND2 { + nspec = 2; + { node ID for Y, taking 22 bytes. } + { node address for Y, taking 8 bytes } + htype = {whatever the handshake type is.} + hlen = 2000 + hdata = { the first 462 bytes of the handshake } + } + EXTEND2 { + nspec = 0; + htype = 0xffff; + hlen = 0; + hdata = { the next 492 bytes of the handshake } + } + EXTEND2 { + nspec = 0; + htype = 0xffff; + hlen = 0; + hdata = { the next 492 bytes of the handshake } + } + EXTEND2 { + nspec = 0; + htype = 0xffff; + hlen = 0; + hdata = { the next 492 bytes of the handshake } + } + EXTEND2 { + nspec = 0; + htype = 0xffff; + hlen = 0; + hdata = { the final 62 bytes of the handshake } + } + + Upon receiving this last cell, the relay X would send a create2v cell + to Y, containing the entire handshake. + +5. Migration + + We can and should implement the EXTEND2 fragmentation feature before + we implement anything that uses it. If we can get it widely deployed + before it's needed, we can use the new handshake types whenever both + of the involved relays support this proposal. + + Clients MUST NOT sent fragmented EXTEND2 cells to relays that don't + support them, since this would cause them to close the circuit. + + Relays MAY send CREATE2V and CREATED2V cells to relays that don't + support them, since unrecognized cell types are ignored. + +6. Resource management issues + + This feature requires relays and clients to buffer EXTEND2 cell + bodies for incoming cells until the entire CREATE2V/CREATED2V body + has arrived. To avoid memory-related denial-of-service attacks, + the buffers allocated for this data need to be counted against the + total data usage of the circuit. + + + +Appendix A. A rejected idea for migration + + In section 5 above, I gave up on the idea of allowing relay A to + extend to relay B with a large CREATE cell when relay A does not + support this proposal. + + There are other ways to do this, but they are impressively kludgey. + For example, we could have a fake CREATE cell for new handshake types + that always elicits a "yes, keep going!" CREATED cell. Then the + client could send the rest of the handshake and receive the rest of + the CREATED cell as RELAY cells inside the circuit. + + This design would add an extra round-trip to circuit extension + whenever it was used, however, and would violate a number of Tor's + assumptions about circuits (e.g., by having half-created circuits, + where authentication hasn't actually been performed). So I'm + guessing we shouldn't do that. +

1 0

[tor/master] Re-run trunnel to capture change for msvc.
by nickm＠torproject.org 23 Jul '15

23 Jul '15

commit 3323615dd2bffa54970624bb6eb2465f4064d812 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 23 12:05:06 2015 -0400 Re-run trunnel to capture change for msvc. --- src/ext/trunnel/trunnel-impl.h | 4 ++-- src/ext/trunnel/trunnel.c | 2 +- src/ext/trunnel/trunnel.h | 2 +- src/trunnel/ed25519_cert.c | 2 +- src/trunnel/ed25519_cert.h | 2 +- src/trunnel/link_handshake.c | 2 +- src/trunnel/link_handshake.h | 2 +- src/trunnel/pwbox.c | 2 +- src/trunnel/pwbox.h | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/ext/trunnel/trunnel-impl.h b/src/ext/trunnel/trunnel-impl.h index d98dc34..ab790f8 100644 --- a/src/ext/trunnel/trunnel-impl.h +++ b/src/ext/trunnel/trunnel-impl.h @@ -1,4 +1,4 @@ -/* trunnel-impl.h -- copied from Trunnel v1.4.1 +/* trunnel-impl.h -- copied from Trunnel v1.4.2 * https://gitweb.torproject.org/trunnel.git * You probably shouldn't edit this file. */ @@ -18,7 +18,7 @@ #include "trunnel-local.h" #endif -#ifdef _MSC_VER +#if defined(_MSC_VER) && (_MSC_VER < 1600) #define uint8_t unsigned char #define uint16_t unsigned short #define uint32_t unsigned int diff --git a/src/ext/trunnel/trunnel.c b/src/ext/trunnel/trunnel.c index ce8db4d..dc1c9fc 100644 --- a/src/ext/trunnel/trunnel.c +++ b/src/ext/trunnel/trunnel.c @@ -1,4 +1,4 @@ -/* trunnel.c -- copied from Trunnel v1.4.1 +/* trunnel.c -- copied from Trunnel v1.4.2 * https://gitweb.torproject.org/trunnel.git * You probably shouldn't edit this file. */ diff --git a/src/ext/trunnel/trunnel.h b/src/ext/trunnel/trunnel.h index 78da904..776e2cf 100644 --- a/src/ext/trunnel/trunnel.h +++ b/src/ext/trunnel/trunnel.h @@ -1,4 +1,4 @@ -/* trunnel.h -- copied from Trunnel v1.4.1 +/* trunnel.h -- copied from Trunnel v1.4.2 * https://gitweb.torproject.org/trunnel.git * You probably shouldn't edit this file. */ diff --git a/src/trunnel/ed25519_cert.c b/src/trunnel/ed25519_cert.c index 6931eae..294d20b 100644 --- a/src/trunnel/ed25519_cert.c +++ b/src/trunnel/ed25519_cert.c @@ -1,4 +1,4 @@ -/* ed25519_cert.c -- generated by Trunnel v1.4.1. +/* ed25519_cert.c -- generated by Trunnel v1.4.2. * https://gitweb.torproject.org/trunnel.git * You probably shouldn't edit this file. */ diff --git a/src/trunnel/ed25519_cert.h b/src/trunnel/ed25519_cert.h index 7839af4..fb00686 100644 --- a/src/trunnel/ed25519_cert.h +++ b/src/trunnel/ed25519_cert.h @@ -1,4 +1,4 @@ -/* ed25519_cert.h -- generated by by Trunnel v1.4.1. +/* ed25519_cert.h -- generated by by Trunnel v1.4.2. * https://gitweb.torproject.org/trunnel.git * You probably shouldn't edit this file. */ diff --git a/src/trunnel/link_handshake.c b/src/trunnel/link_handshake.c index f53161a..5ba1c17 100644 --- a/src/trunnel/link_handshake.c +++ b/src/trunnel/link_handshake.c @@ -1,4 +1,4 @@ -/* link_handshake.c -- generated by Trunnel v1.4.1. +/* link_handshake.c -- generated by Trunnel v1.4.2. * https://gitweb.torproject.org/trunnel.git * You probably shouldn't edit this file. */ diff --git a/src/trunnel/link_handshake.h b/src/trunnel/link_handshake.h index 6da6599..b4f5f19 100644 --- a/src/trunnel/link_handshake.h +++ b/src/trunnel/link_handshake.h @@ -1,4 +1,4 @@ -/* link_handshake.h -- generated by by Trunnel v1.4.1. +/* link_handshake.h -- generated by by Trunnel v1.4.2. * https://gitweb.torproject.org/trunnel.git * You probably shouldn't edit this file. */ diff --git a/src/trunnel/pwbox.c b/src/trunnel/pwbox.c index 28a4f74..9c84b90 100644 --- a/src/trunnel/pwbox.c +++ b/src/trunnel/pwbox.c @@ -1,4 +1,4 @@ -/* pwbox.c -- generated by Trunnel v1.4.1. +/* pwbox.c -- generated by Trunnel v1.4.2. * https://gitweb.torproject.org/trunnel.git * You probably shouldn't edit this file. */ diff --git a/src/trunnel/pwbox.h b/src/trunnel/pwbox.h index a6964b5..4dfb364 100644 --- a/src/trunnel/pwbox.h +++ b/src/trunnel/pwbox.h @@ -1,4 +1,4 @@ -/* pwbox.h -- generated by by Trunnel v1.4.1. +/* pwbox.h -- generated by by Trunnel v1.4.2. * https://gitweb.torproject.org/trunnel.git * You probably shouldn't edit this file. */

1 0

[trunnel/master] Bump version to 1.4.2
by nickm＠torproject.org 23 Jul '15

23 Jul '15

commit 29ff21960609208bdffe8ec295e597fd997d889f Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 23 12:03:10 2015 -0400 Bump version to 1.4.2 --- lib/trunnel/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/trunnel/__init__.py b/lib/trunnel/__init__.py index e444887..574c1ae 100644 --- a/lib/trunnel/__init__.py +++ b/lib/trunnel/__init__.py @@ -3,4 +3,4 @@ # a package. # -__version__ = "1.4.1" +__version__ = "1.4.2"

1 0

[trunnel/master] Fix an msvc issue reported by Gisle Vanem; bump copyright date
by nickm＠torproject.org 23 Jul '15

23 Jul '15

commit 1de832c66450867b4ed0ca5c5ade32e8ead3f6e6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 23 12:02:46 2015 -0400 Fix an msvc issue reported by Gisle Vanem; bump copyright date --- lib/trunnel/data/trunnel-impl.h | 4 ++-- lib/trunnel/data/trunnel.c | 2 +- lib/trunnel/data/trunnel.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/trunnel/data/trunnel-impl.h b/lib/trunnel/data/trunnel-impl.h index 4dd710f..e6de363 100644 --- a/lib/trunnel/data/trunnel-impl.h +++ b/lib/trunnel/data/trunnel-impl.h @@ -1,7 +1,7 @@ /* trunnel-impl.h -- Implementation helpers for trunnel, included by * generated trunnel files * - * Copyright 2014, The Tor Project, Inc. + * Copyright 2014-2015, The Tor Project, Inc. * See license at the end of this file for copying information. */ @@ -14,7 +14,7 @@ #include "trunnel-local.h" #endif -#ifdef _MSC_VER +#if defined(_MSC_VER) && (_MSC_VER < 1600) #define uint8_t unsigned char #define uint16_t unsigned short #define uint32_t unsigned int diff --git a/lib/trunnel/data/trunnel.c b/lib/trunnel/data/trunnel.c index 4c56449..285a310 100644 --- a/lib/trunnel/data/trunnel.c +++ b/lib/trunnel/data/trunnel.c @@ -1,6 +1,6 @@ /* trunnel.c -- Helper functions to implement trunnel. * - * Copyright 2014, The Tor Project, Inc. + * Copyright 2014-2015, The Tor Project, Inc. * See license at the end of this file for copying information. * * See trunnel-impl.h for documentation of these functions. diff --git a/lib/trunnel/data/trunnel.h b/lib/trunnel/data/trunnel.h index 0a78e6c..2ee8629 100644 --- a/lib/trunnel/data/trunnel.h +++ b/lib/trunnel/data/trunnel.h @@ -1,7 +1,7 @@ /* trunnel.h -- Public declarations for trunnel, to be included * in trunnel header files. - * Copyright 2014, The Tor Project, Inc. + * Copyright 2014-2015, The Tor Project, Inc. * See license at the end of this file for copying information. */

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits July 2015