tor-commits January 2016

tor-commits@lists.torproject.org

19 participants
1449 discussions

[translation/torcheck_completed] Update translations for torcheck_completed
by translation＠torproject.org 06 Jan '16

06 Jan '16

commit d86078bfb50c8e03d097efe7650922940e353d6d Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jan 6 12:45:40 2016 +0000 Update translations for torcheck_completed --- ar/torcheck.po | 11 ++++++----- nb/torcheck.po | 11 ++++++----- pt_BR/torcheck.po | 24 ++++++++++++------------ 3 files changed, 24 insertions(+), 22 deletions(-) diff --git a/ar/torcheck.po b/ar/torcheck.po index f9328d9..56b96f9 100644 --- a/ar/torcheck.po +++ b/ar/torcheck.po @@ -9,14 +9,15 @@ # Mohammed ALDOUB <voulnet(a)gmail.com>, 2012 # Mohammed ALDOUB <voulnet(a)gmail.com>, 2012 # OsamaK <osamak(a)gnu.org>, 2011 +# ouss <oussjarrouse(a)gmail.com>, 2016 # Sherief Alaa <sheriefalaa.w(a)gmail.com>, 2013-2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2015-06-12 03:57+0000\n" -"Last-Translator: Mark Zaki <xce(a)live.de>\n" -"Language-Team: Arabic (http://www.transifex.com/projects/p/torproject/language/ar/)\n" +"PO-Revision-Date: 2016-01-03 11:07+0000\n" +"Last-Translator: ouss <oussjarrouse(a)gmail.com>\n" +"Language-Team: Arabic (http://www.transifex.com/otf/torproject/language/ar/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -89,7 +90,7 @@ msgid "Donate to Support Tor" msgstr "تبرع لدعم تور" msgid "Tor Q&A Site" -msgstr "بوابة موقع أسئلة و أجوبة" +msgstr "موقع أسئلة و أجوبة" msgid "Volunteer" msgstr "تطوع" @@ -107,4 +108,4 @@ msgid "Run a Relay" msgstr "تشغيل التتابع" msgid "Stay Anonymous" -msgstr "البقاء مجهول" +msgstr "البقاء مجهول الهوية" diff --git a/nb/torcheck.po b/nb/torcheck.po index 5e4efa2..9cf871e 100644 --- a/nb/torcheck.po +++ b/nb/torcheck.po @@ -2,7 +2,8 @@ # Copyright (C) 2008-2013 The Tor Project, Inc # # Translators: -# Allan Nordhøy <comradekingu(a)gmail.com>, 2015 +# Allan Nordhøy <epost(a)anotheragency.no>, 2015 +# Allan Nordhøy <epost(a)anotheragency.no>, 2015 # FreedomIsGreat <kmdl(a)hotmail.no>, 2012 # Knut Ole <>, 2012 # lateralus, 2013-2014 @@ -12,9 +13,9 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2015-03-04 22:11+0000\n" -"Last-Translator: Allan Nordhøy <comradekingu(a)gmail.com>\n" -"Language-Team: Norwegian Bokmål (http://www.transifex.com/projects/p/torproject/language/nb/)\n" +"PO-Revision-Date: 2015-12-24 06:03+0000\n" +"Last-Translator: Allan Nordhøy <epost(a)anotheragency.no>\n" +"Language-Team: Norwegian Bokmål (http://www.transifex.com/otf/torproject/language/nb/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -47,7 +48,7 @@ msgid "" "href=\"https://www.torproject.org/\">Tor website</a> and specifically the <a" " href=\"https://www.torproject.org/docs/faq#DoesntWork\">instructions for " "configuring your Tor client</a>." -msgstr "Hvis du forsøker å bruke en Tor-klient, vennligst gå til <a href=\"https://www.torproject.org/\">Tors nettside</a> og da spesifikt til <a href=\"https://www.torproject.org/docs/faq#DoesntWork\">instruksjonene for konfigurering Tor-klienten din</a>." +msgstr "Hvis du forsøker å bruke en Tor-klient, vennligst gå til <a href=\"https://www.torproject.org/\">Tors nettside</a> og da spesifikt <a href=\"https://www.torproject.org/docs/faq#DoesntWork\">instruksjon for konfigurering Tor-klienten din</a>." msgid "Sorry, your query failed or an unexpected response was received." msgstr "Beklager, forespørselen din feilet eller et uventet svar ble mottatt." diff --git a/pt_BR/torcheck.po b/pt_BR/torcheck.po index 719b87c..6d91871 100644 --- a/pt_BR/torcheck.po +++ b/pt_BR/torcheck.po @@ -16,7 +16,7 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2015-12-08 12:22+0000\n" +"PO-Revision-Date: 2015-12-20 17:24+0000\n" "Last-Translator: Communia <ameaneantie(a)riseup.net>\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/otf/torproject/language/pt_BR/)\n" "MIME-Version: 1.0\n" @@ -33,7 +33,7 @@ msgid "" "Please refer to the <a href=\"https://www.torproject.org/\">Tor website</a> " "for further information about using Tor safely. You are now free to browse " "the Internet anonymously." -msgstr "Por favor, consulte o <a href=\"https://www.torproject.org/\">Tor website</a> para outras informações sobre como usar Tor com segurança. Sinta-se à vontade para navegar anonimamente na Internet." +msgstr "Por favor, consulte <a href=\"https://www.torproject.org/\">site Tor</a> para outras informações sobre como usar Tor com segurança. Sinta-se à vontade para navegar anonimamente na Internet." msgid "There is a security update available for Tor Browser." msgstr "Há uma atualização de segurança disponível para o Navegador Tor." @@ -41,7 +41,7 @@ msgstr "Há uma atualização de segurança disponível para o Navegador Tor." msgid "" "<a href=\"https://www.torproject.org/download/download-easy.html\">Click " "here to go to the download page</a>" -msgstr "<a href=\"https://www.torproject.org/download/download-easy.html\">Clique aqui para ir à página de download</a>" +msgstr "<a href=\"https://www.torproject.org/download/download-easy.html\">Clique aqui para acessar a página de download</a>" msgid "Sorry. You are not using Tor." msgstr "Desculpe. Você não está usando Tor." @@ -62,16 +62,16 @@ msgid "" msgstr "Uma falha temporária no serviço nos impede de determinar se o seu endereço IP de origem é um <a href=\"https://www.torproject.org/\">nó</a> da rede Tor. " msgid "Your IP address appears to be: " -msgstr "O seu endereço IP parece ser:" +msgstr "O seu endereço IP aparece como:" msgid "Are you using Tor?" -msgstr "Você está usando o Tor?" +msgstr "Você está usando Tor?" msgid "This page is also available in the following languages:" msgstr "Esta página também é disponível nos seguintes idiomas:" msgid "For more information about this exit relay, see:" -msgstr "Para mais informações sobre este retransmissor de saída, consulte:" +msgstr "Para mais informações sobre este relé de saída, consulte:" msgid "" "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, " @@ -88,25 +88,25 @@ msgid "Short User Manual" msgstr "Manual do Usuário Resumido" msgid "Donate to Support Tor" -msgstr "Doe para Apoiar o Tor" +msgstr "Doar para Apoiar Tor" msgid "Tor Q&A Site" msgstr "Site de Perguntas & Respostas do Tor" msgid "Volunteer" -msgstr "Voluntário" +msgstr "Contribuir" msgid "JavaScript is enabled." -msgstr "O JavaScript está habilitado." +msgstr "JavaScript está habilitado." msgid "JavaScript is disabled." -msgstr "O JavaScript está desabilitado." +msgstr "JavaScript está desabilitado." msgid "However, it does not appear to be Tor Browser." -msgstr "No entanto, não parece ser o Navegador Tor." +msgstr "Porém, parece que este não é o Navegador Tor." msgid "Run a Relay" -msgstr "Executar um retransmissor" +msgstr "Executar um relé" msgid "Stay Anonymous" msgstr "Continuar anônimo"

1 0

[translation/torcheck] Update translations for torcheck
by translation＠torproject.org 06 Jan '16

06 Jan '16

commit 02b0f67b2e9f23a9ebf0c9fb7ca4b1f2b9760821 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jan 6 12:45:35 2016 +0000 Update translations for torcheck --- ar/torcheck.po | 11 ++++++----- nb/torcheck.po | 11 ++++++----- pt_BR/torcheck.po | 24 ++++++++++++------------ 3 files changed, 24 insertions(+), 22 deletions(-) diff --git a/ar/torcheck.po b/ar/torcheck.po index f9328d9..56b96f9 100644 --- a/ar/torcheck.po +++ b/ar/torcheck.po @@ -9,14 +9,15 @@ # Mohammed ALDOUB <voulnet(a)gmail.com>, 2012 # Mohammed ALDOUB <voulnet(a)gmail.com>, 2012 # OsamaK <osamak(a)gnu.org>, 2011 +# ouss <oussjarrouse(a)gmail.com>, 2016 # Sherief Alaa <sheriefalaa.w(a)gmail.com>, 2013-2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2015-06-12 03:57+0000\n" -"Last-Translator: Mark Zaki <xce(a)live.de>\n" -"Language-Team: Arabic (http://www.transifex.com/projects/p/torproject/language/ar/)\n" +"PO-Revision-Date: 2016-01-03 11:07+0000\n" +"Last-Translator: ouss <oussjarrouse(a)gmail.com>\n" +"Language-Team: Arabic (http://www.transifex.com/otf/torproject/language/ar/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -89,7 +90,7 @@ msgid "Donate to Support Tor" msgstr "تبرع لدعم تور" msgid "Tor Q&A Site" -msgstr "بوابة موقع أسئلة و أجوبة" +msgstr "موقع أسئلة و أجوبة" msgid "Volunteer" msgstr "تطوع" @@ -107,4 +108,4 @@ msgid "Run a Relay" msgstr "تشغيل التتابع" msgid "Stay Anonymous" -msgstr "البقاء مجهول" +msgstr "البقاء مجهول الهوية" diff --git a/nb/torcheck.po b/nb/torcheck.po index 5e4efa2..9cf871e 100644 --- a/nb/torcheck.po +++ b/nb/torcheck.po @@ -2,7 +2,8 @@ # Copyright (C) 2008-2013 The Tor Project, Inc # # Translators: -# Allan Nordhøy <comradekingu(a)gmail.com>, 2015 +# Allan Nordhøy <epost(a)anotheragency.no>, 2015 +# Allan Nordhøy <epost(a)anotheragency.no>, 2015 # FreedomIsGreat <kmdl(a)hotmail.no>, 2012 # Knut Ole <>, 2012 # lateralus, 2013-2014 @@ -12,9 +13,9 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2015-03-04 22:11+0000\n" -"Last-Translator: Allan Nordhøy <comradekingu(a)gmail.com>\n" -"Language-Team: Norwegian Bokmål (http://www.transifex.com/projects/p/torproject/language/nb/)\n" +"PO-Revision-Date: 2015-12-24 06:03+0000\n" +"Last-Translator: Allan Nordhøy <epost(a)anotheragency.no>\n" +"Language-Team: Norwegian Bokmål (http://www.transifex.com/otf/torproject/language/nb/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -47,7 +48,7 @@ msgid "" "href=\"https://www.torproject.org/\">Tor website</a> and specifically the <a" " href=\"https://www.torproject.org/docs/faq#DoesntWork\">instructions for " "configuring your Tor client</a>." -msgstr "Hvis du forsøker å bruke en Tor-klient, vennligst gå til <a href=\"https://www.torproject.org/\">Tors nettside</a> og da spesifikt til <a href=\"https://www.torproject.org/docs/faq#DoesntWork\">instruksjonene for konfigurering Tor-klienten din</a>." +msgstr "Hvis du forsøker å bruke en Tor-klient, vennligst gå til <a href=\"https://www.torproject.org/\">Tors nettside</a> og da spesifikt <a href=\"https://www.torproject.org/docs/faq#DoesntWork\">instruksjon for konfigurering Tor-klienten din</a>." msgid "Sorry, your query failed or an unexpected response was received." msgstr "Beklager, forespørselen din feilet eller et uventet svar ble mottatt." diff --git a/pt_BR/torcheck.po b/pt_BR/torcheck.po index 719b87c..6d91871 100644 --- a/pt_BR/torcheck.po +++ b/pt_BR/torcheck.po @@ -16,7 +16,7 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2015-12-08 12:22+0000\n" +"PO-Revision-Date: 2015-12-20 17:24+0000\n" "Last-Translator: Communia <ameaneantie(a)riseup.net>\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/otf/torproject/language/pt_BR/)\n" "MIME-Version: 1.0\n" @@ -33,7 +33,7 @@ msgid "" "Please refer to the <a href=\"https://www.torproject.org/\">Tor website</a> " "for further information about using Tor safely. You are now free to browse " "the Internet anonymously." -msgstr "Por favor, consulte o <a href=\"https://www.torproject.org/\">Tor website</a> para outras informações sobre como usar Tor com segurança. Sinta-se à vontade para navegar anonimamente na Internet." +msgstr "Por favor, consulte <a href=\"https://www.torproject.org/\">site Tor</a> para outras informações sobre como usar Tor com segurança. Sinta-se à vontade para navegar anonimamente na Internet." msgid "There is a security update available for Tor Browser." msgstr "Há uma atualização de segurança disponível para o Navegador Tor." @@ -41,7 +41,7 @@ msgstr "Há uma atualização de segurança disponível para o Navegador Tor." msgid "" "<a href=\"https://www.torproject.org/download/download-easy.html\">Click " "here to go to the download page</a>" -msgstr "<a href=\"https://www.torproject.org/download/download-easy.html\">Clique aqui para ir à página de download</a>" +msgstr "<a href=\"https://www.torproject.org/download/download-easy.html\">Clique aqui para acessar a página de download</a>" msgid "Sorry. You are not using Tor." msgstr "Desculpe. Você não está usando Tor." @@ -62,16 +62,16 @@ msgid "" msgstr "Uma falha temporária no serviço nos impede de determinar se o seu endereço IP de origem é um <a href=\"https://www.torproject.org/\">nó</a> da rede Tor. " msgid "Your IP address appears to be: " -msgstr "O seu endereço IP parece ser:" +msgstr "O seu endereço IP aparece como:" msgid "Are you using Tor?" -msgstr "Você está usando o Tor?" +msgstr "Você está usando Tor?" msgid "This page is also available in the following languages:" msgstr "Esta página também é disponível nos seguintes idiomas:" msgid "For more information about this exit relay, see:" -msgstr "Para mais informações sobre este retransmissor de saída, consulte:" +msgstr "Para mais informações sobre este relé de saída, consulte:" msgid "" "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, " @@ -88,25 +88,25 @@ msgid "Short User Manual" msgstr "Manual do Usuário Resumido" msgid "Donate to Support Tor" -msgstr "Doe para Apoiar o Tor" +msgstr "Doar para Apoiar Tor" msgid "Tor Q&A Site" msgstr "Site de Perguntas & Respostas do Tor" msgid "Volunteer" -msgstr "Voluntário" +msgstr "Contribuir" msgid "JavaScript is enabled." -msgstr "O JavaScript está habilitado." +msgstr "JavaScript está habilitado." msgid "JavaScript is disabled." -msgstr "O JavaScript está desabilitado." +msgstr "JavaScript está desabilitado." msgid "However, it does not appear to be Tor Browser." -msgstr "No entanto, não parece ser o Navegador Tor." +msgstr "Porém, parece que este não é o Navegador Tor." msgid "Run a Relay" -msgstr "Executar um retransmissor" +msgstr "Executar um relé" msgid "Stay Anonymous" msgstr "Continuar anônimo"

1 0

[translation/bridgedb_completed] Update translations for bridgedb_completed
by translation＠torproject.org 06 Jan '16

06 Jan '16

commit bea84dcfbe4f34a9f15fd040302d3192d8fec6d4 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jan 6 12:45:25 2016 +0000 Update translations for bridgedb_completed --- ar/LC_MESSAGES/bridgedb.po | 4 +- bg/LC_MESSAGES/bridgedb.po | 338 ++++++++++++++++++++-------------------- ca/LC_MESSAGES/bridgedb.po | 341 ++++++++++++++++++++-------------------- pt_BR/LC_MESSAGES/bridgedb.po | 6 +- tr/LC_MESSAGES/bridgedb.po | 12 +- zh_CN/LC_MESSAGES/bridgedb.po | 343 +++++++++++++++++++++-------------------- 6 files changed, 524 insertions(+), 520 deletions(-) diff --git a/ar/LC_MESSAGES/bridgedb.po b/ar/LC_MESSAGES/bridgedb.po index baf5b21..8105ab9 100644 --- a/ar/LC_MESSAGES/bridgedb.po +++ b/ar/LC_MESSAGES/bridgedb.po @@ -25,8 +25,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2015-07-25 03:40+0000\n" -"PO-Revision-Date: 2015-11-10 21:25+0000\n" -"Last-Translator: yahia zakaria <yahiazak(a)hotmail.com>\n" +"PO-Revision-Date: 2016-01-03 11:13+0000\n" +"Last-Translator: ouss <oussjarrouse(a)gmail.com>\n" "Language-Team: Arabic (http://www.transifex.com/otf/torproject/language/ar/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff --git a/bg/LC_MESSAGES/bridgedb.po b/bg/LC_MESSAGES/bridgedb.po index b01866e..7ff24b4 100644 --- a/bg/LC_MESSAGES/bridgedb.po +++ b/bg/LC_MESSAGES/bridgedb.po @@ -4,18 +4,20 @@ # # Translators: # aramaic <aramaicbg(a)gmail.com>, 2015 +# Maxi <kutia0001(a)gmail.com>, 2015 # Tsvetan Nikolov <slakware(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-08-11 13:22+0000\n" -"Last-Translator: Tsvetan Nikolov <slakware(a)gmail.com>\n" +"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" +"POT-Creation-Date: 2015-07-25 03:40+0000\n" +"PO-Revision-Date: 2015-12-22 07:09+0000\n" +"Last-Translator: Maxi <kutia0001(a)gmail.com>\n" "Language-Team: Bulgarian (http://www.transifex.com/otf/torproject/language/bg/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 0.9.6\n" +"Generated-By: Babel 1.3\n" "Language: bg\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" @@ -30,68 +32,193 @@ msgstr "" #. "fteproxy" #. "Tor" #. "Tor Browser" -#: lib/bridgedb/HTTPServer.py:107 +#: bridgedb/https/server.py:167 msgid "Sorry! Something went wrong with your request." msgstr "Съжаляваме! Нещо се обърка с заявката ви." -#: lib/bridgedb/strings.py:18 +#: bridgedb/https/templates/base.html:79 +msgid "Report a Bug" +msgstr "Информирай за проблем" + +#: bridgedb/https/templates/base.html:82 +msgid "Source Code" +msgstr "Изходен код" + +#: bridgedb/https/templates/base.html:85 +msgid "Changelog" +msgstr "Дневник на промените" + +#: bridgedb/https/templates/base.html:88 +msgid "Contact" +msgstr "Контакт" + +#: bridgedb/https/templates/bridges.html:35 +msgid "Select All" +msgstr "Избeри всичко" + +#: bridgedb/https/templates/bridges.html:40 +msgid "Show QRCode" +msgstr "Покажи QR Код" + +#: bridgedb/https/templates/bridges.html:52 +msgid "QRCode for your bridge lines" +msgstr "QR Код за вашите bridge линии" + +#. 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!". :) +#: bridgedb/https/templates/bridges.html:67 +#: bridgedb/https/templates/bridges.html:125 +msgid "Uh oh, spaghettios!" +msgstr "Ооо, спагетки!" + +#: bridgedb/https/templates/bridges.html:68 +msgid "It seems there was an error getting your QRCode." +msgstr "Изглежда е имало грешка при получаване на вашия QR Код." + +#: bridgedb/https/templates/bridges.html:73 +msgid "" +"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy" +" your bridge lines onto mobile and other devices." +msgstr "Този QRCode съдържа вашите мостови линии. Сканирайте го с QR Код четец да копирате вашите мостови линии към мобилни и други устройства." + +#: bridgedb/https/templates/bridges.html:131 +msgid "There currently aren't any bridges available..." +msgstr "В момента няма налични bridges ..." + +#: bridgedb/https/templates/bridges.html:132 +#, python-format +msgid "" +" Perhaps you should try %s going back %s and choosing a different bridge " +"type!" +msgstr "Най вероятно трябва да %s се върнете %s и изберете различенt bridge тип!" + +#: bridgedb/https/templates/index.html:11 +#, python-format +msgid "Step %s1%s" +msgstr "Стъпка %s1%s" + +#: bridgedb/https/templates/index.html:13 +#, python-format +msgid "Download %s Tor Browser %s" +msgstr "Свали %s Tor Browser %s" + +#: bridgedb/https/templates/index.html:25 +#, python-format +msgid "Step %s2%s" +msgstr "Стъпка %s2%s" + +#: bridgedb/https/templates/index.html:27 +#, python-format +msgid "Get %s bridges %s" +msgstr "Вземи %s bridges %s" + +#: bridgedb/https/templates/index.html:36 +#, python-format +msgid "Step %s3%s" +msgstr "Стъпка %s3%s" + +#: bridgedb/https/templates/index.html:38 +#, python-format +msgid "Now %s add the bridges to Tor Browser %s" +msgstr "Сега %sдобавете bridges към 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.) +#: bridgedb/https/templates/options.html:38 +#, python-format +msgid "%sJ%sust give me bridges!" +msgstr "%sП%sросто ми дайте bridges!" + +#: bridgedb/https/templates/options.html:51 +msgid "Advanced Options" +msgstr "Разширени възможности" + +#: bridgedb/https/templates/options.html:86 +msgid "No" +msgstr "Не" + +#: bridgedb/https/templates/options.html:87 +msgid "none" +msgstr "нищо" + +#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the +#. beginning of words are present in your final translation. Thanks! +#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses." +#: bridgedb/https/templates/options.html:124 +#, python-format +msgid "%sY%ses!" +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"! +#: bridgedb/https/templates/options.html:147 +#, python-format +msgid "%sG%set Bridges" +msgstr "%sВ%sземи Bridges" + +#: bridgedb/strings.py:43 msgid "[This is an automated message; please do not reply.]" msgstr "[Автоматично съобщение; моля не отговаряйте.]" -#: lib/bridgedb/strings.py:20 +#: bridgedb/strings.py:45 msgid "Here are your bridges:" msgstr "Това са вашите мрежови bridges:" -#: lib/bridgedb/strings.py:22 +#: bridgedb/strings.py:47 #, python-format msgid "" "You have exceeded the rate limit. Please slow down! The minimum time between\n" "emails is %s hours. All further emails during this time period will be ignored." msgstr "Надхвърлихте позволения период за е-поща . Моля забавете! Минималния период между две е-пощи е %s часа. Всички следващи е-пощи по време на този период ще бъдат анулирани." -#: lib/bridgedb/strings.py:25 +#: bridgedb/strings.py:50 msgid "" "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)" msgstr "COMMANDs: (комбинирай COMMANDs за да определиш мулти опции едновременно)" #. TRANSLATORS: Please DO NOT translate the word "BridgeDB". -#: lib/bridgedb/strings.py:28 +#: bridgedb/strings.py:53 msgid "Welcome to BridgeDB!" msgstr "Добре дошли в BridgeDB!" #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE". -#: lib/bridgedb/strings.py:30 +#: bridgedb/strings.py:55 msgid "Currently supported transport TYPEs:" msgstr "Актуални поддържани транспорт TYPEs:" -#: lib/bridgedb/strings.py:31 +#: bridgedb/strings.py:56 #, python-format msgid "Hey, %s!" msgstr "Хей, %s!" -#: lib/bridgedb/strings.py:32 +#: bridgedb/strings.py:57 msgid "Hello, friend!" msgstr "Здравей, приятел!" -#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100 +#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90 msgid "Public Keys" msgstr "Обществен ключ" #. TRANSLATORS: This string will end up saying something like: #. "This email was generated with rainbows, unicorns, and sparkles #. for alice(a)example.com on Friday, 09 May, 2014 at 18:59:39." -#: lib/bridgedb/strings.py:37 +#: bridgedb/strings.py:62 #, python-format msgid "" "This email was generated with rainbows, unicorns, and sparkles\n" "for %s on %s at %s." -msgstr "Този е-поща беше генерирана с дъги, уникорни, и заря\nза %s в %s в %s." +msgstr "Този е-поща беше генерирана с дъги, еднорози, и заря\nза %s в %s в %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 +#: bridgedb/strings.py:72 #, python-format msgid "" "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n" @@ -102,7 +229,7 @@ msgid "" msgstr "BridgeDB може да предложи bridges с много %sвидове на Pluggable Transports%s,\nкоито могат да помогнат да подсигурят вашата връзка към Tor Network, правейки я по\nтрудна за наблюдение за всеки наблюдаващ вашия интернет трафик да открие че ползвате Tor\n \n" #. TRANSLATORS: Please DO NOT translate "Pluggable Transports". -#: lib/bridgedb/strings.py:54 +#: bridgedb/strings.py:79 msgid "" "Some bridges with IPv6 addresses are also available, though some Pluggable\n" "Transports aren't IPv6 compatible.\n" @@ -114,7 +241,7 @@ msgstr "Някой bridges с IPv6 адреси са също налични, н #. 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 +#: bridgedb/strings.py:88 #, python-format msgid "" "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n" @@ -123,20 +250,20 @@ msgid "" "\n" msgstr "Допълнително, BridgeDB има много plain-ol'-vanilla bridges %s без никакви\nPluggable Transports %s които не изглеждат толкова добре, но все пак могат\nда помогнат за заобикаляне на интернет цензурата в много случаи.\n\n" -#: lib/bridgedb/strings.py:76 +#: bridgedb/strings.py:101 msgid "What are bridges?" msgstr "Какво са bridges?" -#: lib/bridgedb/strings.py:77 +#: bridgedb/strings.py:102 #, python-format msgid "%s Bridges %s are Tor relays that help you circumvent censorship." msgstr "%s Bridges %s са Tor relays които помагат за заобикаляне на цензурата." -#: lib/bridgedb/strings.py:82 +#: bridgedb/strings.py:107 msgid "I need an alternative way of getting bridges!" msgstr "Имам нужда от алтернативен вариант за намиране на bridges!" -#: lib/bridgedb/strings.py:83 +#: bridgedb/strings.py:108 #, python-format msgid "" "Another way to get bridges is to send an email to %s. Please note that you must\n" @@ -144,12 +271,12 @@ msgid "" "%s, %s or %s." msgstr "Друг вариант за набавяне на bridges е пращане на е-поща до %s. Моля отбележете, че вие трябва да\nизпратите е-поща използвайки адрес на един от следните доставчици:\n%s, %s or %s." -#: lib/bridgedb/strings.py:90 +#: bridgedb/strings.py:115 msgid "My bridges don't work! I need help!" msgstr "Моите bridges не работят! Имам нужда от помощ!" #. TRANSLATORS: Please DO NOT translate "Tor". -#: lib/bridgedb/strings.py:92 +#: bridgedb/strings.py:117 #, python-format msgid "If your Tor doesn't work, you should email %s." msgstr "Ако вашия Tor не работи, изпратете е-поща до %s." @@ -157,48 +284,48 @@ msgstr "Ако вашия Tor не работи, изпратете е-поща #. 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 +#: bridgedb/strings.py:121 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 "Опитайте се да включите колкото се може повече информация за вашия случай, включително списък на\nbridges и Pluggable Transports които сте използвали, вашата Tor Browser версия,\nи всяко съобщение с което Tor е отговорил, и т.н." -#: lib/bridgedb/strings.py:103 +#: bridgedb/strings.py:128 msgid "Here are your bridge lines:" msgstr "Тус са вашите bridge връзки:" -#: lib/bridgedb/strings.py:104 +#: bridgedb/strings.py:129 msgid "Get Bridges!" msgstr "Вземете Bridges!" -#: lib/bridgedb/strings.py:108 +#: bridgedb/strings.py:133 msgid "Please select options for bridge type:" msgstr "Моля изберете опция за вид bridge:" -#: lib/bridgedb/strings.py:109 +#: bridgedb/strings.py:134 msgid "Do you need IPv6 addresses?" msgstr "Нуждаете ли се от IPv6 адреси?" -#: lib/bridgedb/strings.py:110 +#: bridgedb/strings.py:135 #, python-format msgid "Do you need a %s?" msgstr "Нуздаете ли се от %s?" -#: lib/bridgedb/strings.py:114 +#: bridgedb/strings.py:139 msgid "Your browser is not displaying images properly." msgstr "Вашия браузер не показва правилно изображения." -#: lib/bridgedb/strings.py:115 +#: bridgedb/strings.py:140 msgid "Enter the characters from the image above..." msgstr "Въведете символите от изображението от горе..." -#: lib/bridgedb/strings.py:119 +#: bridgedb/strings.py:144 msgid "How to start using your bridges" msgstr "Как да започнете да използвате вашите bridges" #. TRANSLATORS: Please DO NOT translate "Tor Browser". -#: lib/bridgedb/strings.py:121 +#: bridgedb/strings.py:146 #, python-format msgid "" "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n" @@ -207,21 +334,21 @@ msgid "" msgstr "За въвеждане на bridges в Tor Browser, първо отидете на \n%s Tor Browser уеб страницата за сваляне %s и след това \nследвайте инструкциите там за сваляне и стартиране на \nTor Browser." #. TRANSLATORS: Please DO NOT translate "Tor". -#: lib/bridgedb/strings.py:126 +#: bridgedb/strings.py:151 msgid "" "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n" "the wizard until it asks:" msgstr "Когато 'Tor Network Settings' прозорец се отвори, кликнете 'Configure' и следвайте\nсъветника докато не попита:" #. TRANSLATORS: Please DO NOT translate "Tor". -#: lib/bridgedb/strings.py:130 +#: bridgedb/strings.py:155 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:134 +#: bridgedb/strings.py:159 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" @@ -229,153 +356,28 @@ msgid "" "button in the 'Tor Network Settings' wizard for further assistance." msgstr "Изберете 'Да' и след това кликнете 'Напред'. За да конфигурирате вашите нови bridges, копирайте и\nпоставете bridge редовете в прозореца за текстово въвеждане. На края натиснете 'Свържи се', и\nтрябва да сте готови! Ако срещате трудности, отидете на 'Помощ' бутона в 'Tor Network Settings' съветника за помощ." -#: lib/bridgedb/strings.py:142 +#: bridgedb/strings.py:167 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:146 +#: bridgedb/strings.py:171 msgid "Request vanilla bridges." msgstr "Заяви стандартни bridges." -#: lib/bridgedb/strings.py:147 +#: bridgedb/strings.py:172 msgid "Request IPv6 bridges." msgstr "Заяви IPv6 bridges." #. TRANSLATORS: Please DO NOT translate the word the word "TYPE". -#: lib/bridgedb/strings.py:149 +#: bridgedb/strings.py:174 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:152 +#: bridgedb/strings.py:177 msgid "Get a copy of BridgeDB's public GnuPG key." msgstr "Вземи копие на BridgeDB's обществен GnuPG ключ." - -#: lib/bridgedb/templates/base.html:89 -msgid "Report a Bug" -msgstr "Информирай за проблем" - -#: lib/bridgedb/templates/base.html:92 -msgid "Source Code" -msgstr "Изходен код" - -#: lib/bridgedb/templates/base.html:95 -msgid "Changelog" -msgstr "Дневник на промените" - -#: lib/bridgedb/templates/base.html:98 -msgid "Contact" -msgstr "Контакт" - -#: lib/bridgedb/templates/bridges.html:81 -msgid "Select All" -msgstr "Избири всичко" - -#: lib/bridgedb/templates/bridges.html:87 -msgid "Show QRCode" -msgstr "Покажи QR Код" - -#: lib/bridgedb/templates/bridges.html:100 -msgid "QRCode for your bridge lines" -msgstr "QR Код за вашите bridge линии" - -#. 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 "Ооо, спагетки!" - -#: lib/bridgedb/templates/bridges.html:116 -msgid "It seems there was an error getting your QRCode." -msgstr "Изглежда е имало грешка при получаване на вашия 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 "Този QRCode съдържа вашите мостови линии. Сканирайте го с QR Код четец да копирате вашите мостови линии към мобилни и други устройства." - -#: lib/bridgedb/templates/bridges.html:181 -msgid "There currently aren't any bridges available..." -msgstr "В момента няма налични bridges ..." - -#: lib/bridgedb/templates/bridges.html:182 -#, python-format -msgid "" -" Perhaps you should try %s going back %s and choosing a different bridge " -"type!" -msgstr "Най вероятно трябва да %s се върнете %s и изберете различенt bridge тип!" - -#: lib/bridgedb/templates/index.html:11 -#, python-format -msgid "Step %s1%s" -msgstr "Стъпка %s1%s" - -#: lib/bridgedb/templates/index.html:13 -#, python-format -msgid "Download %s Tor Browser %s" -msgstr "Свали %s Tor Browser %s" - -#: lib/bridgedb/templates/index.html:25 -#, python-format -msgid "Step %s2%s" -msgstr "Стъпка %s2%s" - -#: lib/bridgedb/templates/index.html:27 -#, python-format -msgid "Get %s bridges %s" -msgstr "Вземи %s bridges %s" - -#: lib/bridgedb/templates/index.html:36 -#, python-format -msgid "Step %s3%s" -msgstr "Стъпка %s3%s" - -#: lib/bridgedb/templates/index.html:38 -#, python-format -msgid "Now %s add the bridges to Tor Browser %s" -msgstr "Сега %sдобавете bridges към 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 "%sП%sросто дайте ми bridges!" - -#: lib/bridgedb/templates/options.html:52 -msgid "Advanced Options" -msgstr "Разширени възможности" - -#: lib/bridgedb/templates/options.html:88 -msgid "No" -msgstr "Не" - -#: lib/bridgedb/templates/options.html:89 -msgid "none" -msgstr "нищо" - -#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the -#. beginning of words are present in your final translation. Thanks! -#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses." -#: lib/bridgedb/templates/options.html:127 -#, python-format -msgid "%sY%ses!" -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:151 -#, python-format -msgid "%sG%set Bridges" -msgstr "%sВ%sземи Bridges" diff --git a/ca/LC_MESSAGES/bridgedb.po b/ca/LC_MESSAGES/bridgedb.po index 58da8f9..4204f15 100644 --- a/ca/LC_MESSAGES/bridgedb.po +++ b/ca/LC_MESSAGES/bridgedb.po @@ -13,14 +13,15 @@ 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-09-12 16:07+0000\n" +"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" +"POT-Creation-Date: 2015-07-25 03:40+0000\n" +"PO-Revision-Date: 2015-12-18 19:02+0000\n" "Last-Translator: laia_\n" "Language-Team: Catalan (http://www.transifex.com/otf/torproject/language/ca/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 0.9.6\n" +"Generated-By: Babel 1.3\n" "Language: ca\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" @@ -35,57 +36,182 @@ msgstr "" #. "fteproxy" #. "Tor" #. "Tor Browser" -#: lib/bridgedb/HTTPServer.py:107 +#: bridgedb/https/server.py:167 msgid "Sorry! Something went wrong with your request." msgstr "Quelcom ha anat malament amb la petició." -#: lib/bridgedb/strings.py:18 +#: bridgedb/https/templates/base.html:79 +msgid "Report a Bug" +msgstr "Comunica un error" + +#: bridgedb/https/templates/base.html:82 +msgid "Source Code" +msgstr "Codi font" + +#: bridgedb/https/templates/base.html:85 +msgid "Changelog" +msgstr "Registre de canvis" + +#: bridgedb/https/templates/base.html:88 +msgid "Contact" +msgstr "Contacte" + +#: bridgedb/https/templates/bridges.html:35 +msgid "Select All" +msgstr "Selecciona-ho tot" + +#: bridgedb/https/templates/bridges.html:40 +msgid "Show QRCode" +msgstr "Mostra el codi QR" + +#: bridgedb/https/templates/bridges.html:52 +msgid "QRCode for your bridge lines" +msgstr "Codi QR per les línies de ponts" + +#. 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!". :) +#: bridgedb/https/templates/bridges.html:67 +#: bridgedb/https/templates/bridges.html:125 +msgid "Uh oh, spaghettios!" +msgstr "Vatua l'olla!" + +#: bridgedb/https/templates/bridges.html:68 +msgid "It seems there was an error getting your QRCode." +msgstr "Hi ha hagut un error en obtenir el codi QR" + +#: bridgedb/https/templates/bridges.html:73 +msgid "" +"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy" +" your bridge lines onto mobile and other devices." +msgstr "Aquest codi QR conté les línies de pont. Escannegeu-lo amb un lector de codis QR per copiar les línies de pont al mòbil i a altres dispositius. " + +#: bridgedb/https/templates/bridges.html:131 +msgid "There currently aren't any bridges available..." +msgstr "No hi ha ponts disponibles en aquests moments." + +#: bridgedb/https/templates/bridges.html:132 +#, python-format +msgid "" +" Perhaps you should try %s going back %s and choosing a different bridge " +"type!" +msgstr "Proveu %s tornant a %s i triant un tipus diferent de pont." + +#: bridgedb/https/templates/index.html:11 +#, python-format +msgid "Step %s1%s" +msgstr "Pas %s1%s" + +#: bridgedb/https/templates/index.html:13 +#, python-format +msgid "Download %s Tor Browser %s" +msgstr "Descarrega %s Navegador Tor %s" + +#: bridgedb/https/templates/index.html:25 +#, python-format +msgid "Step %s2%s" +msgstr "Pas %s2%s" + +#: bridgedb/https/templates/index.html:27 +#, python-format +msgid "Get %s bridges %s" +msgstr "Descarrega %s ponts %s" + +#: bridgedb/https/templates/index.html:36 +#, python-format +msgid "Step %s3%s" +msgstr "Pas %s3%s" + +#: bridgedb/https/templates/index.html:38 +#, python-format +msgid "Now %s add the bridges to Tor Browser %s" +msgstr "Ara %s adjunta els ponts 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! +#. (These are used to insert HTML5 underlining tags, to mark accesskeys +#. for disabled users.) +#: bridgedb/https/templates/options.html:38 +#, python-format +msgid "%sJ%sust give me bridges!" +msgstr "%sJ%sust donem els meus bridges!" + +#: bridgedb/https/templates/options.html:51 +msgid "Advanced Options" +msgstr "Opcions Avançades" + +#: bridgedb/https/templates/options.html:86 +msgid "No" +msgstr "No" + +#: bridgedb/https/templates/options.html:87 +msgid "none" +msgstr "Cap" + +#. 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." +#: bridgedb/https/templates/options.html:124 +#, python-format +msgid "%sY%ses!" +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"! +#: bridgedb/https/templates/options.html:147 +#, python-format +msgid "%sG%set Bridges" +msgstr "%sD%sescarrega Bridges" + +#: bridgedb/strings.py:43 msgid "[This is an automated message; please do not reply.]" msgstr "[Aquest és un missatge automàtic, no el respongui.]" -#: lib/bridgedb/strings.py:20 +#: bridgedb/strings.py:45 msgid "Here are your bridges:" msgstr "Els vostres ponts: " -#: lib/bridgedb/strings.py:22 +#: bridgedb/strings.py:47 #, python-format msgid "" "You have exceeded the rate limit. Please slow down! The minimum time between\n" "emails is %s hours. All further emails during this time period will be ignored." msgstr "Heu superat el límit. El mínim de temps entre\nels correus és de %s hores. La resta de correus durant aquest període de temps seran ignorats." -#: lib/bridgedb/strings.py:25 +#: bridgedb/strings.py:50 msgid "" "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)" -msgstr "COMMANDs: (combina COMMANDs per especificar les múltiples opcions simultàniament)" +msgstr "COMMANDs: (combina COMMANDs per especificar diverses opcions simultàniament)" #. TRANSLATORS: Please DO NOT translate the word "BridgeDB". -#: lib/bridgedb/strings.py:28 +#: bridgedb/strings.py:53 msgid "Welcome to BridgeDB!" msgstr "Benvingut a BridgeDB!" #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE". -#: lib/bridgedb/strings.py:30 +#: bridgedb/strings.py:55 msgid "Currently supported transport TYPEs:" msgstr "Actualment suportant transport TYPEs:" -#: lib/bridgedb/strings.py:31 +#: bridgedb/strings.py:56 #, python-format msgid "Hey, %s!" msgstr "Hola, %s!" -#: lib/bridgedb/strings.py:32 +#: bridgedb/strings.py:57 msgid "Hello, friend!" msgstr "Hola, amic!" -#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100 +#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90 msgid "Public Keys" msgstr "Claus Públiques" #. 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 +#: bridgedb/strings.py:62 #, python-format msgid "" "This email was generated with rainbows, unicorns, and sparkles\n" @@ -96,7 +222,7 @@ msgstr "Aquest correu va ser creat amb unicorns, arcs de Sant Martí i espurnes\ #. 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 +#: bridgedb/strings.py:72 #, python-format msgid "" "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n" @@ -104,10 +230,10 @@ msgid "" "difficult for anyone watching your internet traffic to determine that you are\n" "using Tor.\n" "\n" -msgstr "BridgeDB pot proveïr ponts amb diversos %stypes de Pluggable Transports%s,\nque poden provocar ofuscacions a la vostra connexió a Tor Network, fent més difícil determinar que esteu usant Tor a qualsevol que vegi el vostre tràfic de connexió a\ninternet \n" +msgstr "BridgeDB pot proveïr ponts amb diversos %stypes de Pluggable Transports%s,\nque poden provocar ofuscacions a la vostra connexió a Tor Network, fent més difícil determinar que esteu usant Tor a qualsevol que vegi el vostre tràfic de connexió a\ninternet. \n" #. TRANSLATORS: Please DO NOT translate "Pluggable Transports". -#: lib/bridgedb/strings.py:54 +#: bridgedb/strings.py:79 msgid "" "Some bridges with IPv6 addresses are also available, though some Pluggable\n" "Transports aren't IPv6 compatible.\n" @@ -119,7 +245,7 @@ msgstr "També hi ha ponts disponibles amb adreces IPv6, tot i que alguns Plugga #. 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 +#: bridgedb/strings.py:88 #, python-format msgid "" "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n" @@ -128,20 +254,20 @@ msgid "" "\n" msgstr "A més a més, BridgeDB té molts ponts %s estàndard sense \nPluggable Transports %s, que potser no són tan interessants, però que també\npoden ajudar a esquivar la censura d'internet en molts casos.\n" -#: lib/bridgedb/strings.py:76 +#: bridgedb/strings.py:101 msgid "What are bridges?" msgstr "Què són els ponts?" -#: lib/bridgedb/strings.py:77 +#: bridgedb/strings.py:102 #, python-format msgid "%s Bridges %s are Tor relays that help you circumvent censorship." msgstr "%s Ponts %s són repetidors Tor que ajuden a esquivar la censura." -#: lib/bridgedb/strings.py:82 +#: bridgedb/strings.py:107 msgid "I need an alternative way of getting bridges!" msgstr "Em cal una manera alternativa d'obtenir ponts." -#: lib/bridgedb/strings.py:83 +#: bridgedb/strings.py:108 #, python-format msgid "" "Another way to get bridges is to send an email to %s. Please note that you must\n" @@ -149,61 +275,61 @@ msgid "" "%s, %s or %s." msgstr "Una altra manera d'aconseguir ponts és enviar un correu electrònic a %s. Tingueu en compte que heu\nd'enviar el correu amb una adreça d'un dels següents proveïdors de correu:\n%s, %s or %s." -#: lib/bridgedb/strings.py:90 +#: bridgedb/strings.py:115 msgid "My bridges don't work! I need help!" msgstr "No em funcionen els ponts! Ajuda!" #. TRANSLATORS: Please DO NOT translate "Tor". -#: lib/bridgedb/strings.py:92 +#: bridgedb/strings.py:117 #, python-format msgid "If your Tor doesn't work, you should email %s." -msgstr "Si Tor no us funciona, hauríeu d'enviar un correu a %s." +msgstr "Si Tor no us funciona, envieu un correu a %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 +#: bridgedb/strings.py:121 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 "Incloeu el màxim d'informació sobre el vostre cas, inclosa la llista de\nponts i de Pluggable Transports que heu intentat utilizar, la vostra versió de Tor Browser,\ni qualsevol missatge que Tor hagi donat, etc." -#: lib/bridgedb/strings.py:103 +#: bridgedb/strings.py:128 msgid "Here are your bridge lines:" msgstr "Les vostres línies de ponts:" -#: lib/bridgedb/strings.py:104 +#: bridgedb/strings.py:129 msgid "Get Bridges!" msgstr "Descarregueu ponts!" -#: lib/bridgedb/strings.py:108 +#: bridgedb/strings.py:133 msgid "Please select options for bridge type:" msgstr "Seleccioneu les opcions pel tipus de pont:" -#: lib/bridgedb/strings.py:109 +#: bridgedb/strings.py:134 msgid "Do you need IPv6 addresses?" msgstr "Necessiteu adreces IPv6?" -#: lib/bridgedb/strings.py:110 +#: bridgedb/strings.py:135 #, python-format msgid "Do you need a %s?" msgstr "Necessiteu un %s?" -#: lib/bridgedb/strings.py:114 +#: bridgedb/strings.py:139 msgid "Your browser is not displaying images properly." msgstr "El navegador no està mostrant les imatges correctament." -#: lib/bridgedb/strings.py:115 +#: bridgedb/strings.py:140 msgid "Enter the characters from the image above..." msgstr "Introduïu els caràcters de la imatge superior..." -#: lib/bridgedb/strings.py:119 +#: bridgedb/strings.py:144 msgid "How to start using your bridges" msgstr "Com començar a utilitzar els ponts" #. TRANSLATORS: Please DO NOT translate "Tor Browser". -#: lib/bridgedb/strings.py:121 +#: bridgedb/strings.py:146 #, python-format msgid "" "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n" @@ -212,21 +338,21 @@ msgid "" msgstr "Per introduir ponts al Tor Browser, primer cal anar a %s de la pàgina de descàrrega\n%s i després seguir les instruccions per descarregar i iniciar\nel Tor Browser. " #. TRANSLATORS: Please DO NOT translate "Tor". -#: lib/bridgedb/strings.py:126 +#: bridgedb/strings.py:151 msgid "" "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n" "the wizard until it asks:" msgstr "Quan aparegui el diàleg 'Configuració Xarxa Tor', clica 'Configura' i segueix\nl'auxiliar fins que pregunti:" #. TRANSLATORS: Please DO NOT translate "Tor". -#: lib/bridgedb/strings.py:130 +#: bridgedb/strings.py:155 msgid "" "Does your Internet Service Provider (ISP) block or otherwise censor connections\n" "to the Tor network?" msgstr "El vostre Proveïdor d'Internet (ISP) bloqueja o censura les connexions\namb la xarxa Tor?" #. TRANSLATORS: Please DO NOT translate "Tor". -#: lib/bridgedb/strings.py:134 +#: bridgedb/strings.py:159 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" @@ -234,153 +360,28 @@ msgid "" "button in the 'Tor Network Settings' wizard for further assistance." msgstr "Seleccioneu 'Sí' i després cliqueu 'Següent'. Per configurar els ponts nous, copieu i\nenganxeu les línies del pont al següent quadre d'entrada de text. Finalment, cliqueu 'Connectar', i ja hauria d'estar a punt! Si teniu problemes, intenteu clicar el botó \nd''Ajuda' a l'auxiliar de 'Configuració Xarxa Tor' per més assistència." -#: lib/bridgedb/strings.py:142 +#: bridgedb/strings.py:167 msgid "Displays this message." msgstr "Mostra aquest missatge." #. 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:146 +#: bridgedb/strings.py:171 msgid "Request vanilla bridges." msgstr "Demanar ponts estàndard." -#: lib/bridgedb/strings.py:147 +#: bridgedb/strings.py:172 msgid "Request IPv6 bridges." msgstr "Demanar ponts IPv6." #. TRANSLATORS: Please DO NOT translate the word the word "TYPE". -#: lib/bridgedb/strings.py:149 +#: bridgedb/strings.py:174 msgid "Request a Pluggable Transport by TYPE." msgstr "Demanar un Pluggable Transport per TYPE." #. TRANSLATORS: Please DO NOT translate "BridgeDB". #. TRANSLATORS: Please DO NOT translate "GnuPG". -#: lib/bridgedb/strings.py:152 +#: bridgedb/strings.py:177 msgid "Get a copy of BridgeDB's public GnuPG key." -msgstr "Fer una còpia de la clau pública GnuPG del BridgeDB." - -#: lib/bridgedb/templates/base.html:89 -msgid "Report a Bug" -msgstr "Comunicar un Bug" - -#: lib/bridgedb/templates/base.html:92 -msgid "Source Code" -msgstr "Codi font" - -#: lib/bridgedb/templates/base.html:95 -msgid "Changelog" -msgstr "Canviar el log" - -#: lib/bridgedb/templates/base.html:98 -msgid "Contact" -msgstr "Contacte" - -#: lib/bridgedb/templates/bridges.html:81 -msgid "Select All" -msgstr "Selecciona-ho tot" - -#: lib/bridgedb/templates/bridges.html:87 -msgid "Show QRCode" -msgstr "Mostra el codi QR" - -#: lib/bridgedb/templates/bridges.html:100 -msgid "QRCode for your bridge lines" -msgstr "Codi QR per les línies de ponts" - -#. 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 "Ueeeee, espaguetiiiiis!!!!" - -#: lib/bridgedb/templates/bridges.html:116 -msgid "It seems there was an error getting your QRCode." -msgstr "Hi ha hagut un error en obtenir el codi 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 "Aquest codi QR conté les línies de pont. Escannegeu-lo amb un lector de codis QR per copiar les línies de pont al mòbil i a altres dispositius. " - -#: lib/bridgedb/templates/bridges.html:181 -msgid "There currently aren't any bridges available..." -msgstr "No hi han ponts disponibles en aquests moments..." - -#: lib/bridgedb/templates/bridges.html:182 -#, python-format -msgid "" -" Perhaps you should try %s going back %s and choosing a different bridge " -"type!" -msgstr "Potser hauries de provar %s tirant enrer %s i triant un tipus diferent de pont!" - -#: lib/bridgedb/templates/index.html:11 -#, python-format -msgid "Step %s1%s" -msgstr "Pas %s1%s" - -#: lib/bridgedb/templates/index.html:13 -#, python-format -msgid "Download %s Tor Browser %s" -msgstr "Descarrega %s Navegador Tor %s" - -#: lib/bridgedb/templates/index.html:25 -#, python-format -msgid "Step %s2%s" -msgstr "Pas %s2%s" - -#: lib/bridgedb/templates/index.html:27 -#, python-format -msgid "Get %s bridges %s" -msgstr "Descarrega %s ponts %s" - -#: lib/bridgedb/templates/index.html:36 -#, python-format -msgid "Step %s3%s" -msgstr "Pas %s3%s" - -#: lib/bridgedb/templates/index.html:38 -#, python-format -msgid "Now %s add the bridges to Tor Browser %s" -msgstr "Ara %s adjunta els ponts 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! -#. (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 donem els meus bridges!" - -#: lib/bridgedb/templates/options.html:52 -msgid "Advanced Options" -msgstr "Opcions Avançades" - -#: lib/bridgedb/templates/options.html:88 -msgid "No" -msgstr "No" - -#: lib/bridgedb/templates/options.html:89 -msgid "none" -msgstr "Cap" - -#. 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!" - -#. 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 "%sG%set Bridges" -msgstr "%sG%set Bridges" +msgstr "Descarregar una còpia de la clau pública GnuPG del BridgeDB." diff --git a/pt_BR/LC_MESSAGES/bridgedb.po b/pt_BR/LC_MESSAGES/bridgedb.po index 144243c..5b67aa3 100644 --- a/pt_BR/LC_MESSAGES/bridgedb.po +++ b/pt_BR/LC_MESSAGES/bridgedb.po @@ -19,8 +19,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2015-07-25 03:40+0000\n" -"PO-Revision-Date: 2015-11-09 01:27+0000\n" -"Last-Translator: Danton Medrado\n" +"PO-Revision-Date: 2015-12-19 19:50+0000\n" +"Last-Translator: Communia <ameaneantie(a)riseup.net>\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/otf/torproject/language/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -265,7 +265,7 @@ msgstr "O que são pontes?" #: bridgedb/strings.py:102 #, python-format msgid "%s Bridges %s are Tor relays that help you circumvent censorship." -msgstr "%s Pontes %s são retransmissores Tor que ajudam a driblar a censura." +msgstr "%s Pontes %s são relés Tor que ajudam a driblar a censura." #: bridgedb/strings.py:107 msgid "I need an alternative way of getting bridges!" diff --git a/tr/LC_MESSAGES/bridgedb.po b/tr/LC_MESSAGES/bridgedb.po index f050747..e8bfdaf 100644 --- a/tr/LC_MESSAGES/bridgedb.po +++ b/tr/LC_MESSAGES/bridgedb.po @@ -11,15 +11,15 @@ # erg26 <ergungorler(a)gmail.com>, 2012 # eromytsatiffird <driffitastymore(a)gmail.com>, 2014 # Fomas <fomas.adana(a)gmail.com>, 2015 -# Idil Yuksel <perfectionne(a)gmail.com>, 2014 +# Idil Yuksel <idilyuksel(a)hotmail.com>, 2014 # Kaya Zeren <kayazeren(a)gmail.com>, 2015 # Ozancan Karataş <ozancankaratas96(a)outlook.com>, 2015 # ozkansib <s.ozkan(a)gyte.edu.tr>, 2014 -# Idil Yuksel <perfectionne(a)gmail.com>, 2014 +# Idil Yuksel <idilyuksel(a)hotmail.com>, 2014 # Sercan Altundaş <>, 2012 # ozkansib <s.ozkan(a)gyte.edu.tr>, 2014 # Tekel Bira <psycookie(a)gmail.com>, 2012 -# Volkan Gezer <volkangezer(a)gmail.com>, 2014-2015 +# Volkan Gezer <volkangezer(a)gmail.com>, 2014-2016 # zeki <zeki.ozguryazilim(a)gmail.com>, 2014 # zeki <zeki.ozguryazilim(a)gmail.com>, 2014 msgid "" @@ -27,8 +27,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2015-07-25 03:40+0000\n" -"PO-Revision-Date: 2015-10-21 18:00+0000\n" -"Last-Translator: Ozancan Karataş <ozancankaratas96(a)outlook.com>\n" +"PO-Revision-Date: 2016-01-04 17:11+0000\n" +"Last-Translator: Volkan Gezer <volkangezer(a)gmail.com>\n" "Language-Team: Turkish (http://www.transifex.com/otf/torproject/language/tr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -50,7 +50,7 @@ msgstr "" #. "Tor Browser" #: bridgedb/https/server.py:167 msgid "Sorry! Something went wrong with your request." -msgstr "Üzgünüz! İsteğiniz ile ilgili birşeyler ters gitti." +msgstr "Üzgünüz! İsteğiniz ile ilgili bir şeyler ters gitti." #: bridgedb/https/templates/base.html:79 msgid "Report a Bug" diff --git a/zh_CN/LC_MESSAGES/bridgedb.po b/zh_CN/LC_MESSAGES/bridgedb.po index 7327341..4e18d8d 100644 --- a/zh_CN/LC_MESSAGES/bridgedb.po +++ b/zh_CN/LC_MESSAGES/bridgedb.po @@ -6,23 +6,24 @@ # khi, 2013 # khi, 2013 # khi, 2013 -# Christopher Meng <cickumqt(a)gmail.com>, 2012 +# Christopher Meng <i(a)cicku.me>, 2012 # hanl <iamh4n(a)gmail.com>, 2011 -# Meng3, 2014 +# Meng3, 2014,2016 # leungsookfan <leung.sookfan(a)riseup.net>, 2014 # khi, 2014-2015 # YF <yfdyh000(a)gmail.com>, 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…'POT-Creation-Date: 2015-03-19 22:13+0000\n" -"PO-Revision-Date: 2015-06-16 14:41+0000\n" -"Last-Translator: khi\n" -"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/torproject/language/zh_CN/)\n" +"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" +"POT-Creation-Date: 2015-07-25 03:40+0000\n" +"PO-Revision-Date: 2016-01-03 19:52+0000\n" +"Last-Translator: Meng3\n" +"Language-Team: Chinese (China) (http://www.transifex.com/otf/torproject/language/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 0.9.6\n" +"Generated-By: Babel 1.3\n" "Language: zh_CN\n" "Plural-Forms: nplurals=1; plural=0;\n" @@ -37,57 +38,182 @@ msgstr "" #. "fteproxy" #. "Tor" #. "Tor Browser" -#: lib/bridgedb/HTTPServer.py:107 +#: bridgedb/https/server.py:167 msgid "Sorry! Something went wrong with your request." msgstr "抱歉，你的邮件请求出现问题。" -#: lib/bridgedb/strings.py:18 +#: bridgedb/https/templates/base.html:79 +msgid "Report a Bug" +msgstr "报告 Bug" + +#: bridgedb/https/templates/base.html:82 +msgid "Source Code" +msgstr "源代码" + +#: bridgedb/https/templates/base.html:85 +msgid "Changelog" +msgstr "更改日志" + +#: bridgedb/https/templates/base.html:88 +msgid "Contact" +msgstr "联系方式" + +#: bridgedb/https/templates/bridges.html:35 +msgid "Select All" +msgstr "选择全部" + +#: bridgedb/https/templates/bridges.html:40 +msgid "Show QRCode" +msgstr "显示二维码" + +#: bridgedb/https/templates/bridges.html:52 +msgid "QRCode for your bridge lines" +msgstr "网桥二维码" + +#. TRANSLATORS: Please translate this into some silly way to say +#. "There was a problem!" in your language. For example, +#. for Italian, you might translate this into "Mama mia!", +#. or for French: "Sacrebleu!". :) +#: bridgedb/https/templates/bridges.html:67 +#: bridgedb/https/templates/bridges.html:125 +msgid "Uh oh, spaghettios!" +msgstr "哎哟哟！" + +#: bridgedb/https/templates/bridges.html:68 +msgid "It seems there was an error getting your QRCode." +msgstr "获取二维码时出错。" + +#: bridgedb/https/templates/bridges.html:73 +msgid "" +"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy" +" your bridge lines onto mobile and other devices." +msgstr "二维码包含网桥信息。利用二维码扫描程序，可将相应的网桥信息复制到手机或其他设备。" + +#: bridgedb/https/templates/bridges.html:131 +msgid "There currently aren't any bridges available..." +msgstr "现在没有可用的网桥。" + +#: bridgedb/https/templates/bridges.html:132 +#, python-format +msgid "" +" Perhaps you should try %s going back %s and choosing a different bridge " +"type!" +msgstr "试试 %s后退%s到前一页面，然后选择其他类型的网桥。" + +#: bridgedb/https/templates/index.html:11 +#, python-format +msgid "Step %s1%s" +msgstr "第 %s 1 %s 步" + +#: bridgedb/https/templates/index.html:13 +#, python-format +msgid "Download %s Tor Browser %s" +msgstr "下载 %s Tor 浏览器 %s" + +#: bridgedb/https/templates/index.html:25 +#, python-format +msgid "Step %s2%s" +msgstr "第 %s 2 %s 步" + +#: bridgedb/https/templates/index.html:27 +#, python-format +msgid "Get %s bridges %s" +msgstr "获取 %s bridges %s" + +#: bridgedb/https/templates/index.html:36 +#, python-format +msgid "Step %s3%s" +msgstr "第 %s 3 %s 步" + +#: bridgedb/https/templates/index.html:38 +#, python-format +msgid "Now %s add the bridges to Tor Browser %s" +msgstr "如何 %s 在 Tor 浏览器添加网桥%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.) +#: bridgedb/https/templates/options.html:38 +#, python-format +msgid "%sJ%sust give me bridges!" +msgstr " 直接给我网桥(%sJ%s)！ " + +#: bridgedb/https/templates/options.html:51 +msgid "Advanced Options" +msgstr "高级选项" + +#: bridgedb/https/templates/options.html:86 +msgid "No" +msgstr "否" + +#: bridgedb/https/templates/options.html:87 +msgid "none" +msgstr "无" + +#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the +#. beginning of words are present in your final translation. Thanks! +#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses." +#: bridgedb/https/templates/options.html:124 +#, python-format +msgid "%sY%ses!" +msgstr "是(%sY%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"! +#: bridgedb/https/templates/options.html:147 +#, python-format +msgid "%sG%set Bridges" +msgstr "获取网桥(%sG%s)" + +#: bridgedb/strings.py:43 msgid "[This is an automated message; please do not reply.]" msgstr "[这是一封自动生成的邮件，请勿回复。]" -#: lib/bridgedb/strings.py:20 +#: bridgedb/strings.py:45 msgid "Here are your bridges:" msgstr "以下是为你提供的网桥：" -#: lib/bridgedb/strings.py:22 +#: bridgedb/strings.py:47 #, python-format msgid "" "You have exceeded the rate limit. Please slow down! The minimum time between\n" "emails is %s hours. All further emails during this time period will be ignored." msgstr "您已超出了发送频率的限制，请慢慢来！两封邮件之间需要最少 %s 小时的间隔。在间隔期间发出的所有邮件将被忽略。" -#: lib/bridgedb/strings.py:25 +#: bridgedb/strings.py:50 msgid "" "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)" msgstr "命令：（组合使用命令可同时指定多个选项）" #. TRANSLATORS: Please DO NOT translate the word "BridgeDB". -#: lib/bridgedb/strings.py:28 +#: bridgedb/strings.py:53 msgid "Welcome to BridgeDB!" msgstr "欢迎来到 BridgeDB！" #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE". -#: lib/bridgedb/strings.py:30 +#: bridgedb/strings.py:55 msgid "Currently supported transport TYPEs:" msgstr "目前可用的 transport 类型：" -#: lib/bridgedb/strings.py:31 +#: bridgedb/strings.py:56 #, python-format msgid "Hey, %s!" msgstr "你好，%s！" -#: lib/bridgedb/strings.py:32 +#: bridgedb/strings.py:57 msgid "Hello, friend!" msgstr "你好，朋友！" -#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100 +#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90 msgid "Public Keys" msgstr "公共密匙" #. TRANSLATORS: This string will end up saying something like: #. "This email was generated with rainbows, unicorns, and sparkles #. for alice(a)example.com on Friday, 09 May, 2014 at 18:59:39." -#: lib/bridgedb/strings.py:37 +#: bridgedb/strings.py:62 #, python-format msgid "" "This email was generated with rainbows, unicorns, and sparkles\n" @@ -98,7 +224,7 @@ msgstr "本邮件是对 %s 的自动回复，日期 %s %s。" #. 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 +#: bridgedb/strings.py:72 #, python-format msgid "" "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n" @@ -109,7 +235,7 @@ msgid "" msgstr "BridgeDB 能提供 %s 几种 Pluggable Transports %s 类型网桥，可用于混淆 Tor 网络的连接，从而让网络监控者难以判断你在使用 Tor。\n" #. TRANSLATORS: Please DO NOT translate "Pluggable Transports". -#: lib/bridgedb/strings.py:54 +#: bridgedb/strings.py:79 msgid "" "Some bridges with IPv6 addresses are also available, though some Pluggable\n" "Transports aren't IPv6 compatible.\n" @@ -121,7 +247,7 @@ msgstr "另外提供一些IPv6格式的网桥，不过某些 Pluggable Transport #. 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 +#: bridgedb/strings.py:88 #, python-format msgid "" "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n" @@ -130,33 +256,33 @@ msgid "" "\n" msgstr "此外，BridgeDB 提供很多 %s 非Pluggable Transports %s 的普通网桥。\n虽然听起来不够酷，但是这些普通网桥依然可以在很多情况下帮助绕过审查。\n" -#: lib/bridgedb/strings.py:76 +#: bridgedb/strings.py:101 msgid "What are bridges?" msgstr "什么是网桥？" -#: lib/bridgedb/strings.py:77 +#: bridgedb/strings.py:102 #, python-format msgid "%s Bridges %s are Tor relays that help you circumvent censorship." msgstr "%s网桥%s即 Tor 中继节点，用于帮助用户绕过审查或封锁。" -#: lib/bridgedb/strings.py:82 +#: bridgedb/strings.py:107 msgid "I need an alternative way of getting bridges!" msgstr "需要使用其他获取方式获取网桥！" -#: lib/bridgedb/strings.py:83 +#: bridgedb/strings.py:108 #, python-format 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。注意：必须使用电子邮箱发送请求：%s、%s 或 %s。" +msgstr "另一种获取网桥的方式是发送电子邮件至 %s。注意：必须使用以下电子邮箱发送请求：%s、%s 或 %s。" -#: lib/bridgedb/strings.py:90 +#: bridgedb/strings.py:115 msgid "My bridges don't work! I need help!" msgstr "用网桥也无法连接，需要帮助！" #. TRANSLATORS: Please DO NOT translate "Tor". -#: lib/bridgedb/strings.py:92 +#: bridgedb/strings.py:117 #, python-format msgid "If your Tor doesn't work, you should email %s." msgstr "如果 Tor 无法正常运行，请发邮件至 %s。" @@ -164,48 +290,48 @@ msgstr "如果 Tor 无法正常运行，请发邮件至 %s。" #. TRANSLATORS: Please DO NOT translate "Pluggable Transports". #. TRANSLATORS: Please DO NOT translate "Tor Browser". #. TRANSLATORS: Please DO NOT translate "Tor". -#: lib/bridgedb/strings.py:96 +#: bridgedb/strings.py:121 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 "请尽量详细地描述你的情况，包括所用的网桥及其类型，Tor 浏览器版本以及任何 Tor 显示的信息等等。" -#: lib/bridgedb/strings.py:103 +#: bridgedb/strings.py:128 msgid "Here are your bridge lines:" msgstr "以下是为你提供的网桥：" -#: lib/bridgedb/strings.py:104 +#: bridgedb/strings.py:129 msgid "Get Bridges!" msgstr "获得网桥！" -#: lib/bridgedb/strings.py:108 +#: bridgedb/strings.py:133 msgid "Please select options for bridge type:" msgstr "请选择类型类型。" -#: lib/bridgedb/strings.py:109 +#: bridgedb/strings.py:134 msgid "Do you need IPv6 addresses?" msgstr "是否需要IPv6地址？" -#: lib/bridgedb/strings.py:110 +#: bridgedb/strings.py:135 #, python-format msgid "Do you need a %s?" msgstr "是否需要 %s？" -#: lib/bridgedb/strings.py:114 +#: bridgedb/strings.py:139 msgid "Your browser is not displaying images properly." msgstr "浏览器无法正确显示图片。" -#: lib/bridgedb/strings.py:115 +#: bridgedb/strings.py:140 msgid "Enter the characters from the image above..." msgstr "请输入上图中的字符（不区分大小写）..." -#: lib/bridgedb/strings.py:119 +#: bridgedb/strings.py:144 msgid "How to start using your bridges" msgstr "如何使用网桥" #. TRANSLATORS: Please DO NOT translate "Tor Browser". -#: lib/bridgedb/strings.py:121 +#: bridgedb/strings.py:146 #, python-format msgid "" "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n" @@ -214,21 +340,21 @@ msgid "" msgstr "如需在 Tor 浏览器中添加网桥，请先根据 %s Tor 浏览器下载页面 %s 的说明下载和启动 Tor 浏览器。" #. TRANSLATORS: Please DO NOT translate "Tor". -#: lib/bridgedb/strings.py:126 +#: bridgedb/strings.py:151 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:130 +#: bridgedb/strings.py:155 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:134 +#: bridgedb/strings.py:159 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" @@ -236,153 +362,28 @@ msgid "" "button in the 'Tor Network Settings' wizard for further assistance." msgstr "选择“是”，然后点击“下一步”。如下添加新的网桥，请将网桥地址行通过复制粘贴的方式输入到文本输入框。最后，点击“连接”就可以连接至 Tor 网络。如有问题需要帮助，请点击“Tor 网络设置”向导窗口中的“帮助”按钮。" -#: lib/bridgedb/strings.py:142 +#: bridgedb/strings.py:167 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:146 +#: bridgedb/strings.py:171 msgid "Request vanilla bridges." msgstr "请求普通网桥。" -#: lib/bridgedb/strings.py:147 +#: bridgedb/strings.py:172 msgid "Request IPv6 bridges." msgstr "请求IPv6网络。" #. TRANSLATORS: Please DO NOT translate the word the word "TYPE". -#: lib/bridgedb/strings.py:149 +#: bridgedb/strings.py:174 msgid "Request a Pluggable Transport by TYPE." msgstr "按照类型请求不同的 Pluggable Transport 网桥。" #. TRANSLATORS: Please DO NOT translate "BridgeDB". #. TRANSLATORS: Please DO NOT translate "GnuPG". -#: lib/bridgedb/strings.py:152 +#: bridgedb/strings.py:177 msgid "Get a copy of BridgeDB's public GnuPG key." msgstr "获取 BridgeDB 的 GnuPG 公共密匙。" - -#: lib/bridgedb/templates/base.html:89 -msgid "Report a Bug" -msgstr "报告 Bug" - -#: lib/bridgedb/templates/base.html:92 -msgid "Source Code" -msgstr "源代码" - -#: lib/bridgedb/templates/base.html:95 -msgid "Changelog" -msgstr "更改日志" - -#: lib/bridgedb/templates/base.html:98 -msgid "Contact" -msgstr "联系方式" - -#: lib/bridgedb/templates/bridges.html:81 -msgid "Select All" -msgstr "选择全部" - -#: lib/bridgedb/templates/bridges.html:87 -msgid "Show QRCode" -msgstr "显示二维码" - -#: lib/bridgedb/templates/bridges.html:100 -msgid "QRCode for your bridge lines" -msgstr "网桥二维码" - -#. TRANSLATORS: Please translate this into some silly way to say -#. "There was a problem!" in your language. For example, -#. for Italian, you might translate this into "Mama mia!", -#. or for French: "Sacrebleu!". :) -#: lib/bridgedb/templates/bridges.html:115 -#: lib/bridgedb/templates/bridges.html:175 -msgid "Uh oh, spaghettios!" -msgstr "哎哟哟！" - -#: lib/bridgedb/templates/bridges.html:116 -msgid "It seems there was an error getting your QRCode." -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 "二维码包含网桥信息。利用二维码扫描程序，可将相应的网桥信息复制到手机或其他设备。" - -#: lib/bridgedb/templates/bridges.html:181 -msgid "There currently aren't any bridges available..." -msgstr "现在没有可用的网桥。" - -#: lib/bridgedb/templates/bridges.html:182 -#, python-format -msgid "" -" Perhaps you should try %s going back %s and choosing a different bridge " -"type!" -msgstr "试试 %s后退%s到前一页面，然后选择其他类型的网桥。" - -#: lib/bridgedb/templates/index.html:11 -#, python-format -msgid "Step %s1%s" -msgstr "第 %s 1 %s 步" - -#: lib/bridgedb/templates/index.html:13 -#, python-format -msgid "Download %s Tor Browser %s" -msgstr "下载 %s Tor 浏览器 %s" - -#: lib/bridgedb/templates/index.html:25 -#, python-format -msgid "Step %s2%s" -msgstr "第 %s 2 %s 步" - -#: lib/bridgedb/templates/index.html:27 -#, python-format -msgid "Get %s bridges %s" -msgstr "获取 %s bridges %s" - -#: lib/bridgedb/templates/index.html:36 -#, python-format -msgid "Step %s3%s" -msgstr "第 %s 3 %s 步" - -#: lib/bridgedb/templates/index.html:38 -#, python-format -msgid "Now %s add the bridges to Tor Browser %s" -msgstr "如何 %s 在 Tor 浏览器添加网桥%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%s)！ " - -#: lib/bridgedb/templates/options.html:52 -msgid "Advanced Options" -msgstr "高级选项" - -#: lib/bridgedb/templates/options.html:88 -msgid "No" -msgstr "否" - -#: lib/bridgedb/templates/options.html:89 -msgid "none" -msgstr "无" - -#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the -#. beginning of words are present in your final translation. Thanks! -#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses." -#: lib/bridgedb/templates/options.html:127 -#, python-format -msgid "%sY%ses!" -msgstr "是(%sY%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:151 -#, python-format -msgid "%sG%set Bridges" -msgstr "获取网桥(%sG%s)"

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 06 Jan '16

06 Jan '16

commit c0fa3c324c539186ab82c22a68daf989712f350c Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jan 6 12:45:10 2016 +0000 Update translations for bridgedb --- ar/LC_MESSAGES/bridgedb.po | 4 +- bg/LC_MESSAGES/bridgedb.po | 338 ++++++++++++++++++++-------------------- ca/LC_MESSAGES/bridgedb.po | 341 ++++++++++++++++++++-------------------- mr/LC_MESSAGES/bridgedb.po | 338 ++++++++++++++++++++-------------------- pt_BR/LC_MESSAGES/bridgedb.po | 6 +- tr/LC_MESSAGES/bridgedb.po | 12 +- zh_CN/LC_MESSAGES/bridgedb.po | 343 +++++++++++++++++++++-------------------- zh_HK/LC_MESSAGES/bridgedb.po | 342 ++++++++++++++++++++-------------------- 8 files changed, 866 insertions(+), 858 deletions(-) diff --git a/ar/LC_MESSAGES/bridgedb.po b/ar/LC_MESSAGES/bridgedb.po index baf5b21..8105ab9 100644 --- a/ar/LC_MESSAGES/bridgedb.po +++ b/ar/LC_MESSAGES/bridgedb.po @@ -25,8 +25,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2015-07-25 03:40+0000\n" -"PO-Revision-Date: 2015-11-10 21:25+0000\n" -"Last-Translator: yahia zakaria <yahiazak(a)hotmail.com>\n" +"PO-Revision-Date: 2016-01-03 11:13+0000\n" +"Last-Translator: ouss <oussjarrouse(a)gmail.com>\n" "Language-Team: Arabic (http://www.transifex.com/otf/torproject/language/ar/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff --git a/bg/LC_MESSAGES/bridgedb.po b/bg/LC_MESSAGES/bridgedb.po index b01866e..7ff24b4 100644 --- a/bg/LC_MESSAGES/bridgedb.po +++ b/bg/LC_MESSAGES/bridgedb.po @@ -4,18 +4,20 @@ # # Translators: # aramaic <aramaicbg(a)gmail.com>, 2015 +# Maxi <kutia0001(a)gmail.com>, 2015 # Tsvetan Nikolov <slakware(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-08-11 13:22+0000\n" -"Last-Translator: Tsvetan Nikolov <slakware(a)gmail.com>\n" +"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" +"POT-Creation-Date: 2015-07-25 03:40+0000\n" +"PO-Revision-Date: 2015-12-22 07:09+0000\n" +"Last-Translator: Maxi <kutia0001(a)gmail.com>\n" "Language-Team: Bulgarian (http://www.transifex.com/otf/torproject/language/bg/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 0.9.6\n" +"Generated-By: Babel 1.3\n" "Language: bg\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" @@ -30,68 +32,193 @@ msgstr "" #. "fteproxy" #. "Tor" #. "Tor Browser" -#: lib/bridgedb/HTTPServer.py:107 +#: bridgedb/https/server.py:167 msgid "Sorry! Something went wrong with your request." msgstr "Съжаляваме! Нещо се обърка с заявката ви." -#: lib/bridgedb/strings.py:18 +#: bridgedb/https/templates/base.html:79 +msgid "Report a Bug" +msgstr "Информирай за проблем" + +#: bridgedb/https/templates/base.html:82 +msgid "Source Code" +msgstr "Изходен код" + +#: bridgedb/https/templates/base.html:85 +msgid "Changelog" +msgstr "Дневник на промените" + +#: bridgedb/https/templates/base.html:88 +msgid "Contact" +msgstr "Контакт" + +#: bridgedb/https/templates/bridges.html:35 +msgid "Select All" +msgstr "Избeри всичко" + +#: bridgedb/https/templates/bridges.html:40 +msgid "Show QRCode" +msgstr "Покажи QR Код" + +#: bridgedb/https/templates/bridges.html:52 +msgid "QRCode for your bridge lines" +msgstr "QR Код за вашите bridge линии" + +#. 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!". :) +#: bridgedb/https/templates/bridges.html:67 +#: bridgedb/https/templates/bridges.html:125 +msgid "Uh oh, spaghettios!" +msgstr "Ооо, спагетки!" + +#: bridgedb/https/templates/bridges.html:68 +msgid "It seems there was an error getting your QRCode." +msgstr "Изглежда е имало грешка при получаване на вашия QR Код." + +#: bridgedb/https/templates/bridges.html:73 +msgid "" +"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy" +" your bridge lines onto mobile and other devices." +msgstr "Този QRCode съдържа вашите мостови линии. Сканирайте го с QR Код четец да копирате вашите мостови линии към мобилни и други устройства." + +#: bridgedb/https/templates/bridges.html:131 +msgid "There currently aren't any bridges available..." +msgstr "В момента няма налични bridges ..." + +#: bridgedb/https/templates/bridges.html:132 +#, python-format +msgid "" +" Perhaps you should try %s going back %s and choosing a different bridge " +"type!" +msgstr "Най вероятно трябва да %s се върнете %s и изберете различенt bridge тип!" + +#: bridgedb/https/templates/index.html:11 +#, python-format +msgid "Step %s1%s" +msgstr "Стъпка %s1%s" + +#: bridgedb/https/templates/index.html:13 +#, python-format +msgid "Download %s Tor Browser %s" +msgstr "Свали %s Tor Browser %s" + +#: bridgedb/https/templates/index.html:25 +#, python-format +msgid "Step %s2%s" +msgstr "Стъпка %s2%s" + +#: bridgedb/https/templates/index.html:27 +#, python-format +msgid "Get %s bridges %s" +msgstr "Вземи %s bridges %s" + +#: bridgedb/https/templates/index.html:36 +#, python-format +msgid "Step %s3%s" +msgstr "Стъпка %s3%s" + +#: bridgedb/https/templates/index.html:38 +#, python-format +msgid "Now %s add the bridges to Tor Browser %s" +msgstr "Сега %sдобавете bridges към 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.) +#: bridgedb/https/templates/options.html:38 +#, python-format +msgid "%sJ%sust give me bridges!" +msgstr "%sП%sросто ми дайте bridges!" + +#: bridgedb/https/templates/options.html:51 +msgid "Advanced Options" +msgstr "Разширени възможности" + +#: bridgedb/https/templates/options.html:86 +msgid "No" +msgstr "Не" + +#: bridgedb/https/templates/options.html:87 +msgid "none" +msgstr "нищо" + +#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the +#. beginning of words are present in your final translation. Thanks! +#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses." +#: bridgedb/https/templates/options.html:124 +#, python-format +msgid "%sY%ses!" +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"! +#: bridgedb/https/templates/options.html:147 +#, python-format +msgid "%sG%set Bridges" +msgstr "%sВ%sземи Bridges" + +#: bridgedb/strings.py:43 msgid "[This is an automated message; please do not reply.]" msgstr "[Автоматично съобщение; моля не отговаряйте.]" -#: lib/bridgedb/strings.py:20 +#: bridgedb/strings.py:45 msgid "Here are your bridges:" msgstr "Това са вашите мрежови bridges:" -#: lib/bridgedb/strings.py:22 +#: bridgedb/strings.py:47 #, python-format msgid "" "You have exceeded the rate limit. Please slow down! The minimum time between\n" "emails is %s hours. All further emails during this time period will be ignored." msgstr "Надхвърлихте позволения период за е-поща . Моля забавете! Минималния период между две е-пощи е %s часа. Всички следващи е-пощи по време на този период ще бъдат анулирани." -#: lib/bridgedb/strings.py:25 +#: bridgedb/strings.py:50 msgid "" "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)" msgstr "COMMANDs: (комбинирай COMMANDs за да определиш мулти опции едновременно)" #. TRANSLATORS: Please DO NOT translate the word "BridgeDB". -#: lib/bridgedb/strings.py:28 +#: bridgedb/strings.py:53 msgid "Welcome to BridgeDB!" msgstr "Добре дошли в BridgeDB!" #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE". -#: lib/bridgedb/strings.py:30 +#: bridgedb/strings.py:55 msgid "Currently supported transport TYPEs:" msgstr "Актуални поддържани транспорт TYPEs:" -#: lib/bridgedb/strings.py:31 +#: bridgedb/strings.py:56 #, python-format msgid "Hey, %s!" msgstr "Хей, %s!" -#: lib/bridgedb/strings.py:32 +#: bridgedb/strings.py:57 msgid "Hello, friend!" msgstr "Здравей, приятел!" -#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100 +#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90 msgid "Public Keys" msgstr "Обществен ключ" #. TRANSLATORS: This string will end up saying something like: #. "This email was generated with rainbows, unicorns, and sparkles #. for alice(a)example.com on Friday, 09 May, 2014 at 18:59:39." -#: lib/bridgedb/strings.py:37 +#: bridgedb/strings.py:62 #, python-format msgid "" "This email was generated with rainbows, unicorns, and sparkles\n" "for %s on %s at %s." -msgstr "Този е-поща беше генерирана с дъги, уникорни, и заря\nза %s в %s в %s." +msgstr "Този е-поща беше генерирана с дъги, еднорози, и заря\nза %s в %s в %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 +#: bridgedb/strings.py:72 #, python-format msgid "" "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n" @@ -102,7 +229,7 @@ msgid "" msgstr "BridgeDB може да предложи bridges с много %sвидове на Pluggable Transports%s,\nкоито могат да помогнат да подсигурят вашата връзка към Tor Network, правейки я по\nтрудна за наблюдение за всеки наблюдаващ вашия интернет трафик да открие че ползвате Tor\n \n" #. TRANSLATORS: Please DO NOT translate "Pluggable Transports". -#: lib/bridgedb/strings.py:54 +#: bridgedb/strings.py:79 msgid "" "Some bridges with IPv6 addresses are also available, though some Pluggable\n" "Transports aren't IPv6 compatible.\n" @@ -114,7 +241,7 @@ msgstr "Някой bridges с IPv6 адреси са също налични, н #. 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 +#: bridgedb/strings.py:88 #, python-format msgid "" "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n" @@ -123,20 +250,20 @@ msgid "" "\n" msgstr "Допълнително, BridgeDB има много plain-ol'-vanilla bridges %s без никакви\nPluggable Transports %s които не изглеждат толкова добре, но все пак могат\nда помогнат за заобикаляне на интернет цензурата в много случаи.\n\n" -#: lib/bridgedb/strings.py:76 +#: bridgedb/strings.py:101 msgid "What are bridges?" msgstr "Какво са bridges?" -#: lib/bridgedb/strings.py:77 +#: bridgedb/strings.py:102 #, python-format msgid "%s Bridges %s are Tor relays that help you circumvent censorship." msgstr "%s Bridges %s са Tor relays които помагат за заобикаляне на цензурата." -#: lib/bridgedb/strings.py:82 +#: bridgedb/strings.py:107 msgid "I need an alternative way of getting bridges!" msgstr "Имам нужда от алтернативен вариант за намиране на bridges!" -#: lib/bridgedb/strings.py:83 +#: bridgedb/strings.py:108 #, python-format msgid "" "Another way to get bridges is to send an email to %s. Please note that you must\n" @@ -144,12 +271,12 @@ msgid "" "%s, %s or %s." msgstr "Друг вариант за набавяне на bridges е пращане на е-поща до %s. Моля отбележете, че вие трябва да\nизпратите е-поща използвайки адрес на един от следните доставчици:\n%s, %s or %s." -#: lib/bridgedb/strings.py:90 +#: bridgedb/strings.py:115 msgid "My bridges don't work! I need help!" msgstr "Моите bridges не работят! Имам нужда от помощ!" #. TRANSLATORS: Please DO NOT translate "Tor". -#: lib/bridgedb/strings.py:92 +#: bridgedb/strings.py:117 #, python-format msgid "If your Tor doesn't work, you should email %s." msgstr "Ако вашия Tor не работи, изпратете е-поща до %s." @@ -157,48 +284,48 @@ msgstr "Ако вашия Tor не работи, изпратете е-поща #. 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 +#: bridgedb/strings.py:121 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 "Опитайте се да включите колкото се може повече информация за вашия случай, включително списък на\nbridges и Pluggable Transports които сте използвали, вашата Tor Browser версия,\nи всяко съобщение с което Tor е отговорил, и т.н." -#: lib/bridgedb/strings.py:103 +#: bridgedb/strings.py:128 msgid "Here are your bridge lines:" msgstr "Тус са вашите bridge връзки:" -#: lib/bridgedb/strings.py:104 +#: bridgedb/strings.py:129 msgid "Get Bridges!" msgstr "Вземете Bridges!" -#: lib/bridgedb/strings.py:108 +#: bridgedb/strings.py:133 msgid "Please select options for bridge type:" msgstr "Моля изберете опция за вид bridge:" -#: lib/bridgedb/strings.py:109 +#: bridgedb/strings.py:134 msgid "Do you need IPv6 addresses?" msgstr "Нуждаете ли се от IPv6 адреси?" -#: lib/bridgedb/strings.py:110 +#: bridgedb/strings.py:135 #, python-format msgid "Do you need a %s?" msgstr "Нуздаете ли се от %s?" -#: lib/bridgedb/strings.py:114 +#: bridgedb/strings.py:139 msgid "Your browser is not displaying images properly." msgstr "Вашия браузер не показва правилно изображения." -#: lib/bridgedb/strings.py:115 +#: bridgedb/strings.py:140 msgid "Enter the characters from the image above..." msgstr "Въведете символите от изображението от горе..." -#: lib/bridgedb/strings.py:119 +#: bridgedb/strings.py:144 msgid "How to start using your bridges" msgstr "Как да започнете да използвате вашите bridges" #. TRANSLATORS: Please DO NOT translate "Tor Browser". -#: lib/bridgedb/strings.py:121 +#: bridgedb/strings.py:146 #, python-format msgid "" "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n" @@ -207,21 +334,21 @@ msgid "" msgstr "За въвеждане на bridges в Tor Browser, първо отидете на \n%s Tor Browser уеб страницата за сваляне %s и след това \nследвайте инструкциите там за сваляне и стартиране на \nTor Browser." #. TRANSLATORS: Please DO NOT translate "Tor". -#: lib/bridgedb/strings.py:126 +#: bridgedb/strings.py:151 msgid "" "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n" "the wizard until it asks:" msgstr "Когато 'Tor Network Settings' прозорец се отвори, кликнете 'Configure' и следвайте\nсъветника докато не попита:" #. TRANSLATORS: Please DO NOT translate "Tor". -#: lib/bridgedb/strings.py:130 +#: bridgedb/strings.py:155 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:134 +#: bridgedb/strings.py:159 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" @@ -229,153 +356,28 @@ msgid "" "button in the 'Tor Network Settings' wizard for further assistance." msgstr "Изберете 'Да' и след това кликнете 'Напред'. За да конфигурирате вашите нови bridges, копирайте и\nпоставете bridge редовете в прозореца за текстово въвеждане. На края натиснете 'Свържи се', и\nтрябва да сте готови! Ако срещате трудности, отидете на 'Помощ' бутона в 'Tor Network Settings' съветника за помощ." -#: lib/bridgedb/strings.py:142 +#: bridgedb/strings.py:167 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:146 +#: bridgedb/strings.py:171 msgid "Request vanilla bridges." msgstr "Заяви стандартни bridges." -#: lib/bridgedb/strings.py:147 +#: bridgedb/strings.py:172 msgid "Request IPv6 bridges." msgstr "Заяви IPv6 bridges." #. TRANSLATORS: Please DO NOT translate the word the word "TYPE". -#: lib/bridgedb/strings.py:149 +#: bridgedb/strings.py:174 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:152 +#: bridgedb/strings.py:177 msgid "Get a copy of BridgeDB's public GnuPG key." msgstr "Вземи копие на BridgeDB's обществен GnuPG ключ." - -#: lib/bridgedb/templates/base.html:89 -msgid "Report a Bug" -msgstr "Информирай за проблем" - -#: lib/bridgedb/templates/base.html:92 -msgid "Source Code" -msgstr "Изходен код" - -#: lib/bridgedb/templates/base.html:95 -msgid "Changelog" -msgstr "Дневник на промените" - -#: lib/bridgedb/templates/base.html:98 -msgid "Contact" -msgstr "Контакт" - -#: lib/bridgedb/templates/bridges.html:81 -msgid "Select All" -msgstr "Избири всичко" - -#: lib/bridgedb/templates/bridges.html:87 -msgid "Show QRCode" -msgstr "Покажи QR Код" - -#: lib/bridgedb/templates/bridges.html:100 -msgid "QRCode for your bridge lines" -msgstr "QR Код за вашите bridge линии" - -#. 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 "Ооо, спагетки!" - -#: lib/bridgedb/templates/bridges.html:116 -msgid "It seems there was an error getting your QRCode." -msgstr "Изглежда е имало грешка при получаване на вашия 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 "Този QRCode съдържа вашите мостови линии. Сканирайте го с QR Код четец да копирате вашите мостови линии към мобилни и други устройства." - -#: lib/bridgedb/templates/bridges.html:181 -msgid "There currently aren't any bridges available..." -msgstr "В момента няма налични bridges ..." - -#: lib/bridgedb/templates/bridges.html:182 -#, python-format -msgid "" -" Perhaps you should try %s going back %s and choosing a different bridge " -"type!" -msgstr "Най вероятно трябва да %s се върнете %s и изберете различенt bridge тип!" - -#: lib/bridgedb/templates/index.html:11 -#, python-format -msgid "Step %s1%s" -msgstr "Стъпка %s1%s" - -#: lib/bridgedb/templates/index.html:13 -#, python-format -msgid "Download %s Tor Browser %s" -msgstr "Свали %s Tor Browser %s" - -#: lib/bridgedb/templates/index.html:25 -#, python-format -msgid "Step %s2%s" -msgstr "Стъпка %s2%s" - -#: lib/bridgedb/templates/index.html:27 -#, python-format -msgid "Get %s bridges %s" -msgstr "Вземи %s bridges %s" - -#: lib/bridgedb/templates/index.html:36 -#, python-format -msgid "Step %s3%s" -msgstr "Стъпка %s3%s" - -#: lib/bridgedb/templates/index.html:38 -#, python-format -msgid "Now %s add the bridges to Tor Browser %s" -msgstr "Сега %sдобавете bridges към 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 "%sП%sросто дайте ми bridges!" - -#: lib/bridgedb/templates/options.html:52 -msgid "Advanced Options" -msgstr "Разширени възможности" - -#: lib/bridgedb/templates/options.html:88 -msgid "No" -msgstr "Не" - -#: lib/bridgedb/templates/options.html:89 -msgid "none" -msgstr "нищо" - -#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the -#. beginning of words are present in your final translation. Thanks! -#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses." -#: lib/bridgedb/templates/options.html:127 -#, python-format -msgid "%sY%ses!" -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:151 -#, python-format -msgid "%sG%set Bridges" -msgstr "%sВ%sземи Bridges" diff --git a/ca/LC_MESSAGES/bridgedb.po b/ca/LC_MESSAGES/bridgedb.po index 58da8f9..4204f15 100644 --- a/ca/LC_MESSAGES/bridgedb.po +++ b/ca/LC_MESSAGES/bridgedb.po @@ -13,14 +13,15 @@ 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-09-12 16:07+0000\n" +"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" +"POT-Creation-Date: 2015-07-25 03:40+0000\n" +"PO-Revision-Date: 2015-12-18 19:02+0000\n" "Last-Translator: laia_\n" "Language-Team: Catalan (http://www.transifex.com/otf/torproject/language/ca/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 0.9.6\n" +"Generated-By: Babel 1.3\n" "Language: ca\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" @@ -35,57 +36,182 @@ msgstr "" #. "fteproxy" #. "Tor" #. "Tor Browser" -#: lib/bridgedb/HTTPServer.py:107 +#: bridgedb/https/server.py:167 msgid "Sorry! Something went wrong with your request." msgstr "Quelcom ha anat malament amb la petició." -#: lib/bridgedb/strings.py:18 +#: bridgedb/https/templates/base.html:79 +msgid "Report a Bug" +msgstr "Comunica un error" + +#: bridgedb/https/templates/base.html:82 +msgid "Source Code" +msgstr "Codi font" + +#: bridgedb/https/templates/base.html:85 +msgid "Changelog" +msgstr "Registre de canvis" + +#: bridgedb/https/templates/base.html:88 +msgid "Contact" +msgstr "Contacte" + +#: bridgedb/https/templates/bridges.html:35 +msgid "Select All" +msgstr "Selecciona-ho tot" + +#: bridgedb/https/templates/bridges.html:40 +msgid "Show QRCode" +msgstr "Mostra el codi QR" + +#: bridgedb/https/templates/bridges.html:52 +msgid "QRCode for your bridge lines" +msgstr "Codi QR per les línies de ponts" + +#. 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!". :) +#: bridgedb/https/templates/bridges.html:67 +#: bridgedb/https/templates/bridges.html:125 +msgid "Uh oh, spaghettios!" +msgstr "Vatua l'olla!" + +#: bridgedb/https/templates/bridges.html:68 +msgid "It seems there was an error getting your QRCode." +msgstr "Hi ha hagut un error en obtenir el codi QR" + +#: bridgedb/https/templates/bridges.html:73 +msgid "" +"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy" +" your bridge lines onto mobile and other devices." +msgstr "Aquest codi QR conté les línies de pont. Escannegeu-lo amb un lector de codis QR per copiar les línies de pont al mòbil i a altres dispositius. " + +#: bridgedb/https/templates/bridges.html:131 +msgid "There currently aren't any bridges available..." +msgstr "No hi ha ponts disponibles en aquests moments." + +#: bridgedb/https/templates/bridges.html:132 +#, python-format +msgid "" +" Perhaps you should try %s going back %s and choosing a different bridge " +"type!" +msgstr "Proveu %s tornant a %s i triant un tipus diferent de pont." + +#: bridgedb/https/templates/index.html:11 +#, python-format +msgid "Step %s1%s" +msgstr "Pas %s1%s" + +#: bridgedb/https/templates/index.html:13 +#, python-format +msgid "Download %s Tor Browser %s" +msgstr "Descarrega %s Navegador Tor %s" + +#: bridgedb/https/templates/index.html:25 +#, python-format +msgid "Step %s2%s" +msgstr "Pas %s2%s" + +#: bridgedb/https/templates/index.html:27 +#, python-format +msgid "Get %s bridges %s" +msgstr "Descarrega %s ponts %s" + +#: bridgedb/https/templates/index.html:36 +#, python-format +msgid "Step %s3%s" +msgstr "Pas %s3%s" + +#: bridgedb/https/templates/index.html:38 +#, python-format +msgid "Now %s add the bridges to Tor Browser %s" +msgstr "Ara %s adjunta els ponts 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! +#. (These are used to insert HTML5 underlining tags, to mark accesskeys +#. for disabled users.) +#: bridgedb/https/templates/options.html:38 +#, python-format +msgid "%sJ%sust give me bridges!" +msgstr "%sJ%sust donem els meus bridges!" + +#: bridgedb/https/templates/options.html:51 +msgid "Advanced Options" +msgstr "Opcions Avançades" + +#: bridgedb/https/templates/options.html:86 +msgid "No" +msgstr "No" + +#: bridgedb/https/templates/options.html:87 +msgid "none" +msgstr "Cap" + +#. 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." +#: bridgedb/https/templates/options.html:124 +#, python-format +msgid "%sY%ses!" +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"! +#: bridgedb/https/templates/options.html:147 +#, python-format +msgid "%sG%set Bridges" +msgstr "%sD%sescarrega Bridges" + +#: bridgedb/strings.py:43 msgid "[This is an automated message; please do not reply.]" msgstr "[Aquest és un missatge automàtic, no el respongui.]" -#: lib/bridgedb/strings.py:20 +#: bridgedb/strings.py:45 msgid "Here are your bridges:" msgstr "Els vostres ponts: " -#: lib/bridgedb/strings.py:22 +#: bridgedb/strings.py:47 #, python-format msgid "" "You have exceeded the rate limit. Please slow down! The minimum time between\n" "emails is %s hours. All further emails during this time period will be ignored." msgstr "Heu superat el límit. El mínim de temps entre\nels correus és de %s hores. La resta de correus durant aquest període de temps seran ignorats." -#: lib/bridgedb/strings.py:25 +#: bridgedb/strings.py:50 msgid "" "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)" -msgstr "COMMANDs: (combina COMMANDs per especificar les múltiples opcions simultàniament)" +msgstr "COMMANDs: (combina COMMANDs per especificar diverses opcions simultàniament)" #. TRANSLATORS: Please DO NOT translate the word "BridgeDB". -#: lib/bridgedb/strings.py:28 +#: bridgedb/strings.py:53 msgid "Welcome to BridgeDB!" msgstr "Benvingut a BridgeDB!" #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE". -#: lib/bridgedb/strings.py:30 +#: bridgedb/strings.py:55 msgid "Currently supported transport TYPEs:" msgstr "Actualment suportant transport TYPEs:" -#: lib/bridgedb/strings.py:31 +#: bridgedb/strings.py:56 #, python-format msgid "Hey, %s!" msgstr "Hola, %s!" -#: lib/bridgedb/strings.py:32 +#: bridgedb/strings.py:57 msgid "Hello, friend!" msgstr "Hola, amic!" -#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100 +#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90 msgid "Public Keys" msgstr "Claus Públiques" #. 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 +#: bridgedb/strings.py:62 #, python-format msgid "" "This email was generated with rainbows, unicorns, and sparkles\n" @@ -96,7 +222,7 @@ msgstr "Aquest correu va ser creat amb unicorns, arcs de Sant Martí i espurnes\ #. 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 +#: bridgedb/strings.py:72 #, python-format msgid "" "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n" @@ -104,10 +230,10 @@ msgid "" "difficult for anyone watching your internet traffic to determine that you are\n" "using Tor.\n" "\n" -msgstr "BridgeDB pot proveïr ponts amb diversos %stypes de Pluggable Transports%s,\nque poden provocar ofuscacions a la vostra connexió a Tor Network, fent més difícil determinar que esteu usant Tor a qualsevol que vegi el vostre tràfic de connexió a\ninternet \n" +msgstr "BridgeDB pot proveïr ponts amb diversos %stypes de Pluggable Transports%s,\nque poden provocar ofuscacions a la vostra connexió a Tor Network, fent més difícil determinar que esteu usant Tor a qualsevol que vegi el vostre tràfic de connexió a\ninternet. \n" #. TRANSLATORS: Please DO NOT translate "Pluggable Transports". -#: lib/bridgedb/strings.py:54 +#: bridgedb/strings.py:79 msgid "" "Some bridges with IPv6 addresses are also available, though some Pluggable\n" "Transports aren't IPv6 compatible.\n" @@ -119,7 +245,7 @@ msgstr "També hi ha ponts disponibles amb adreces IPv6, tot i que alguns Plugga #. 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 +#: bridgedb/strings.py:88 #, python-format msgid "" "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n" @@ -128,20 +254,20 @@ msgid "" "\n" msgstr "A més a més, BridgeDB té molts ponts %s estàndard sense \nPluggable Transports %s, que potser no són tan interessants, però que també\npoden ajudar a esquivar la censura d'internet en molts casos.\n" -#: lib/bridgedb/strings.py:76 +#: bridgedb/strings.py:101 msgid "What are bridges?" msgstr "Què són els ponts?" -#: lib/bridgedb/strings.py:77 +#: bridgedb/strings.py:102 #, python-format msgid "%s Bridges %s are Tor relays that help you circumvent censorship." msgstr "%s Ponts %s són repetidors Tor que ajuden a esquivar la censura." -#: lib/bridgedb/strings.py:82 +#: bridgedb/strings.py:107 msgid "I need an alternative way of getting bridges!" msgstr "Em cal una manera alternativa d'obtenir ponts." -#: lib/bridgedb/strings.py:83 +#: bridgedb/strings.py:108 #, python-format msgid "" "Another way to get bridges is to send an email to %s. Please note that you must\n" @@ -149,61 +275,61 @@ msgid "" "%s, %s or %s." msgstr "Una altra manera d'aconseguir ponts és enviar un correu electrònic a %s. Tingueu en compte que heu\nd'enviar el correu amb una adreça d'un dels següents proveïdors de correu:\n%s, %s or %s." -#: lib/bridgedb/strings.py:90 +#: bridgedb/strings.py:115 msgid "My bridges don't work! I need help!" msgstr "No em funcionen els ponts! Ajuda!" #. TRANSLATORS: Please DO NOT translate "Tor". -#: lib/bridgedb/strings.py:92 +#: bridgedb/strings.py:117 #, python-format msgid "If your Tor doesn't work, you should email %s." -msgstr "Si Tor no us funciona, hauríeu d'enviar un correu a %s." +msgstr "Si Tor no us funciona, envieu un correu a %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 +#: bridgedb/strings.py:121 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 "Incloeu el màxim d'informació sobre el vostre cas, inclosa la llista de\nponts i de Pluggable Transports que heu intentat utilizar, la vostra versió de Tor Browser,\ni qualsevol missatge que Tor hagi donat, etc." -#: lib/bridgedb/strings.py:103 +#: bridgedb/strings.py:128 msgid "Here are your bridge lines:" msgstr "Les vostres línies de ponts:" -#: lib/bridgedb/strings.py:104 +#: bridgedb/strings.py:129 msgid "Get Bridges!" msgstr "Descarregueu ponts!" -#: lib/bridgedb/strings.py:108 +#: bridgedb/strings.py:133 msgid "Please select options for bridge type:" msgstr "Seleccioneu les opcions pel tipus de pont:" -#: lib/bridgedb/strings.py:109 +#: bridgedb/strings.py:134 msgid "Do you need IPv6 addresses?" msgstr "Necessiteu adreces IPv6?" -#: lib/bridgedb/strings.py:110 +#: bridgedb/strings.py:135 #, python-format msgid "Do you need a %s?" msgstr "Necessiteu un %s?" -#: lib/bridgedb/strings.py:114 +#: bridgedb/strings.py:139 msgid "Your browser is not displaying images properly." msgstr "El navegador no està mostrant les imatges correctament." -#: lib/bridgedb/strings.py:115 +#: bridgedb/strings.py:140 msgid "Enter the characters from the image above..." msgstr "Introduïu els caràcters de la imatge superior..." -#: lib/bridgedb/strings.py:119 +#: bridgedb/strings.py:144 msgid "How to start using your bridges" msgstr "Com començar a utilitzar els ponts" #. TRANSLATORS: Please DO NOT translate "Tor Browser". -#: lib/bridgedb/strings.py:121 +#: bridgedb/strings.py:146 #, python-format msgid "" "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n" @@ -212,21 +338,21 @@ msgid "" msgstr "Per introduir ponts al Tor Browser, primer cal anar a %s de la pàgina de descàrrega\n%s i després seguir les instruccions per descarregar i iniciar\nel Tor Browser. " #. TRANSLATORS: Please DO NOT translate "Tor". -#: lib/bridgedb/strings.py:126 +#: bridgedb/strings.py:151 msgid "" "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n" "the wizard until it asks:" msgstr "Quan aparegui el diàleg 'Configuració Xarxa Tor', clica 'Configura' i segueix\nl'auxiliar fins que pregunti:" #. TRANSLATORS: Please DO NOT translate "Tor". -#: lib/bridgedb/strings.py:130 +#: bridgedb/strings.py:155 msgid "" "Does your Internet Service Provider (ISP) block or otherwise censor connections\n" "to the Tor network?" msgstr "El vostre Proveïdor d'Internet (ISP) bloqueja o censura les connexions\namb la xarxa Tor?" #. TRANSLATORS: Please DO NOT translate "Tor". -#: lib/bridgedb/strings.py:134 +#: bridgedb/strings.py:159 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" @@ -234,153 +360,28 @@ msgid "" "button in the 'Tor Network Settings' wizard for further assistance." msgstr "Seleccioneu 'Sí' i després cliqueu 'Següent'. Per configurar els ponts nous, copieu i\nenganxeu les línies del pont al següent quadre d'entrada de text. Finalment, cliqueu 'Connectar', i ja hauria d'estar a punt! Si teniu problemes, intenteu clicar el botó \nd''Ajuda' a l'auxiliar de 'Configuració Xarxa Tor' per més assistència." -#: lib/bridgedb/strings.py:142 +#: bridgedb/strings.py:167 msgid "Displays this message." msgstr "Mostra aquest missatge." #. 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:146 +#: bridgedb/strings.py:171 msgid "Request vanilla bridges." msgstr "Demanar ponts estàndard." -#: lib/bridgedb/strings.py:147 +#: bridgedb/strings.py:172 msgid "Request IPv6 bridges." msgstr "Demanar ponts IPv6." #. TRANSLATORS: Please DO NOT translate the word the word "TYPE". -#: lib/bridgedb/strings.py:149 +#: bridgedb/strings.py:174 msgid "Request a Pluggable Transport by TYPE." msgstr "Demanar un Pluggable Transport per TYPE." #. TRANSLATORS: Please DO NOT translate "BridgeDB". #. TRANSLATORS: Please DO NOT translate "GnuPG". -#: lib/bridgedb/strings.py:152 +#: bridgedb/strings.py:177 msgid "Get a copy of BridgeDB's public GnuPG key." -msgstr "Fer una còpia de la clau pública GnuPG del BridgeDB." - -#: lib/bridgedb/templates/base.html:89 -msgid "Report a Bug" -msgstr "Comunicar un Bug" - -#: lib/bridgedb/templates/base.html:92 -msgid "Source Code" -msgstr "Codi font" - -#: lib/bridgedb/templates/base.html:95 -msgid "Changelog" -msgstr "Canviar el log" - -#: lib/bridgedb/templates/base.html:98 -msgid "Contact" -msgstr "Contacte" - -#: lib/bridgedb/templates/bridges.html:81 -msgid "Select All" -msgstr "Selecciona-ho tot" - -#: lib/bridgedb/templates/bridges.html:87 -msgid "Show QRCode" -msgstr "Mostra el codi QR" - -#: lib/bridgedb/templates/bridges.html:100 -msgid "QRCode for your bridge lines" -msgstr "Codi QR per les línies de ponts" - -#. 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 "Ueeeee, espaguetiiiiis!!!!" - -#: lib/bridgedb/templates/bridges.html:116 -msgid "It seems there was an error getting your QRCode." -msgstr "Hi ha hagut un error en obtenir el codi 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 "Aquest codi QR conté les línies de pont. Escannegeu-lo amb un lector de codis QR per copiar les línies de pont al mòbil i a altres dispositius. " - -#: lib/bridgedb/templates/bridges.html:181 -msgid "There currently aren't any bridges available..." -msgstr "No hi han ponts disponibles en aquests moments..." - -#: lib/bridgedb/templates/bridges.html:182 -#, python-format -msgid "" -" Perhaps you should try %s going back %s and choosing a different bridge " -"type!" -msgstr "Potser hauries de provar %s tirant enrer %s i triant un tipus diferent de pont!" - -#: lib/bridgedb/templates/index.html:11 -#, python-format -msgid "Step %s1%s" -msgstr "Pas %s1%s" - -#: lib/bridgedb/templates/index.html:13 -#, python-format -msgid "Download %s Tor Browser %s" -msgstr "Descarrega %s Navegador Tor %s" - -#: lib/bridgedb/templates/index.html:25 -#, python-format -msgid "Step %s2%s" -msgstr "Pas %s2%s" - -#: lib/bridgedb/templates/index.html:27 -#, python-format -msgid "Get %s bridges %s" -msgstr "Descarrega %s ponts %s" - -#: lib/bridgedb/templates/index.html:36 -#, python-format -msgid "Step %s3%s" -msgstr "Pas %s3%s" - -#: lib/bridgedb/templates/index.html:38 -#, python-format -msgid "Now %s add the bridges to Tor Browser %s" -msgstr "Ara %s adjunta els ponts 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! -#. (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 donem els meus bridges!" - -#: lib/bridgedb/templates/options.html:52 -msgid "Advanced Options" -msgstr "Opcions Avançades" - -#: lib/bridgedb/templates/options.html:88 -msgid "No" -msgstr "No" - -#: lib/bridgedb/templates/options.html:89 -msgid "none" -msgstr "Cap" - -#. 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!" - -#. 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 "%sG%set Bridges" -msgstr "%sG%set Bridges" +msgstr "Descarregar una còpia de la clau pública GnuPG del BridgeDB." diff --git a/mr/LC_MESSAGES/bridgedb.po b/mr/LC_MESSAGES/bridgedb.po index 1670e86..77b8bca 100644 --- a/mr/LC_MESSAGES/bridgedb.po +++ b/mr/LC_MESSAGES/bridgedb.po @@ -3,17 +3,19 @@ # This file is distributed under the same license as the BridgeDB project. # # Translators: +# Vikrant Korde <vikrant.korde(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-04-19 08:23+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" -"Language-Team: Marathi (http://www.transifex.com/projects/p/torproject/language/mr/)\n" +"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" +"POT-Creation-Date: 2015-07-25 03:40+0000\n" +"PO-Revision-Date: 2015-12-24 11:15+0000\n" +"Last-Translator: Vikrant Korde <vikrant.korde(a)gmail.com>\n" +"Language-Team: Marathi (http://www.transifex.com/otf/torproject/language/mr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 0.9.6\n" +"Generated-By: Babel 1.3\n" "Language: mr\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" @@ -28,57 +30,182 @@ msgstr "" #. "fteproxy" #. "Tor" #. "Tor Browser" -#: lib/bridgedb/HTTPServer.py:107 +#: bridgedb/https/server.py:167 msgid "Sorry! Something went wrong with your request." msgstr "" -#: lib/bridgedb/strings.py:18 +#: bridgedb/https/templates/base.html:79 +msgid "Report a Bug" +msgstr "दोष नोंदवा" + +#: bridgedb/https/templates/base.html:82 +msgid "Source Code" +msgstr "सोअर्स कोड" + +#: bridgedb/https/templates/base.html:85 +msgid "Changelog" +msgstr "बदल लॉग" + +#: bridgedb/https/templates/base.html:88 +msgid "Contact" +msgstr "संपर्क" + +#: bridgedb/https/templates/bridges.html:35 +msgid "Select All" +msgstr "सर्व निवडा" + +#: bridgedb/https/templates/bridges.html:40 +msgid "Show QRCode" +msgstr "क्यूआर कोड दर्शवा" + +#: bridgedb/https/templates/bridges.html:52 +msgid "QRCode for your bridge lines" +msgstr "क्यू आर कोड मिळवताना गडबड झाली" + +#. TRANSLATORS: Please translate this into some silly way to say +#. "There was a problem!" in your language. For example, +#. for Italian, you might translate this into "Mama mia!", +#. or for French: "Sacrebleu!". :) +#: bridgedb/https/templates/bridges.html:67 +#: bridgedb/https/templates/bridges.html:125 +msgid "Uh oh, spaghettios!" +msgstr "ओ हो !" + +#: bridgedb/https/templates/bridges.html:68 +msgid "It seems there was an error getting your QRCode." +msgstr "मिळवताना गडबड झाली" + +#: bridgedb/https/templates/bridges.html:73 +msgid "" +"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy" +" your bridge lines onto mobile and other devices." +msgstr "" + +#: bridgedb/https/templates/bridges.html:131 +msgid "There currently aren't any bridges available..." +msgstr "" + +#: bridgedb/https/templates/bridges.html:132 +#, python-format +msgid "" +" Perhaps you should try %s going back %s and choosing a different bridge " +"type!" +msgstr "" + +#: bridgedb/https/templates/index.html:11 +#, python-format +msgid "Step %s1%s" +msgstr "" + +#: bridgedb/https/templates/index.html:13 +#, python-format +msgid "Download %s Tor Browser %s" +msgstr "" + +#: bridgedb/https/templates/index.html:25 +#, python-format +msgid "Step %s2%s" +msgstr "" + +#: bridgedb/https/templates/index.html:27 +#, python-format +msgid "Get %s bridges %s" +msgstr "" + +#: bridgedb/https/templates/index.html:36 +#, python-format +msgid "Step %s3%s" +msgstr "" + +#: bridgedb/https/templates/index.html:38 +#, python-format +msgid "Now %s add the bridges to Tor Browser %s" +msgstr "" + +#. 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.) +#: bridgedb/https/templates/options.html:38 +#, python-format +msgid "%sJ%sust give me bridges!" +msgstr "" + +#: bridgedb/https/templates/options.html:51 +msgid "Advanced Options" +msgstr "" + +#: bridgedb/https/templates/options.html:86 +msgid "No" +msgstr "" + +#: bridgedb/https/templates/options.html:87 +msgid "none" +msgstr "" + +#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the +#. beginning of words are present in your final translation. Thanks! +#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses." +#: bridgedb/https/templates/options.html:124 +#, python-format +msgid "%sY%ses!" +msgstr "" + +#. 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"! +#: bridgedb/https/templates/options.html:147 +#, python-format +msgid "%sG%set Bridges" +msgstr "" + +#: bridgedb/strings.py:43 msgid "[This is an automated message; please do not reply.]" msgstr "" -#: lib/bridgedb/strings.py:20 +#: bridgedb/strings.py:45 msgid "Here are your bridges:" msgstr "" -#: lib/bridgedb/strings.py:22 +#: bridgedb/strings.py:47 #, python-format msgid "" "You have exceeded the rate limit. Please slow down! The minimum time between\n" "emails is %s hours. All further emails during this time period will be ignored." msgstr "" -#: lib/bridgedb/strings.py:25 +#: bridgedb/strings.py:50 msgid "" "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)" msgstr "" #. TRANSLATORS: Please DO NOT translate the word "BridgeDB". -#: lib/bridgedb/strings.py:28 +#: bridgedb/strings.py:53 msgid "Welcome to BridgeDB!" msgstr "" #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE". -#: lib/bridgedb/strings.py:30 +#: bridgedb/strings.py:55 msgid "Currently supported transport TYPEs:" msgstr "" -#: lib/bridgedb/strings.py:31 +#: bridgedb/strings.py:56 #, python-format msgid "Hey, %s!" msgstr "" -#: lib/bridgedb/strings.py:32 +#: bridgedb/strings.py:57 msgid "Hello, friend!" msgstr "" -#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100 +#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90 msgid "Public Keys" msgstr "" #. TRANSLATORS: This string will end up saying something like: #. "This email was generated with rainbows, unicorns, and sparkles #. for alice(a)example.com on Friday, 09 May, 2014 at 18:59:39." -#: lib/bridgedb/strings.py:37 +#: bridgedb/strings.py:62 #, python-format msgid "" "This email was generated with rainbows, unicorns, and sparkles\n" @@ -89,7 +216,7 @@ msgstr "" #. 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 +#: bridgedb/strings.py:72 #, python-format msgid "" "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n" @@ -100,7 +227,7 @@ msgid "" msgstr "" #. TRANSLATORS: Please DO NOT translate "Pluggable Transports". -#: lib/bridgedb/strings.py:54 +#: bridgedb/strings.py:79 msgid "" "Some bridges with IPv6 addresses are also available, though some Pluggable\n" "Transports aren't IPv6 compatible.\n" @@ -112,7 +239,7 @@ msgstr "" #. 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 +#: bridgedb/strings.py:88 #, python-format msgid "" "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n" @@ -121,20 +248,20 @@ msgid "" "\n" msgstr "" -#: lib/bridgedb/strings.py:76 +#: bridgedb/strings.py:101 msgid "What are bridges?" msgstr "" -#: lib/bridgedb/strings.py:77 +#: bridgedb/strings.py:102 #, python-format msgid "%s Bridges %s are Tor relays that help you circumvent censorship." msgstr "" -#: lib/bridgedb/strings.py:82 +#: bridgedb/strings.py:107 msgid "I need an alternative way of getting bridges!" msgstr "" -#: lib/bridgedb/strings.py:83 +#: bridgedb/strings.py:108 #, python-format msgid "" "Another way to get bridges is to send an email to %s. Please note that you must\n" @@ -142,12 +269,12 @@ msgid "" "%s, %s or %s." msgstr "" -#: lib/bridgedb/strings.py:90 +#: bridgedb/strings.py:115 msgid "My bridges don't work! I need help!" msgstr "" #. TRANSLATORS: Please DO NOT translate "Tor". -#: lib/bridgedb/strings.py:92 +#: bridgedb/strings.py:117 #, python-format msgid "If your Tor doesn't work, you should email %s." msgstr "" @@ -155,48 +282,48 @@ msgstr "" #. 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 +#: bridgedb/strings.py:121 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 "" -#: lib/bridgedb/strings.py:103 +#: bridgedb/strings.py:128 msgid "Here are your bridge lines:" msgstr "" -#: lib/bridgedb/strings.py:104 +#: bridgedb/strings.py:129 msgid "Get Bridges!" msgstr "" -#: lib/bridgedb/strings.py:108 +#: bridgedb/strings.py:133 msgid "Please select options for bridge type:" msgstr "" -#: lib/bridgedb/strings.py:109 +#: bridgedb/strings.py:134 msgid "Do you need IPv6 addresses?" msgstr "" -#: lib/bridgedb/strings.py:110 +#: bridgedb/strings.py:135 #, python-format msgid "Do you need a %s?" msgstr "" -#: lib/bridgedb/strings.py:114 +#: bridgedb/strings.py:139 msgid "Your browser is not displaying images properly." msgstr "" -#: lib/bridgedb/strings.py:115 +#: bridgedb/strings.py:140 msgid "Enter the characters from the image above..." msgstr "" -#: lib/bridgedb/strings.py:119 +#: bridgedb/strings.py:144 msgid "How to start using your bridges" msgstr "" #. TRANSLATORS: Please DO NOT translate "Tor Browser". -#: lib/bridgedb/strings.py:121 +#: bridgedb/strings.py:146 #, python-format msgid "" "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n" @@ -205,21 +332,21 @@ msgid "" msgstr "" #. TRANSLATORS: Please DO NOT translate "Tor". -#: lib/bridgedb/strings.py:126 +#: bridgedb/strings.py:151 msgid "" "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n" "the wizard until it asks:" msgstr "" #. TRANSLATORS: Please DO NOT translate "Tor". -#: lib/bridgedb/strings.py:130 +#: bridgedb/strings.py:155 msgid "" "Does your Internet Service Provider (ISP) block or otherwise censor connections\n" "to the Tor network?" msgstr "" #. TRANSLATORS: Please DO NOT translate "Tor". -#: lib/bridgedb/strings.py:134 +#: bridgedb/strings.py:159 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" @@ -227,153 +354,28 @@ msgid "" "button in the 'Tor Network Settings' wizard for further assistance." msgstr "" -#: lib/bridgedb/strings.py:142 +#: bridgedb/strings.py:167 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:146 +#: bridgedb/strings.py:171 msgid "Request vanilla bridges." msgstr "" -#: lib/bridgedb/strings.py:147 +#: bridgedb/strings.py:172 msgid "Request IPv6 bridges." msgstr "" #. TRANSLATORS: Please DO NOT translate the word the word "TYPE". -#: lib/bridgedb/strings.py:149 +#: bridgedb/strings.py:174 msgid "Request a Pluggable Transport by TYPE." msgstr "" #. TRANSLATORS: Please DO NOT translate "BridgeDB". #. TRANSLATORS: Please DO NOT translate "GnuPG". -#: lib/bridgedb/strings.py:152 +#: bridgedb/strings.py:177 msgid "Get a copy of BridgeDB's public GnuPG key." msgstr "" - -#: lib/bridgedb/templates/base.html:89 -msgid "Report a Bug" -msgstr "" - -#: lib/bridgedb/templates/base.html:92 -msgid "Source Code" -msgstr "" - -#: lib/bridgedb/templates/base.html:95 -msgid "Changelog" -msgstr "" - -#: lib/bridgedb/templates/base.html:98 -msgid "Contact" -msgstr "" - -#: lib/bridgedb/templates/bridges.html:81 -msgid "Select All" -msgstr "" - -#: lib/bridgedb/templates/bridges.html:87 -msgid "Show QRCode" -msgstr "" - -#: lib/bridgedb/templates/bridges.html:100 -msgid "QRCode for your bridge lines" -msgstr "" - -#. TRANSLATORS: Please translate this into some silly way to say -#. "There was a problem!" in your language. For example, -#. for Italian, you might translate this into "Mama mia!", -#. or for French: "Sacrebleu!". :) -#: lib/bridgedb/templates/bridges.html:115 -#: lib/bridgedb/templates/bridges.html:175 -msgid "Uh oh, spaghettios!" -msgstr "" - -#: lib/bridgedb/templates/bridges.html:116 -msgid "It seems there was an error getting your QRCode." -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 "" - -#: lib/bridgedb/templates/bridges.html:181 -msgid "There currently aren't any bridges available..." -msgstr "" - -#: lib/bridgedb/templates/bridges.html:182 -#, python-format -msgid "" -" Perhaps you should try %s going back %s and choosing a different bridge " -"type!" -msgstr "" - -#: lib/bridgedb/templates/index.html:11 -#, python-format -msgid "Step %s1%s" -msgstr "" - -#: lib/bridgedb/templates/index.html:13 -#, python-format -msgid "Download %s Tor Browser %s" -msgstr "" - -#: lib/bridgedb/templates/index.html:25 -#, python-format -msgid "Step %s2%s" -msgstr "" - -#: lib/bridgedb/templates/index.html:27 -#, python-format -msgid "Get %s bridges %s" -msgstr "" - -#: lib/bridgedb/templates/index.html:36 -#, python-format -msgid "Step %s3%s" -msgstr "" - -#: lib/bridgedb/templates/index.html:38 -#, python-format -msgid "Now %s add the bridges to Tor Browser %s" -msgstr "" - -#. 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 "" - -#: lib/bridgedb/templates/options.html:52 -msgid "Advanced Options" -msgstr "" - -#: lib/bridgedb/templates/options.html:88 -msgid "No" -msgstr "" - -#: lib/bridgedb/templates/options.html:89 -msgid "none" -msgstr "" - -#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the -#. beginning of words are present in your final translation. Thanks! -#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses." -#: lib/bridgedb/templates/options.html:127 -#, python-format -msgid "%sY%ses!" -msgstr "" - -#. 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 "%sG%set Bridges" -msgstr "" diff --git a/pt_BR/LC_MESSAGES/bridgedb.po b/pt_BR/LC_MESSAGES/bridgedb.po index 144243c..5b67aa3 100644 --- a/pt_BR/LC_MESSAGES/bridgedb.po +++ b/pt_BR/LC_MESSAGES/bridgedb.po @@ -19,8 +19,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2015-07-25 03:40+0000\n" -"PO-Revision-Date: 2015-11-09 01:27+0000\n" -"Last-Translator: Danton Medrado\n" +"PO-Revision-Date: 2015-12-19 19:50+0000\n" +"Last-Translator: Communia <ameaneantie(a)riseup.net>\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/otf/torproject/language/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -265,7 +265,7 @@ msgstr "O que são pontes?" #: bridgedb/strings.py:102 #, python-format msgid "%s Bridges %s are Tor relays that help you circumvent censorship." -msgstr "%s Pontes %s são retransmissores Tor que ajudam a driblar a censura." +msgstr "%s Pontes %s são relés Tor que ajudam a driblar a censura." #: bridgedb/strings.py:107 msgid "I need an alternative way of getting bridges!" diff --git a/tr/LC_MESSAGES/bridgedb.po b/tr/LC_MESSAGES/bridgedb.po index f050747..e8bfdaf 100644 --- a/tr/LC_MESSAGES/bridgedb.po +++ b/tr/LC_MESSAGES/bridgedb.po @@ -11,15 +11,15 @@ # erg26 <ergungorler(a)gmail.com>, 2012 # eromytsatiffird <driffitastymore(a)gmail.com>, 2014 # Fomas <fomas.adana(a)gmail.com>, 2015 -# Idil Yuksel <perfectionne(a)gmail.com>, 2014 +# Idil Yuksel <idilyuksel(a)hotmail.com>, 2014 # Kaya Zeren <kayazeren(a)gmail.com>, 2015 # Ozancan Karataş <ozancankaratas96(a)outlook.com>, 2015 # ozkansib <s.ozkan(a)gyte.edu.tr>, 2014 -# Idil Yuksel <perfectionne(a)gmail.com>, 2014 +# Idil Yuksel <idilyuksel(a)hotmail.com>, 2014 # Sercan Altundaş <>, 2012 # ozkansib <s.ozkan(a)gyte.edu.tr>, 2014 # Tekel Bira <psycookie(a)gmail.com>, 2012 -# Volkan Gezer <volkangezer(a)gmail.com>, 2014-2015 +# Volkan Gezer <volkangezer(a)gmail.com>, 2014-2016 # zeki <zeki.ozguryazilim(a)gmail.com>, 2014 # zeki <zeki.ozguryazilim(a)gmail.com>, 2014 msgid "" @@ -27,8 +27,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2015-07-25 03:40+0000\n" -"PO-Revision-Date: 2015-10-21 18:00+0000\n" -"Last-Translator: Ozancan Karataş <ozancankaratas96(a)outlook.com>\n" +"PO-Revision-Date: 2016-01-04 17:11+0000\n" +"Last-Translator: Volkan Gezer <volkangezer(a)gmail.com>\n" "Language-Team: Turkish (http://www.transifex.com/otf/torproject/language/tr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -50,7 +50,7 @@ msgstr "" #. "Tor Browser" #: bridgedb/https/server.py:167 msgid "Sorry! Something went wrong with your request." -msgstr "Üzgünüz! İsteğiniz ile ilgili birşeyler ters gitti." +msgstr "Üzgünüz! İsteğiniz ile ilgili bir şeyler ters gitti." #: bridgedb/https/templates/base.html:79 msgid "Report a Bug" diff --git a/zh_CN/LC_MESSAGES/bridgedb.po b/zh_CN/LC_MESSAGES/bridgedb.po index 7327341..4e18d8d 100644 --- a/zh_CN/LC_MESSAGES/bridgedb.po +++ b/zh_CN/LC_MESSAGES/bridgedb.po @@ -6,23 +6,24 @@ # khi, 2013 # khi, 2013 # khi, 2013 -# Christopher Meng <cickumqt(a)gmail.com>, 2012 +# Christopher Meng <i(a)cicku.me>, 2012 # hanl <iamh4n(a)gmail.com>, 2011 -# Meng3, 2014 +# Meng3, 2014,2016 # leungsookfan <leung.sookfan(a)riseup.net>, 2014 # khi, 2014-2015 # YF <yfdyh000(a)gmail.com>, 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…'POT-Creation-Date: 2015-03-19 22:13+0000\n" -"PO-Revision-Date: 2015-06-16 14:41+0000\n" -"Last-Translator: khi\n" -"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/torproject/language/zh_CN/)\n" +"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" +"POT-Creation-Date: 2015-07-25 03:40+0000\n" +"PO-Revision-Date: 2016-01-03 19:52+0000\n" +"Last-Translator: Meng3\n" +"Language-Team: Chinese (China) (http://www.transifex.com/otf/torproject/language/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 0.9.6\n" +"Generated-By: Babel 1.3\n" "Language: zh_CN\n" "Plural-Forms: nplurals=1; plural=0;\n" @@ -37,57 +38,182 @@ msgstr "" #. "fteproxy" #. "Tor" #. "Tor Browser" -#: lib/bridgedb/HTTPServer.py:107 +#: bridgedb/https/server.py:167 msgid "Sorry! Something went wrong with your request." msgstr "抱歉，你的邮件请求出现问题。" -#: lib/bridgedb/strings.py:18 +#: bridgedb/https/templates/base.html:79 +msgid "Report a Bug" +msgstr "报告 Bug" + +#: bridgedb/https/templates/base.html:82 +msgid "Source Code" +msgstr "源代码" + +#: bridgedb/https/templates/base.html:85 +msgid "Changelog" +msgstr "更改日志" + +#: bridgedb/https/templates/base.html:88 +msgid "Contact" +msgstr "联系方式" + +#: bridgedb/https/templates/bridges.html:35 +msgid "Select All" +msgstr "选择全部" + +#: bridgedb/https/templates/bridges.html:40 +msgid "Show QRCode" +msgstr "显示二维码" + +#: bridgedb/https/templates/bridges.html:52 +msgid "QRCode for your bridge lines" +msgstr "网桥二维码" + +#. TRANSLATORS: Please translate this into some silly way to say +#. "There was a problem!" in your language. For example, +#. for Italian, you might translate this into "Mama mia!", +#. or for French: "Sacrebleu!". :) +#: bridgedb/https/templates/bridges.html:67 +#: bridgedb/https/templates/bridges.html:125 +msgid "Uh oh, spaghettios!" +msgstr "哎哟哟！" + +#: bridgedb/https/templates/bridges.html:68 +msgid "It seems there was an error getting your QRCode." +msgstr "获取二维码时出错。" + +#: bridgedb/https/templates/bridges.html:73 +msgid "" +"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy" +" your bridge lines onto mobile and other devices." +msgstr "二维码包含网桥信息。利用二维码扫描程序，可将相应的网桥信息复制到手机或其他设备。" + +#: bridgedb/https/templates/bridges.html:131 +msgid "There currently aren't any bridges available..." +msgstr "现在没有可用的网桥。" + +#: bridgedb/https/templates/bridges.html:132 +#, python-format +msgid "" +" Perhaps you should try %s going back %s and choosing a different bridge " +"type!" +msgstr "试试 %s后退%s到前一页面，然后选择其他类型的网桥。" + +#: bridgedb/https/templates/index.html:11 +#, python-format +msgid "Step %s1%s" +msgstr "第 %s 1 %s 步" + +#: bridgedb/https/templates/index.html:13 +#, python-format +msgid "Download %s Tor Browser %s" +msgstr "下载 %s Tor 浏览器 %s" + +#: bridgedb/https/templates/index.html:25 +#, python-format +msgid "Step %s2%s" +msgstr "第 %s 2 %s 步" + +#: bridgedb/https/templates/index.html:27 +#, python-format +msgid "Get %s bridges %s" +msgstr "获取 %s bridges %s" + +#: bridgedb/https/templates/index.html:36 +#, python-format +msgid "Step %s3%s" +msgstr "第 %s 3 %s 步" + +#: bridgedb/https/templates/index.html:38 +#, python-format +msgid "Now %s add the bridges to Tor Browser %s" +msgstr "如何 %s 在 Tor 浏览器添加网桥%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.) +#: bridgedb/https/templates/options.html:38 +#, python-format +msgid "%sJ%sust give me bridges!" +msgstr " 直接给我网桥(%sJ%s)！ " + +#: bridgedb/https/templates/options.html:51 +msgid "Advanced Options" +msgstr "高级选项" + +#: bridgedb/https/templates/options.html:86 +msgid "No" +msgstr "否" + +#: bridgedb/https/templates/options.html:87 +msgid "none" +msgstr "无" + +#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the +#. beginning of words are present in your final translation. Thanks! +#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses." +#: bridgedb/https/templates/options.html:124 +#, python-format +msgid "%sY%ses!" +msgstr "是(%sY%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"! +#: bridgedb/https/templates/options.html:147 +#, python-format +msgid "%sG%set Bridges" +msgstr "获取网桥(%sG%s)" + +#: bridgedb/strings.py:43 msgid "[This is an automated message; please do not reply.]" msgstr "[这是一封自动生成的邮件，请勿回复。]" -#: lib/bridgedb/strings.py:20 +#: bridgedb/strings.py:45 msgid "Here are your bridges:" msgstr "以下是为你提供的网桥：" -#: lib/bridgedb/strings.py:22 +#: bridgedb/strings.py:47 #, python-format msgid "" "You have exceeded the rate limit. Please slow down! The minimum time between\n" "emails is %s hours. All further emails during this time period will be ignored." msgstr "您已超出了发送频率的限制，请慢慢来！两封邮件之间需要最少 %s 小时的间隔。在间隔期间发出的所有邮件将被忽略。" -#: lib/bridgedb/strings.py:25 +#: bridgedb/strings.py:50 msgid "" "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)" msgstr "命令：（组合使用命令可同时指定多个选项）" #. TRANSLATORS: Please DO NOT translate the word "BridgeDB". -#: lib/bridgedb/strings.py:28 +#: bridgedb/strings.py:53 msgid "Welcome to BridgeDB!" msgstr "欢迎来到 BridgeDB！" #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE". -#: lib/bridgedb/strings.py:30 +#: bridgedb/strings.py:55 msgid "Currently supported transport TYPEs:" msgstr "目前可用的 transport 类型：" -#: lib/bridgedb/strings.py:31 +#: bridgedb/strings.py:56 #, python-format msgid "Hey, %s!" msgstr "你好，%s！" -#: lib/bridgedb/strings.py:32 +#: bridgedb/strings.py:57 msgid "Hello, friend!" msgstr "你好，朋友！" -#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100 +#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90 msgid "Public Keys" msgstr "公共密匙" #. TRANSLATORS: This string will end up saying something like: #. "This email was generated with rainbows, unicorns, and sparkles #. for alice(a)example.com on Friday, 09 May, 2014 at 18:59:39." -#: lib/bridgedb/strings.py:37 +#: bridgedb/strings.py:62 #, python-format msgid "" "This email was generated with rainbows, unicorns, and sparkles\n" @@ -98,7 +224,7 @@ msgstr "本邮件是对 %s 的自动回复，日期 %s %s。" #. 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 +#: bridgedb/strings.py:72 #, python-format msgid "" "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n" @@ -109,7 +235,7 @@ msgid "" msgstr "BridgeDB 能提供 %s 几种 Pluggable Transports %s 类型网桥，可用于混淆 Tor 网络的连接，从而让网络监控者难以判断你在使用 Tor。\n" #. TRANSLATORS: Please DO NOT translate "Pluggable Transports". -#: lib/bridgedb/strings.py:54 +#: bridgedb/strings.py:79 msgid "" "Some bridges with IPv6 addresses are also available, though some Pluggable\n" "Transports aren't IPv6 compatible.\n" @@ -121,7 +247,7 @@ msgstr "另外提供一些IPv6格式的网桥，不过某些 Pluggable Transport #. 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 +#: bridgedb/strings.py:88 #, python-format msgid "" "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n" @@ -130,33 +256,33 @@ msgid "" "\n" msgstr "此外，BridgeDB 提供很多 %s 非Pluggable Transports %s 的普通网桥。\n虽然听起来不够酷，但是这些普通网桥依然可以在很多情况下帮助绕过审查。\n" -#: lib/bridgedb/strings.py:76 +#: bridgedb/strings.py:101 msgid "What are bridges?" msgstr "什么是网桥？" -#: lib/bridgedb/strings.py:77 +#: bridgedb/strings.py:102 #, python-format msgid "%s Bridges %s are Tor relays that help you circumvent censorship." msgstr "%s网桥%s即 Tor 中继节点，用于帮助用户绕过审查或封锁。" -#: lib/bridgedb/strings.py:82 +#: bridgedb/strings.py:107 msgid "I need an alternative way of getting bridges!" msgstr "需要使用其他获取方式获取网桥！" -#: lib/bridgedb/strings.py:83 +#: bridgedb/strings.py:108 #, python-format 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。注意：必须使用电子邮箱发送请求：%s、%s 或 %s。" +msgstr "另一种获取网桥的方式是发送电子邮件至 %s。注意：必须使用以下电子邮箱发送请求：%s、%s 或 %s。" -#: lib/bridgedb/strings.py:90 +#: bridgedb/strings.py:115 msgid "My bridges don't work! I need help!" msgstr "用网桥也无法连接，需要帮助！" #. TRANSLATORS: Please DO NOT translate "Tor". -#: lib/bridgedb/strings.py:92 +#: bridgedb/strings.py:117 #, python-format msgid "If your Tor doesn't work, you should email %s." msgstr "如果 Tor 无法正常运行，请发邮件至 %s。" @@ -164,48 +290,48 @@ msgstr "如果 Tor 无法正常运行，请发邮件至 %s。" #. TRANSLATORS: Please DO NOT translate "Pluggable Transports". #. TRANSLATORS: Please DO NOT translate "Tor Browser". #. TRANSLATORS: Please DO NOT translate "Tor". -#: lib/bridgedb/strings.py:96 +#: bridgedb/strings.py:121 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 "请尽量详细地描述你的情况，包括所用的网桥及其类型，Tor 浏览器版本以及任何 Tor 显示的信息等等。" -#: lib/bridgedb/strings.py:103 +#: bridgedb/strings.py:128 msgid "Here are your bridge lines:" msgstr "以下是为你提供的网桥：" -#: lib/bridgedb/strings.py:104 +#: bridgedb/strings.py:129 msgid "Get Bridges!" msgstr "获得网桥！" -#: lib/bridgedb/strings.py:108 +#: bridgedb/strings.py:133 msgid "Please select options for bridge type:" msgstr "请选择类型类型。" -#: lib/bridgedb/strings.py:109 +#: bridgedb/strings.py:134 msgid "Do you need IPv6 addresses?" msgstr "是否需要IPv6地址？" -#: lib/bridgedb/strings.py:110 +#: bridgedb/strings.py:135 #, python-format msgid "Do you need a %s?" msgstr "是否需要 %s？" -#: lib/bridgedb/strings.py:114 +#: bridgedb/strings.py:139 msgid "Your browser is not displaying images properly." msgstr "浏览器无法正确显示图片。" -#: lib/bridgedb/strings.py:115 +#: bridgedb/strings.py:140 msgid "Enter the characters from the image above..." msgstr "请输入上图中的字符（不区分大小写）..." -#: lib/bridgedb/strings.py:119 +#: bridgedb/strings.py:144 msgid "How to start using your bridges" msgstr "如何使用网桥" #. TRANSLATORS: Please DO NOT translate "Tor Browser". -#: lib/bridgedb/strings.py:121 +#: bridgedb/strings.py:146 #, python-format msgid "" "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n" @@ -214,21 +340,21 @@ msgid "" msgstr "如需在 Tor 浏览器中添加网桥，请先根据 %s Tor 浏览器下载页面 %s 的说明下载和启动 Tor 浏览器。" #. TRANSLATORS: Please DO NOT translate "Tor". -#: lib/bridgedb/strings.py:126 +#: bridgedb/strings.py:151 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:130 +#: bridgedb/strings.py:155 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:134 +#: bridgedb/strings.py:159 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" @@ -236,153 +362,28 @@ msgid "" "button in the 'Tor Network Settings' wizard for further assistance." msgstr "选择“是”，然后点击“下一步”。如下添加新的网桥，请将网桥地址行通过复制粘贴的方式输入到文本输入框。最后，点击“连接”就可以连接至 Tor 网络。如有问题需要帮助，请点击“Tor 网络设置”向导窗口中的“帮助”按钮。" -#: lib/bridgedb/strings.py:142 +#: bridgedb/strings.py:167 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:146 +#: bridgedb/strings.py:171 msgid "Request vanilla bridges." msgstr "请求普通网桥。" -#: lib/bridgedb/strings.py:147 +#: bridgedb/strings.py:172 msgid "Request IPv6 bridges." msgstr "请求IPv6网络。" #. TRANSLATORS: Please DO NOT translate the word the word "TYPE". -#: lib/bridgedb/strings.py:149 +#: bridgedb/strings.py:174 msgid "Request a Pluggable Transport by TYPE." msgstr "按照类型请求不同的 Pluggable Transport 网桥。" #. TRANSLATORS: Please DO NOT translate "BridgeDB". #. TRANSLATORS: Please DO NOT translate "GnuPG". -#: lib/bridgedb/strings.py:152 +#: bridgedb/strings.py:177 msgid "Get a copy of BridgeDB's public GnuPG key." msgstr "获取 BridgeDB 的 GnuPG 公共密匙。" - -#: lib/bridgedb/templates/base.html:89 -msgid "Report a Bug" -msgstr "报告 Bug" - -#: lib/bridgedb/templates/base.html:92 -msgid "Source Code" -msgstr "源代码" - -#: lib/bridgedb/templates/base.html:95 -msgid "Changelog" -msgstr "更改日志" - -#: lib/bridgedb/templates/base.html:98 -msgid "Contact" -msgstr "联系方式" - -#: lib/bridgedb/templates/bridges.html:81 -msgid "Select All" -msgstr "选择全部" - -#: lib/bridgedb/templates/bridges.html:87 -msgid "Show QRCode" -msgstr "显示二维码" - -#: lib/bridgedb/templates/bridges.html:100 -msgid "QRCode for your bridge lines" -msgstr "网桥二维码" - -#. TRANSLATORS: Please translate this into some silly way to say -#. "There was a problem!" in your language. For example, -#. for Italian, you might translate this into "Mama mia!", -#. or for French: "Sacrebleu!". :) -#: lib/bridgedb/templates/bridges.html:115 -#: lib/bridgedb/templates/bridges.html:175 -msgid "Uh oh, spaghettios!" -msgstr "哎哟哟！" - -#: lib/bridgedb/templates/bridges.html:116 -msgid "It seems there was an error getting your QRCode." -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 "二维码包含网桥信息。利用二维码扫描程序，可将相应的网桥信息复制到手机或其他设备。" - -#: lib/bridgedb/templates/bridges.html:181 -msgid "There currently aren't any bridges available..." -msgstr "现在没有可用的网桥。" - -#: lib/bridgedb/templates/bridges.html:182 -#, python-format -msgid "" -" Perhaps you should try %s going back %s and choosing a different bridge " -"type!" -msgstr "试试 %s后退%s到前一页面，然后选择其他类型的网桥。" - -#: lib/bridgedb/templates/index.html:11 -#, python-format -msgid "Step %s1%s" -msgstr "第 %s 1 %s 步" - -#: lib/bridgedb/templates/index.html:13 -#, python-format -msgid "Download %s Tor Browser %s" -msgstr "下载 %s Tor 浏览器 %s" - -#: lib/bridgedb/templates/index.html:25 -#, python-format -msgid "Step %s2%s" -msgstr "第 %s 2 %s 步" - -#: lib/bridgedb/templates/index.html:27 -#, python-format -msgid "Get %s bridges %s" -msgstr "获取 %s bridges %s" - -#: lib/bridgedb/templates/index.html:36 -#, python-format -msgid "Step %s3%s" -msgstr "第 %s 3 %s 步" - -#: lib/bridgedb/templates/index.html:38 -#, python-format -msgid "Now %s add the bridges to Tor Browser %s" -msgstr "如何 %s 在 Tor 浏览器添加网桥%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%s)！ " - -#: lib/bridgedb/templates/options.html:52 -msgid "Advanced Options" -msgstr "高级选项" - -#: lib/bridgedb/templates/options.html:88 -msgid "No" -msgstr "否" - -#: lib/bridgedb/templates/options.html:89 -msgid "none" -msgstr "无" - -#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the -#. beginning of words are present in your final translation. Thanks! -#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses." -#: lib/bridgedb/templates/options.html:127 -#, python-format -msgid "%sY%ses!" -msgstr "是(%sY%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:151 -#, python-format -msgid "%sG%set Bridges" -msgstr "获取网桥(%sG%s)" diff --git a/zh_HK/LC_MESSAGES/bridgedb.po b/zh_HK/LC_MESSAGES/bridgedb.po index 1d1973b..ffe9043 100644 --- a/zh_HK/LC_MESSAGES/bridgedb.po +++ b/zh_HK/LC_MESSAGES/bridgedb.po @@ -4,17 +4,19 @@ # # Translators: # CasperLi_HK <casper.hk(a)hotmail.com>, 2013 +# Wen-Gan Li <wgli(a)wgli.net>, 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-04-19 08:23+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" -"Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/torproject/language/zh_HK/)\n" +"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" +"POT-Creation-Date: 2015-07-25 03:40+0000\n" +"PO-Revision-Date: 2015-12-22 12:26+0000\n" +"Last-Translator: Wen-Gan Li <wgli(a)wgli.net>\n" +"Language-Team: Chinese (Hong Kong) (http://www.transifex.com/otf/torproject/language/zh_HK/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 0.9.6\n" +"Generated-By: Babel 1.3\n" "Language: zh_HK\n" "Plural-Forms: nplurals=1; plural=0;\n" @@ -29,57 +31,182 @@ msgstr "" #. "fteproxy" #. "Tor" #. "Tor Browser" -#: lib/bridgedb/HTTPServer.py:107 +#: bridgedb/https/server.py:167 msgid "Sorry! Something went wrong with your request." msgstr "" -#: lib/bridgedb/strings.py:18 +#: bridgedb/https/templates/base.html:79 +msgid "Report a Bug" +msgstr "" + +#: bridgedb/https/templates/base.html:82 +msgid "Source Code" +msgstr "" + +#: bridgedb/https/templates/base.html:85 +msgid "Changelog" +msgstr "" + +#: bridgedb/https/templates/base.html:88 +msgid "Contact" +msgstr "" + +#: bridgedb/https/templates/bridges.html:35 +msgid "Select All" +msgstr "" + +#: bridgedb/https/templates/bridges.html:40 +msgid "Show QRCode" +msgstr "" + +#: bridgedb/https/templates/bridges.html:52 +msgid "QRCode for your bridge lines" +msgstr "" + +#. TRANSLATORS: Please translate this into some silly way to say +#. "There was a problem!" in your language. For example, +#. for Italian, you might translate this into "Mama mia!", +#. or for French: "Sacrebleu!". :) +#: bridgedb/https/templates/bridges.html:67 +#: bridgedb/https/templates/bridges.html:125 +msgid "Uh oh, spaghettios!" +msgstr "" + +#: bridgedb/https/templates/bridges.html:68 +msgid "It seems there was an error getting your QRCode." +msgstr "" + +#: bridgedb/https/templates/bridges.html:73 +msgid "" +"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy" +" your bridge lines onto mobile and other devices." +msgstr "" + +#: bridgedb/https/templates/bridges.html:131 +msgid "There currently aren't any bridges available..." +msgstr "" + +#: bridgedb/https/templates/bridges.html:132 +#, python-format +msgid "" +" Perhaps you should try %s going back %s and choosing a different bridge " +"type!" +msgstr "" + +#: bridgedb/https/templates/index.html:11 +#, python-format +msgid "Step %s1%s" +msgstr "" + +#: bridgedb/https/templates/index.html:13 +#, python-format +msgid "Download %s Tor Browser %s" +msgstr "" + +#: bridgedb/https/templates/index.html:25 +#, python-format +msgid "Step %s2%s" +msgstr "" + +#: bridgedb/https/templates/index.html:27 +#, python-format +msgid "Get %s bridges %s" +msgstr "" + +#: bridgedb/https/templates/index.html:36 +#, python-format +msgid "Step %s3%s" +msgstr "" + +#: bridgedb/https/templates/index.html:38 +#, python-format +msgid "Now %s add the bridges to Tor Browser %s" +msgstr "" + +#. 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.) +#: bridgedb/https/templates/options.html:38 +#, python-format +msgid "%sJ%sust give me bridges!" +msgstr "" + +#: bridgedb/https/templates/options.html:51 +msgid "Advanced Options" +msgstr "" + +#: bridgedb/https/templates/options.html:86 +msgid "No" +msgstr "否" + +#: bridgedb/https/templates/options.html:87 +msgid "none" +msgstr "" + +#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the +#. beginning of words are present in your final translation. Thanks! +#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses." +#: bridgedb/https/templates/options.html:124 +#, python-format +msgid "%sY%ses!" +msgstr "" + +#. 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"! +#: bridgedb/https/templates/options.html:147 +#, python-format +msgid "%sG%set Bridges" +msgstr "" + +#: bridgedb/strings.py:43 msgid "[This is an automated message; please do not reply.]" msgstr "" -#: lib/bridgedb/strings.py:20 +#: bridgedb/strings.py:45 msgid "Here are your bridges:" msgstr "" -#: lib/bridgedb/strings.py:22 +#: bridgedb/strings.py:47 #, python-format msgid "" "You have exceeded the rate limit. Please slow down! The minimum time between\n" "emails is %s hours. All further emails during this time period will be ignored." msgstr "" -#: lib/bridgedb/strings.py:25 +#: bridgedb/strings.py:50 msgid "" "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)" msgstr "" #. TRANSLATORS: Please DO NOT translate the word "BridgeDB". -#: lib/bridgedb/strings.py:28 +#: bridgedb/strings.py:53 msgid "Welcome to BridgeDB!" msgstr "" #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE". -#: lib/bridgedb/strings.py:30 +#: bridgedb/strings.py:55 msgid "Currently supported transport TYPEs:" msgstr "" -#: lib/bridgedb/strings.py:31 +#: bridgedb/strings.py:56 #, python-format msgid "Hey, %s!" msgstr "" -#: lib/bridgedb/strings.py:32 +#: bridgedb/strings.py:57 msgid "Hello, friend!" msgstr "" -#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100 +#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90 msgid "Public Keys" msgstr "" #. TRANSLATORS: This string will end up saying something like: #. "This email was generated with rainbows, unicorns, and sparkles #. for alice(a)example.com on Friday, 09 May, 2014 at 18:59:39." -#: lib/bridgedb/strings.py:37 +#: bridgedb/strings.py:62 #, python-format msgid "" "This email was generated with rainbows, unicorns, and sparkles\n" @@ -90,7 +217,7 @@ msgstr "" #. 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 +#: bridgedb/strings.py:72 #, python-format msgid "" "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n" @@ -101,7 +228,7 @@ msgid "" msgstr "" #. TRANSLATORS: Please DO NOT translate "Pluggable Transports". -#: lib/bridgedb/strings.py:54 +#: bridgedb/strings.py:79 msgid "" "Some bridges with IPv6 addresses are also available, though some Pluggable\n" "Transports aren't IPv6 compatible.\n" @@ -113,7 +240,7 @@ msgstr "" #. 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 +#: bridgedb/strings.py:88 #, python-format msgid "" "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n" @@ -122,20 +249,20 @@ msgid "" "\n" msgstr "" -#: lib/bridgedb/strings.py:76 +#: bridgedb/strings.py:101 msgid "What are bridges?" -msgstr "什麼是橋？" +msgstr "咩叫橋接？" -#: lib/bridgedb/strings.py:77 +#: bridgedb/strings.py:102 #, python-format msgid "%s Bridges %s are Tor relays that help you circumvent censorship." msgstr "" -#: lib/bridgedb/strings.py:82 +#: bridgedb/strings.py:107 msgid "I need an alternative way of getting bridges!" -msgstr "我需要得到另一種方式來得到橋！" +msgstr "我需要另一種黎方式做橋接！" -#: lib/bridgedb/strings.py:83 +#: bridgedb/strings.py:108 #, python-format msgid "" "Another way to get bridges is to send an email to %s. Please note that you must\n" @@ -143,12 +270,12 @@ msgid "" "%s, %s or %s." msgstr "" -#: lib/bridgedb/strings.py:90 +#: bridgedb/strings.py:115 msgid "My bridges don't work! I need help!" msgstr "" #. TRANSLATORS: Please DO NOT translate "Tor". -#: lib/bridgedb/strings.py:92 +#: bridgedb/strings.py:117 #, python-format msgid "If your Tor doesn't work, you should email %s." msgstr "" @@ -156,48 +283,48 @@ msgstr "" #. 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 +#: bridgedb/strings.py:121 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 "" -#: lib/bridgedb/strings.py:103 +#: bridgedb/strings.py:128 msgid "Here are your bridge lines:" msgstr "" -#: lib/bridgedb/strings.py:104 +#: bridgedb/strings.py:129 msgid "Get Bridges!" msgstr "" -#: lib/bridgedb/strings.py:108 +#: bridgedb/strings.py:133 msgid "Please select options for bridge type:" msgstr "" -#: lib/bridgedb/strings.py:109 +#: bridgedb/strings.py:134 msgid "Do you need IPv6 addresses?" msgstr "" -#: lib/bridgedb/strings.py:110 +#: bridgedb/strings.py:135 #, python-format msgid "Do you need a %s?" msgstr "" -#: lib/bridgedb/strings.py:114 +#: bridgedb/strings.py:139 msgid "Your browser is not displaying images properly." msgstr "" -#: lib/bridgedb/strings.py:115 +#: bridgedb/strings.py:140 msgid "Enter the characters from the image above..." msgstr "" -#: lib/bridgedb/strings.py:119 +#: bridgedb/strings.py:144 msgid "How to start using your bridges" msgstr "" #. TRANSLATORS: Please DO NOT translate "Tor Browser". -#: lib/bridgedb/strings.py:121 +#: bridgedb/strings.py:146 #, python-format msgid "" "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n" @@ -206,21 +333,21 @@ msgid "" msgstr "" #. TRANSLATORS: Please DO NOT translate "Tor". -#: lib/bridgedb/strings.py:126 +#: bridgedb/strings.py:151 msgid "" "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n" "the wizard until it asks:" msgstr "" #. TRANSLATORS: Please DO NOT translate "Tor". -#: lib/bridgedb/strings.py:130 +#: bridgedb/strings.py:155 msgid "" "Does your Internet Service Provider (ISP) block or otherwise censor connections\n" "to the Tor network?" msgstr "" #. TRANSLATORS: Please DO NOT translate "Tor". -#: lib/bridgedb/strings.py:134 +#: bridgedb/strings.py:159 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" @@ -228,153 +355,28 @@ msgid "" "button in the 'Tor Network Settings' wizard for further assistance." msgstr "" -#: lib/bridgedb/strings.py:142 +#: bridgedb/strings.py:167 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:146 +#: bridgedb/strings.py:171 msgid "Request vanilla bridges." msgstr "" -#: lib/bridgedb/strings.py:147 +#: bridgedb/strings.py:172 msgid "Request IPv6 bridges." msgstr "" #. TRANSLATORS: Please DO NOT translate the word the word "TYPE". -#: lib/bridgedb/strings.py:149 +#: bridgedb/strings.py:174 msgid "Request a Pluggable Transport by TYPE." msgstr "" #. TRANSLATORS: Please DO NOT translate "BridgeDB". #. TRANSLATORS: Please DO NOT translate "GnuPG". -#: lib/bridgedb/strings.py:152 +#: bridgedb/strings.py:177 msgid "Get a copy of BridgeDB's public GnuPG key." msgstr "" - -#: lib/bridgedb/templates/base.html:89 -msgid "Report a Bug" -msgstr "" - -#: lib/bridgedb/templates/base.html:92 -msgid "Source Code" -msgstr "" - -#: lib/bridgedb/templates/base.html:95 -msgid "Changelog" -msgstr "" - -#: lib/bridgedb/templates/base.html:98 -msgid "Contact" -msgstr "" - -#: lib/bridgedb/templates/bridges.html:81 -msgid "Select All" -msgstr "" - -#: lib/bridgedb/templates/bridges.html:87 -msgid "Show QRCode" -msgstr "" - -#: lib/bridgedb/templates/bridges.html:100 -msgid "QRCode for your bridge lines" -msgstr "" - -#. TRANSLATORS: Please translate this into some silly way to say -#. "There was a problem!" in your language. For example, -#. for Italian, you might translate this into "Mama mia!", -#. or for French: "Sacrebleu!". :) -#: lib/bridgedb/templates/bridges.html:115 -#: lib/bridgedb/templates/bridges.html:175 -msgid "Uh oh, spaghettios!" -msgstr "" - -#: lib/bridgedb/templates/bridges.html:116 -msgid "It seems there was an error getting your QRCode." -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 "" - -#: lib/bridgedb/templates/bridges.html:181 -msgid "There currently aren't any bridges available..." -msgstr "" - -#: lib/bridgedb/templates/bridges.html:182 -#, python-format -msgid "" -" Perhaps you should try %s going back %s and choosing a different bridge " -"type!" -msgstr "" - -#: lib/bridgedb/templates/index.html:11 -#, python-format -msgid "Step %s1%s" -msgstr "" - -#: lib/bridgedb/templates/index.html:13 -#, python-format -msgid "Download %s Tor Browser %s" -msgstr "" - -#: lib/bridgedb/templates/index.html:25 -#, python-format -msgid "Step %s2%s" -msgstr "" - -#: lib/bridgedb/templates/index.html:27 -#, python-format -msgid "Get %s bridges %s" -msgstr "" - -#: lib/bridgedb/templates/index.html:36 -#, python-format -msgid "Step %s3%s" -msgstr "" - -#: lib/bridgedb/templates/index.html:38 -#, python-format -msgid "Now %s add the bridges to Tor Browser %s" -msgstr "" - -#. 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 "" - -#: lib/bridgedb/templates/options.html:52 -msgid "Advanced Options" -msgstr "" - -#: lib/bridgedb/templates/options.html:88 -msgid "No" -msgstr "否" - -#: lib/bridgedb/templates/options.html:89 -msgid "none" -msgstr "" - -#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the -#. beginning of words are present in your final translation. Thanks! -#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses." -#: lib/bridgedb/templates/options.html:127 -#, python-format -msgid "%sY%ses!" -msgstr "" - -#. 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 "%sG%set Bridges" -msgstr ""

1 0

[tor-browser-bundle/hardened-builds] Preparations for 5.5a6-hardened
by gk＠torproject.org 06 Jan '16

06 Jan '16

commit bda810b201efda79bef12d759845e0a94aef71d6 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Jan 6 10:55:41 2016 +0000 Preparations for 5.5a6-hardened --- Bundle-Data/Docs/ChangeLog.txt | 7 +++++++ gitian/versions.alpha | 8 ++++---- tools/update-responses/config.yml | 10 +++++----- 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 8072453..fd05337 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,10 @@ +Tor Browser 5.5a6-hardened -- January 7 2016 + * All Platforms + * Update NoScript to 2.9 + * Update HTTPS Everywhere to 5.1.2 + * Bug 17931: Tor Browser crashes in LogMessageToConsole() + * Bug 17875: Discourage editing of torrc-defaults + Tor Browser 5.5a5-hardened -- December 16 2015 * All Platforms * Update Firefox to 38.5.0esr diff --git a/gitian/versions.alpha b/gitian/versions.alpha index a7d03c9..22eb8df 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -15,11 +15,11 @@ FIREFOX_VERSION=38.5.0esr TORBROWSER_UPDATE_CHANNEL=hardened -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-5.5-2-build1 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-5.5-2-build2 TOR_TAG=tor-0.2.7.6 TORLAUNCHER_TAG=0.2.8.1 TORBUTTON_TAG=1.9.4.2 -HTTPSE_TAG=5.1.1 +HTTPSE_TAG=5.1.2 NSIS_TAG=v0.3 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.22-stable @@ -66,7 +66,7 @@ NOTOCJKFONT_VER=1.004 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 -NOSCRIPT_PACKAGE=noscript_security_suite-2.7-sm+fx+fn.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.9-sm+fx+fn.xpi TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz OSXSDK_PACKAGE=MacOSX10.7.sdk.tar.gz @@ -97,7 +97,7 @@ OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf OSXSDK_OLD_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=ab84fd85addd6c15f2ce1e81c58ac9f09b228f9e56703f4d938447b8a2b752ea +NOSCRIPT_HASH=7d67363b10708ef816d786e99d035a16a41eee8c8c1b3c87e4544717b066db71 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4 diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index 4244d87..fc3ee99 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-responses/config.yml @@ -9,7 +9,7 @@ build_targets: osx32: Darwin_x86-gcc3 osx64: Darwin_x86_64-gcc3 channels: - hardened: 5.5a5-hardened + hardened: 5.5a6-hardened release: 5.0 versions: 5.0: @@ -23,12 +23,12 @@ versions: osx32: minSupportedOSVersion: 10.8 detailsURL: https://blog.torproject.org/blog/end-life-plan-tor-browser-32-bit-macs#upda… - 5.5a5-hardened: + 5.5a6-hardened: platformVersion: 38.5.0 - detailsURL: https://blog.torproject.org/blog/tor-browser-55a5-hardened-released - download_url: https://www.torproject.org/dist/torbrowser/5.5a5-hardened + detailsURL: https://blog.torproject.org/blog/tor-browser-55a6-hardened-released + download_url: https://www.torproject.org/dist/torbrowser/5.5a6-hardened incremental_from: - - 5.5a4-hardened + - 5.5a5-hardened migrate_archs: osx32: osx64 osx32:

1 0

[tor-browser-bundle/master] Preparations for 5.5a6
by gk＠torproject.org 05 Jan '16

05 Jan '16

commit 4ecd949538a9dee8ce070a7d69800eb9ab229860 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Jan 5 21:07:51 2016 +0000 Preparations for 5.5a6 --- Bundle-Data/Docs/ChangeLog.txt | 7 +++++++ gitian/versions.alpha | 8 ++++---- tools/update-responses/config.yml | 10 +++++----- 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 4812fc4..87a3799 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,10 @@ +Tor Browser 5.5a6 -- January 7 2016 + * All Platforms + * Update NoScript to 2.9 + * Update HTTPS Everywhere to 5.1.2 + * Bug 17931: Tor Browser crashes in LogMessageToConsole() + * Bug 17875: Discourage editing of torrc-defaults + Tor Browser 5.5a5 -- December 15 2015 * All Platforms * Update Firefox to 38.5.0esr diff --git a/gitian/versions.alpha b/gitian/versions.alpha index d1c9f36..149b765 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -11,11 +11,11 @@ FIREFOX_VERSION=38.5.0esr TORBROWSER_UPDATE_CHANNEL=alpha -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-5.5-2-build1 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-5.5-2-build2 TOR_TAG=tor-0.2.7.6 TORLAUNCHER_TAG=0.2.7.7 TORBUTTON_TAG=1.9.4.2 -HTTPSE_TAG=5.1.1 +HTTPSE_TAG=5.1.2 NSIS_TAG=v0.3 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.22-stable @@ -62,7 +62,7 @@ NOTOCJKFONT_VER=1.004 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 -NOSCRIPT_PACKAGE=noscript_security_suite-2.7-sm+fx+fn.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.9-sm+fx+fn.xpi TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz OSXSDK_PACKAGE=MacOSX10.7.sdk.tar.gz @@ -93,7 +93,7 @@ OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf OSXSDK_OLD_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=ab84fd85addd6c15f2ce1e81c58ac9f09b228f9e56703f4d938447b8a2b752ea +NOSCRIPT_HASH=7d67363b10708ef816d786e99d035a16a41eee8c8c1b3c87e4544717b066db71 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4 diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index ddd5b1e..d61793c 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-responses/config.yml @@ -9,7 +9,7 @@ build_targets: osx32: Darwin_x86-gcc3 osx64: Darwin_x86_64-gcc3 channels: - alpha: 5.5a5 + alpha: 5.5a6 release: 5.0 versions: 5.0: @@ -23,12 +23,12 @@ versions: osx32: minSupportedOSVersion: 10.8 detailsURL: https://blog.torproject.org/blog/end-life-plan-tor-browser-32-bit-macs#upda… - 5.5a5: + 5.5a6: platformVersion: 38.5.0 - detailsURL: https://blog.torproject.org/blog/tor-browser-55a5-released - download_url: https://www.torproject.org/dist/torbrowser/5.5a5 + detailsURL: https://blog.torproject.org/blog/tor-browser-55a6-released + download_url: https://www.torproject.org/dist/torbrowser/5.5a6 incremental_from: - - 5.5a4 + - 5.5a5 migrate_archs: osx32: osx64 osx32:

1 0

[webwml/master] Rename arm to nyx on the volunteer page
by atagar＠torproject.org 05 Jan '16

05 Jan '16

commit 039803c9332938af6d3ead279fc300391c05ee86 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Jan 5 08:34:19 2016 -0800 Rename arm to nyx on the volunteer page I'm still holding off on the bulk of the rename until our next release (no reason to confuse its existing users with its name change), but contributors can handle it. Link was broken - thanks to unixninja92 for pointing it out... https://trac.torproject.org/projects/tor/ticket/18000 --- getinvolved/en/volunteer.wml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/getinvolved/en/volunteer.wml b/getinvolved/en/volunteer.wml index a15c952..7ea98e6 100644 --- a/getinvolved/en/volunteer.wml +++ b/getinvolved/en/volunteer.wml @@ -157,7 +157,7 @@ meetings around the world.</li> </tr> <tr> - <td><a href="#project-arm">Arm</a></td> + <td><a href="#project-nyx">Nyx</a></td> <td>User Interface</td> <td>Python, Curses</td> <td>Light</td> @@ -450,14 +450,14 @@ meetings around the world.</li> more secure. </p> - <a id="project-arm"></a> - <h3><a href="https://www.atagar.com/arm/">Arm</a> (<a - href="https://gitweb.torproject.org/arm.git">code</a>, <a + <a id="project-nyx"></a> + <h3><a href="https://www.atagar.com/arm/">Nyx</a> (<a + href="https://gitweb.torproject.org/nyx.git">code</a>, <a href="https://trac.torproject.org/projects/tor/query?status=accepted&status=assig…">bug tracker</a>)</h3> <p> - The anonymizing relay monitor (arm) is a terminal status monitor for Tor, + Nyx (previously <i>arm</i>) is a terminal status monitor for Tor intended for command-line aficionados, ssh connections, and anyone with a tty terminal. This works much like top does for system usage, providing real time statistics for bandwidth, resource usage, connections, and quite

1 0

[tor-browser/tor-browser-38.5.0esr-5.5-2] Bug 17931: Use a non-format argument in LogMessageToConsole
by gk＠torproject.org 05 Jan '16

05 Jan '16

commit eb89821a7755d3eaaff675801fe8f075be2a6d01 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Mon Jan 4 09:32:21 2016 -0800 Bug 17931: Use a non-format argument in LogMessageToConsole --- dom/base/nsContentUtils.cpp | 15 ++------------- dom/base/nsContentUtils.h | 4 ++-- 2 files changed, 4 insertions(+), 15 deletions(-) diff --git a/dom/base/nsContentUtils.cpp b/dom/base/nsContentUtils.cpp index be130e4..5d3dea7 100644 --- a/dom/base/nsContentUtils.cpp +++ b/dom/base/nsContentUtils.cpp @@ -11,7 +11,6 @@ #include <algorithm> #include <math.h> -#include "prprf.h" #include "DecoderTraits.h" #include "harfbuzz/hb.h" #include "imgICache.h" @@ -3392,7 +3391,7 @@ nsContentUtils::ReportToConsoleNonLocalized(const nsAString& aErrorText, } void -nsContentUtils::LogMessageToConsole(const char* aMsg, ...) +nsContentUtils::LogMessageToConsole(const char* aMsg) { if (!sConsoleService) { // only need to bother null-checking here CallGetService(NS_CONSOLESERVICE_CONTRACTID, &sConsoleService); @@ -3400,17 +3399,7 @@ nsContentUtils::LogMessageToConsole(const char* aMsg, ...) return; } } - - va_list args; - va_start(args, aMsg); - char* formatted = PR_vsmprintf(aMsg, args); - va_end(args); - if (!formatted) { - return; - } - - sConsoleService->LogStringMessage(NS_ConvertUTF8toUTF16(formatted).get()); - PR_smprintf_free(formatted); + sConsoleService->LogStringMessage(NS_ConvertUTF8toUTF16(aMsg).get()); } bool diff --git a/dom/base/nsContentUtils.h b/dom/base/nsContentUtils.h index 699889a..b194ae4 100644 --- a/dom/base/nsContentUtils.h +++ b/dom/base/nsContentUtils.h @@ -825,8 +825,8 @@ public: uint32_t aLineNumber = 0, uint32_t aColumnNumber = 0); - static void LogMessageToConsole(const char* aMsg, ...); - + static void LogMessageToConsole(const char* aMsg); + /** * Get the localized string named |aKey| in properties file |aFile|. */

1 0

[tor-browser/tor-browser-38.5.0esr-5.5-2] Bug 17931: Update GonkGPSGeolocationProvider.cpp to use B2G-style logging
by gk＠torproject.org 05 Jan '16

05 Jan '16

commit 4241f99bdf703516b69b03b89feb8152f290d0f2 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Mon Jan 4 09:46:17 2016 -0800 Bug 17931: Update GonkGPSGeolocationProvider.cpp to use B2G-style logging --- dom/system/gonk/GonkGPSGeolocationProvider.cpp | 32 ++++++++++++------------ 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/dom/system/gonk/GonkGPSGeolocationProvider.cpp b/dom/system/gonk/GonkGPSGeolocationProvider.cpp index e5a63db..3cf657f 100644 --- a/dom/system/gonk/GonkGPSGeolocationProvider.cpp +++ b/dom/system/gonk/GonkGPSGeolocationProvider.cpp @@ -51,6 +51,13 @@ #define FLUSH_AIDE_DATA 0 +#undef LOG +#undef ERR +#undef DBG +#define LOG(args...) __android_log_print(ANDROID_LOG_INFO, "GonkGPSGeolocationProvider", ## args) +#define ERR(args...) __android_log_print(ANDROID_LOG_ERROR, "GonkGPSGeolocationProvider", ## args) +#define DBG(args...) __android_log_print(ANDROID_LOG_DEBUG, "GonkGPSGeolocationProvider" , ## args) + using namespace mozilla; using namespace mozilla::dom; @@ -145,8 +152,7 @@ void GonkGPSGeolocationProvider::NmeaCallback(GpsUtcTime timestamp, const char* nmea, int length) { if (gDebug_isLoggingEnabled) { - nsContentUtils::LogMessageToConsole("geo: NMEA: timestamp:\t%lld, length: %d, %s", - timestamp, length, nmea); + DBG("NMEA: timestamp:\t%lld, length: %d, %s", timestamp, length, nmea); } } @@ -420,15 +426,13 @@ GonkGPSGeolocationProvider::RequestSettingValue(const char* aKey) nsCOMPtr<nsISettingsServiceLock> lock; nsresult rv = ss->CreateLock(nullptr, getter_AddRefs(lock)); if (NS_FAILED(rv)) { - nsContentUtils::LogMessageToConsole( - "geo: error while createLock setting '%s': %d\n", aKey, rv); + ERR("error while createLock setting '%s': %d\n", aKey, rv); return; } rv = lock->Get(aKey, this); if (NS_FAILED(rv)) { - nsContentUtils::LogMessageToConsole( - "geo: error while get setting '%s': %d\n", aKey, rv); + ERR("error while get setting '%s': %d\n", aKey, rv); return; } } @@ -599,8 +603,7 @@ GonkGPSGeolocationProvider::InjectLocation(double latitude, float accuracy) { if (gDebug_isLoggingEnabled) { - nsContentUtils::LogMessageToConsole("geo: injecting location (%f, %f) accuracy: %f", - latitude, longitude, accuracy); + DBG("injecting location (%f, %f) accuracy: %f", latitude, longitude, accuracy); } MOZ_ASSERT(NS_IsMainThread()); @@ -818,14 +821,12 @@ GonkGPSGeolocationProvider::NetworkLocationUpdate::Update(nsIDOMGeoPosition *pos (isGPSTempInactive && delta > kMinMLSCoordChangeInMeters)) { if (gDebug_isLoggingEnabled) { - nsContentUtils::LogMessageToConsole("geo: Using MLS, GPS age:%fs, MLS Delta:%fm\n", - diff_ms / 1000.0, delta); + DBG("Using MLS, GPS age:%fs, MLS Delta:%fm\n", diff_ms / 1000.0, delta); } provider->mLocationCallback->Update(position); } else if (provider->mLastGPSPosition) { if (gDebug_isLoggingEnabled) { - nsContentUtils::LogMessageToConsole("geo: Using old GPS age:%fs\n", - diff_ms / 1000.0); + DBG("Using old GPS age:%fs\n", diff_ms / 1000.0); } // This is a fallback case so that the GPS provider responds with its last @@ -1058,16 +1059,15 @@ GonkGPSGeolocationProvider::Observe(nsISupports* aSubject, } if (setting.mKey.EqualsASCII(kSettingDebugGpsIgnored)) { - nsContentUtils::LogMessageToConsole("geo: received mozsettings-changed: ignoring\n"); + LOG("received mozsettings-changed: ignoring\n"); gDebug_isGPSLocationIgnored = setting.mValue.isBoolean() ? setting.mValue.toBoolean() : false; if (gDebug_isLoggingEnabled) { - nsContentUtils::LogMessageToConsole("geo: Debug: GPS ignored %d\n", - gDebug_isGPSLocationIgnored); + DBG("GPS ignored %d\n", gDebug_isGPSLocationIgnored); } return NS_OK; } else if (setting.mKey.EqualsASCII(kSettingDebugEnabled)) { - nsContentUtils::LogMessageToConsole("geo: received mozsettings-changed: logging\n"); + LOG("received mozsettings-changed: logging\n"); gDebug_isLoggingEnabled = setting.mValue.isBoolean() ? setting.mValue.toBoolean() : false; return NS_OK;

1 0

[tor-browser/tor-browser-38.5.0esr-5.0-2] Bug 17931: Use a non-format argument in LogMessageToConsole
by gk＠torproject.org 05 Jan '16

05 Jan '16

commit 0a6d7f30284d9e67c32acdb1abbd73da9ced4ca2 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Mon Jan 4 09:32:21 2016 -0800 Bug 17931: Use a non-format argument in LogMessageToConsole --- dom/base/nsContentUtils.cpp | 15 ++------------- dom/base/nsContentUtils.h | 4 ++-- 2 files changed, 4 insertions(+), 15 deletions(-) diff --git a/dom/base/nsContentUtils.cpp b/dom/base/nsContentUtils.cpp index be130e4..5d3dea7 100644 --- a/dom/base/nsContentUtils.cpp +++ b/dom/base/nsContentUtils.cpp @@ -11,7 +11,6 @@ #include <algorithm> #include <math.h> -#include "prprf.h" #include "DecoderTraits.h" #include "harfbuzz/hb.h" #include "imgICache.h" @@ -3392,7 +3391,7 @@ nsContentUtils::ReportToConsoleNonLocalized(const nsAString& aErrorText, } void -nsContentUtils::LogMessageToConsole(const char* aMsg, ...) +nsContentUtils::LogMessageToConsole(const char* aMsg) { if (!sConsoleService) { // only need to bother null-checking here CallGetService(NS_CONSOLESERVICE_CONTRACTID, &sConsoleService); @@ -3400,17 +3399,7 @@ nsContentUtils::LogMessageToConsole(const char* aMsg, ...) return; } } - - va_list args; - va_start(args, aMsg); - char* formatted = PR_vsmprintf(aMsg, args); - va_end(args); - if (!formatted) { - return; - } - - sConsoleService->LogStringMessage(NS_ConvertUTF8toUTF16(formatted).get()); - PR_smprintf_free(formatted); + sConsoleService->LogStringMessage(NS_ConvertUTF8toUTF16(aMsg).get()); } bool diff --git a/dom/base/nsContentUtils.h b/dom/base/nsContentUtils.h index 699889a..b194ae4 100644 --- a/dom/base/nsContentUtils.h +++ b/dom/base/nsContentUtils.h @@ -825,8 +825,8 @@ public: uint32_t aLineNumber = 0, uint32_t aColumnNumber = 0); - static void LogMessageToConsole(const char* aMsg, ...); - + static void LogMessageToConsole(const char* aMsg); + /** * Get the localized string named |aKey| in properties file |aFile|. */

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits January 2016