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

[translation/torcheck] Update translations for torcheck
by translation＠torproject.org 22 May '15

22 May '15

commit 0b02597cb844557530c3912cecc7c431954536a0 Author: Translation commit bot <translation(a)torproject.org> Date: Fri May 22 19:45:09 2015 +0000 Update translations for torcheck --- id/torcheck.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/id/torcheck.po b/id/torcheck.po index 896d78a..ca6a496 100644 --- a/id/torcheck.po +++ b/id/torcheck.po @@ -4,6 +4,7 @@ # Translators: # Anthony Santana, 2014 # brain90 <gibransyah(a)gmail.com>, 2012 +# cholif yulian <cholifyulian123(a)gmail.com>, 2015 # brain90 <gibransyah(a)gmail.com>, 2012 # Hasan Al Banna, 2014 # Jaya Wijaya <SecretCommission(a)tormail.org>, 2012 @@ -15,8 +16,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2015-05-09 10:02+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2015-05-22 19:44+0000\n" +"Last-Translator: cholif yulian <cholifyulian123(a)gmail.com>\n" "Language-Team: Indonesian (http://www.transifex.com/projects/p/torproject/language/id/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -35,7 +36,7 @@ msgid "" msgstr "Silakan kunjungi <a href=\"https://www.torproject.org/\">situs web Tor</a> untuk informasi lebih lanjut tentang penggunaan Tor dengan aman. Anda kini dapat berselancar awanama di Internet secara bebas." msgid "There is a security update available for Tor Browser." -msgstr "" +msgstr "Tersedia pengaman yg ter-up date pada browser Tor" msgid "" "<a href=\"https://www.torproject.org/download/download-easy.html\">Click "

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 22 May '15

22 May '15

commit 7e66fee897c3d1479b1211d898ef01f84c998e3c Author: Translation commit bot <translation(a)torproject.org> Date: Fri May 22 17:45:03 2015 +0000 Update translations for bridgedb --- pt/LC_MESSAGES/bridgedb.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pt/LC_MESSAGES/bridgedb.po b/pt/LC_MESSAGES/bridgedb.po index 186a1ef..f00702c 100644 --- a/pt/LC_MESSAGES/bridgedb.po +++ b/pt/LC_MESSAGES/bridgedb.po @@ -16,7 +16,7 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'POT-Creation-Date: 2015-03-19 22:13+0000\n" -"PO-Revision-Date: 2015-05-22 17:13+0000\n" +"PO-Revision-Date: 2015-05-22 17:21+0000\n" "Last-Translator: MMSRS\n" "Language-Team: Portuguese (http://www.transifex.com/projects/p/torproject/language/pt/)\n" "MIME-Version: 1.0\n"

1 0

[translation/torbutton-torbuttondtd] Update translations for torbutton-torbuttondtd
by translation＠torproject.org 22 May '15

22 May '15

commit bc98b831402b81750c078f83b5a0163a0099ba05 Author: Translation commit bot <translation(a)torproject.org> Date: Fri May 22 17:16:10 2015 +0000 Update translations for torbutton-torbuttondtd --- pt/torbutton.dtd | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pt/torbutton.dtd b/pt/torbutton.dtd index 0121052..e946ff2 100644 --- a/pt/torbutton.dtd +++ b/pt/torbutton.dtd @@ -165,17 +165,17 @@ <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Linha de base JIT."> <!ENTITY torbutton.prefs.sec_jit_slower_desc "Os scripts em alguns sítios poderão funcionar muito lentamente."> <!ENTITY torbutton.prefs.sec_jar_desc "Os ficheiros JAR remotos estão bloqueados."> -<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR files are extremely rare on the web, but can be a source of XSS and other attacks."> -<!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled."> +<!ENTITY torbutton.prefs.sec_jar_tooltip "Os ficheiros JAR são extremamente raros na Web, mas podem ser uma fonte de XSS e outros ataques."> +<!ENTITY torbutton.prefs.sec_mathml_desc "Alguns mecanismos de visualização de equações matemáticas estão desativados."> <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML está desativado."> <!ENTITY torbutton.prefs.sec_med_high "Médio-Alto"> -<!ENTITY torbutton.prefs.sec_all_jit_desc "All JavaScript performance optimizations are disabled."> -<!ENTITY torbutton.prefs.sec_font_rend_desc "Some font rendering features are disabled."> -<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "The Graphite font rendering mechanism is disabled."> +<!ENTITY torbutton.prefs.sec_all_jit_desc "Todas as otimizações de desempenho JavaScript estão desativadas."> +<!ENTITY torbutton.prefs.sec_font_rend_desc "Algumas funções de renderização do tipo de letra estão desativadas."> +<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "O mecanismo de renderização do tipo de letra Graphite está desativado."> <!ENTITY torbutton.prefs.sec_svg_desc "Alguns tipos de imagens estão desativados."> <!ENTITY torbutton.prefs.sec_svg_desc_tooltip "As imagens SVG estão desativadas."> <!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript está desativado por predefinição em todos os sites não HTTPS."> -<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript can be enabled on a per-site basis via the NoScript toolbar button."> +<!ENTITY torbutton.prefs.sec_js_desc_tooltip "O JavaScript pode ser ativado numa base de per-sítio através do botão da barra de ferramentas NoScript."> <!ENTITY torbutton.prefs.sec_high "Alto"> <!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript está desativado por predefinição em todos os sítios."> <!ENTITY torbutton.prefs.sec_audio_video_desc "A maioria dos formatos de áudio e vídeo estão desativados.">

1 0

[translation/torbutton-torbuttonproperties] Update translations for torbutton-torbuttonproperties
by translation＠torproject.org 22 May '15

22 May '15

commit 6f0d183c3d8a6c78ef078f29e5bd59f8bfb61c8c Author: Translation commit bot <translation(a)torproject.org> Date: Fri May 22 17:16:05 2015 +0000 Update translations for torbutton-torbuttonproperties --- pt/torbutton.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pt/torbutton.properties b/pt/torbutton.properties index 0dc5004..ceec3a8 100644 --- a/pt/torbutton.properties +++ b/pt/torbutton.properties @@ -7,7 +7,7 @@ torbutton.circuit_display.this_browser = Este navegador torbutton.circuit_display.relay = retransmitir torbutton.circuit_display.tor_bridge = Ponte torbutton.circuit_display.unknown_country = País desconhecido -torbutton.content_sizer.margin_tooltip = Tor Browser adds this margin to make the width and height of your window less distinctive, and thus reduces the ability of people to track you online. +torbutton.content_sizer.margin_tooltip = O Navegador Tor adiciona esta margem para realçar a altura e a largura da sua janela, e com isso reduz a possibilidade de as pessoas on-line o possam rastrear. torbutton.panel.tooltip.disabled = Clique para ativar o Tor torbutton.panel.tooltip.enabled = Clique para desativar o Tor torbutton.panel.plugins.disabled = Clique para ativar os plugins @@ -56,10 +56,10 @@ torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy an torbutton.popup.never_ask_again = Não voltar a perguntar-me torbutton.popup.confirm_newnym = O Navegador Tor irá fechar todas as janela e separadores. Estarão perdidas todas sessões do sítio da Web.\n\nReiniciar o Navegador Tor para repor a sua identidade?\n\n -torbutton.slider_notification = The green onion menu now has a security slider which lets you adjust your security level. Check it out! +torbutton.slider_notification = Agora, o menu da cebola verde tem um cursor de segurança que o deixa ajustar o seu nível de segurança. Verifique-o! torbutton.slider_notification_button = Abra as definições de segurança -torbutton.maximize_warning = Maximizing Tor Browser can allow websites to determine your monitor size, which can be used to track you. We recommend that you leave Tor Browser windows in their original default size. +torbutton.maximize_warning = Ao maximizar o Navegador Tor pode permitir que os sítios da Web determinem o tamanho do seu monitor, o que poderá ser utilizado para o rastrear. Nós recomendamos que deixe as janelas do Navegador no seu tamanho original predefinido. # Canvas permission prompt. Strings are kept here for ease of translation. canvas.siteprompt=Este site (%S) tentou extrair informação HTML5, que pode ser usada para identificar claramente o seu computador.\n\nQuer que o navegador Tor permita que o site extraia a informação HTML5?

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 22 May '15

22 May '15

commit a6e6182c786d3d72c9c60f45cef66e4af5002ff1 Author: Translation commit bot <translation(a)torproject.org> Date: Fri May 22 17:15:05 2015 +0000 Update translations for bridgedb --- pt/LC_MESSAGES/bridgedb.po | 45 ++++++++++++++++++++++---------------------- 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/pt/LC_MESSAGES/bridgedb.po b/pt/LC_MESSAGES/bridgedb.po index 81aca44..186a1ef 100644 --- a/pt/LC_MESSAGES/bridgedb.po +++ b/pt/LC_MESSAGES/bridgedb.po @@ -7,6 +7,7 @@ # André Monteiro <andre.monteir(a)gmail.com>, 2014 # kagazz <lourenxo_619(a)hotmail.com>, 2014 # alfalb_mansil, 2014 +# MMSRS, 2015 # Andrew_Melim <nokostya.translation(a)gmail.com>, 2014 # Pedro Albuquerque <palbuquerque73(a)gmail.com>, 2014-2015 # Sérgio Marques <smarquespt(a)gmail.com>, 2014 @@ -15,8 +16,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'POT-Creation-Date: 2015-03-19 22:13+0000\n" -"PO-Revision-Date: 2015-04-19 08:23+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2015-05-22 17:13+0000\n" +"Last-Translator: MMSRS\n" "Language-Team: Portuguese (http://www.transifex.com/projects/p/torproject/language/pt/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -46,7 +47,7 @@ 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 as suas pontes:" +msgstr "Aqui estão as suas ligações:" #: lib/bridgedb/strings.py:22 #, python-format @@ -105,7 +106,7 @@ msgid "" "difficult for anyone watching your internet traffic to determine that you are\n" "using Tor.\n" "\n" -msgstr "A BridgeDB pode fornecer pontes com vários %stypes de Pluggable Transports%s,\nque poderão ajudar a ocultar as suas ligações à Tor Network, tornando mais difícil\na filtragem do seu tráfego de Internet para determinar se está a usar o Tor.\n" +msgstr "A BridgeDB pode proporcionar ligações com vários %stypes de Pluggable Transports%s,\nque podem ajudar a ocultar as suas conexões à Rede Tor, tornando mais difícil\no rastreamento do seu tráfego na Internet para determinar se está a utilizar o Tor.\n" #. TRANSLATORS: Please DO NOT translate "Pluggable Transports". #: lib/bridgedb/strings.py:54 @@ -113,7 +114,7 @@ msgid "" "Some bridges with IPv6 addresses are also available, though some Pluggable\n" "Transports aren't IPv6 compatible.\n" "\n" -msgstr "Também estão disponíveis algumas pontes com endereços IPv6. \nNo entanto, alguns Pluggable Transports não são compatíveis com ligações IPv6.\n\n" +msgstr "Também estão disponíveis algumas ligações com endereços IPv6. \nNo entanto, alguns Pluggable Transports não são compatíveis com o IPv6.\n\n" #. TRANSLATORS: Please DO NOT translate "BridgeDB". #. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring, @@ -127,20 +128,20 @@ msgid "" "Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n" "help to circumvent internet censorship in many cases.\n" "\n" -msgstr "Adicionalmente, a BridgeDB tem imensas pontes %s simples, normais e regulares\nmas sem qualquer Pluggable Transports %s, o que pode não parecer aliciante, mas\nque, ainda assim, ajudam a contornar a censura na Internet.\n" +msgstr "Adicionalmente, BridgeDB tem imensas ligações %s simples, normais e regulares\nmas sem quaisquer Pluggable Transports %s, o que poderá não parecer ótimo, mas estes,\nainda assim, ajudam a contornar a censura na Internet, na maioria dos casos.\n" #: lib/bridgedb/strings.py:76 msgid "What are bridges?" -msgstr "O que são pontes?" +msgstr "O que são ligações?" #: lib/bridgedb/strings.py:77 #, python-format msgid "%s Bridges %s are Tor relays that help you circumvent censorship." -msgstr "%s Pontes %s são relays Tor para ajudar a contornar a censura." +msgstr "%s Ligações %s são retransmissões Tor que o ajudam a contornar a censura." #: lib/bridgedb/strings.py:82 msgid "I need an alternative way of getting bridges!" -msgstr "Preciso de uma alternativa para obter pontes!" +msgstr "Eu preciso de uma alternativa para obter ligações!" #: lib/bridgedb/strings.py:83 #, python-format @@ -148,11 +149,11 @@ msgid "" "Another way to get bridges is to send an email to %s. Please note that you must\n" "send the email using an address from one of the following email providers:\n" "%s, %s or %s." -msgstr "Outra forma de obter pontes é enviar uma mensagem para %s. Por favor, note que\na mensagem tem de ser enviada de um dos seguintes fornecedores de serviço:\n%s, %s ou %s." +msgstr "Outra forma de obter ligações, é enviar uma mensagem para %s. Por favor, note que\ndeverá enviar a mensagem utilizando um endereço dos seguintes fornecedores de correio eletrónico:\n%s, %s ou %s." #: lib/bridgedb/strings.py:90 msgid "My bridges don't work! I need help!" -msgstr "As minhas pontes não funcionam! Eu preciso de ajuda!" +msgstr "As minhas ligações não funcionam! Eu preciso de ajuda!" #. TRANSLATORS: Please DO NOT translate "Tor". #: lib/bridgedb/strings.py:92 @@ -168,7 +169,7 @@ 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 "Tente incluir o máximo de informação sobre os problemas. Deve incluir a lista\nde pontes e Pluggable Transports que tentou utilizar, a sua versão Tor e \nquaisquer mensagens que o Tor retornou..." +msgstr "Tente incluir o máximo de informação possível sobre o seu caso, incluindo a lista\nde ligações e Pluggable Transports que tentou utilizar, a versão do seu Tor e \nquaisquer mensagens que o Tor devolveu, etc." #: lib/bridgedb/strings.py:103 msgid "Here are your bridge lines:" @@ -176,7 +177,7 @@ msgstr "Aqui estão as suas linhas de ponte:" #: lib/bridgedb/strings.py:104 msgid "Get Bridges!" -msgstr "Obter pontes!" +msgstr "Obter Ligações!" #: lib/bridgedb/strings.py:108 msgid "Please select options for bridge type:" @@ -201,7 +202,7 @@ msgstr "Introduza os caracteres da imagem acima..." #: lib/bridgedb/strings.py:119 msgid "How to start using your bridges" -msgstr "Como utilizar as suas pontes" +msgstr "Como utilizar as suas ligações" #. TRANSLATORS: Please DO NOT translate "Tor Browser". #: lib/bridgedb/strings.py:121 @@ -233,7 +234,7 @@ msgid "" "paste the bridge lines into the text input box. Finally, click 'Connect', and\n" "you should be good to go! If you experience trouble, try clicking the 'Help'\n" "button in the 'Tor Network Settings' wizard for further assistance." -msgstr "Selecione Sim e clique Seguinte. Para configurar as novas pontes, copie e\ncole as linhas de ponte na caixa de texto. Finalmente, clique em \"Ligar\" e\ndeve estar pronto! Se ocorrerem erros, clique no botão de Ajuda no\nassistente de Definições da rede Tor." +msgstr "Selecione 'Sim' e clique em 'Seguinte'. Para configurar as suas novas ligações, copie e\ncole as linhas da ligação na caixa de texto. Finalmente, clique em 'Conetar' e\ndeverá estar pronto para continuar! Se ocorrerem erros, clique em 'Ajuda' no\nassistente de 'Configurações da Rede Tor' para mais assistência." #: lib/bridgedb/strings.py:142 msgid "Displays this message." @@ -244,11 +245,11 @@ msgstr "Mostra esta mensagem." #. "plain-ol'-vanilla" bridges. #: lib/bridgedb/strings.py:146 msgid "Request vanilla bridges." -msgstr "Solicita as pontes básicas." +msgstr "Solicita as ligações básicas." #: lib/bridgedb/strings.py:147 msgid "Request IPv6 bridges." -msgstr "Solicita pontes IPv6." +msgstr "Solicita ligações IPv6." #. TRANSLATORS: Please DO NOT translate the word the word "TYPE". #: lib/bridgedb/strings.py:149 @@ -310,7 +311,7 @@ msgstr "Este QRCode contém as suas linhas de ponte. Leia-o com um leitor de QRC #: lib/bridgedb/templates/bridges.html:181 msgid "There currently aren't any bridges available..." -msgstr "Atualmente não existem pontes livres..." +msgstr "Atualmente, não existem ligações disponíveis..." #: lib/bridgedb/templates/bridges.html:182 #, python-format @@ -337,7 +338,7 @@ msgstr "Passo %s2%s" #: lib/bridgedb/templates/index.html:27 #, python-format msgid "Get %s bridges %s" -msgstr "Obtenha %s pontes %s" +msgstr "Obtenha %s ligações %s" #: lib/bridgedb/templates/index.html:36 #, python-format @@ -347,7 +348,7 @@ 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 adiciona as pontes ao navegador Tor %s" +msgstr "Agora %s adiciona as ligações ao Navegador Tor %s" #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the #. beginning of words are present in your final translation. Thanks! @@ -356,7 +357,7 @@ msgstr "Agora %s adiciona as pontes ao navegador Tor %s" #: lib/bridgedb/templates/options.html:38 #, python-format msgid "%sJ%sust give me bridges!" -msgstr "%sA%spenas quero as pontes!" +msgstr "Dê-me %sa%spenas as ligações!" #: lib/bridgedb/templates/options.html:52 msgid "Advanced Options" @@ -384,4 +385,4 @@ msgstr "%sS%sim!" #: lib/bridgedb/templates/options.html:151 #, python-format msgid "%sG%set Bridges" -msgstr "%sO%sbter pontes" +msgstr "%sO%sbter Ligações"

1 0

[translation/torbutton-abouttorproperties_completed] Update translations for torbutton-abouttorproperties_completed
by translation＠torproject.org 22 May '15

22 May '15

commit a4be69d66a613e35455b934c5525a518c7f3928b Author: Translation commit bot <translation(a)torproject.org> Date: Fri May 22 16:46:14 2015 +0000 Update translations for torbutton-abouttorproperties_completed --- pt/abouttor.properties | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/pt/abouttor.properties b/pt/abouttor.properties new file mode 100644 index 0000000..7bf9d5d --- /dev/null +++ b/pt/abouttor.properties @@ -0,0 +1,21 @@ +# Copyright (c) 2014, The Tor Project, Inc. +# See LICENSE for licensing information. +# vim: set sw=2 sts=2 ts=8 et: + +aboutTor.searchSP.privacy=Procurar com <a href="%1$S">segurança</a> com <a href="%2$S">Startpage</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchSP.search.link=https://startpage.com/ + +aboutTor.searchDDG.privacy=Procurar com <a href="%1$S">segurança</a> com <a href="%2$S">DuckDuckGo</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html +# The following string is a link which replaces %2$S above. +aboutTor.searchDDG.search.link=https://duckduckgo.com/ + +aboutTor.searchDC.privacy=Procurar com <a href="%1$S">segurança</a> com <a href="%2$S">Disconnect.me</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchDC.privacy.link=https://disconnect.me/privacy +# The following string is a link which replaces %2$S above. +aboutTor.searchDC.search.link=https://search.disconnect.me/

1 0

[translation/torbutton-abouttorproperties] Update translations for torbutton-abouttorproperties
by translation＠torproject.org 22 May '15

22 May '15

commit 19d961c4588f58c0f7e03938f52a3ff4c618f51b Author: Translation commit bot <translation(a)torproject.org> Date: Fri May 22 16:46:11 2015 +0000 Update translations for torbutton-abouttorproperties --- pt/abouttor.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pt/abouttor.properties b/pt/abouttor.properties index d607324..7bf9d5d 100644 --- a/pt/abouttor.properties +++ b/pt/abouttor.properties @@ -2,19 +2,19 @@ # See LICENSE for licensing information. # vim: set sw=2 sts=2 ts=8 et: -aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>. +aboutTor.searchSP.privacy=Procurar com <a href="%1$S">segurança</a> com <a href="%2$S">Startpage</a>. # The following string is a link which replaces %1$S above. aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.ht… # The following string is a link which replaces %2$S above. aboutTor.searchSP.search.link=https://startpage.com/ -aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>. +aboutTor.searchDDG.privacy=Procurar com <a href="%1$S">segurança</a> com <a href="%2$S">DuckDuckGo</a>. # The following string is a link which replaces %1$S above. aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html # The following string is a link which replaces %2$S above. aboutTor.searchDDG.search.link=https://duckduckgo.com/ -aboutTor.searchDC.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Disconnect.me</a>. +aboutTor.searchDC.privacy=Procurar com <a href="%1$S">segurança</a> com <a href="%2$S">Disconnect.me</a>. # The following string is a link which replaces %1$S above. aboutTor.searchDC.privacy.link=https://disconnect.me/privacy # The following string is a link which replaces %2$S above.

1 0

[stem/master] Include release dates at the top of the changelog page
by atagar＠torproject.org 22 May '15

22 May '15

commit 0dc8aa2038c0ba7c0389943d4c40e8eaeee8b509 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri May 22 09:45:12 2015 -0700 Include release dates at the top of the changelog page At the top of our changelog we provide a list of anchor links. When we just had a couple releases it looked a tad better to exclude the dates, but think it's a tad better now with 'em. --- docs/change_log.rst | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/change_log.rst b/docs/change_log.rst index f3bbc13..a502dba 100644 --- a/docs/change_log.rst +++ b/docs/change_log.rst @@ -7,11 +7,11 @@ unreleased. For a monthly report on work being done see my `development log * :ref:`versioning` * :ref:`unreleased` -* :ref:`Version 1.4 <version_1.4>` -* :ref:`Version 1.3 <version_1.3>` -* :ref:`Version 1.2 <version_1.2>` -* :ref:`Version 1.1 <version_1.1>` -* :ref:`Version 1.0 <version_1.0>` +* :ref:`version_1.4` +* :ref:`version_1.3` +* :ref:`version_1.2` +* :ref:`version_1.1` +* :ref:`version_1.0` .. _versioning:

1 0

[nyx/master] Revise popup dialogs to use 'with'
by atagar＠torproject.org 22 May '15

22 May '15

commit 7121ff8a9b5db7c970b9ec920ccabbc6607dc856 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri May 22 09:39:07 2015 -0700 Revise popup dialogs to use 'with' Our popup dialogs acquire a curses lock for its duration. We were doing it via a init() and finalize() method, which were always used in a try/finally block. However, this is exactly the use case for python's 'with' keyword so using that instead. Not entirely happy with this code (it's still pending a rewrite), but better. --- nyx/connections/count_popup.py | 106 +++++------ nyx/connections/descriptor_popup.py | 68 ++++--- nyx/log_panel.py | 8 +- nyx/menu/menu.py | 73 ++++---- nyx/popups.py | 348 ++++++++++++++++------------------- 5 files changed, 281 insertions(+), 322 deletions(-) diff --git a/nyx/connections/count_popup.py b/nyx/connections/count_popup.py index 00aeb31..e61dc26 100644 --- a/nyx/connections/count_popup.py +++ b/nyx/connections/count_popup.py @@ -28,84 +28,80 @@ def showCountDialog(count_type, counts): no_stats_msg = "Usage stats aren't available yet, press any key..." if is_no_stats: - popup, width, height = nyx.popups.init(3, len(no_stats_msg) + 4) + height, width = 3, len(no_stats_msg) + 4 else: - popup, width, height = nyx.popups.init(4 + max(1, len(counts)), 80) + height, width = 4 + max(1, len(counts)), 80 - if not popup: - return + with nyx.popups.popup_window(height, width) as (popup, height, width): + if popup: + control = nyx.controller.get_controller() - try: - control = nyx.controller.get_controller() + popup.win.box() - popup.win.box() + # dialog title - # dialog title + if count_type == CountType.CLIENT_LOCALE: + title = 'Client Locales' + elif count_type == CountType.EXIT_PORT: + title = 'Exiting Port Usage' + else: + title = '' + log.warn('Unrecognized count type: %s' % count_type) - if count_type == CountType.CLIENT_LOCALE: - title = 'Client Locales' - elif count_type == CountType.EXIT_PORT: - title = 'Exiting Port Usage' - else: - title = '' - log.warn('Unrecognized count type: %s' % count_type) + popup.addstr(0, 0, title, curses.A_STANDOUT) - popup.addstr(0, 0, title, curses.A_STANDOUT) + if is_no_stats: + popup.addstr(1, 2, no_stats_msg, curses.A_BOLD, 'cyan') + else: + sorted_counts = sorted(counts.iteritems(), key=operator.itemgetter(1)) + sorted_counts.reverse() - if is_no_stats: - popup.addstr(1, 2, no_stats_msg, curses.A_BOLD, 'cyan') - else: - sorted_counts = sorted(counts.iteritems(), key=operator.itemgetter(1)) - sorted_counts.reverse() + # constructs string formatting for the max key and value display width - # constructs string formatting for the max key and value display width + key_width, val_width, value_total = 3, 1, 0 - key_width, val_width, value_total = 3, 1, 0 + for k, v in sorted_counts: + key_width = max(key_width, len(k)) + val_width = max(val_width, len(str(v))) + value_total += v - for k, v in sorted_counts: - key_width = max(key_width, len(k)) - val_width = max(val_width, len(str(v))) - value_total += v + # extra space since we're adding usage informaion - # extra space since we're adding usage informaion - - if count_type == CountType.EXIT_PORT: - key_width += EXIT_USAGE_WIDTH + if count_type == CountType.EXIT_PORT: + key_width += EXIT_USAGE_WIDTH - label_format = '%%-%is %%%ii (%%%%%%-2i)' % (key_width, val_width) + label_format = '%%-%is %%%ii (%%%%%%-2i)' % (key_width, val_width) - for i in range(height - 4): - k, v = sorted_counts[i] + for i in range(height - 4): + k, v = sorted_counts[i] - # includes a port usage column + # includes a port usage column - if count_type == CountType.EXIT_PORT: - usage = connection.port_usage(k) + if count_type == CountType.EXIT_PORT: + usage = connection.port_usage(k) - if usage: - key_format = '%%-%is %%s' % (key_width - EXIT_USAGE_WIDTH) - k = key_format % (k, usage[:EXIT_USAGE_WIDTH - 3]) + if usage: + key_format = '%%-%is %%s' % (key_width - EXIT_USAGE_WIDTH) + k = key_format % (k, usage[:EXIT_USAGE_WIDTH - 3]) - label = label_format % (k, v, v * 100 / value_total) - popup.addstr(i + 1, 2, label, curses.A_BOLD, 'green') + label = label_format % (k, v, v * 100 / value_total) + popup.addstr(i + 1, 2, label, curses.A_BOLD, 'green') - # All labels have the same size since they're based on the max widths. - # If this changes then this'll need to be the max label width. + # All labels have the same size since they're based on the max widths. + # If this changes then this'll need to be the max label width. - label_width = len(label) + label_width = len(label) - # draws simple bar graph for percentages + # draws simple bar graph for percentages - fill_width = v * (width - 4 - label_width) / value_total + fill_width = v * (width - 4 - label_width) / value_total - for j in range(fill_width): - popup.addstr(i + 1, 3 + label_width + j, ' ', curses.A_STANDOUT, 'red') + for j in range(fill_width): + popup.addstr(i + 1, 3 + label_width + j, ' ', curses.A_STANDOUT, 'red') - popup.addstr(height - 2, 2, 'Press any key...') + popup.addstr(height - 2, 2, 'Press any key...') - popup.win.refresh() + popup.win.refresh() - curses.cbreak() - control.key_input() - finally: - nyx.popups.finalize() + curses.cbreak() + control.key_input() diff --git a/nyx/connections/descriptor_popup.py b/nyx/connections/descriptor_popup.py index f05631a..0409ab8 100644 --- a/nyx/connections/descriptor_popup.py +++ b/nyx/connections/descriptor_popup.py @@ -66,43 +66,37 @@ def show_descriptor_popup(conn_panel): popup_height, popup_width = get_preferred_size(display_text, conn_panel.max_x, show_line_number) - popup, _, height = nyx.popups.init(popup_height, popup_width) - - if not popup: - break - - scroll, is_changed = 0, True - - try: - while not is_done: - if is_changed: - draw(popup, fingerprint, display_text, display_color, scroll, show_line_number) - is_changed = False - - key = control.key_input() - - if key.is_scroll(): - # TODO: This is a bit buggy in that scrolling is by display_text - # lines rather than the displayed lines, causing issues when - # content wraps. The result is that we can't have a scrollbar and - # can't scroll to the bottom if there's a multi-line being - # displayed. However, trying to correct this introduces a big can - # of worms and after hours decided that this isn't worth the - # effort... - - new_scroll = ui_tools.get_scroll_position(key, scroll, height - 2, len(display_text)) - - if scroll != new_scroll: - scroll, is_changed = new_scroll, True - elif key.is_selection() or key.match('d'): - is_done = True # closes popup - elif key.match('left', 'right'): - # navigation - pass on to conn_panel and recreate popup - - conn_panel.handle_key(panel.KeyInput(curses.KEY_UP) if key.match('left') else panel.KeyInput(curses.KEY_DOWN)) - break - finally: - nyx.popups.finalize() + with nyx.popups.popup_window(popup_height, popup_width) as (popup, _, height): + if popup: + scroll, is_changed = 0, True + + while not is_done: + if is_changed: + draw(popup, fingerprint, display_text, display_color, scroll, show_line_number) + is_changed = False + + key = control.key_input() + + if key.is_scroll(): + # TODO: This is a bit buggy in that scrolling is by display_text + # lines rather than the displayed lines, causing issues when + # content wraps. The result is that we can't have a scrollbar and + # can't scroll to the bottom if there's a multi-line being + # displayed. However, trying to correct this introduces a big can + # of worms and after hours decided that this isn't worth the + # effort... + + new_scroll = ui_tools.get_scroll_position(key, scroll, height - 2, len(display_text)) + + if scroll != new_scroll: + scroll, is_changed = new_scroll, True + elif key.is_selection() or key.match('d'): + is_done = True # closes popup + elif key.match('left', 'right'): + # navigation - pass on to conn_panel and recreate popup + + conn_panel.handle_key(panel.KeyInput(curses.KEY_UP) if key.match('left') else panel.KeyInput(curses.KEY_DOWN)) + break finally: conn_panel.set_title_visible(True) conn_panel.redraw(True) diff --git a/nyx/log_panel.py b/nyx/log_panel.py index 4180f57..4912cd7 100644 --- a/nyx/log_panel.py +++ b/nyx/log_panel.py @@ -140,10 +140,8 @@ class LogPanel(panel.Panel, threading.Thread): # allow user to enter new types of events to log - unchanged if left blank - popup, width, height = nyx.popups.init(11, 80) - - if popup: - try: + with nyx.popups.popup_window(11, 80) as (popup, width, height): + if popup: # displays the available flags popup.win.box() @@ -167,8 +165,6 @@ class LogPanel(panel.Panel, threading.Thread): self.redraw(True) except ValueError as exc: nyx.popups.show_msg('Invalid flags: %s' % str(exc), 2) - finally: - nyx.popups.finalize() def show_snapshot_prompt(self): """ diff --git a/nyx/menu/menu.py b/nyx/menu/menu.py index 59f9a4e..34e9a67 100644 --- a/nyx/menu/menu.py +++ b/nyx/menu/menu.py @@ -76,64 +76,59 @@ class MenuCursor: def show_menu(): - popup, _, _ = nyx.popups.init(1, below_static = False) + with nyx.popups.popup_window(1, below_static = False) as (popup, width, height): + if popup: + control = nyx.controller.get_controller() - if not popup: - return - - control = nyx.controller.get_controller() + # generates the menu and uses the initial selection of the first item in + # the file menu - try: - # generates the menu and uses the initial selection of the first item in - # the file menu + menu = nyx.menu.actions.make_menu() + cursor = MenuCursor(menu.get_children()[0].get_children()[0]) - menu = nyx.menu.actions.make_menu() - cursor = MenuCursor(menu.get_children()[0].get_children()[0]) + while not cursor.is_done(): + # sets the background color - while not cursor.is_done(): - # sets the background color + popup.win.clear() + popup.win.bkgd(' ', curses.A_STANDOUT | ui_tools.get_color("red")) + selection_hierarchy = cursor.get_selection().get_hierarchy() - popup.win.clear() - popup.win.bkgd(' ', curses.A_STANDOUT | ui_tools.get_color("red")) - selection_hierarchy = cursor.get_selection().get_hierarchy() + # provide a message saying how to close the menu - # provide a message saying how to close the menu + control.set_msg('Press m or esc to close the menu.', curses.A_BOLD, True) - control.set_msg('Press m or esc to close the menu.', curses.A_BOLD, True) + # renders the menu bar, noting where the open submenu is positioned - # renders the menu bar, noting where the open submenu is positioned + draw_left, selection_left = 0, 0 - draw_left, selection_left = 0, 0 + for top_level_item in menu.get_children(): + draw_format = curses.A_BOLD - for top_level_item in menu.get_children(): - draw_format = curses.A_BOLD + if top_level_item == selection_hierarchy[1]: + draw_format |= curses.A_UNDERLINE + selection_left = draw_left - if top_level_item == selection_hierarchy[1]: - draw_format |= curses.A_UNDERLINE - selection_left = draw_left + draw_label = ' %s ' % top_level_item.get_label()[1] + popup.addstr(0, draw_left, draw_label, draw_format) + popup.addch(0, draw_left + len(draw_label), curses.ACS_VLINE) - draw_label = ' %s ' % top_level_item.get_label()[1] - popup.addstr(0, draw_left, draw_label, draw_format) - popup.addch(0, draw_left + len(draw_label), curses.ACS_VLINE) + draw_left += len(draw_label) + 1 - draw_left += len(draw_label) + 1 + # recursively shows opened submenus - # recursively shows opened submenus + _draw_submenu(cursor, 1, 1, selection_left) - _draw_submenu(cursor, 1, 1, selection_left) + popup.win.refresh() - popup.win.refresh() + curses.cbreak() + cursor.handle_key(control.key_input()) - curses.cbreak() - cursor.handle_key(control.key_input()) + # redraws the rest of the interface if we're rendering on it again - # redraws the rest of the interface if we're rendering on it again + if not cursor.is_done(): + control.redraw() - if not cursor.is_done(): - control.redraw() - finally: - control.set_msg() - nyx.popups.finalize() + control.set_msg() def _draw_submenu(cursor, level, top, left): diff --git a/nyx/popups.py b/nyx/popups.py index 2f98e73..355d7f1 100644 --- a/nyx/popups.py +++ b/nyx/popups.py @@ -10,52 +10,55 @@ from nyx import __version__, __release_date__ from nyx.util import panel, ui_tools -def init(height = -1, width = -1, top = 0, left = 0, below_static = True): +def popup_window(height = -1, width = -1, top = 0, left = 0, below_static = True): """ - Preparation for displaying a popup. This creates a popup with a valid - subwindow instance. If that's successful then the curses lock is acquired - and this returns a tuple of the... - (popup, draw width, draw height) - Otherwise this leaves curses unlocked and returns None. + Provides a popup dialog you can use in a 'with' block... - Arguments: - height - maximum height of the popup - width - maximum width of the popup - top - top position, relative to the sticky content - left - left position from the screen - below_static - positions popup below static content if true - """ + with popup_window(5, 10) as (popup, width, height): + if popup: + ... do stuff... - control = nyx.controller.get_controller() + This popup has a lock on the curses interface for the duration of the block, + preventing other draw operations from taking place. If the popup isn't + visible then the popup it returns will be **None**. - if below_static: - sticky_height = sum([sticky_panel.get_height() for sticky_panel in control.get_sticky_panels()]) - else: - sticky_height = 0 + :param int height: maximum height of the popup + :param int width: maximum width of the popup + :param int top: top position, relative to the sticky content + :param int left: left position from the screen + :param bool below_static: positions popup below static content if True + + :returns: tuple of the form (subwindow, width, height) when used in a with block + """ - popup = panel.Panel(control.get_screen(), 'popup', top + sticky_height, left, height, width) - popup.set_visible(True) + class _Popup(object): + def __enter__(self): + control = nyx.controller.get_controller() - # Redraws the popup to prepare a subwindow instance. If none is spawned then - # the panel can't be drawn (for instance, due to not being visible). + if below_static: + sticky_height = sum([sticky_panel.get_height() for sticky_panel in control.get_sticky_panels()]) + else: + sticky_height = 0 - popup.redraw(True) + popup = panel.Panel(control.get_screen(), 'popup', top + sticky_height, left, height, width) + popup.set_visible(True) - if popup.win is not None: - panel.CURSES_LOCK.acquire() - return (popup, popup.max_x - 1, popup.max_y) - else: - return (None, 0, 0) + # Redraws the popup to prepare a subwindow instance. If none is spawned then + # the panel can't be drawn (for instance, due to not being visible). + popup.redraw(True) -def finalize(): - """ - Cleans up after displaying a popup, releasing the cureses lock and redrawing - the rest of the display. - """ + if popup.win is not None: + panel.CURSES_LOCK.acquire() + return (popup, popup.max_x - 1, popup.max_y) + else: + return (None, 0, 0) - nyx.controller.get_controller().request_redraw() - panel.CURSES_LOCK.release() + def __exit__(self, exit_type, value, traceback): + nyx.controller.get_controller().request_redraw() + panel.CURSES_LOCK.release() + + return _Popup() def input_prompt(msg, initial_value = ''): @@ -112,68 +115,61 @@ def show_help_popup(): properly, this is an arrow, enter, or scroll key then this returns None. """ - popup, _, height = init(9, 80) - - if not popup: - return - - exit_key = None - - try: - control = nyx.controller.get_controller() - page_panels = control.get_display_panels() + with popup_window(9, 80) as (popup, _, height): + if popup: + exit_key = None + control = nyx.controller.get_controller() + page_panels = control.get_display_panels() - # the first page is the only one with multiple panels, and it looks better - # with the log entries first, so reversing the order + # the first page is the only one with multiple panels, and it looks better + # with the log entries first, so reversing the order - page_panels.reverse() + page_panels.reverse() - help_options = [] + help_options = [] - for entry in page_panels: - help_options += entry.get_help() + for entry in page_panels: + help_options += entry.get_help() - # test doing afterward in case of overwriting + # test doing afterward in case of overwriting - popup.win.box() - popup.addstr(0, 0, 'Page %i Commands:' % (control.get_page() + 1), curses.A_STANDOUT) + popup.win.box() + popup.addstr(0, 0, 'Page %i Commands:' % (control.get_page() + 1), curses.A_STANDOUT) - for i in range(len(help_options)): - if i / 2 >= height - 2: - break + for i in range(len(help_options)): + if i / 2 >= height - 2: + break - # draws entries in the form '<key>: <description>[ (<selection>)]', for - # instance... - # u: duplicate log entries (hidden) + # draws entries in the form '<key>: <description>[ (<selection>)]', for + # instance... + # u: duplicate log entries (hidden) - key, description, selection = help_options[i] + key, description, selection = help_options[i] - if key: - description = ': ' + description + if key: + description = ': ' + description - row = (i / 2) + 1 - col = 2 if i % 2 == 0 else 41 + row = (i / 2) + 1 + col = 2 if i % 2 == 0 else 41 - popup.addstr(row, col, key, curses.A_BOLD) - col += len(key) - popup.addstr(row, col, description) - col += len(description) + popup.addstr(row, col, key, curses.A_BOLD) + col += len(key) + popup.addstr(row, col, description) + col += len(description) - if selection: - popup.addstr(row, col, ' (') - popup.addstr(row, col + 2, selection, curses.A_BOLD) - popup.addstr(row, col + 2 + len(selection), ')') + if selection: + popup.addstr(row, col, ' (') + popup.addstr(row, col + 2, selection, curses.A_BOLD) + popup.addstr(row, col + 2 + len(selection), ')') - # tells user to press a key if the lower left is unoccupied + # tells user to press a key if the lower left is unoccupied - if len(help_options) < 13 and height == 9: - popup.addstr(7, 2, 'Press any key...') + if len(help_options) < 13 and height == 9: + popup.addstr(7, 2, 'Press any key...') - popup.win.refresh() - curses.cbreak() - exit_key = control.key_input() - finally: - finalize() + popup.win.refresh() + curses.cbreak() + exit_key = control.key_input() if not exit_key.is_selection() and not exit_key.is_scroll() and \ not exit_key.match('left', 'right'): @@ -187,27 +183,21 @@ def show_about_popup(): Presents a popup with author and version information. """ - popup, _, height = init(9, 80) - - if not popup: - return + with popup_window(9, 80) as (popup, _, height): + if popup: + control = nyx.controller.get_controller() - try: - control = nyx.controller.get_controller() - - popup.win.box() - popup.addstr(0, 0, 'About:', curses.A_STANDOUT) - popup.addstr(1, 2, 'nyx, version %s (released %s)' % (__version__, __release_date__), curses.A_BOLD) - popup.addstr(2, 4, 'Written by Damian Johnson (atagar(a)torproject.org)') - popup.addstr(3, 4, 'Project page: www.atagar.com/nyx') - popup.addstr(5, 2, 'Released under the GPL v3 (http://www.gnu.org/licenses/gpl.html)') - popup.addstr(7, 2, 'Press any key...') - popup.win.refresh() + popup.win.box() + popup.addstr(0, 0, 'About:', curses.A_STANDOUT) + popup.addstr(1, 2, 'nyx, version %s (released %s)' % (__version__, __release_date__), curses.A_BOLD) + popup.addstr(2, 4, 'Written by Damian Johnson (atagar(a)torproject.org)') + popup.addstr(3, 4, 'Project page: www.atagar.com/nyx') + popup.addstr(5, 2, 'Released under the GPL v3 (http://www.gnu.org/licenses/gpl.html)') + popup.addstr(7, 2, 'Press any key...') + popup.win.refresh() - curses.cbreak() - control.key_input() - finally: - finalize() + curses.cbreak() + control.key_input() def show_sort_dialog(title, options, old_selection, option_colors): @@ -230,66 +220,59 @@ def show_sort_dialog(title, options, old_selection, option_colors): option_colors - mappings of options to their color """ - popup, _, _ = init(9, 80) + with popup_window(9, 80) as (popup, _, _): + if popup: + new_selections = [] # new ordering + cursor_location = 0 # index of highlighted option + curses.cbreak() # wait indefinitely for key presses (no timeout) - if not popup: - return + selection_options = list(options) + selection_options.append('Cancel') - new_selections = [] # new ordering + while len(new_selections) < len(old_selection): + popup.win.erase() + popup.win.box() + popup.addstr(0, 0, title, curses.A_STANDOUT) - try: - cursor_location = 0 # index of highlighted option - curses.cbreak() # wait indefinitely for key presses (no timeout) + _draw_sort_selection(popup, 1, 2, 'Current Order: ', old_selection, option_colors) + _draw_sort_selection(popup, 2, 2, 'New Order: ', new_selections, option_colors) - selection_options = list(options) - selection_options.append('Cancel') + # presents remaining options, each row having up to four options with + # spacing of nineteen cells - while len(new_selections) < len(old_selection): - popup.win.erase() - popup.win.box() - popup.addstr(0, 0, title, curses.A_STANDOUT) + row, col = 4, 0 - _draw_sort_selection(popup, 1, 2, 'Current Order: ', old_selection, option_colors) - _draw_sort_selection(popup, 2, 2, 'New Order: ', new_selections, option_colors) + for i in range(len(selection_options)): + option_format = curses.A_STANDOUT if cursor_location == i else curses.A_NORMAL + popup.addstr(row, col * 19 + 2, selection_options[i], option_format) + col += 1 - # presents remaining options, each row having up to four options with - # spacing of nineteen cells + if col == 4: + row, col = row + 1, 0 - row, col = 4, 0 + popup.win.refresh() - for i in range(len(selection_options)): - option_format = curses.A_STANDOUT if cursor_location == i else curses.A_NORMAL - popup.addstr(row, col * 19 + 2, selection_options[i], option_format) - col += 1 + key = nyx.controller.get_controller().key_input() - if col == 4: - row, col = row + 1, 0 + if key.match('left'): + cursor_location = max(0, cursor_location - 1) + elif key.match('right'): + cursor_location = min(len(selection_options) - 1, cursor_location + 1) + elif key.match('up'): + cursor_location = max(0, cursor_location - 4) + elif key.match('down'): + cursor_location = min(len(selection_options) - 1, cursor_location + 4) + elif key.is_selection(): + selection = selection_options[cursor_location] - popup.win.refresh() - - key = nyx.controller.get_controller().key_input() - - if key.match('left'): - cursor_location = max(0, cursor_location - 1) - elif key.match('right'): - cursor_location = min(len(selection_options) - 1, cursor_location + 1) - elif key.match('up'): - cursor_location = max(0, cursor_location - 4) - elif key.match('down'): - cursor_location = min(len(selection_options) - 1, cursor_location + 4) - elif key.is_selection(): - selection = selection_options[cursor_location] - - if selection == 'Cancel': - break - else: - new_selections.append(selection) - selection_options.remove(selection) - cursor_location = min(cursor_location, len(selection_options) - 1) - elif key == 27: - break # esc - cancel - finally: - finalize() + if selection == 'Cancel': + break + else: + new_selections.append(selection) + selection_options.remove(selection) + cursor_location = min(cursor_location, len(selection_options) - 1) + elif key == 27: + break # esc - cancel if len(new_selections) == len(old_selection): return new_selections @@ -343,50 +326,45 @@ def show_menu(title, options, old_selection): """ max_width = max(map(len, options)) + 9 - popup, _, _ = init(len(options) + 2, max_width) - if not popup: - return + with popup_window(len(options) + 2, max_width) as (popup, _, _): + if popup: + selection = old_selection if old_selection != -1 else 0 - selection = old_selection if old_selection != -1 else 0 + # hides the title of the first panel on the page - try: - # hides the title of the first panel on the page + control = nyx.controller.get_controller() + top_panel = control.get_display_panels(include_sticky = False)[0] + top_panel.set_title_visible(False) + top_panel.redraw(True) - control = nyx.controller.get_controller() - top_panel = control.get_display_panels(include_sticky = False)[0] - top_panel.set_title_visible(False) - top_panel.redraw(True) + curses.cbreak() # wait indefinitely for key presses (no timeout) - curses.cbreak() # wait indefinitely for key presses (no timeout) + while True: + popup.win.erase() + popup.win.box() + popup.addstr(0, 0, title, curses.A_STANDOUT) - while True: - popup.win.erase() - popup.win.box() - popup.addstr(0, 0, title, curses.A_STANDOUT) + for i in range(len(options)): + label = options[i] + format = curses.A_STANDOUT if i == selection else curses.A_NORMAL + tab = '> ' if i == old_selection else ' ' + popup.addstr(i + 1, 2, tab) + popup.addstr(i + 1, 4, ' %s ' % label, format) - for i in range(len(options)): - label = options[i] - format = curses.A_STANDOUT if i == selection else curses.A_NORMAL - tab = '> ' if i == old_selection else ' ' - popup.addstr(i + 1, 2, tab) - popup.addstr(i + 1, 4, ' %s ' % label, format) + popup.win.refresh() - popup.win.refresh() + key = control.key_input() - key = control.key_input() - - if key.match('up'): - selection = max(0, selection - 1) - elif key.match('down'): - selection = min(len(options) - 1, selection + 1) - elif key.is_selection(): - break - elif key.match('esc'): - selection = -1 - break - finally: - top_panel.set_title_visible(True) - finalize() + if key.match('up'): + selection = max(0, selection - 1) + elif key.match('down'): + selection = min(len(options) - 1, selection + 1) + elif key.is_selection(): + break + elif key.match('esc'): + selection = -1 + break + top_panel.set_title_visible(True) return selection

1 0

[translation/abouttor-homepage_completed] Update translations for abouttor-homepage_completed
by translation＠torproject.org 22 May '15

22 May '15

commit 7d22cea60f085749c25a201e328ac8bca2bc0357 Author: Translation commit bot <translation(a)torproject.org> Date: Fri May 22 16:16:14 2015 +0000 Update translations for abouttor-homepage_completed --- ja/aboutTor.dtd | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ja/aboutTor.dtd b/ja/aboutTor.dtd index cf272b4..974820c 100644 --- a/ja/aboutTor.dtd +++ b/ja/aboutTor.dtd @@ -1,5 +1,5 @@  @@ -8,7 +8,7 @@ <!ENTITY aboutTor.outOfDateTorOn.label "しかし、このブラウザは古いバージョンです。"> <!ENTITY aboutTor.outOfDateTorOff.label "また、このブラウザは古いバージョンです。"> -<!ENTITY aboutTor.outOfDate2.label "オニオンをクリックして、Tor Browser Bundleのアップデートをダウンロードを選択"> +<!ENTITY aboutTor.outOfDate2.label "Onion をクリックして Tor Browser のアップデートを確認してください。"> <!ENTITY aboutTor.check.label "Torのネットワーク設定をテストする"> @@ -25,6 +25,7 @@ <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> +<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…"> <!ENTITY aboutTor.torInfo1.label "追加情報: "> <!ENTITY aboutTor.torInfo2.label "国とIPアドレス:">

1 0