tor-commits
Threads by month
- ----- 2025 -----
- June
- May
- April
- March
- February
- January
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
June 2014
- 21 participants
- 1212 discussions

[bridgedb/develop] Update Brazilian Portuguese (pt_BR) translations.
by isis@torproject.org 06 Jun '14
by isis@torproject.org 06 Jun '14
06 Jun '14
commit 5544c5f141c2cc0eabf8aec1003e5e8dfd989ee0
Author: Isis Lovecruft <isis(a)torproject.org>
Date: Fri Jun 6 20:25:24 2014 +0000
Update Brazilian Portuguese (pt_BR) translations.
* THANKS to Communia, Humberto Sartini, Anastasia01, and recognitium.
---
lib/bridgedb/i18n/pt_BR/LC_MESSAGES/bridgedb.po | 339 +++++++++++++++++++----
1 file changed, 287 insertions(+), 52 deletions(-)
diff --git a/lib/bridgedb/i18n/pt_BR/LC_MESSAGES/bridgedb.po b/lib/bridgedb/i18n/pt_BR/LC_MESSAGES/bridgedb.po
index 3d6ba21..a716b70 100644
--- a/lib/bridgedb/i18n/pt_BR/LC_MESSAGES/bridgedb.po
+++ b/lib/bridgedb/i18n/pt_BR/LC_MESSAGES/bridgedb.po
@@ -1,18 +1,20 @@
# Translations template for BridgeDB.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2014 'The Tor Project, Inc.'
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
-# Translators:
-# Communia <ameaneantie(a)riseup.net>, 2013
+# Communia <ameaneantie(a)riseup.net>, 2013-2014
# Augustine <evandro(a)geocities.com>, 2013
+# Humberto Sartini <humberto(a)hss.blog.br>, 2014
+# Anastasia01, 2014
# Snake Plissken <>, 2012
+# recognitium <rodrigoesborges(a)gmail.com>, 2014
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2013-03-27 21:41+0000\n"
-"PO-Revision-Date: 2013-08-20 22:20+0000\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n"
+"POT-Creation-Date: 2014-05-16 18:39+0000\n"
+"PO-Revision-Date: 2014-05-29 18:31+0000\n"
"Last-Translator: Communia <ameaneantie(a)riseup.net>\n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/torproject/language/pt_BR/)\n"
"MIME-Version: 1.0\n"
@@ -22,82 +24,315 @@ msgstr ""
"Language: pt_BR\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: lib/bridgedb/templates/base.html:33
+#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
+#. any string (regardless of capitalization and/or punctuation):
+#. "bridge"
+#. "bridges"
+#. "BridgeDB"
+#. "pluggable transport"
+#. "pluggable transports"
+#. "obfs2"
+#. "obfs3"
+#. "scramblesuit"
+#. "fte"
+#. "Tor"
+#. "Tor Browser"
+#. "TBB"
+#: lib/bridgedb/HTTPServer.py:124
+msgid "Sorry! Something went wrong with your request."
+msgstr "Desculpe! Algo errado ocorreu com a sua solicitação."
+
+#: lib/bridgedb/strings.py:18
+msgid "[This is an automated message; please do not reply.]"
+msgstr "[Esta é uma mensagem automática; por favor, não responda.]"
+
+#: lib/bridgedb/strings.py:20
+msgid "Here are your bridges:"
+msgstr "Aqui estão suas pontes:"
+
+#: lib/bridgedb/strings.py:22
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr "Você excedeu o limite. Mais devagar, por favor! O tempo mínimo entre\ne-mails é de %s horas. Todos os outros e-mails serão ignorados durante este período."
+
+#: lib/bridgedb/strings.py:25
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr "COMANDOS: (combinar COMANDOS para especificar múltiplas opções simultaneamente)"
+
+#: lib/bridgedb/strings.py:27
+msgid "Welcome to BridgeDB!"
+msgstr "Bem vindo ao BridgeDB!"
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: lib/bridgedb/strings.py:29
+msgid "Currently supported transport TYPEs:"
+msgstr "TIPOS de transportes atualmente compatíveis:"
+
+#: lib/bridgedb/strings.py:30
+#, python-format
+msgid "Hey, %s!"
+msgstr "Olá, %s!"
+
+#: lib/bridgedb/strings.py:31
+msgid "Hello, friend!"
+msgstr "Olá, amigo!"
+
+#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+msgid "Public Keys"
+msgstr "Chaves Públicas"
+
+#. 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:36
+#, python-format
+msgid ""
+"This email was generated with rainbows, unicorns, and sparkles\n"
+"for %s on %s at %s."
+msgstr "Este e-mail foi gerado com arco-íris, unicórnios e purpurina, por %s, %s, às %s."
+
+#: lib/bridgedb/strings.py:42
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr "BridgeDB pode fornecer pontes com vários %stipos de Transportes Plugáveis%s,\nque podem ajudar a ofuscar suas conexões com a Rede Tor, tornando mais\nddifícil para qualquer um ver seu tráfego de internet para determinar que você está\nusando o Tor.\n"
+
+#: lib/bridgedb/strings.py:48
+msgid ""
+"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
+"Transports aren't IPv6 compatible.\n"
+"\n"
+msgstr "Algumas pontes com endereços IPv6 também estão disponíveis, mas alguns PLUGGABLE TRNAPORTS não são compatíveis com o IPv6.\n"
+
+#: lib/bridgedb/strings.py:52
+#, python-format
+msgid ""
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr "Além disso, BridgeDB tem muitas pontes tradicionais %s sem nenhum PLUGGABLE TRANSPORTS%s, que podem ajudar a driblar a censura na internet em muitos casos.\n"
+
+#: lib/bridgedb/strings.py:65
msgid "What are bridges?"
msgstr "O que são pontes?"
-#: lib/bridgedb/templates/base.html:34
+#: lib/bridgedb/strings.py:66
#, python-format
-msgid ""
-"%s Bridge relays %s are Tor relays that help you circumvent censorship."
-msgstr "%s Retransmissores de ponte %s são retransmissores Tor que ajudam a driblar a censura."
+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."
-#: lib/bridgedb/templates/base.html:39
+#: lib/bridgedb/strings.py:71
msgid "I need an alternative way of getting bridges!"
msgstr "Preciso de um outro modo de obter pontes!"
-#: lib/bridgedb/templates/base.html:40
+#: lib/bridgedb/strings.py:72
#, python-format
msgid ""
-"Another way to find public bridge addresses is to send an email (from a %s "
-"or a %s address) to %s with the line 'get bridges' by itself in the body of "
-"the mail."
-msgstr "Outra maneira de encontrar endereços de pontes públicas, é enviando um e-mail (de um endereço %s ou %s) para %s apenas com o texto 'get bridges' no corpo da mensagem."
+"Another way to get bridges is to send an email to %s. Please note that you must\n"
+"send the email using an address from one of the following email providers:\n"
+"%s or %s."
+msgstr "Outro modo de obter pontes é enviando um e-mail para %s. Por favor, lembre que você deve enviar o e-mail utilizando um endereço de um dos seguintes provedores de e-mail: \n%s ou %s. "
-#: lib/bridgedb/templates/base.html:48
+#: lib/bridgedb/strings.py:79
msgid "My bridges don't work! I need help!"
msgstr "Minhas pontes não funcionam! Preciso de ajuda!"
-#: lib/bridgedb/templates/base.html:49
+#: lib/bridgedb/strings.py:80
#, python-format
+msgid "If your Tor doesn't work, you should email %s."
+msgstr "Se o Tor não funcionar, envie um e-mail %s."
+
+#: lib/bridgedb/strings.py:81
msgid ""
-"If your Tor doesn't work, you should email %s. Try including as much info "
-"about your case as you can, including the list of bridges you used, the "
-"bundle filename/version you used, the messages that Tor gave out, etc."
-msgstr "Se seu Tor não funcionar, envie um e-mail para %s. Inclua tantas informações sobre seu caso quanto puder, por exemplo, a lista de pontes utilizadas, a versão ou o nome do arquivo do pacote Tor, as mensagens que o Tor tiver mostrado, etc."
+"Try including as much info about your case as you can, including the list of\n"
+"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
+"and any messages which Tor gave out, etc."
+msgstr "Tente incluir o máximo de informações possíveis sobre o seu caso, como a lista das pontes e dos PLUGGABLE TRANSPORTS que você tentou usar, a versão do seu navegador Tor e todas as mensagens que o Tor emitiu, etc."
+
+#: lib/bridgedb/strings.py:88
+msgid "Here are your bridge lines:"
+msgstr "Veja sua pontes ativas:"
+
+#: lib/bridgedb/strings.py:89
+msgid "Get Bridges!"
+msgstr "Obtenha Pontes!"
+
+#: lib/bridgedb/strings.py:93
+msgid "Please select options for bridge type:"
+msgstr "Por favor, selecione as opções de tipos de pontes:"
+
+#: lib/bridgedb/strings.py:94
+msgid "Do you need IPv6 addresses?"
+msgstr "Você precisa de endereços IPv6?"
+
+#: lib/bridgedb/strings.py:95
+#, python-format
+msgid "Do you need a %s?"
+msgstr "Você precisa de %s?"
-#: lib/bridgedb/templates/bridges.html:10
+#: lib/bridgedb/strings.py:99
+msgid "Your browser is not displaying images properly."
+msgstr "Seu navegador não está mostrando as imagens corretamente."
+
+#: lib/bridgedb/strings.py:100
+msgid "Enter the characters from the image above..."
+msgstr "Digite os caracteres da imagem acima..."
+
+#: lib/bridgedb/strings.py:104
+msgid "How to start using your bridges"
+msgstr "Como começar a usar as suas pontes"
+
+#: lib/bridgedb/strings.py:105
+#, python-format
msgid ""
-"To use the above lines, go to Vidalia's Network settings page, and click "
-"\"My ISP blocks connections to the Tor network\". Then add each bridge "
-"address one at a time."
-msgstr "Para utilizar as informações acima, abra a página de configurações de rede do\nVidalia, e clique em \"Meu ISP bloqueia as conexões para a rede Tor\". Depois,\nadicione cada ponte, uma a uma."
+"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
+"Browser download page %s to start Tor Browser."
+msgstr "Para inserir pontes no navegador Tor, siga as instruções no %s página\n de downloads do navegador Tor %s para iniciar o navegador Tor."
+
+#: lib/bridgedb/strings.py:108
+msgid ""
+"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
+"the wizard until it asks:"
+msgstr "Quando a janela 'Configurações da Rede Tor' aparecer, clique em 'Configurar' e siga\no assistente até que ele pergunte:"
+
+#: lib/bridgedb/strings.py:111
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr "O seu Provedor de Serviços de Internet (PSI) bloqueia ou censura conexões\nà rede Tor?"
+
+#: lib/bridgedb/strings.py:114
+msgid ""
+"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
+"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"button in the 'Tor Network Settings' wizard for further assistance."
+msgstr "Selecione 'Sim' e clique em 'Próximo'. Para configurar suas novas pontes, copie e\ncole as coordenadas das pontes na caixa de texto de saída. Por fim, clique em 'Conectar'.\nIsso deve ser o suficiente! Se você encontrar problemas, tente clicar no botão\n'Ajuda' no assistente de 'Configurações da Rede Tor', para mais assistência."
+
+#: lib/bridgedb/strings.py:122
+msgid "Displays this message."
+msgstr "Mostrar essa mensagem."
+
+#: lib/bridgedb/strings.py:123
+msgid "Request vanilla bridges."
+msgstr "Solicitar pontes VANILLA."
+
+#: lib/bridgedb/strings.py:124
+msgid "Request IPv6 bridges."
+msgstr "Solicitar pontes IPv6."
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: lib/bridgedb/strings.py:126
+msgid "Request a Pluggable Transport by TYPE."
+msgstr "Requerer Transporte Plugável por TYPE"
+
+#: lib/bridgedb/strings.py:127
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr "Obter uma cópia da chave pública GnuPG do BridgeDB."
+
+#: lib/bridgedb/templates/base.html:91
+msgid "Report a Bug"
+msgstr "Relatar um Erro"
+
+#: lib/bridgedb/templates/base.html:93
+msgid "Source Code"
+msgstr "Código Fonte:"
-#: lib/bridgedb/templates/bridges.html:13
-msgid "No bridges currently available"
-msgstr "Nenhuma ponte disponível no momento"
+#: lib/bridgedb/templates/base.html:96
+msgid "Changelog"
+msgstr "Registro de alterações"
-#: lib/bridgedb/templates/captcha.html:6
-msgid "Upgrade your browser to Firefox"
-msgstr "Atualize seu navegador para Firefox"
+#: lib/bridgedb/templates/base.html:98
+msgid "Contact"
+msgstr "Contato"
-#: lib/bridgedb/templates/captcha.html:8
-msgid "Type the two words"
-msgstr "Digite as duas palavras"
+#: lib/bridgedb/templates/bridges.html:65
+msgid "Uh oh, spaghettios!"
+msgstr "Ops, um erro!"
-#: lib/bridgedb/templates/index.html:6
-msgid "Step 1"
-msgstr "1º Passo"
+#: lib/bridgedb/templates/bridges.html:70
+msgid "There currently aren't any bridges available..."
+msgstr "Atualmente não há nenhuma ponte disponível..."
-#: lib/bridgedb/templates/index.html:8
+#: lib/bridgedb/templates/bridges.html:71
#, python-format
-msgid "Get %s Tor Browser Bundle %s"
-msgstr "Obtenha %s o Pacote de Navegação Tor %s"
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr "Talvez você deva tentar %s voltar %s e escolher um outro tipo de ponte!"
+
+#: lib/bridgedb/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr "Passo %s1%s"
#: lib/bridgedb/templates/index.html:13
-msgid "Step 2"
-msgstr "2º Passo"
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr "Fazer download do %s Navegador Tor %s"
-#: lib/bridgedb/templates/index.html:15
+#: lib/bridgedb/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr "Passo %s2%s"
+
+#: lib/bridgedb/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr "Obter %s pontes %s"
-#: lib/bridgedb/templates/index.html:19
-msgid "Step 3"
-msgstr "3º Passo"
+#: lib/bridgedb/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr "Passo %s3%s"
+
+#: lib/bridgedb/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr "Agora, %s inserir as pontes no Navegador 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.)
+#. TRANSLATORS: Please do NOT translate the word "bridges"!
+#: lib/bridgedb/templates/options.html:39
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr "%sS%só me dê bridges!"
+
+#: lib/bridgedb/templates/options.html:53
+msgid "Advanced Options"
+msgstr "Opções Avançadas"
+
+#: lib/bridgedb/templates/options.html:89
+msgid "No"
+msgstr "Não"
+
+#: lib/bridgedb/templates/options.html:90
+msgid "none"
+msgstr "nenhum"
+
+#. 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:131
+#, python-format
+msgid "%sY%ses!"
+msgstr "%sS%sim!"
-#: lib/bridgedb/templates/index.html:21
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Please do NOT translate the word "bridge"!
+#: lib/bridgedb/templates/options.html:155
#, python-format
-msgid "Now %s add the bridges to Tor %s"
-msgstr "Agora, %s adicione as pontes ao Tor %s"
+msgid "%sG%set Bridges"
+msgstr "%sO%sbtenha Bridges"
1
0
commit 3c2422e3a38b2472242eba4ba97f1d11ff57642e
Author: Isis Lovecruft <isis(a)torproject.org>
Date: Fri Jun 6 20:18:38 2014 +0000
Update Polish (pl) translations.
* THANKS to hoek, yodaa, maxxx, and sebx.
---
lib/bridgedb/i18n/pl/LC_MESSAGES/bridgedb.po | 340 ++++++++++++++++++++++----
1 file changed, 288 insertions(+), 52 deletions(-)
diff --git a/lib/bridgedb/i18n/pl/LC_MESSAGES/bridgedb.po b/lib/bridgedb/i18n/pl/LC_MESSAGES/bridgedb.po
index 07dd413..f502b85 100644
--- a/lib/bridgedb/i18n/pl/LC_MESSAGES/bridgedb.po
+++ b/lib/bridgedb/i18n/pl/LC_MESSAGES/bridgedb.po
@@ -1,18 +1,21 @@
# Translations template for BridgeDB.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2014 'The Tor Project, Inc.'
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
-# yodaa <slayer123312(a)gmail.com>, 2013
+# yodaa <aron.plotnikowski(a)cryptolab.net>, 2013
# JerBen <ayurveda63(a)gmail.com>, 2012
# bogdrozd <bog.d(a)gazeta.pl>, 2013
+# hoek <hoek(a)hoek.pl>, 2014
+# maxxx <maxxxrally(a)gmail.com>, 2014
+# sebx, 2014
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2013-03-27 21:41+0000\n"
-"PO-Revision-Date: 2013-05-24 00:30+0000\n"
-"Last-Translator: yodaa <slayer123312(a)gmail.com>\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n"
+"POT-Creation-Date: 2014-05-16 18:39+0000\n"
+"PO-Revision-Date: 2014-05-29 21:11+0000\n"
+"Last-Translator: sebx\n"
"Language-Team: Polish (http://www.transifex.com/projects/p/torproject/language/pl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -21,82 +24,315 @@ msgstr ""
"Language: pl\n"
"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: lib/bridgedb/templates/base.html:33
+#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
+#. any string (regardless of capitalization and/or punctuation):
+#. "bridge"
+#. "bridges"
+#. "BridgeDB"
+#. "pluggable transport"
+#. "pluggable transports"
+#. "obfs2"
+#. "obfs3"
+#. "scramblesuit"
+#. "fte"
+#. "Tor"
+#. "Tor Browser"
+#. "TBB"
+#: lib/bridgedb/HTTPServer.py:124
+msgid "Sorry! Something went wrong with your request."
+msgstr "Przepraszamy! Ale coś poszło nie tak z Twoim zapytaniem."
+
+#: lib/bridgedb/strings.py:18
+msgid "[This is an automated message; please do not reply.]"
+msgstr "[To jest wiadomość generowana automatycznie; prosimy na nią nie odpisywać.]"
+
+#: lib/bridgedb/strings.py:20
+msgid "Here are your bridges:"
+msgstr "Oto Twoje bridges:"
+
+#: lib/bridgedb/strings.py:22
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr "Przekroczono limit szybkości. Proszę zwolnij! Minimalny czas pomiędzy \nwiadomości e-mail to %s godzin. Wszystkie dodatkowe e-maile w tym okresie będą ignorowane."
+
+#: lib/bridgedb/strings.py:25
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr "POLECENIA: (łącz polecenia, aby sprecyzować kilka opcji jednocześnie)"
+
+#: lib/bridgedb/strings.py:27
+msgid "Welcome to BridgeDB!"
+msgstr "Witamy w BridgeDB!"
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: lib/bridgedb/strings.py:29
+msgid "Currently supported transport TYPEs:"
+msgstr "Obecnie obsługiwane transport TYPEs:"
+
+#: lib/bridgedb/strings.py:30
+#, python-format
+msgid "Hey, %s!"
+msgstr "Witaj, %s!"
+
+#: lib/bridgedb/strings.py:31
+msgid "Hello, friend!"
+msgstr "Witaj przyjacielu!"
+
+#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+msgid "Public Keys"
+msgstr "Klucze Publiczne"
+
+#. 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:36
+#, python-format
+msgid ""
+"This email was generated with rainbows, unicorns, and sparkles\n"
+"for %s on %s at %s."
+msgstr "Ten email zastał wygenerowany przez tęcze, jednorożce i gwiazdki \ndla %s w %s o %s."
+
+#: lib/bridgedb/strings.py:42
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr "BridgeDB może dostarczać połączenia mostkowe z kilkoma %stypes włączanymi protokołami%s,\nktóre mogą pomóc ukryć Twoje połączenie do Sieci Tor, tworząc trudniejsze\ndo podsłuchania dla osób obserwujących ruch sieci w celu ustalenia gdzie się znajdujesz\nużywając Tor.\n"
+
+#: lib/bridgedb/strings.py:48
+msgid ""
+"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
+"Transports aren't IPv6 compatible.\n"
+"\n"
+msgstr "Niektóre połączenia mostkowe z adresami IPv6 są również dostępne, pomimo,\nże niektóre wtyczki protokołów nie są kompatybilne z IPv6.\n"
+
+#: lib/bridgedb/strings.py:52
+#, python-format
+msgid ""
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr "Dodatkowo, BridgeDB posiada mnóstwo mostkó plain-ol'-vanilla %s bez jakichkolwiek\nwtyczek protokołów transportowych %s, które mogą nie wydawać się zbyt przydatne, ale mogą w wielu przypadkach pomagać w obejściu śledzenia przez osoby trzecie naszej transmisji w sieci.\n"
+
+#: lib/bridgedb/strings.py:65
msgid "What are bridges?"
msgstr "Czym są mostki?"
-#: lib/bridgedb/templates/base.html:34
+#: lib/bridgedb/strings.py:66
#, python-format
-msgid ""
-"%s Bridge relays %s are Tor relays that help you circumvent censorship."
-msgstr "%s Przekaźniki mostkowe %s są przekaźnikami Tora, które pozwalają obchodzić cenzurę."
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
+msgstr "%s Mostki %s są bramkami sieci Tor pomagającymi obejść chęć śledzenia transmisji przez osoby trzecie."
-#: lib/bridgedb/templates/base.html:39
+#: lib/bridgedb/strings.py:71
msgid "I need an alternative way of getting bridges!"
msgstr "Potrzebuję alternatywnego sposobu na pozyskanie mostków!"
-#: lib/bridgedb/templates/base.html:40
+#: lib/bridgedb/strings.py:72
#, python-format
msgid ""
-"Another way to find public bridge addresses is to send an email (from a %s "
-"or a %s address) to %s with the line 'get bridges' by itself in the body of "
-"the mail."
-msgstr "Innym sposobem na znalezienie publicznych adresów mostków jest wysłanie e-maila (z adresu %s lub %s) na %s z samą linią 'get bridges' w zawartości wiadomości"
+"Another way to get bridges is to send an email to %s. Please note that you must\n"
+"send the email using an address from one of the following email providers:\n"
+"%s or %s."
+msgstr "Innym sposobem uzyskania bridges jest wysłanie e-maila do %s. Proszę pamiętaj, że musisz \nwysłać e-mail za uzywając adresu z jednego z następujących dostawców usługi email:\n%s lub %s."
-#: lib/bridgedb/templates/base.html:48
+#: lib/bridgedb/strings.py:79
msgid "My bridges don't work! I need help!"
msgstr "Moje mostki nie działają! Potrzebuję pomocy!"
-#: lib/bridgedb/templates/base.html:49
+#: lib/bridgedb/strings.py:80
+#, python-format
+msgid "If your Tor doesn't work, you should email %s."
+msgstr "Jeśli Twój Tor nie działa, powinieneś wysłać email do %s."
+
+#: lib/bridgedb/strings.py:81
+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 "Spróbuj podzielić się informacji o swoim przypadku, uwzględniając listę bridges i Pluggable Transports których próbowałeś użyć, wersję Tor Browser,\noraz wszelkie wiadomości, które przekazał Tor itp."
+
+#: lib/bridgedb/strings.py:88
+msgid "Here are your bridge lines:"
+msgstr "Oto Twoje połączenia bridge:"
+
+#: lib/bridgedb/strings.py:89
+msgid "Get Bridges!"
+msgstr "Zdobądź Bridges!"
+
+#: lib/bridgedb/strings.py:93
+msgid "Please select options for bridge type:"
+msgstr "Proszę wybrać opcje typu mostka:"
+
+#: lib/bridgedb/strings.py:94
+msgid "Do you need IPv6 addresses?"
+msgstr "Czy potrzebujesz adresów IPv6?"
+
+#: lib/bridgedb/strings.py:95
#, python-format
+msgid "Do you need a %s?"
+msgstr "Czy potrzebujesz %s?"
+
+#: lib/bridgedb/strings.py:99
+msgid "Your browser is not displaying images properly."
+msgstr "Twoja przeglądarka nie wyświetla odpowiednio obrazów."
+
+#: lib/bridgedb/strings.py:100
+msgid "Enter the characters from the image above..."
+msgstr "Wpisz znaki z powyższego obrazka..."
+
+#: lib/bridgedb/strings.py:104
+msgid "How to start using your bridges"
+msgstr "Jak zacząć używać twoich bridges"
+
+#: lib/bridgedb/strings.py:105
+#, python-format
+msgid ""
+"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
+"Browser download page %s to start Tor Browser."
+msgstr "Aby wprowadzić bridges do Tor Browser, postępuj zgodnie z instrukcjami na %s stronie \npobierania Tor Browser %s, aby uruchomić Tor Browser."
+
+#: lib/bridgedb/strings.py:108
msgid ""
-"If your Tor doesn't work, you should email %s. Try including as much info "
-"about your case as you can, including the list of bridges you used, the "
-"bundle filename/version you used, the messages that Tor gave out, etc."
-msgstr "Jeśli Tor nie działa, powinno się wysłać e-mail do %s. Spróbuj podać tak dużo informacji, jak tylko możesz, łącznie z listą mostków, nazwą/wersją instalatora, komunikaty wyświetlane przez Tora itd."
+"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
+"the wizard until it asks:"
+msgstr "Kiedy pojawi się dialog 'Ustawienia Sieci Tor' to kliknij przycisk \"Konfiguruj\" i postępuj zgodnie z\nkreatorem aż poprosi o:"
-#: lib/bridgedb/templates/bridges.html:10
+#: lib/bridgedb/strings.py:111
msgid ""
-"To use the above lines, go to Vidalia's Network settings page, and click "
-"\"My ISP blocks connections to the Tor network\". Then add each bridge "
-"address one at a time."
-msgstr "Aby użyć powyższych linii, wejdź na stronę Ustawień Sieciowych Vidalii i kliknij \"Mój dostawca blokuje połączenia do sieci Tora\". Potem dodaj każdy adres mostka po jednym na raz."
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr "Czy Twój dostawca usług internetowych (ISP) blokuje lub cenzuruje połączenia sieci Tor?"
+
+#: lib/bridgedb/strings.py:114
+msgid ""
+"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
+"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"button in the 'Tor Network Settings' wizard for further assistance."
+msgstr "Wybierz 'Tak' a następnie kliknij 'Dalej'. Aby skonfigurować swoje nowe \nbridges, kopiuj i wklej każdy bridge w nowym wierszu w polu tekstowym. \nNa koniec kliknij 'Połącz' i to wszystko! Jeśli napotkasz jakiekolwiek problemy, naciśnij przycisk 'Pomoc' w kreatorze 'Ustawienia Sieci Tor' w celu uzyskania dalszej pomocy."
+
+#: lib/bridgedb/strings.py:122
+msgid "Displays this message."
+msgstr "Wyświetla tę wiadomość."
+
+#: lib/bridgedb/strings.py:123
+msgid "Request vanilla bridges."
+msgstr "Zapytanie mostków 'vanilla'."
+
+#: lib/bridgedb/strings.py:124
+msgid "Request IPv6 bridges."
+msgstr "Zapytanie mostków IPv6."
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: lib/bridgedb/strings.py:126
+msgid "Request a Pluggable Transport by TYPE."
+msgstr "Poproś o Pluggable Transport przez TYPE."
+
+#: lib/bridgedb/strings.py:127
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr "Uzyskaj kopię klucza publicznego GnuPG BridgeDB."
+
+#: lib/bridgedb/templates/base.html:91
+msgid "Report a Bug"
+msgstr "Zgłoś Błąd"
+
+#: lib/bridgedb/templates/base.html:93
+msgid "Source Code"
+msgstr "Kod źródłowy"
-#: lib/bridgedb/templates/bridges.html:13
-msgid "No bridges currently available"
-msgstr "W tej chwili nie ma dostępnych mostków"
+#: lib/bridgedb/templates/base.html:96
+msgid "Changelog"
+msgstr "Lista zmian"
-#: lib/bridgedb/templates/captcha.html:6
-msgid "Upgrade your browser to Firefox"
-msgstr "Zaktualizuj swoją przeglądarkę na Firefoksa."
+#: lib/bridgedb/templates/base.html:98
+msgid "Contact"
+msgstr "Kontakt"
-#: lib/bridgedb/templates/captcha.html:8
-msgid "Type the two words"
-msgstr "Wpisz dwa słowa"
+#: lib/bridgedb/templates/bridges.html:65
+msgid "Uh oh, spaghettios!"
+msgstr "Oh coś poszło nie tak!"
-#: lib/bridgedb/templates/index.html:6
-msgid "Step 1"
-msgstr "Krok 1"
+#: lib/bridgedb/templates/bridges.html:70
+msgid "There currently aren't any bridges available..."
+msgstr "Obecnie nie ma żadnych dostępnych bridges..."
-#: lib/bridgedb/templates/index.html:8
+#: lib/bridgedb/templates/bridges.html:71
#, python-format
-msgid "Get %s Tor Browser Bundle %s"
-msgstr "Pobierz %s Paczkę Tora z Przeglądarką %s"
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr "Być może powinieneś spróbować %s wrócić %s i wybrać inny typ mostu!"
+
+#: lib/bridgedb/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr "Krok %s1%s"
#: lib/bridgedb/templates/index.html:13
-msgid "Step 2"
-msgstr "Krok 2"
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr "Pobierz %s Tor Browser %s"
-#: lib/bridgedb/templates/index.html:15
+#: lib/bridgedb/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr "Krok %s2%s"
+
+#: lib/bridgedb/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr "Pobierz %s mostki %s"
-#: lib/bridgedb/templates/index.html:19
-msgid "Step 3"
-msgstr "Krok 3"
+#: lib/bridgedb/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr "Krok %s3%s"
+
+#: lib/bridgedb/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr "Teraz %s doda bridges do 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.)
+#. TRANSLATORS: Please do NOT translate the word "bridges"!
+#: lib/bridgedb/templates/options.html:39
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr "%sD%saj mi tylko bridges!"
+
+#: lib/bridgedb/templates/options.html:53
+msgid "Advanced Options"
+msgstr "Opcje zaawansowane"
+
+#: lib/bridgedb/templates/options.html:89
+msgid "No"
+msgstr "Nie"
+
+#: lib/bridgedb/templates/options.html:90
+msgid "none"
+msgstr "brak"
+
+#. 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:131
+#, python-format
+msgid "%sY%ses!"
+msgstr "%sT%sak!"
-#: lib/bridgedb/templates/index.html:21
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Please do NOT translate the word "bridge"!
+#: lib/bridgedb/templates/options.html:155
#, python-format
-msgid "Now %s add the bridges to Tor %s"
-msgstr "Teraz %s dodaj mostki do Tora %s"
+msgid "%sG%set Bridges"
+msgstr "%sZ%sdobądź Bridges"
1
0
commit f5a6735d932ea68eda3ef041b0299f96fd94236b
Author: Isis Lovecruft <isis(a)torproject.org>
Date: Fri Jun 6 20:27:29 2014 +0000
Update Turkish (tr) translations.
* THANKS to volkangezer.
---
lib/bridgedb/i18n/tr/LC_MESSAGES/bridgedb.po | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/lib/bridgedb/i18n/tr/LC_MESSAGES/bridgedb.po b/lib/bridgedb/i18n/tr/LC_MESSAGES/bridgedb.po
index 59eff6c..fb2b70f 100644
--- a/lib/bridgedb/i18n/tr/LC_MESSAGES/bridgedb.po
+++ b/lib/bridgedb/i18n/tr/LC_MESSAGES/bridgedb.po
@@ -3,17 +3,19 @@
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
+# Translators:
# Tosbaa <conan(a)operamail.com>, 2013
# erg26 <ergungorler(a)gmail.com>, 2012
# Sercan Altundaş <>, 2012
# Tekel Bira <psycookie(a)gmail.com>, 2012
+# volkangezer <volkangezer(a)gmail.com>, 2014
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2013-03-27 21:41+0000\n"
-"PO-Revision-Date: 2013-06-07 22:00+0000\n"
-"Last-Translator: Tosbaa <conan(a)operamail.com>\n"
+"PO-Revision-Date: 2014-05-08 15:30+0000\n"
+"Last-Translator: volkangezer <volkangezer(a)gmail.com>\n"
"Language-Team: Turkish (http://www.transifex.com/projects/p/torproject/language/tr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -30,7 +32,7 @@ msgstr "Köprüler nedir?"
#, python-format
msgid ""
"%s Bridge relays %s are Tor relays that help you circumvent censorship."
-msgstr "%s Köprü aktarıcıları, sansürü aşmanızı sağlayan %s Tor aktarıcılarıdır."
+msgstr "%s Köprü aynaları, sansürü aşmanızı sağlayan %s Tor aktarıcılarıdır."
#: lib/bridgedb/templates/base.html:39
msgid "I need an alternative way of getting bridges!"
1
0
commit f96c34fb4136e6aa458e2abddb2dd7d5f1da16a8
Author: Isis Lovecruft <isis(a)torproject.org>
Date: Fri Jun 6 20:05:31 2014 +0000
Update Japanese (ja) translations.
* THANKS to plazmism.
---
lib/bridgedb/i18n/ja/LC_MESSAGES/bridgedb.po | 337 ++++++++++++++++++++++----
1 file changed, 286 insertions(+), 51 deletions(-)
diff --git a/lib/bridgedb/i18n/ja/LC_MESSAGES/bridgedb.po b/lib/bridgedb/i18n/ja/LC_MESSAGES/bridgedb.po
index ac407c7..76232ac 100644
--- a/lib/bridgedb/i18n/ja/LC_MESSAGES/bridgedb.po
+++ b/lib/bridgedb/i18n/ja/LC_MESSAGES/bridgedb.po
@@ -1,16 +1,18 @@
# Translations template for BridgeDB.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2014 'The Tor Project, Inc.'
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
# brt <87(a)itokei.info>, 2013
# plazmism <gomidori(a)live.jp>, 2013
+# plazmism <gomidori(a)live.jp>, 2014
+# Masaki Saito <rezoolab(a)gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2013-03-27 21:41+0000\n"
-"PO-Revision-Date: 2013-05-31 02:50+0000\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n"
+"POT-Creation-Date: 2014-05-16 18:39+0000\n"
+"PO-Revision-Date: 2014-06-03 15:41+0000\n"
"Last-Translator: plazmism <gomidori(a)live.jp>\n"
"Language-Team: Japanese (http://www.transifex.com/projects/p/torproject/language/ja/)\n"
"MIME-Version: 1.0\n"
@@ -20,82 +22,315 @@ msgstr ""
"Language: ja\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: lib/bridgedb/templates/base.html:33
-msgid "What are bridges?"
-msgstr "ブリッジとはなんですか?"
+#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
+#. any string (regardless of capitalization and/or punctuation):
+#. "bridge"
+#. "bridges"
+#. "BridgeDB"
+#. "pluggable transport"
+#. "pluggable transports"
+#. "obfs2"
+#. "obfs3"
+#. "scramblesuit"
+#. "fte"
+#. "Tor"
+#. "Tor Browser"
+#. "TBB"
+#: lib/bridgedb/HTTPServer.py:124
+msgid "Sorry! Something went wrong with your request."
+msgstr "申し訳ありませんが、リクエストに問題がありました。"
+
+#: lib/bridgedb/strings.py:18
+msgid "[This is an automated message; please do not reply.]"
+msgstr "[このメールは自動送信されたメッセージです。返信しないでください。]"
+
+#: lib/bridgedb/strings.py:20
+msgid "Here are your bridges:"
+msgstr "あなたのブリッジはこちら:"
+
+#: lib/bridgedb/strings.py:22
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr "レート制限を超過しました。メール間の最小時間は %s 時間です。この期間中にさらに送信したメールは全て無視されます。"
+
+#: lib/bridgedb/strings.py:25
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr "コマンド: (コマンドを組み合わせて、同時に複数のオプションを指定する)"
+
+#: lib/bridgedb/strings.py:27
+msgid "Welcome to BridgeDB!"
+msgstr "BridgeDB へようこそ!"
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: lib/bridgedb/strings.py:29
+msgid "Currently supported transport TYPEs:"
+msgstr "現在サポートされているトランスポートタイプ:"
+
+#: lib/bridgedb/strings.py:30
+#, python-format
+msgid "Hey, %s!"
+msgstr "どうも %s さん!"
+
+#: lib/bridgedb/strings.py:31
+msgid "Hello, friend!"
+msgstr "どうもこんにちは!"
+
+#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+msgid "Public Keys"
+msgstr "公開鍵"
+
+#. TRANSLATORS: This string will end up saying something like:
+#. "This email was generated with rainbows, unicorns, and sparkles
+#. for alice(a)example.com on Friday, 09 May, 2014 at 18:59:39."
+#: lib/bridgedb/strings.py:36
+#, python-format
+msgid ""
+"This email was generated with rainbows, unicorns, and sparkles\n"
+"for %s on %s at %s."
+msgstr "このメールは %s に %s %s に rainbow 及び unicorn 、 sparkle で生成されました。"
-#: lib/bridgedb/templates/base.html:34
+#: lib/bridgedb/strings.py:42
#, python-format
msgid ""
-"%s Bridge relays %s are Tor relays that help you circumvent censorship."
-msgstr "%s ブリッジリレー %sは検閲を回避することを助けるTorリレーです。"
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr "BridgeDB は、%sタイプの Pluggable Transports%s でブリッジを提供します。\nTor ネットワークへの接続を悟られづらくすることに役立ち、あなたの\nインターネットトラフィックを監視している誰かがあなたが Tor を使用していることを判別することがさらに難しくなります。\n\n"
-#: lib/bridgedb/templates/base.html:39
+#: lib/bridgedb/strings.py:48
+msgid ""
+"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
+"Transports aren't IPv6 compatible.\n"
+"\n"
+msgstr "IPv6 のアドレスのブリッジも利用できるものがありますが、 Pluggable Transports には IPv6 に互換性がないものもあります。\n\n"
+
+#: lib/bridgedb/strings.py:52
+#, python-format
+msgid ""
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr "加えて、 BridgeDB は、 %s Pluggable Transport %s のない多くの何の変哲もない\n通常のブリッジを持ち、それはクールには思えないかもしれません。しかし、多くの場合、インターネット検閲を回避するのになお有効です。\n"
+
+#: lib/bridgedb/strings.py:65
+msgid "What are bridges?"
+msgstr "ブリッジとは?"
+
+#: lib/bridgedb/strings.py:66
+#, python-format
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
+msgstr "%s ブリッジ %s は、 インターネット検閲を回避する助けとなる Tor リレーです。"
+
+#: lib/bridgedb/strings.py:71
msgid "I need an alternative way of getting bridges!"
msgstr "ブリッジを得る他の方法が必要です!"
-#: lib/bridgedb/templates/base.html:40
+#: lib/bridgedb/strings.py:72
#, python-format
msgid ""
-"Another way to find public bridge addresses is to send an email (from a %s "
-"or a %s address) to %s with the line 'get bridges' by itself in the body of "
-"the mail."
-msgstr "パブリックブリッジのアドレスを探す他の方法は、(%sか%sのアドレスから) メールの文面に「get bridges」の行をつけて%sにメールを送ることです。"
+"Another way to get bridges is to send an email to %s. Please note that you must\n"
+"send the email using an address from one of the following email providers:\n"
+"%s or %s."
+msgstr "ブリッジを入手する別のやり方は %s までメールを送ることです。以下のメールプロバイダのうちの1つのアドレスを使用してメールを送信しなければならないことにご注意ください: %s または %s"
-#: lib/bridgedb/templates/base.html:48
+#: lib/bridgedb/strings.py:79
msgid "My bridges don't work! I need help!"
msgstr "私のブリッジが動きません! 助けてください!"
-#: lib/bridgedb/templates/base.html:49
+#: lib/bridgedb/strings.py:80
+#, python-format
+msgid "If your Tor doesn't work, you should email %s."
+msgstr "Tor がうまく動作しない場合、 %s までメールを下さい。"
+
+#: lib/bridgedb/strings.py:81
+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 "あなたが使おうとしたブリッジや Pluggable Transports 、 ご利用の Tor Browser バージョン、そして Tor が出力したメッセージ等などを含み、出来る限りあなたのケースに関する多くの情報を含めてみてください。"
+
+#: lib/bridgedb/strings.py:88
+msgid "Here are your bridge lines:"
+msgstr "あなたのブリッジラインはこちらです:"
+
+#: lib/bridgedb/strings.py:89
+msgid "Get Bridges!"
+msgstr "ブリッジを入手!"
+
+#: lib/bridgedb/strings.py:93
+msgid "Please select options for bridge type:"
+msgstr "ブリッジタイプのオプションを選択してください:"
+
+#: lib/bridgedb/strings.py:94
+msgid "Do you need IPv6 addresses?"
+msgstr "IPv6 アドレスが必要ですか?"
+
+#: lib/bridgedb/strings.py:95
#, python-format
+msgid "Do you need a %s?"
+msgstr "%s が必要ですか?"
+
+#: lib/bridgedb/strings.py:99
+msgid "Your browser is not displaying images properly."
+msgstr "ご利用のブラウザは適切に画像を表示していません。"
+
+#: lib/bridgedb/strings.py:100
+msgid "Enter the characters from the image above..."
+msgstr "上記の画像から文字を入力してください..."
+
+#: lib/bridgedb/strings.py:104
+msgid "How to start using your bridges"
+msgstr "ブリッジ使用の始め方"
+
+#: lib/bridgedb/strings.py:105
+#, python-format
+msgid ""
+"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
+"Browser download page %s to start Tor Browser."
+msgstr "Tor Browser にブリッジ情報を入力するには、 %s Tor Browser のダウンロードページ %s の指示に従って Tor Browser を起動してください。"
+
+#: lib/bridgedb/strings.py:108
msgid ""
-"If your Tor doesn't work, you should email %s. Try including as much info "
-"about your case as you can, including the list of bridges you used, the "
-"bundle filename/version you used, the messages that Tor gave out, etc."
-msgstr "あなたのTorが動作しないなら、%sにメールするべきです。 使っていたブリッジのリスト、使っていたバンドルのファイル名/バージョン、Torが出したメッセージなど、できるだけ問題についての情報を多く含めるようにしてください。"
+"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
+"the wizard until it asks:"
+msgstr "「Tor ネットワーク設定」ダイアログがポップアップした際、設定をクリックして\n聞かれるまでウィザードに従ってください。"
-#: lib/bridgedb/templates/bridges.html:10
+#: lib/bridgedb/strings.py:111
msgid ""
-"To use the above lines, go to Vidalia's Network settings page, and click "
-"\"My ISP blocks connections to the Tor network\". Then add each bridge "
-"address one at a time."
-msgstr "以上の記述を使用するには、Vidaliaのネットワーク設定ページに行き、「私のISPはTorネットワークへの接続をブロックしています」をクリックしてください。その後、各ブリッジアドレスが1つずつ追加されます。"
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr "ご利用のインターネットサービスプロバイダー (ISP) は Tor ネットワークへの接続をブロックないし\n別のやり方で検閲していますか?"
+
+#: lib/bridgedb/strings.py:114
+msgid ""
+"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
+"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"button in the 'Tor Network Settings' wizard for further assistance."
+msgstr "「はい」を選択して、「次」をクリックしてください。新しいブリッジを構成するために、テキスト\n入力ボックスにブリッジラインをコピーペーストしてください。最後に、「接続」をクリックして、\nさあ準備が出来たはずです!何か問題があったら、さらなる助けを得るために「Tor\nネットワーク設定」ウィザード内「ヘルプ」ボタンをクリックしてください。"
+
+#: lib/bridgedb/strings.py:122
+msgid "Displays this message."
+msgstr "この画像を表示"
+
+#: lib/bridgedb/strings.py:123
+msgid "Request vanilla bridges."
+msgstr "vanilla ブリッジをリクエスト"
+
+#: lib/bridgedb/strings.py:124
+msgid "Request IPv6 bridges."
+msgstr "IPv6 ブリッジをリクエスト"
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: lib/bridgedb/strings.py:126
+msgid "Request a Pluggable Transport by TYPE."
+msgstr "タイプごとに Pluggable Transport をリクエスト"
+
+#: lib/bridgedb/strings.py:127
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr "BridgeDB の GnuPG 公開鍵のコピーを手に入れましょう。"
+
+#: lib/bridgedb/templates/base.html:91
+msgid "Report a Bug"
+msgstr "バグを報告する"
+
+#: lib/bridgedb/templates/base.html:93
+msgid "Source Code"
+msgstr "ソースコード"
-#: lib/bridgedb/templates/bridges.html:13
-msgid "No bridges currently available"
-msgstr "現在利用できるブリッジがありません"
+#: lib/bridgedb/templates/base.html:96
+msgid "Changelog"
+msgstr "変更履歴"
-#: lib/bridgedb/templates/captcha.html:6
-msgid "Upgrade your browser to Firefox"
-msgstr "ブラウザをFirefoxにアップグレード"
+#: lib/bridgedb/templates/base.html:98
+msgid "Contact"
+msgstr "お問い合わせ"
-#: lib/bridgedb/templates/captcha.html:8
-msgid "Type the two words"
-msgstr "2つの単語をタイプしてください"
+#: lib/bridgedb/templates/bridges.html:65
+msgid "Uh oh, spaghettios!"
+msgstr "おっとスパゲッティ!"
-#: lib/bridgedb/templates/index.html:6
-msgid "Step 1"
-msgstr "ステップ 1"
+#: lib/bridgedb/templates/bridges.html:70
+msgid "There currently aren't any bridges available..."
+msgstr "今の時点では利用できるブリッジがありません..."
-#: lib/bridgedb/templates/index.html:8
+#: lib/bridgedb/templates/bridges.html:71
#, python-format
-msgid "Get %s Tor Browser Bundle %s"
-msgstr "Tor %s Browser Bundle %sを手に入れる"
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr "おそらく 、 %s 戻って %s 異なるブリッジタイプを選択してみるべきでしょう。"
+
+#: lib/bridgedb/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr "ステップ %s1%s"
#: lib/bridgedb/templates/index.html:13
-msgid "Step 2"
-msgstr "ステップ 2"
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr "%s Tor Browser %s をダウンロード"
-#: lib/bridgedb/templates/index.html:15
+#: lib/bridgedb/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr "ステップ %s2%s"
+
+#: lib/bridgedb/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr "%s ブリッジ %s を手に入れる"
-#: lib/bridgedb/templates/index.html:19
-msgid "Step 3"
-msgstr "ステップ 3"
+#: 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 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.)
+#. TRANSLATORS: Please do NOT translate the word "bridges"!
+#: lib/bridgedb/templates/options.html:39
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr "%sあ%sの、ください、 bridges!"
+
+#: lib/bridgedb/templates/options.html:53
+msgid "Advanced Options"
+msgstr "高度な設定"
+
+#: lib/bridgedb/templates/options.html:89
+msgid "No"
+msgstr "いいえ"
+
+#: lib/bridgedb/templates/options.html:90
+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:131
+#, python-format
+msgid "%sY%ses!"
+msgstr "%sは%sい!"
-#: lib/bridgedb/templates/index.html:21
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Please do NOT translate the word "bridge"!
+#: lib/bridgedb/templates/options.html:155
#, python-format
-msgid "Now %s add the bridges to Tor %s"
-msgstr "すぐに%s Torにブリッジを追加 %s"
+msgid "%sG%set Bridges"
+msgstr "%sG%set Bridges"
1
0
commit 114ed194dd7c1f6cdb95a8a692a515b293755c59
Author: Isis Lovecruft <isis(a)torproject.org>
Date: Fri Jun 6 20:14:43 2014 +0000
Update Dutch (nl) translations.
* THANKS to Ann Boen, erwindelaat, guryman, and BBLN.
---
lib/bridgedb/i18n/nl/LC_MESSAGES/bridgedb.po | 341 ++++++++++++++++++++++----
1 file changed, 289 insertions(+), 52 deletions(-)
diff --git a/lib/bridgedb/i18n/nl/LC_MESSAGES/bridgedb.po b/lib/bridgedb/i18n/nl/LC_MESSAGES/bridgedb.po
index b6f56c0..cecc09d 100644
--- a/lib/bridgedb/i18n/nl/LC_MESSAGES/bridgedb.po
+++ b/lib/bridgedb/i18n/nl/LC_MESSAGES/bridgedb.po
@@ -1,20 +1,24 @@
# Translations template for BridgeDB.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2014 'The Tor Project, Inc.'
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
# Adriaan Callaerts <adriaan.callaerts(a)gmail.com>, 2013
+# Ann Boen <ann.boen(a)gmail.com>, 2014
+# erwindelaat <erwin.de.laat(a)cleveridge.org>, 2014
# WMRKameleon <info(a)wmrkameleon.nl>, 2013
# Shondoit Walker <shondoit(a)gmail.com>, 2011
# Marco Brohet <therbom(a)gmail.com>, 2012
+# guryman <tombecht(a)live.nl>, 2014
# math1985 <transifex(a)matthijsmelissen.nl>, 2013
+# BBLN <webmaster(a)bbln.nl>, 2014
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2013-03-27 21:41+0000\n"
-"PO-Revision-Date: 2013-06-21 14:30+0000\n"
-"Last-Translator: math1985 <transifex(a)matthijsmelissen.nl>\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n"
+"POT-Creation-Date: 2014-05-16 18:39+0000\n"
+"PO-Revision-Date: 2014-06-02 15:22+0000\n"
+"Last-Translator: Ann Boen <ann.boen(a)gmail.com>\n"
"Language-Team: Dutch (http://www.transifex.com/projects/p/torproject/language/nl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -23,82 +27,315 @@ msgstr ""
"Language: nl\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: lib/bridgedb/templates/base.html:33
+#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
+#. any string (regardless of capitalization and/or punctuation):
+#. "bridge"
+#. "bridges"
+#. "BridgeDB"
+#. "pluggable transport"
+#. "pluggable transports"
+#. "obfs2"
+#. "obfs3"
+#. "scramblesuit"
+#. "fte"
+#. "Tor"
+#. "Tor Browser"
+#. "TBB"
+#: lib/bridgedb/HTTPServer.py:124
+msgid "Sorry! Something went wrong with your request."
+msgstr "Sorry! Er is iets mis gegaan met je verzoek."
+
+#: lib/bridgedb/strings.py:18
+msgid "[This is an automated message; please do not reply.]"
+msgstr "[Dit is een automatisch bericht, gelieve niet te beantwoorden.]"
+
+#: lib/bridgedb/strings.py:20
+msgid "Here are your bridges:"
+msgstr "Hier zijn je bridges:"
+
+#: lib/bridgedb/strings.py:22
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr "Je hebt de rate limiet overschreden. Graag rustiger aan! De minimale tijd tussen\ne-mailberichten is %s uur. Alle verdere e-mails gedurende deze periode worden genegeerd."
+
+#: lib/bridgedb/strings.py:25
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr "COMMANDs: (combineer commando's om meerdere opties tegelijkertijd te specificeren)"
+
+#: lib/bridgedb/strings.py:27
+msgid "Welcome to BridgeDB!"
+msgstr "Welkom bij BridgeDB!"
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: lib/bridgedb/strings.py:29
+msgid "Currently supported transport TYPEs:"
+msgstr "Huidig ondersteunde transport TYPEs:"
+
+#: lib/bridgedb/strings.py:30
+#, python-format
+msgid "Hey, %s!"
+msgstr "Hoi, %s!"
+
+#: lib/bridgedb/strings.py:31
+msgid "Hello, friend!"
+msgstr "Hallo, vriend!"
+
+#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+msgid "Public Keys"
+msgstr "Publieke Sleutels"
+
+#. 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:36
+#, python-format
+msgid ""
+"This email was generated with rainbows, unicorns, and sparkles\n"
+"for %s on %s at %s."
+msgstr "Deze email is gegenereerd met regenbogen, eenhoorns, en fonkelingen voor %s op %s om %s."
+
+#: lib/bridgedb/strings.py:42
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr "BridgeDB kan voorzien in bridges met meerdere Pluggable Transports%s %stypes,\ndie helpen bij het verduisteren van uw connecties naar het Tor netwerk,\nwaardoor het moeilijker wordt voor anderen om uw internet traffic te bekijken en vast te stellen dat u Tor gebruikt.\n\n"
+
+#: lib/bridgedb/strings.py:48
+msgid ""
+"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
+"Transports aren't IPv6 compatible.\n"
+"\n"
+msgstr "Sommige bridges met IPv6 adressen zijn eveneens beschikbaar, maar sommige Pluggable\nTransports bieden geen ondersteuning voor IPv6.\n"
+
+#: lib/bridgedb/strings.py:52
+#, python-format
+msgid ""
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr "Verder heeft BridgeDB genoeg oude vanilla bridges %s zonder enige\nPluggable Transports %s wat mogelijk niet zo cool klinkt, maar deze kunnen nog steeds helpen bij het omzeilen van internetcensuur in de meeste gevallen.\n\n"
+
+#: lib/bridgedb/strings.py:65
msgid "What are bridges?"
msgstr "Wat zijn bridges?"
-#: lib/bridgedb/templates/base.html:34
+#: lib/bridgedb/strings.py:66
#, python-format
-msgid ""
-"%s Bridge relays %s are Tor relays that help you circumvent censorship."
-msgstr "%s Bridge relays %s zijn Tor relays die je in staat stellen censuur te omzeilen."
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
+msgstr "%s Bridges %s zijn Tor relays die je helpen censuur te omzeilen."
-#: lib/bridgedb/templates/base.html:39
+#: lib/bridgedb/strings.py:71
msgid "I need an alternative way of getting bridges!"
-msgstr "Ik heb een alternatieve manier nodig om bridges te verkrijgen."
+msgstr "Ik heb een alternatieve manier nodig om bridges te verkrijgen!"
-#: lib/bridgedb/templates/base.html:40
+#: lib/bridgedb/strings.py:72
#, python-format
msgid ""
-"Another way to find public bridge addresses is to send an email (from a %s "
-"or a %s address) to %s with the line 'get bridges' by itself in the body of "
-"the mail."
-msgstr "Een andere manier om publieke bridges te vinden is om een e-mail te sturen (van een %s of een %s-adres) naar %s met enkel de regel 'get bridges' in de inhoud van de e-mail."
+"Another way to get bridges is to send an email to %s. Please note that you must\n"
+"send the email using an address from one of the following email providers:\n"
+"%s or %s."
+msgstr "Een andere manier om bridges te bemachtingen is door een email te sturen naar %s. \nHoudt er rekening mee dat u een email moet sturen door gebruik te maken van een adres van een de volgende providers:\n%s of %s."
-#: lib/bridgedb/templates/base.html:48
+#: lib/bridgedb/strings.py:79
msgid "My bridges don't work! I need help!"
msgstr "Mijn bridges werken niet! Ik heb hulp nodig!"
-#: lib/bridgedb/templates/base.html:49
+#: lib/bridgedb/strings.py:80
+#, python-format
+msgid "If your Tor doesn't work, you should email %s."
+msgstr "Als uw Tor niet werkt, email dan naar %s."
+
+#: lib/bridgedb/strings.py:81
+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 "Probeer zoveel mogelijk informatie toe te voegen over je situatie als je kan, waaronder de lijst met \nbridges en Pluggable Transports die je geprobeerd hebt te gebruiken, je Tor Browser versie,\nen alle meldingen welke Tor heeft uitgegeven, etc."
+
+#: lib/bridgedb/strings.py:88
+msgid "Here are your bridge lines:"
+msgstr "Hier zijn je bridge regels:"
+
+#: lib/bridgedb/strings.py:89
+msgid "Get Bridges!"
+msgstr "Krijg Bridges!"
+
+#: lib/bridgedb/strings.py:93
+msgid "Please select options for bridge type:"
+msgstr "Selecteer opties voor bridge type:"
+
+#: lib/bridgedb/strings.py:94
+msgid "Do you need IPv6 addresses?"
+msgstr "Heeft u IPv6 adressen nodig?"
+
+#: lib/bridgedb/strings.py:95
#, python-format
+msgid "Do you need a %s?"
+msgstr "Heeft u een %s nodig?"
+
+#: lib/bridgedb/strings.py:99
+msgid "Your browser is not displaying images properly."
+msgstr "Uw browser vertoont afbeeldingen niet naar behoren."
+
+#: lib/bridgedb/strings.py:100
+msgid "Enter the characters from the image above..."
+msgstr "Voer de karakters in van de afbeelding hier beneden..."
+
+#: lib/bridgedb/strings.py:104
+msgid "How to start using your bridges"
+msgstr "Hoe te starten met het gebruik van je bridges"
+
+#: lib/bridgedb/strings.py:105
+#, python-format
+msgid ""
+"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
+"Browser download page %s to start Tor Browser."
+msgstr "Om bridges toe te voegen in Tor Browser, volg de instructies op de %s Tor\nBrowser download pagina %s om de Tor Browser te starten."
+
+#: lib/bridgedb/strings.py:108
msgid ""
-"If your Tor doesn't work, you should email %s. Try including as much info "
-"about your case as you can, including the list of bridges you used, the "
-"bundle filename/version you used, the messages that Tor gave out, etc."
-msgstr "Als je Tor niet werkt, zou je %s moeten e-mailen. Probeer zo veel mogelijk informatie over uw geval te verzamelen, inclusief de lijst van bridges die u heeft gebruikt, de bestandsnaam en -versie van de bundel die u gebruikt, de berichten die Tor uitgaf, etc."
+"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
+"the wizard until it asks:"
+msgstr "Wanneer de 'Tor Network Settings' dialoog opent, klik 'Configure' en volg\nde wizard totdat deze vraagt om:"
-#: lib/bridgedb/templates/bridges.html:10
+#: lib/bridgedb/strings.py:111
msgid ""
-"To use the above lines, go to Vidalia's Network settings page, and click "
-"\"My ISP blocks connections to the Tor network\". Then add each bridge "
-"address one at a time."
-msgstr "Om de bovenstaande regels te gebruiken, ga naar Vidalia's Netwerk instellingen pagina en klik op \"Mijn ISP blokkeert verbindingen naar het Tor netwerk\". Voeg daarna elke bridge toe, één regel per keer."
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr "Blokkeert of censureert je internetprovider (ISP) verbindingen\nnaar het Tor netwerk?"
+
+#: lib/bridgedb/strings.py:114
+msgid ""
+"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
+"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"button in the 'Tor Network Settings' wizard for further assistance."
+msgstr "Selecteer 'Ja' en klik vervolgens 'Next'. Om je nieuwe bridges te configureren, kopieer en\nplak je de bridge regels in het invoerveld. Vervolgens klik je 'Connect', en\nben je klaar om te gaan! Als je problemen ervaart, klik dan de 'Help'\nknop in de 'Tor Network Settings' wizard voor verdere hulp."
+
+#: lib/bridgedb/strings.py:122
+msgid "Displays this message."
+msgstr "Toont dit bericht."
+
+#: lib/bridgedb/strings.py:123
+msgid "Request vanilla bridges."
+msgstr "Vraag vanilla bridges aan."
+
+#: lib/bridgedb/strings.py:124
+msgid "Request IPv6 bridges."
+msgstr "Verzoek IPv6 bridges"
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: lib/bridgedb/strings.py:126
+msgid "Request a Pluggable Transport by TYPE."
+msgstr "Vraag een Pluggable Transport op TYPE aan."
+
+#: lib/bridgedb/strings.py:127
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr "Verkrijg een kopie van BridgeDB's publieke GnuPG key."
+
+#: lib/bridgedb/templates/base.html:91
+msgid "Report a Bug"
+msgstr "Rapporteer een bug"
+
+#: lib/bridgedb/templates/base.html:93
+msgid "Source Code"
+msgstr "Broncode"
-#: lib/bridgedb/templates/bridges.html:13
-msgid "No bridges currently available"
-msgstr "Er zijn momenteel geen bridges beschikbaar."
+#: lib/bridgedb/templates/base.html:96
+msgid "Changelog"
+msgstr "Wijzigingslogboek"
-#: lib/bridgedb/templates/captcha.html:6
-msgid "Upgrade your browser to Firefox"
-msgstr "Upgrade uw browser naar Firefox"
+#: lib/bridgedb/templates/base.html:98
+msgid "Contact"
+msgstr "Contact"
-#: lib/bridgedb/templates/captcha.html:8
-msgid "Type the two words"
-msgstr "Typ de twee woorden"
+#: lib/bridgedb/templates/bridges.html:65
+msgid "Uh oh, spaghettios!"
+msgstr "Helaas pindakaas!"
-#: lib/bridgedb/templates/index.html:6
-msgid "Step 1"
-msgstr "Stap 1"
+#: lib/bridgedb/templates/bridges.html:70
+msgid "There currently aren't any bridges available..."
+msgstr "Er zijn momenteel geen bridges beschikbaar..."
-#: lib/bridgedb/templates/index.html:8
+#: lib/bridgedb/templates/bridges.html:71
#, python-format
-msgid "Get %s Tor Browser Bundle %s"
-msgstr "Download %s Tor Browser Bundle %s"
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr "Misschien moet je proberen %s terug te gaan %s en een ander bridge type te selecteren!"
+
+#: lib/bridgedb/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr "Stap %s1%s"
#: lib/bridgedb/templates/index.html:13
-msgid "Step 2"
-msgstr "Stap 2"
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr "Download %s Tor Browser %s"
-#: lib/bridgedb/templates/index.html:15
+#: lib/bridgedb/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr "Stap %s2%s"
+
+#: lib/bridgedb/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr "Download %s bridges %s"
-#: lib/bridgedb/templates/index.html:19
-msgid "Step 3"
-msgstr "Stap 3"
+#: lib/bridgedb/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr "Stap %s3%s"
+
+#: lib/bridgedb/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr "Nu %s voeg de bridges toe aan 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.)
+#. TRANSLATORS: Please do NOT translate the word "bridges"!
+#: lib/bridgedb/templates/options.html:39
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr "Geef me %sg%sewoon bridges!"
+
+#: lib/bridgedb/templates/options.html:53
+msgid "Advanced Options"
+msgstr "Geavanceerde Opties"
+
+#: lib/bridgedb/templates/options.html:89
+msgid "No"
+msgstr "Nee"
+
+#: lib/bridgedb/templates/options.html:90
+msgid "none"
+msgstr "geen"
+
+#. 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:131
+#, python-format
+msgid "%sY%ses!"
+msgstr "%sJ%sa!"
-#: lib/bridgedb/templates/index.html:21
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Please do NOT translate the word "bridge"!
+#: lib/bridgedb/templates/options.html:155
#, python-format
-msgid "Now %s add the bridges to Tor %s"
-msgstr "%s Voeg nu de bridges aan Tor toe %s"
+msgid "%sG%set Bridges"
+msgstr "%sK%srijg Bridges"
1
0

[bridgedb/develop] Merge branch 'translations/2014-06-06-update' into develop
by isis@torproject.org 06 Jun '14
by isis@torproject.org 06 Jun '14
06 Jun '14
commit d63ba215e16d5098edc41dc8c150edf68091ebe4
Merge: 46ab59e 0840864
Author: Isis Lovecruft <isis(a)torproject.org>
Date: Fri Jun 6 20:38:57 2014 +0000
Merge branch 'translations/2014-06-06-update' into develop
lib/bridgedb/i18n/da/LC_MESSAGES/bridgedb.po | 371 +++++++++++++++++++----
lib/bridgedb/i18n/de/LC_MESSAGES/bridgedb.po | 350 +++++++++++++++++----
lib/bridgedb/i18n/el/LC_MESSAGES/bridgedb.po | 9 +-
lib/bridgedb/i18n/es/LC_MESSAGES/bridgedb.po | 340 +++++++++++++++++----
lib/bridgedb/i18n/fr_CA/LC_MESSAGES/bridgedb.po | 334 ++++++++++++++++----
lib/bridgedb/i18n/it/LC_MESSAGES/bridgedb.po | 345 +++++++++++++++++----
lib/bridgedb/i18n/ja/LC_MESSAGES/bridgedb.po | 337 ++++++++++++++++----
lib/bridgedb/i18n/ko/LC_MESSAGES/bridgedb.po | 104 +++++++
lib/bridgedb/i18n/nl/LC_MESSAGES/bridgedb.po | 341 +++++++++++++++++----
lib/bridgedb/i18n/pl/LC_MESSAGES/bridgedb.po | 340 +++++++++++++++++----
lib/bridgedb/i18n/pt_BR/LC_MESSAGES/bridgedb.po | 339 +++++++++++++++++----
lib/bridgedb/i18n/tr/LC_MESSAGES/bridgedb.po | 8 +-
lib/bridgedb/i18n/uk/LC_MESSAGES/bridgedb.po | 337 ++++++++++++++++----
13 files changed, 3025 insertions(+), 530 deletions(-)
1
0
commit 3d2b6462c377966e99447dfd4db9a874ce23ceb9
Author: Isis Lovecruft <isis(a)torproject.org>
Date: Fri Jun 6 20:30:05 2014 +0000
Update Ukranian (uk) translations.
* THANKS to LinuxChata and ghostishev.
---
lib/bridgedb/i18n/uk/LC_MESSAGES/bridgedb.po | 337 ++++++++++++++++++++++----
1 file changed, 285 insertions(+), 52 deletions(-)
diff --git a/lib/bridgedb/i18n/uk/LC_MESSAGES/bridgedb.po b/lib/bridgedb/i18n/uk/LC_MESSAGES/bridgedb.po
index 2b03216..502fa97 100644
--- a/lib/bridgedb/i18n/uk/LC_MESSAGES/bridgedb.po
+++ b/lib/bridgedb/i18n/uk/LC_MESSAGES/bridgedb.po
@@ -1,18 +1,18 @@
# Translations template for BridgeDB.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2014 'The Tor Project, Inc.'
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
-# Translators:
# ghostishev, 2014
+# LinuxChata, 2014
# AVATOR <sclub2018(a)yandex.ua>, 2013
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2013-03-27 21:41+0000\n"
-"PO-Revision-Date: 2014-03-13 10:40+0000\n"
-"Last-Translator: ghostishev\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n"
+"POT-Creation-Date: 2014-05-16 18:39+0000\n"
+"PO-Revision-Date: 2014-05-17 18:12+0000\n"
+"Last-Translator: LinuxChata\n"
"Language-Team: Ukrainian (http://www.transifex.com/projects/p/torproject/language/uk/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -21,82 +21,315 @@ msgstr ""
"Language: uk\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: lib/bridgedb/templates/base.html:33
+#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
+#. any string (regardless of capitalization and/or punctuation):
+#. "bridge"
+#. "bridges"
+#. "BridgeDB"
+#. "pluggable transport"
+#. "pluggable transports"
+#. "obfs2"
+#. "obfs3"
+#. "scramblesuit"
+#. "fte"
+#. "Tor"
+#. "Tor Browser"
+#. "TBB"
+#: lib/bridgedb/HTTPServer.py:124
+msgid "Sorry! Something went wrong with your request."
+msgstr "Ми приносимо наші вибачення! Щось пішло не так з Вашим запитом."
+
+#: lib/bridgedb/strings.py:18
+msgid "[This is an automated message; please do not reply.]"
+msgstr "[Це автоматичне повідомлення; будь ласка, не відповідайте.]"
+
+#: lib/bridgedb/strings.py:20
+msgid "Here are your bridges:"
+msgstr "Ваші bridges:"
+
+#: lib/bridgedb/strings.py:22
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr "Ви перевищили обмеження швидкості. Будь ласка, уповільніться! Мінімальний час між\nлистами %s годин. Всі подальші листи в цей період часу будуть ігноруватися."
+
+#: lib/bridgedb/strings.py:25
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr "Команди: (комбінувати команди вказавши кілька варіантів одночасно)"
+
+#: lib/bridgedb/strings.py:27
+msgid "Welcome to BridgeDB!"
+msgstr "Ласкаво просимо у BridgeDB!"
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: lib/bridgedb/strings.py:29
+msgid "Currently supported transport TYPEs:"
+msgstr "У даний час підтримуються transport TYPE:"
+
+#: lib/bridgedb/strings.py:30
+#, python-format
+msgid "Hey, %s!"
+msgstr "Привіт, %s!"
+
+#: lib/bridgedb/strings.py:31
+msgid "Hello, friend!"
+msgstr "Привіт, друже!"
+
+#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+msgid "Public Keys"
+msgstr "Відкриті ключі"
+
+#. TRANSLATORS: This string will end up saying something like:
+#. "This email was generated with rainbows, unicorns, and sparkles
+#. for alice(a)example.com on Friday, 09 May, 2014 at 18:59:39."
+#: lib/bridgedb/strings.py:36
+#, python-format
+msgid ""
+"This email was generated with rainbows, unicorns, and sparkles\n"
+"for %s on %s at %s."
+msgstr "Цей лист був згенеровано з райдугами, єдинорогами і блискітками\nдля %s %s о %s."
+
+#: lib/bridgedb/strings.py:42
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr "BridgeDB може забезпечити bridges з декількома %sтипами Pluggable Transports%s,\nякі можуть допомогти приховати свої зв'язки з Tor мережею, що ускладнює роботу\nдля тих, хто перевіряє Ваш інтернет-трафік, щоб визначити, що Ви\nвикористовуєте Tor. \n"
+
+#: lib/bridgedb/strings.py:48
+msgid ""
+"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
+"Transports aren't IPv6 compatible.\n"
+"\n"
+msgstr "Деякі мости з адресами IPv6, також доступні, хоча деякі Pluggable\nTransports не сумісні з IPv6.\n"
+
+#: lib/bridgedb/strings.py:52
+#, python-format
+msgid ""
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr "Крім того, BridgeDB має багато plain-ol'-vanilla bridges %s без\nPluggable Transports %s, які, можливо, не звучать гарно, але вони \nможуть допомогти обійти інтернет-цензуру в багатьох випадках.\n"
+
+#: lib/bridgedb/strings.py:65
msgid "What are bridges?"
msgstr "Що таке ретранслятор типу міст?"
-#: lib/bridgedb/templates/base.html:34
+#: lib/bridgedb/strings.py:66
#, python-format
-msgid ""
-"%s Bridge relays %s are Tor relays that help you circumvent censorship."
-msgstr "%s Мости %s це ретранслятори Tor, які допомагають обійти цензуру."
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
+msgstr "%s Bridges %s є Tor реле, які допоможуть Вам обійти цензуру."
-#: lib/bridgedb/templates/base.html:39
+#: lib/bridgedb/strings.py:71
msgid "I need an alternative way of getting bridges!"
msgstr "Мені потрібен альтернативний спосіб отримання списку мостів!"
-#: lib/bridgedb/templates/base.html:40
+#: lib/bridgedb/strings.py:72
#, python-format
msgid ""
-"Another way to find public bridge addresses is to send an email (from a %s "
-"or a %s address) to %s with the line 'get bridges' by itself in the body of "
-"the mail."
-msgstr "Інший спосіб знайти публічний міст - надіслати листа (з адреси %s або %s) на %s з одним рядком 'get bridges' в тілі листа."
+"Another way to get bridges is to send an email to %s. Please note that you must\n"
+"send the email using an address from one of the following email providers:\n"
+"%s or %s."
+msgstr "Ще один спосіб отримати bridges - це відправити лист на адресу %s. Зверніть увагу, що\nВи повинні надіслати лист, використовуючи адресу від одного з наступних постачальників\nпослуг електронної пошти:\n%s або %s."
-#: lib/bridgedb/templates/base.html:48
+#: lib/bridgedb/strings.py:79
msgid "My bridges don't work! I need help!"
msgstr "Мої мости не працюють! Допоможіть!"
-#: lib/bridgedb/templates/base.html:49
+#: lib/bridgedb/strings.py:80
#, python-format
+msgid "If your Tor doesn't work, you should email %s."
+msgstr "Якщо Ваш Tor не працює, Ви можете відправити нам електронного листа %s."
+
+#: lib/bridgedb/strings.py:81
msgid ""
-"If your Tor doesn't work, you should email %s. Try including as much info "
-"about your case as you can, including the list of bridges you used, the "
-"bundle filename/version you used, the messages that Tor gave out, etc."
-msgstr "Якщо Tor не працює - напишіть %s. Опишіть проблему якомога більш докладно, Введіть список використаних мостів, ім'я файлу / версію, яку ви використовували, повідомлення про помилки та інше."
+"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,\nі будь-які повідомлення, які Tor видавав, і т.д."
+
+#: lib/bridgedb/strings.py:88
+msgid "Here are your bridge lines:"
+msgstr "Лінії для Вашого bridge:"
+
+#: lib/bridgedb/strings.py:89
+msgid "Get Bridges!"
+msgstr "Отримати Bridges!"
+
+#: lib/bridgedb/strings.py:93
+msgid "Please select options for bridge type:"
+msgstr "Будь ласка, оберіть параметри типу bridge:"
+
+#: lib/bridgedb/strings.py:94
+msgid "Do you need IPv6 addresses?"
+msgstr "Вам потрібні адреси IPv6?"
+
+#: lib/bridgedb/strings.py:95
+#, python-format
+msgid "Do you need a %s?"
+msgstr "Вам потрібен %s?"
-#: lib/bridgedb/templates/bridges.html:10
+#: lib/bridgedb/strings.py:99
+msgid "Your browser is not displaying images properly."
+msgstr "Ваш браузер не відображає зображення належним чином."
+
+#: lib/bridgedb/strings.py:100
+msgid "Enter the characters from the image above..."
+msgstr "Введіть зображенні символи ..."
+
+#: lib/bridgedb/strings.py:104
+msgid "How to start using your bridges"
+msgstr "Як почати користуватися Вашими bridges"
+
+#: lib/bridgedb/strings.py:105
+#, python-format
msgid ""
-"To use the above lines, go to Vidalia's Network settings page, and click "
-"\"My ISP blocks connections to the Tor network\". Then add each bridge "
-"address one at a time."
-msgstr "Для використання рядків вище, відкрийте сторінку Vidalia налаштування Мережі, і натисніть\n\"Мій провайдер Інтернет блокує з'єднання з мережею Tor\". Потім додайте кожну адресу моста\nза раз."
+"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
+"Browser download page %s to start Tor Browser."
+msgstr "Для введення bridges у браузері Tor, дотримуйтесь інструкцій %s на сторінці \nзавантаження браузера Tor %s для запуску браузера Tor."
+
+#: lib/bridgedb/strings.py:108
+msgid ""
+"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
+"the wizard until it asks:"
+msgstr "Коли діалог \"Налаштування мережі Tor\" відкриється, натисніть \"Налаштувати\" і дотримуйтесь\nпідказкам майстра, допоки він не запросить:"
+
+#: lib/bridgedb/strings.py:111
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr "Вашій інтернет-провайдер (ISP) блокує або цензурує з'єднання\nдо мережі Tor?"
+
+#: lib/bridgedb/strings.py:114
+msgid ""
+"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
+"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"button in the 'Tor Network Settings' wizard for further assistance."
+msgstr "Виберіть \"Так\", а потім натисніть \"Далі\". Для налаштування нових bridges, скопіюйте і\nвставте лінії bridge у поле для введення тексту. Потім, натисніть 'Підключатися', і\nвсе повинно працювати! Якщо у Вас виникли проблеми, спробуйте натиснути \"Довідка\" \nв майстрові \"Мережеві параметри Tor' для отримання додаткової допомоги."
+
+#: lib/bridgedb/strings.py:122
+msgid "Displays this message."
+msgstr "Відображає це повідомлення."
+
+#: lib/bridgedb/strings.py:123
+msgid "Request vanilla bridges."
+msgstr "Запит на отримання vanilla bridges."
+
+#: lib/bridgedb/strings.py:124
+msgid "Request IPv6 bridges."
+msgstr "Запит на отримання IPv6 bridges."
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: lib/bridgedb/strings.py:126
+msgid "Request a Pluggable Transport by TYPE."
+msgstr "Запит на отримання Pluggable Transport по TYPE."
+
+#: lib/bridgedb/strings.py:127
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr "Отримати копію відкритого GnuPG ключа для BridgeDB."
+
+#: lib/bridgedb/templates/base.html:91
+msgid "Report a Bug"
+msgstr "Повідомити про помилку"
+
+#: lib/bridgedb/templates/base.html:93
+msgid "Source Code"
+msgstr "Код"
-#: lib/bridgedb/templates/bridges.html:13
-msgid "No bridges currently available"
-msgstr "На цей час немає доступних мостів"
+#: lib/bridgedb/templates/base.html:96
+msgid "Changelog"
+msgstr "Список змін"
-#: lib/bridgedb/templates/captcha.html:6
-msgid "Upgrade your browser to Firefox"
-msgstr "Оновіть ваш браузер до Firefox"
+#: lib/bridgedb/templates/base.html:98
+msgid "Contact"
+msgstr "Контакт"
-#: lib/bridgedb/templates/captcha.html:8
-msgid "Type the two words"
-msgstr "Введіть два слова"
+#: lib/bridgedb/templates/bridges.html:65
+msgid "Uh oh, spaghettios!"
+msgstr "Ой-ой, spaghettios!"
-#: lib/bridgedb/templates/index.html:6
-msgid "Step 1"
-msgstr "Крок 1"
+#: lib/bridgedb/templates/bridges.html:70
+msgid "There currently aren't any bridges available..."
+msgstr "В даний час немає доступних bridges ..."
-#: lib/bridgedb/templates/index.html:8
+#: lib/bridgedb/templates/bridges.html:71
#, python-format
-msgid "Get %s Tor Browser Bundle %s"
-msgstr "Отримайте %s пакет Tor Browser %s"
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr "Можливо, Вам слід спробувати %s повернутися %s і вибрати інший тип bridge!"
+
+#: lib/bridgedb/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr "Крок %s1%s"
#: lib/bridgedb/templates/index.html:13
-msgid "Step 2"
-msgstr "Крок 2"
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr "Завантажити %s Tor Browser %s"
-#: lib/bridgedb/templates/index.html:15
+#: lib/bridgedb/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr "Крок %s2%s"
+
+#: lib/bridgedb/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr "Отримайте %s мости %s"
-#: lib/bridgedb/templates/index.html:19
-msgid "Step 3"
-msgstr "Крок 3"
+#: 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.)
+#. TRANSLATORS: Please do NOT translate the word "bridges"!
+#: lib/bridgedb/templates/options.html:39
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr "%sТ%sільки дай мені bridges!"
+
+#: lib/bridgedb/templates/options.html:53
+msgid "Advanced Options"
+msgstr "Розширені Параметри"
+
+#: lib/bridgedb/templates/options.html:89
+msgid "No"
+msgstr "Ні"
+
+#: lib/bridgedb/templates/options.html:90
+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:131
+#, python-format
+msgid "%sY%ses!"
+msgstr "%sТ%sак!"
-#: lib/bridgedb/templates/index.html:21
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Please do NOT translate the word "bridge"!
+#: lib/bridgedb/templates/options.html:155
#, python-format
-msgid "Now %s add the bridges to Tor %s"
-msgstr "Тепер %s додайте мости в Tor %s"
+msgid "%sG%set Bridges"
+msgstr "%sО%sтримати Bridges"
1
0
commit 08408643de0992b2747a90a41c9840d171c1970a
Author: Isis Lovecruft <isis(a)torproject.org>
Date: Fri Jun 6 20:31:39 2014 +0000
Add Korean (ko) translations.
These are somehow the old strings from before the UIs were revised. It
seems the automated Transifex updater scripts didn't create a new PO
file for Korean… that or I did something wrong. Either way, we can still
use *some* of these strings, so we should add them.
* THANKS to ilbe123, cwt96, Dr.what, and pCsOrI.
---
lib/bridgedb/i18n/ko/LC_MESSAGES/bridgedb.po | 104 ++++++++++++++++++++++++++
1 file changed, 104 insertions(+)
diff --git a/lib/bridgedb/i18n/ko/LC_MESSAGES/bridgedb.po b/lib/bridgedb/i18n/ko/LC_MESSAGES/bridgedb.po
new file mode 100644
index 0000000..e877b87
--- /dev/null
+++ b/lib/bridgedb/i18n/ko/LC_MESSAGES/bridgedb.po
@@ -0,0 +1,104 @@
+# Translations template for BridgeDB.
+# Copyright (C) 2013 ORGANIZATION
+# This file is distributed under the same license as the BridgeDB project.
+#
+# Translators:
+# Translators:
+# ilbe123 <a3057016(a)drdrb.net>, 2014
+# cwt96 <cwt967(a)naver.com>, 2012
+# Dr.what <javrick6(a)naver.com>, 2014
+# pCsOrI <pcsori(a)gmail.com>, 2012
+msgid ""
+msgstr ""
+"Project-Id-Version: The Tor Project\n"
+"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
+"POT-Creation-Date: 2013-03-27 21:41+0000\n"
+"PO-Revision-Date: 2014-05-06 06:40+0000\n"
+"Last-Translator: ilbe123 <a3057016(a)drdrb.net>\n"
+"Language-Team: Korean (http://www.transifex.com/projects/p/torproject/language/ko/)\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"
+"Language: ko\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: lib/bridgedb/templates/base.html:33
+msgid "What are bridges?"
+msgstr "'브릿지'란?"
+
+#: lib/bridgedb/templates/base.html:34
+#, python-format
+msgid ""
+"%s Bridge relays %s are Tor relays that help you circumvent censorship."
+msgstr "중계 서버 브릿지 %s 중에서, %s 가 여러분의 검열 우회를 도와줄 수 있는 Tor 중계 서버 입니다."
+
+#: lib/bridgedb/templates/base.html:39
+msgid "I need an alternative way of getting bridges!"
+msgstr "브릿지를 얻는 다른 방법이 없을까요?"
+
+#: lib/bridgedb/templates/base.html:40
+#, python-format
+msgid ""
+"Another way to find public bridge addresses is to send an email (from a %s "
+"or a %s address) to %s with the line 'get bridges' by itself in the body of "
+"the mail."
+msgstr "공개된 브릿지 주소를 찾을 때, 통신선에 'get brides'라고 이메일을 적어서 보내는 방법도 있습니다.(메일을 보내는 사람의 주소 표기는 from %s 또는 %s 주소)"
+
+#: lib/bridgedb/templates/base.html:48
+msgid "My bridges don't work! I need help!"
+msgstr "브릿지가 맛이 갔어요! 도와줘요!"
+
+#: lib/bridgedb/templates/base.html:49
+#, python-format
+msgid ""
+"If your Tor doesn't work, you should email %s. Try including as much info "
+"about your case as you can, including the list of bridges you used, the "
+"bundle filename/version you used, the messages that Tor gave out, etc."
+msgstr "귀하의 토르가 작동하지 않는다면, %s의 이메일을 보내셔야 합니다. 가능한 한 많은 정보를 포함해서 보내주세요. 예를 들면 귀하가 사용한 브릿지의 목록, 귀하가 사용하는 번들의 파일 이름과 버전, 귀하의 토르가 맛 갔을 때 나온 메세지. 이 외에도 적을 수 있는 여러 가지."
+
+#: lib/bridgedb/templates/bridges.html:10
+msgid ""
+"To use the above lines, go to Vidalia's Network settings page, and click "
+"\"My ISP blocks connections to the Tor network\". Then add each bridge "
+"address one at a time."
+msgstr "위 통신선을 사용하시려면 'Vidalia's Network settings'-비달리아 네트워크 설정-페이지에 들어간 후, 'My ISP blocks connections to the Tor network'-Tor 네트워크에 내 ISP 연결을 차단-을 클릭합니다. 그러면 한번에 각각의 브릿지 주소를 추가 할 수 있습니다."
+
+#: lib/bridgedb/templates/bridges.html:13
+msgid "No bridges currently available"
+msgstr "현재 이용 가능한 브릿지 없음"
+
+#: lib/bridgedb/templates/captcha.html:6
+msgid "Upgrade your browser to Firefox"
+msgstr "당신의 브라우저를 파이어폭스로 업그레이드 하세요!"
+
+#: lib/bridgedb/templates/captcha.html:8
+msgid "Type the two words"
+msgstr "두개의 단어를 입력하십시오"
+
+#: lib/bridgedb/templates/index.html:6
+msgid "Step 1"
+msgstr "1단계"
+
+#: lib/bridgedb/templates/index.html:8
+#, python-format
+msgid "Get %s Tor Browser Bundle %s"
+msgstr "Tor %s Browser Bundle %s를 입수"
+
+#: lib/bridgedb/templates/index.html:13
+msgid "Step 2"
+msgstr "2단계"
+
+#: lib/bridgedb/templates/index.html:15
+#, python-format
+msgid "Get %s bridges %s"
+msgstr "%s 브릿지 %s를 입수"
+
+#: lib/bridgedb/templates/index.html:19
+msgid "Step 3"
+msgstr "3단계"
+
+#: lib/bridgedb/templates/index.html:21
+#, python-format
+msgid "Now %s add the bridges to Tor %s"
+msgstr "곧 바로 %s Tor 브리지를 추가 %s"
1
0

[bridgedb/develop] Add utility unittest.TestCase mixin class for testing SMTP.
by isis@torproject.org 06 Jun '14
by isis@torproject.org 06 Jun '14
06 Jun '14
commit be223814812bad96000da37ab7690704214b2f5a
Author: Isis Lovecruft <isis(a)torproject.org>
Date: Tue May 20 18:20:42 2014 +0000
Add utility unittest.TestCase mixin class for testing SMTP.
* ADD a new class, `test_email_server.SMTPTestsMixin`, which has the
following methods useful for testing SMTP within
`t.t.unittest.TestCase` subclasses:
- SMTPTestsMixin._buildEmail(fromAddr=None, toAddr=None,
subject=None, body=None)
Creates email text (including headers) for use in an SMTP DATA
segment. Includes the SMTP DATA EOM command ('.') at the
end. If no keyword arguments are given, the defaults are fairly
sane.
- SMTPTestsMixin._buildSMTP(commands)
Format a list of SMTP protocol commands into a string, using
the proper protocol delimiter.
- SMTPTestsMixin._test(commands, expected)
Send the commands to the TestCase's protocol (this must be the
`proto` attribute of your `TestCase`), and then check that the
expected output matches what was received from
`TestCase.transport` (another attribute you must assign).
---
lib/bridgedb/test/test_email_server.py | 113 ++++++++++++++++++++++++++++++++
lib/bridgedb/test/util.py | 10 +++
2 files changed, 123 insertions(+)
diff --git a/lib/bridgedb/test/test_email_server.py b/lib/bridgedb/test/test_email_server.py
index 23c65b8..30d27f1 100644
--- a/lib/bridgedb/test/test_email_server.py
+++ b/lib/bridgedb/test/test_email_server.py
@@ -26,9 +26,12 @@ from bridgedb.persistent import Conf
from bridgedb.schedule import Unscheduled
from bridgedb.test.test_HTTPServer import DummyBridge
from bridgedb.test.util import fileCheckDecorator
+from bridgedb.test.util import TestCaseMixin
from twisted.python import log
from twisted.internet import defer
+from twisted.internet import reactor
+from twisted.test import proto_helpers
from twisted.trial import unittest
@@ -416,6 +419,116 @@ class MailDeliveryTest(unittest.TestCase):
self.delivery.validateTo, user)
+class SMTPTestCaseMixin(TestCaseMixin):
+ """Utility methods for use within any subclasses of
+ :api:`twisted.trial.unittest.TestCase` which test SMTP.
+
+ To use me, subclass :api:`twisted.trial.unittest.TestCase` and mix me into
+ the middle of your class inheritance declarations, like so::
+
+ class ExampleSMTPTests(SMTPTestCaseMixin, unittest.TestCase):
+ pass
+
+ and then make certain that your ``TestCase`` subclass has its ``proto``
+ and attribute assigned properly::
+
+ class ExampleSMTPTests(SMTPTestCaseMixin, unittest.TestCase):
+ def setUp(self):
+ factory = twisted.mail.smtp.SMTPFactory()
+ self.proto = self.factory.buildProtocol(('127.0.0.1', 0))
+
+
+ :ivar proto: A :api:`Protocol <twisted.internet.protocol.Protocol>`
+ associated with a
+ :api:`ServerFactory <twisted.internet.protocol.ServerFactory>`.
+ :ivar transport: Anything that implements
+ :api:`ITransport <twisted.internet.interfaces.ITransport>`. The default
+ is a :api:`twisted.test.proto_helpers.StringTransportWithDisconection`.
+ :ivar str smtpFromAddr: The default email address for the server.
+ """
+
+ proto = None
+ transport = proto_helpers.StringTransportWithDisconnection()
+ smtpFromAddr = None
+
+ def tearDown(self):
+ """Cleanup method after each ``test_*`` method runs; removes timed out
+ connections on the reactor and clears the :ivar:`transport`.
+ """
+ self.transport.clear() # Clear bytes from the transport.
+
+ for delay in reactor.getDelayedCalls():
+ try:
+ delay.cancel()
+ except (AlreadyCalled, AlreadyCancelled):
+ pass
+
+ def _buildEmail(self, fromAddr=None, toAddr=None, subject=None, body=None):
+ """Creates email text (including headers) for use in an SMTP DATA
+ segment. Includes the SMTP DATA EOM command ('.') at the end. If no
+ keyword arguments are given, the defaults are fairly sane.
+
+ Suitable for testing a :class:`bridgedb.email.server.MailFactory`.
+
+ :param str fromAddr: An email address for the 'From:' header.
+ :param str toAddr: An email address for the 'To:' header.
+ :param str subject: The contents of the 'Subject:' header.
+ :param str body: The contents of the email body.
+ :rtype: str
+ :returns: The email text.
+ """
+ fromAddr = fromAddr if fromAddr else 'testing@localhost'
+ toAddr = toAddr if toAddr else self.smtpFromAddr
+ subject = subject if subject else 'testing testing one two three'
+ body = body if body else 'get bridges'
+
+ contents = ['From: %s' % fromAddr,
+ 'To: %s' % toAddr,
+ 'Subject: %s' % subject,
+ '\r\n %s' % body,
+ '.'] # SMTP DATA EOM command
+ emailText = self.proto.delimiter.join(contents)
+ return emailText
+
+ def _buildSMTP(self, commands):
+ """Format a list of SMTP protocol commands into a string, using the proper
+ protocol delimiter.
+
+ :param list commands: A list of raw SMTP-protocol command lines.
+ :rtype: str
+ :returns: The string for sending those **commands**, suitable for
+ giving to a :api:`twisted.internet.Protocol.dataReceived` method.
+ """
+ data = self.proto.delimiter.join(commands) + self.proto.delimiter
+ return data
+
+ def _test(self, commands, expected, noisy=False):
+ """Send the SMTP **commands** to the ``dataReceived`` method of your
+ TestCase's protocol (this must be the `proto` attribute of your
+ `TestCase`, i.e. this uses ``TestCase.proto.dataReceived``). Next,
+ check that the substring which is **expected** to be within the
+ server's output matches what was received from :ivar`transport`.
+
+ :param list commands: A sequence of raw SMTP command lines. This will
+ automatically be passed to :meth:`_buildSMTP`.
+ :param str expected: A substring which should occur in the "server"
+ output (taken from the :ivar:`transport`).
+ :param bool noisy: If ``True``, print the conversation between the
+ "client" and the "server" in a nicely formatted manner.
+ """
+ data = self._buildSMTP(commands)
+ self.proto.dataReceived(data)
+ recv = self.transport.value()
+
+ if noisy:
+ client = data.replace('\r\n', '\r\n ')
+ server = recv.replace('\r\n', '\r\n\t\t ')
+ print('\n CLIENT --------->', '\n %s' % client)
+ print('\t\t', '<--------- SERVER', '\n\t\t %s' % server)
+
+ self.assertSubstring(expected, recv)
+
+
class EmailServerServiceTests(unittest.TestCase):
def setUp(self):
self.config = _createConfig()
diff --git a/lib/bridgedb/test/util.py b/lib/bridgedb/test/util.py
index a012597..ca68d1d 100644
--- a/lib/bridgedb/test/util.py
+++ b/lib/bridgedb/test/util.py
@@ -14,11 +14,14 @@
from __future__ import print_function
from __future__ import unicode_literals
+import abc
import doctest
import os
from functools import wraps
+from twisted.trial import unittest
+
def fileCheckDecorator(func):
"""Method decorator for a t.t.unittest.TestCase test_* method.
@@ -62,5 +65,12 @@ def fileCheckDecorator(func):
% (str(description), dst, src))
return wrapper
+
+class TestCaseMixin:
+ """Subclasses of me can be used as mix-in classes with ``TestCase``s."""
+ __metaclass__ = abc.ABCMeta
+TestCaseMixin.register(unittest.TestCase)
+
+
if __name__ == "__main__":
doctest.run_docstring_examples(fileCheckDecorator, None)
1
0

[bridgedb/develop] Implement skipped unittests for bridgedb.email.server.addServer().
by isis@torproject.org 06 Jun '14
by isis@torproject.org 06 Jun '14
06 Jun '14
commit 705633e1774ad54214592101d7ed1226115b5ff6
Author: Isis Lovecruft <isis(a)torproject.org>
Date: Tue May 20 20:12:23 2014 +0000
Implement skipped unittests for bridgedb.email.server.addServer().
---
lib/bridgedb/test/test_email_server.py | 41 +++++++++++++++++++++++++++-----
1 file changed, 35 insertions(+), 6 deletions(-)
diff --git a/lib/bridgedb/test/test_email_server.py b/lib/bridgedb/test/test_email_server.py
index 30d27f1..717a006 100644
--- a/lib/bridgedb/test/test_email_server.py
+++ b/lib/bridgedb/test/test_email_server.py
@@ -529,14 +529,43 @@ class SMTPTestCaseMixin(TestCaseMixin):
self.assertSubstring(expected, recv)
-class EmailServerServiceTests(unittest.TestCase):
+class EmailServerServiceTests(SMTPTestCaseMixin, unittest.TestCase):
+ """Unittests for :func:`bridgedb.email.server.addServer`."""
+
def setUp(self):
+ """Create a server.MailContext and EmailBasedDistributor."""
self.config = _createConfig()
self.context = _createMailContext(self.config)
- self.distributor = self.context.distributor
+ self.smtpFromAddr = self.context.smtpFromAddr # 'bridges@localhost'
+ self.sched = Unscheduled()
+ self.dist = self.context.distributor
+
+ def tearDown(self):
+ """Kill all connections with fire."""
+ if self.transport:
+ self.transport.loseConnection()
+ super(EmailServerServiceTests, self).tearDown()
+ # FIXME: this is definitely not how we're supposed to do this, but it
+ # kills the DirtyReactorAggregateErrors.
+ reactor.disconnectAll()
+ reactor.runUntilCurrent()
def test_addServer(self):
- self.skip = True
- raise unittest.SkipTest("Not finished yet")
- from twisted.internet import reactor
- server.addServer(self.config, self.distributor, Unscheduled)
+ """Call :func:`bridgedb.email.server.addServer` to test startup."""
+ factory = server.addServer(self.config, self.dist, self.sched)
+ factory.timeout = None
+ factory.protocol.timeout = None # Or else the reactor gets dirty
+
+ self.proto = factory.buildProtocol(('127.0.0.1', 0))
+ self.proto.setTimeout(None)
+ # Set the transport's protocol, because
+ # StringTransportWithDisconnection is a bit janky:
+ self.transport.protocol = self.proto
+ self.proto.makeConnection(self.transport)
+
+ self._test(['HELO localhost',
+ 'MAIL FROM: testing@localhost',
+ 'RCPT TO: %s' % self.smtpFromAddr,
+ "DATA", self._buildEmail(body="get transport obfs3")],
+ "250 Delivery in progress",
+ noisy=True)
1
0