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

[translation/tails-persistence-setup] Update translations for tails-persistence-setup
by translation＠torproject.org 22 Sep '15

22 Sep '15

commit 9f30f7081d94d5168bb37f7fdc5faef4261d908e Author: Translation commit bot <translation(a)torproject.org> Date: Tue Sep 22 17:45:33 2015 +0000 Update translations for tails-persistence-setup --- lb/lb.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lb/lb.po b/lb/lb.po index 1fe4d7b..02597b3 100644 --- a/lb/lb.po +++ b/lb/lb.po @@ -7,10 +7,10 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" -"POT-Creation-Date: 2015-02-23 13:07+0100\n" -"PO-Revision-Date: 2015-02-24 10:24+0000\n" +"POT-Creation-Date: 2015-08-05 19:02+0200\n" +"PO-Revision-Date: 2015-09-22 17:44+0000\n" "Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" -"Language-Team: Luxembourgish (http://www.transifex.com/projects/p/torproject/language/lb/)\n" +"Language-Team: Luxembourgish (http://www.transifex.com/otf/torproject/language/lb/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -223,7 +223,7 @@ msgstr "" #: ../lib/Tails/Persistence/Step/Bootstrap.pm:144 msgid "Passphrase:" -msgstr "" +msgstr "Passwuert:" #: ../lib/Tails/Persistence/Step/Bootstrap.pm:154 msgid "Verify Passphrase:"

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 22 Sep '15

22 Sep '15

commit 093da0399df76bd5d7eb965610495071e56e939d Author: Translation commit bot <translation(a)torproject.org> Date: Tue Sep 22 17:45:23 2015 +0000 Update translations for https_everywhere --- lb/ssl-observatory.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lb/ssl-observatory.dtd b/lb/ssl-observatory.dtd index 69f1cfd..eb22bb4 100644 --- a/lb/ssl-observatory.dtd +++ b/lb/ssl-observatory.dtd @@ -1,7 +1,7 @@  <!ENTITY ssl-observatory.popup.details "Details and Privacy Information"> <!ENTITY ssl-observatory.popup.later "Ask Me Later"> -<!ENTITY ssl-observatory.popup.no "No"> +<!ENTITY ssl-observatory.popup.no "Nee"> <!ENTITY ssl-observatory.popup.text "HTTPS Everywhere can detect attacks against your browser by sending the certificates you receive to the @@ -15,7 +15,7 @@ to turn it on?">--> <!ENTITY ssl-observatory.popup.title "Should HTTPS Everywhere use the SSL Observatory?"> -<!ENTITY ssl-observatory.popup.yes "Yes"> +<!ENTITY ssl-observatory.popup.yes "Jo">

1 0

[translation/bridgedb_completed] Update translations for bridgedb_completed
by translation＠torproject.org 22 Sep '15

22 Sep '15

commit f325fb573eb1ec2a8afa11d2c59cf9abef25dd01 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Sep 22 17:45:08 2015 +0000 Update translations for bridgedb_completed --- lb/LC_MESSAGES/bridgedb.po | 380 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 380 insertions(+) diff --git a/lb/LC_MESSAGES/bridgedb.po b/lb/LC_MESSAGES/bridgedb.po new file mode 100644 index 0000000..04fd50a --- /dev/null +++ b/lb/LC_MESSAGES/bridgedb.po @@ -0,0 +1,380 @@ +# Translations template for BridgeDB. +# Copyright (C) 2015 'The Tor Project, Inc.' +# This file is distributed under the same license as the BridgeDB project. +# +# Translators: +# Tyler Durden <virii(a)enn.lu>, 2015 +msgid "" +msgstr "" +"Project-Id-Version: The Tor Project\n" +"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'POT-Creation-Date: 2015-03-19 22:13+0000\n" +"PO-Revision-Date: 2015-09-22 17:39+0000\n" +"Last-Translator: Tyler Durden <virii(a)enn.lu>\n" +"Language-Team: Luxembourgish (http://www.transifex.com/otf/torproject/language/lb/)\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: lb\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in +#. any string (regardless of capitalization and/or punctuation): +#. "BridgeDB" +#. "pluggable transport" +#. "pluggable transports" +#. "obfs2" +#. "obfs3" +#. "scramblesuit" +#. "fteproxy" +#. "Tor" +#. "Tor Browser" +#: lib/bridgedb/HTTPServer.py:107 +msgid "Sorry! Something went wrong with your request." +msgstr "Entschëllegt! Et ass eppes falsch mat ärer Ufro." + +#: lib/bridgedb/strings.py:18 +msgid "[This is an automated message; please do not reply.]" +msgstr "[Dat heiten ass eng automatesch Noriicht. Wann ech gelift net drop äntweren.]" + +#: lib/bridgedb/strings.py:20 +msgid "Here are your bridges:" +msgstr "Hei sinn deng Brécken-Server:" + +#: 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 "Dir huet de Grenzwäert iwwerschratt. Wann ech gelift méi lues! De klengsten Ofstand zwëschent den E-Mails bedréit %s Stonnen. All weider E-Mail während dëser Zäit, gëtt ignoréiert." + +#: lib/bridgedb/strings.py:25 +msgid "" +"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)" +msgstr "BEFEHLER: (Kombinéiert BEFEHLER em méi Méiglechkeeten gläichzäiteg unzeginn)" + +#. TRANSLATORS: Please DO NOT translate the word "BridgeDB". +#: lib/bridgedb/strings.py:28 +msgid "Welcome to BridgeDB!" +msgstr "Wëllkomm bei der Bréckendatebank!" + +#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE". +#: lib/bridgedb/strings.py:30 +msgid "Currently supported transport TYPEs:" +msgstr "Momentan ënnerstëtzt Transportypen:" + +#: lib/bridgedb/strings.py:31 +#, python-format +msgid "Hey, %s!" +msgstr "Moien, %s!" + +#: lib/bridgedb/strings.py:32 +msgid "Hello, friend!" +msgstr "Moien, Frënd!" + +#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100 +msgid "Public Keys" +msgstr "Ëffentlech Schlësselen" + +#. TRANSLATORS: This string will end up saying something like: +#. "This email was generated with rainbows, unicorns, and sparkles +#. for alice(a)example.com on Friday, 09 May, 2014 at 18:59:39." +#: lib/bridgedb/strings.py:37 +#, python-format +msgid "" +"This email was generated with rainbows, unicorns, and sparkles\n" +"for %s on %s at %s." +msgstr "Des E-Mail gouf fir dech, %s op %s em %s mat Reebéi, Eenhaaren\nan Glitzer erstallt." + +#. TRANSLATORS: Please DO NOT translate "BridgeDB". +#. TRANSLATORS: Please DO NOT translate "Pluggable Transports". +#. TRANSLATORS: Please DO NOT translate "Tor". +#. TRANSLATORS: Please DO NOT translate "Tor Network". +#: lib/bridgedb/strings.py:47 +#, python-format +msgid "" +"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n" +"which can help obfuscate your connections to the Tor Network, making it more\n" +"difficult for anyone watching your internet traffic to determine that you are\n" +"using Tor.\n" +"\n" +msgstr "BridgeDB oder Bréckendatebank kann verschidden %stypen vun Pluggable Transports%s\nbereedstellen. Déi kennen hëllefen är Connectioun zum Tor Netzwierk ze verschleieren. \nDoduerch gëtt et méi schwéier eraus ze fannen op dir Tor benotzt.\n\n" + +#. TRANSLATORS: Please DO NOT translate "Pluggable Transports". +#: lib/bridgedb/strings.py:54 +msgid "" +"Some bridges with IPv6 addresses are also available, though some Pluggable\n" +"Transports aren't IPv6 compatible.\n" +"\n" +msgstr "E puer Brécken-Server sinn via IPv6 ze areechen, leider si verschidden Pluggable\nTransports net IPv6 kompatibel.\n\n" + +#. TRANSLATORS: Please DO NOT translate "BridgeDB". +#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring, +#. regular, or unexciting". Like vanilla ice cream. It refers to bridges +#. which do not have Pluggable Transports, and only speak the regular, +#. boring Tor protocol. Translate it as you see fit. Have fun with it. +#: lib/bridgedb/strings.py:63 +#, python-format +msgid "" +"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n" +"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n" +"help to circumvent internet censorship in many cases.\n" +"\n" +msgstr "Zousätzlech huet d'BridgeDB och nach eng sëllech hierkëmmlech Brécken-Server %s, déi ouni\nPluggable Transports %s dohierkommen. Dat klengt zwar net deck, mä déi kënnen dacks\nnach ëmmer hëllefen eng Internetzensur ze ëmgoen.\n\n" + +#: lib/bridgedb/strings.py:76 +msgid "What are bridges?" +msgstr "Wat si Brécken?" + +#: lib/bridgedb/strings.py:77 +#, python-format +msgid "%s Bridges %s are Tor relays that help you circumvent censorship." +msgstr "%s Brécken-Server %s sinn Tor-Relaisen, déi iech dobäi hëllefen d'Zensur ze ëmgoen." + +#: lib/bridgedb/strings.py:82 +msgid "I need an alternative way of getting bridges!" +msgstr "Ech brauch eng alternativ Aart a Weis fir u Brécken-Server ze kommen!" + +#: lib/bridgedb/strings.py:83 +#, python-format +msgid "" +"Another way to get bridges is to send an email to %s. Please note that you must\n" +"send the email using an address from one of the following email providers:\n" +"%s, %s or %s." +msgstr "Een anere Wee fir un Brécken-Server ze kommen, ass fir eng E-Mail un %s ze schécken.\nWann ech gelift, passt op datt dir eng E-Mail vun engem vun dësen Mail Provider musst verschécken:\n%s, %s oder %s." + +#: lib/bridgedb/strings.py:90 +msgid "My bridges don't work! I need help!" +msgstr "Meng Brécken funktionéieren net! Ech brauch Hëllef!" + +#. TRANSLATORS: Please DO NOT translate "Tor". +#: lib/bridgedb/strings.py:92 +#, python-format +msgid "If your Tor doesn't work, you should email %s." +msgstr "Wann Tor net funktionéiert, dann solls de dem %s mailen." + +#. TRANSLATORS: Please DO NOT translate "Pluggable Transports". +#. TRANSLATORS: Please DO NOT translate "Tor Browser". +#. TRANSLATORS: Please DO NOT translate "Tor". +#: lib/bridgedb/strings.py:96 +msgid "" +"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 "Probéiert sou vill wei méiglech un Informatiounen ze ginn déi äre Fall betreffen.\nDat heescht eng Lescht vun de Brécken-Server an Pluggable Transports déi dir probéiert\nhutt, är Tor Browser Versioun, an all aner Noriicht déi iech Tor ginn huet, asw." + +#: lib/bridgedb/strings.py:103 +msgid "Here are your bridge lines:" +msgstr "Hei sinn är Brécken-Server Adressen:" + +#: lib/bridgedb/strings.py:104 +msgid "Get Bridges!" +msgstr "Erhal Adressen vu Brécken-Server!" + +#: lib/bridgedb/strings.py:108 +msgid "Please select options for bridge type:" +msgstr "Wann ech gelift, wielt d'Optiounen fir de Bréckentyp:" + +#: lib/bridgedb/strings.py:109 +msgid "Do you need IPv6 addresses?" +msgstr "Brauchs de IPv6 Adressen?" + +#: lib/bridgedb/strings.py:110 +#, python-format +msgid "Do you need a %s?" +msgstr "Braucht dir eng %s?" + +#: lib/bridgedb/strings.py:114 +msgid "Your browser is not displaying images properly." +msgstr "Äre Browser weist Biller net richteg un." + +#: lib/bridgedb/strings.py:115 +msgid "Enter the characters from the image above..." +msgstr "Gitt wann ech gelift d'Zeechen vum Bild uewen an." + +#: lib/bridgedb/strings.py:119 +msgid "How to start using your bridges" +msgstr "Sou fänkt der un är Brécken ze benotzen" + +#. TRANSLATORS: Please DO NOT translate "Tor Browser". +#: lib/bridgedb/strings.py:121 +#, python-format +msgid "" +"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n" +"page %s and then follow the instructions there for downloading and starting\n" +"Tor Browser." +msgstr "Fir Brécken an ärem Tor Browser unzeginn, gitt der zur %s Tor Browser Downloadsäit %s\nan dann follegt den Uweisungen fir den Tor Browser ze downloaden an ze starten." + +#. TRANSLATORS: Please DO NOT translate "Tor". +#: lib/bridgedb/strings.py:126 +msgid "" +"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n" +"the wizard until it asks:" +msgstr "Wann den \"Tor Netzwierk Astellungen\" Dialog kennt, da klickt op \"Konfiguréieren\" an\nfollegt den Uweisunge vum Assistent:" + +#. TRANSLATORS: Please DO NOT translate "Tor". +#: lib/bridgedb/strings.py:130 +msgid "" +"Does your Internet Service Provider (ISP) block or otherwise censor connections\n" +"to the Tor network?" +msgstr "Blockéiert oder zenséiert ären Internetprovider (ISP) är Connectioun zum Tor Netzwierk?" + +#. TRANSLATORS: Please DO NOT translate "Tor". +#: lib/bridgedb/strings.py:134 +msgid "" +"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n" +"paste the bridge lines into the text input box. Finally, click 'Connect', and\n" +"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 "Wielt \"Jo\" an dann klickt \"Weider\". Em är nei Brécken-Server ze konfiguréieren,\nkopéiert d'Zeilen mät den Brécken-Server Adressen an fügt se an Textfeld an.\nKlickt schlussendlech op \"Verbannen\"! Wann der Problemer hutt, dann klickt op den \"Hëllef\"\nKnäppchen am Assistent vun \"Tor Netzwierk Astellungen\", fir eng weider Hëllefstellung ze kréien." + +#: lib/bridgedb/strings.py:142 +msgid "Displays this message." +msgstr "Des Noriicht uweisen." + +#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the +#. same non-Pluggable Transport bridges described above as being +#. "plain-ol'-vanilla" bridges. +#: lib/bridgedb/strings.py:146 +msgid "Request vanilla bridges." +msgstr "Standard Brécken-Server ufroen." + +#: lib/bridgedb/strings.py:147 +msgid "Request IPv6 bridges." +msgstr "IPv6 Brécken ufroen." + +#. TRANSLATORS: Please DO NOT translate the word the word "TYPE". +#: lib/bridgedb/strings.py:149 +msgid "Request a Pluggable Transport by TYPE." +msgstr "Een Pluggable Transport vum TYPE ufroen." + +#. TRANSLATORS: Please DO NOT translate "BridgeDB". +#. TRANSLATORS: Please DO NOT translate "GnuPG". +#: lib/bridgedb/strings.py:152 +msgid "Get a copy of BridgeDB's public GnuPG key." +msgstr "Eng Kopie vum ëffentlechen GnuPG Schlëssel vun der Bréckendatebank kréien." + +#: lib/bridgedb/templates/base.html:89 +msgid "Report a Bug" +msgstr "E Feeler mellen" + +#: lib/bridgedb/templates/base.html:92 +msgid "Source Code" +msgstr "Quellcode" + +#: lib/bridgedb/templates/base.html:95 +msgid "Changelog" +msgstr "Ännerungsprotokoll" + +#: lib/bridgedb/templates/base.html:98 +msgid "Contact" +msgstr "Kontakt" + +#: lib/bridgedb/templates/bridges.html:81 +msgid "Select All" +msgstr "Alles auswielen" + +#: lib/bridgedb/templates/bridges.html:87 +msgid "Show QRCode" +msgstr "QRCode uweisen" + +#: lib/bridgedb/templates/bridges.html:100 +msgid "QRCode for your bridge lines" +msgstr "De QRCode fir är Brécken-Server Adressen" + +#. TRANSLATORS: Please translate this into some silly way to say +#. "There was a problem!" in your language. For example, +#. for Italian, you might translate this into "Mama mia!", +#. or for French: "Sacrebleu!". :) +#: lib/bridgedb/templates/bridges.html:115 +#: lib/bridgedb/templates/bridges.html:175 +msgid "Uh oh, spaghettios!" +msgstr "Oh oh, hei ass eng schif gaang!" + +#: lib/bridgedb/templates/bridges.html:116 +msgid "It seems there was an error getting your QRCode." +msgstr "Et gesäit sou aus als wär e Feeler geschitt bei ärem QRCode." + +#: lib/bridgedb/templates/bridges.html:121 +msgid "" +"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy" +" your bridge lines onto mobile and other devices." +msgstr "Dësen QrCode enthält är Brécken-Server Adressen. Scannt en mam engem QRCode Lieser a kopéiert domadder är Adressen op aner mobil Geräter." + +#: lib/bridgedb/templates/bridges.html:181 +msgid "There currently aren't any bridges available..." +msgstr "Momentan si keng Brécken-Server disponibel..." + +#: lib/bridgedb/templates/bridges.html:182 +#, python-format +msgid "" +" Perhaps you should try %s going back %s and choosing a different bridge " +"type!" +msgstr "Villäicht sollt dir probéieren %s zeréck ze goen %s an een anere Bréckentyp auszewielen!" + +#: lib/bridgedb/templates/index.html:11 +#, python-format +msgid "Step %s1%s" +msgstr "Schrëtt %s1%s" + +#: lib/bridgedb/templates/index.html:13 +#, python-format +msgid "Download %s Tor Browser %s" +msgstr "%s Tor Browser %s eroflueden" + +#: lib/bridgedb/templates/index.html:25 +#, python-format +msgid "Step %s2%s" +msgstr "Schrëtt %s2%s" + +#: lib/bridgedb/templates/index.html:27 +#, python-format +msgid "Get %s bridges %s" +msgstr "Erhal Adressen vu %s Brécken-Server %s" + +#: lib/bridgedb/templates/index.html:36 +#, python-format +msgid "Step %s3%s" +msgstr "Schrëtt %s3%s" + +#: lib/bridgedb/templates/index.html:38 +#, python-format +msgid "Now %s add the bridges to Tor Browser %s" +msgstr "Lo %s Brécken-Server Adressen dem Tor Browser bäifügen %s" + +#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the +#. beginning of words are present in your final translation. Thanks! +#. (These are used to insert HTML5 underlining tags, to mark accesskeys +#. for disabled users.) +#: lib/bridgedb/templates/options.html:38 +#, python-format +msgid "%sJ%sust give me bridges!" +msgstr "%sG%sëff mer Brécken-Server!" + +#: lib/bridgedb/templates/options.html:52 +msgid "Advanced Options" +msgstr "Erweidert Optiounen" + +#: lib/bridgedb/templates/options.html:88 +msgid "No" +msgstr "Nee" + +#: lib/bridgedb/templates/options.html:89 +msgid "none" +msgstr "keng" + +#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the +#. beginning of words are present in your final translation. Thanks! +#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses." +#: lib/bridgedb/templates/options.html:127 +#, python-format +msgid "%sY%ses!" +msgstr "%sJ%so!" + +#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the +#. beginning of words are present in your final translation. Thanks! +#. TRANSLATORS: Please do NOT translate the word "bridge"! +#: lib/bridgedb/templates/options.html:151 +#, python-format +msgid "%sG%set Bridges" +msgstr "%sE%srhal Adressen vu Brécken-Server!"

1 0

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

22 Sep '15

commit 2982bc7d9014f960aeed9a90c16efc6b3233b1ad Author: Translation commit bot <translation(a)torproject.org> Date: Tue Sep 22 17:45:03 2015 +0000 Update translations for bridgedb --- lb/LC_MESSAGES/bridgedb.po | 64 ++++++++++++++++++++++---------------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/lb/LC_MESSAGES/bridgedb.po b/lb/LC_MESSAGES/bridgedb.po index 4d32b9c..04fd50a 100644 --- a/lb/LC_MESSAGES/bridgedb.po +++ b/lb/LC_MESSAGES/bridgedb.po @@ -8,7 +8,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-09-22 17:14+0000\n" +"PO-Revision-Date: 2015-09-22 17:39+0000\n" "Last-Translator: Tyler Durden <virii(a)enn.lu>\n" "Language-Team: Luxembourgish (http://www.transifex.com/otf/torproject/language/lb/)\n" "MIME-Version: 1.0\n" @@ -217,7 +217,7 @@ msgstr "Wann den \"Tor Netzwierk Astellungen\" Dialog kennt, da klickt op \"Konf msgid "" "Does your Internet Service Provider (ISP) block or otherwise censor connections\n" "to the Tor network?" -msgstr "" +msgstr "Blockéiert oder zenséiert ären Internetprovider (ISP) är Connectioun zum Tor Netzwierk?" #. TRANSLATORS: Please DO NOT translate "Tor". #: lib/bridgedb/strings.py:134 @@ -226,61 +226,61 @@ msgid "" "paste the bridge lines into the text input box. Finally, click 'Connect', and\n" "you should be good to go! If you experience trouble, try clicking the 'Help'\n" "button in the 'Tor Network Settings' wizard for further assistance." -msgstr "" +msgstr "Wielt \"Jo\" an dann klickt \"Weider\". Em är nei Brécken-Server ze konfiguréieren,\nkopéiert d'Zeilen mät den Brécken-Server Adressen an fügt se an Textfeld an.\nKlickt schlussendlech op \"Verbannen\"! Wann der Problemer hutt, dann klickt op den \"Hëllef\"\nKnäppchen am Assistent vun \"Tor Netzwierk Astellungen\", fir eng weider Hëllefstellung ze kréien." #: lib/bridgedb/strings.py:142 msgid "Displays this message." -msgstr "" +msgstr "Des Noriicht uweisen." #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the #. same non-Pluggable Transport bridges described above as being #. "plain-ol'-vanilla" bridges. #: lib/bridgedb/strings.py:146 msgid "Request vanilla bridges." -msgstr "" +msgstr "Standard Brécken-Server ufroen." #: lib/bridgedb/strings.py:147 msgid "Request IPv6 bridges." -msgstr "" +msgstr "IPv6 Brécken ufroen." #. TRANSLATORS: Please DO NOT translate the word the word "TYPE". #: lib/bridgedb/strings.py:149 msgid "Request a Pluggable Transport by TYPE." -msgstr "" +msgstr "Een Pluggable Transport vum TYPE ufroen." #. TRANSLATORS: Please DO NOT translate "BridgeDB". #. TRANSLATORS: Please DO NOT translate "GnuPG". #: lib/bridgedb/strings.py:152 msgid "Get a copy of BridgeDB's public GnuPG key." -msgstr "" +msgstr "Eng Kopie vum ëffentlechen GnuPG Schlëssel vun der Bréckendatebank kréien." #: lib/bridgedb/templates/base.html:89 msgid "Report a Bug" -msgstr "" +msgstr "E Feeler mellen" #: lib/bridgedb/templates/base.html:92 msgid "Source Code" -msgstr "" +msgstr "Quellcode" #: lib/bridgedb/templates/base.html:95 msgid "Changelog" -msgstr "" +msgstr "Ännerungsprotokoll" #: lib/bridgedb/templates/base.html:98 msgid "Contact" -msgstr "" +msgstr "Kontakt" #: lib/bridgedb/templates/bridges.html:81 msgid "Select All" -msgstr "" +msgstr "Alles auswielen" #: lib/bridgedb/templates/bridges.html:87 msgid "Show QRCode" -msgstr "" +msgstr "QRCode uweisen" #: lib/bridgedb/templates/bridges.html:100 msgid "QRCode for your bridge lines" -msgstr "" +msgstr "De QRCode fir är Brécken-Server Adressen" #. TRANSLATORS: Please translate this into some silly way to say #. "There was a problem!" in your language. For example, @@ -289,58 +289,58 @@ msgstr "" #: lib/bridgedb/templates/bridges.html:115 #: lib/bridgedb/templates/bridges.html:175 msgid "Uh oh, spaghettios!" -msgstr "" +msgstr "Oh oh, hei ass eng schif gaang!" #: lib/bridgedb/templates/bridges.html:116 msgid "It seems there was an error getting your QRCode." -msgstr "" +msgstr "Et gesäit sou aus als wär e Feeler geschitt bei ärem QRCode." #: lib/bridgedb/templates/bridges.html:121 msgid "" "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy" " your bridge lines onto mobile and other devices." -msgstr "" +msgstr "Dësen QrCode enthält är Brécken-Server Adressen. Scannt en mam engem QRCode Lieser a kopéiert domadder är Adressen op aner mobil Geräter." #: lib/bridgedb/templates/bridges.html:181 msgid "There currently aren't any bridges available..." -msgstr "" +msgstr "Momentan si keng Brécken-Server disponibel..." #: lib/bridgedb/templates/bridges.html:182 #, python-format msgid "" " Perhaps you should try %s going back %s and choosing a different bridge " "type!" -msgstr "" +msgstr "Villäicht sollt dir probéieren %s zeréck ze goen %s an een anere Bréckentyp auszewielen!" #: lib/bridgedb/templates/index.html:11 #, python-format msgid "Step %s1%s" -msgstr "" +msgstr "Schrëtt %s1%s" #: lib/bridgedb/templates/index.html:13 #, python-format msgid "Download %s Tor Browser %s" -msgstr "" +msgstr "%s Tor Browser %s eroflueden" #: lib/bridgedb/templates/index.html:25 #, python-format msgid "Step %s2%s" -msgstr "" +msgstr "Schrëtt %s2%s" #: lib/bridgedb/templates/index.html:27 #, python-format msgid "Get %s bridges %s" -msgstr "" +msgstr "Erhal Adressen vu %s Brécken-Server %s" #: lib/bridgedb/templates/index.html:36 #, python-format msgid "Step %s3%s" -msgstr "" +msgstr "Schrëtt %s3%s" #: lib/bridgedb/templates/index.html:38 #, python-format msgid "Now %s add the bridges to Tor Browser %s" -msgstr "" +msgstr "Lo %s Brécken-Server Adressen dem Tor Browser bäifügen %s" #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the #. beginning of words are present in your final translation. Thanks! @@ -349,19 +349,19 @@ msgstr "" #: lib/bridgedb/templates/options.html:38 #, python-format msgid "%sJ%sust give me bridges!" -msgstr "" +msgstr "%sG%sëff mer Brécken-Server!" #: lib/bridgedb/templates/options.html:52 msgid "Advanced Options" -msgstr "" +msgstr "Erweidert Optiounen" #: lib/bridgedb/templates/options.html:88 msgid "No" -msgstr "" +msgstr "Nee" #: lib/bridgedb/templates/options.html:89 msgid "none" -msgstr "" +msgstr "keng" #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the #. beginning of words are present in your final translation. Thanks! @@ -369,7 +369,7 @@ msgstr "" #: lib/bridgedb/templates/options.html:127 #, python-format msgid "%sY%ses!" -msgstr "" +msgstr "%sJ%so!" #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the #. beginning of words are present in your final translation. Thanks! @@ -377,4 +377,4 @@ msgstr "" #: lib/bridgedb/templates/options.html:151 #, python-format msgid "%sG%set Bridges" -msgstr "" +msgstr "%sE%srhal Adressen vu Brécken-Server!"

1 0

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

22 Sep '15

commit e68b8885d0025faad78a669dd9049bb7b46e6e68 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Sep 22 17:15:04 2015 +0000 Update translations for bridgedb --- lb/LC_MESSAGES/bridgedb.po | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/lb/LC_MESSAGES/bridgedb.po b/lb/LC_MESSAGES/bridgedb.po index 50dd87c..4d32b9c 100644 --- a/lb/LC_MESSAGES/bridgedb.po +++ b/lb/LC_MESSAGES/bridgedb.po @@ -8,7 +8,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-09-22 16:44+0000\n" +"PO-Revision-Date: 2015-09-22 17:14+0000\n" "Last-Translator: Tyler Durden <virii(a)enn.lu>\n" "Language-Team: Luxembourgish (http://www.transifex.com/otf/torproject/language/lb/)\n" "MIME-Version: 1.0\n" @@ -98,7 +98,7 @@ msgid "" "difficult for anyone watching your internet traffic to determine that you are\n" "using Tor.\n" "\n" -msgstr "" +msgstr "BridgeDB oder Bréckendatebank kann verschidden %stypen vun Pluggable Transports%s\nbereedstellen. Déi kennen hëllefen är Connectioun zum Tor Netzwierk ze verschleieren. \nDoduerch gëtt et méi schwéier eraus ze fannen op dir Tor benotzt.\n\n" #. TRANSLATORS: Please DO NOT translate "Pluggable Transports". #: lib/bridgedb/strings.py:54 @@ -106,7 +106,7 @@ msgid "" "Some bridges with IPv6 addresses are also available, though some Pluggable\n" "Transports aren't IPv6 compatible.\n" "\n" -msgstr "" +msgstr "E puer Brécken-Server sinn via IPv6 ze areechen, leider si verschidden Pluggable\nTransports net IPv6 kompatibel.\n\n" #. TRANSLATORS: Please DO NOT translate "BridgeDB". #. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring, @@ -120,7 +120,7 @@ msgid "" "Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n" "help to circumvent internet censorship in many cases.\n" "\n" -msgstr "" +msgstr "Zousätzlech huet d'BridgeDB och nach eng sëllech hierkëmmlech Brécken-Server %s, déi ouni\nPluggable Transports %s dohierkommen. Dat klengt zwar net deck, mä déi kënnen dacks\nnach ëmmer hëllefen eng Internetzensur ze ëmgoen.\n\n" #: lib/bridgedb/strings.py:76 msgid "What are bridges?" @@ -141,7 +141,7 @@ msgid "" "Another way to get bridges is to send an email to %s. Please note that you must\n" "send the email using an address from one of the following email providers:\n" "%s, %s or %s." -msgstr "" +msgstr "Een anere Wee fir un Brécken-Server ze kommen, ass fir eng E-Mail un %s ze schécken.\nWann ech gelift, passt op datt dir eng E-Mail vun engem vun dësen Mail Provider musst verschécken:\n%s, %s oder %s." #: lib/bridgedb/strings.py:90 msgid "My bridges don't work! I need help!" @@ -161,11 +161,11 @@ msgid "" "Try including as much info about your case as you can, including the list of\n" "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n" "and any messages which Tor gave out, etc." -msgstr "" +msgstr "Probéiert sou vill wei méiglech un Informatiounen ze ginn déi äre Fall betreffen.\nDat heescht eng Lescht vun de Brécken-Server an Pluggable Transports déi dir probéiert\nhutt, är Tor Browser Versioun, an all aner Noriicht déi iech Tor ginn huet, asw." #: lib/bridgedb/strings.py:103 msgid "Here are your bridge lines:" -msgstr "" +msgstr "Hei sinn är Brécken-Server Adressen:" #: lib/bridgedb/strings.py:104 msgid "Get Bridges!" @@ -173,7 +173,7 @@ msgstr "Erhal Adressen vu Brécken-Server!" #: lib/bridgedb/strings.py:108 msgid "Please select options for bridge type:" -msgstr "" +msgstr "Wann ech gelift, wielt d'Optiounen fir de Bréckentyp:" #: lib/bridgedb/strings.py:109 msgid "Do you need IPv6 addresses?" @@ -182,19 +182,19 @@ msgstr "Brauchs de IPv6 Adressen?" #: lib/bridgedb/strings.py:110 #, python-format msgid "Do you need a %s?" -msgstr "Brauchs du eng %s?" +msgstr "Braucht dir eng %s?" #: lib/bridgedb/strings.py:114 msgid "Your browser is not displaying images properly." -msgstr "" +msgstr "Äre Browser weist Biller net richteg un." #: lib/bridgedb/strings.py:115 msgid "Enter the characters from the image above..." -msgstr "" +msgstr "Gitt wann ech gelift d'Zeechen vum Bild uewen an." #: lib/bridgedb/strings.py:119 msgid "How to start using your bridges" -msgstr "" +msgstr "Sou fänkt der un är Brécken ze benotzen" #. TRANSLATORS: Please DO NOT translate "Tor Browser". #: lib/bridgedb/strings.py:121 @@ -203,14 +203,14 @@ msgid "" "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n" "page %s and then follow the instructions there for downloading and starting\n" "Tor Browser." -msgstr "" +msgstr "Fir Brécken an ärem Tor Browser unzeginn, gitt der zur %s Tor Browser Downloadsäit %s\nan dann follegt den Uweisungen fir den Tor Browser ze downloaden an ze starten." #. TRANSLATORS: Please DO NOT translate "Tor". #: lib/bridgedb/strings.py:126 msgid "" "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n" "the wizard until it asks:" -msgstr "" +msgstr "Wann den \"Tor Netzwierk Astellungen\" Dialog kennt, da klickt op \"Konfiguréieren\" an\nfollegt den Uweisunge vum Assistent:" #. TRANSLATORS: Please DO NOT translate "Tor". #: lib/bridgedb/strings.py:130

1 0

[nyx/master] Rewrite connection panel
by atagar＠torproject.org 22 Sep '15

22 Sep '15

commit 97f1f949e3824f955e3d5b4103ca3f2a9a006632 Merge: 35206a3 b31eda0 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Sep 22 10:10:28 2015 -0700 Rewrite connection panel Damn this was a big overhaul! Connection panel was ~1,700 lines of headache inducing code. Now it's just 700 and damn simple. There's still more work I want to do in this space, but general panel overhaul is done so time to merge. nyx/__init__.py | 1 + nyx/config/attributes.cfg | 18 + nyx/config_panel.py | 119 ++- nyx/connection_panel.py | 700 +++++++++++++++++ nyx/connections/__init__.py | 11 - nyx/connections/circ_entry.py | 255 ------- nyx/connections/conn_entry.py | 1260 ------------------------------- nyx/connections/conn_panel.py | 699 ----------------- nyx/connections/descriptor_popup.py | 174 ----- nyx/connections/entries.py | 179 ----- nyx/controller.py | 5 +- nyx/log_panel.py | 10 +- nyx/menu/actions.py | 13 - nyx/popups.py | 167 +++- nyx/resources/nyx.1 | 2 +- nyx/torrc_panel.py | 272 ++++--- nyx/util/panel.py | 3 + nyx/util/tor_config.py | 411 +++++----- nyx/util/tracker.py | 259 ++++++- nyxrc.sample | 29 - run_tests.py | 2 - setup.py | 2 +- test/util/tracker/connection_tracker.py | 48 +- test/util/tracker/port_usage_tracker.py | 16 +- 24 files changed, 1557 insertions(+), 3098 deletions(-)

1 0

[nyx/master] Fix connection counting
by atagar＠torproject.org 22 Sep '15

22 Sep '15

commit b31eda0d518709432d7892fd227f2b9253d2202d Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Sep 22 10:07:14 2015 -0700 Fix connection counting Part of our refactoring broke counts for port usage and client locales since we no longer cache connecitons in the panel. Keeping track of the connections we've already counted to fix this. --- nyx/connection_panel.py | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/nyx/connection_panel.py b/nyx/connection_panel.py index 2c8a4d6..0541911 100644 --- a/nyx/connection_panel.py +++ b/nyx/connection_panel.py @@ -74,10 +74,6 @@ CONFIG = conf.config_dict('nyx', { }, conf_handler) -def to_unix_time(dt): - return (dt - datetime.datetime(1970, 1, 1)).total_seconds() - - class Entry(object): @staticmethod @lru_cache() @@ -243,7 +239,8 @@ class CircuitEntry(Entry): nickname = consensus_tracker.get_relay_nickname(fingerprint) locale = tor_controller().get_info('ip-to-country/%s' % address, None) - connection = nyx.util.tracker.Connection(to_unix_time(self._circuit.created), False, '127.0.0.1', 0, address, port, 'tcp') + created_timestamp = (self._circuit.created - datetime.datetime(1970, 1, 1)).total_seconds() + connection = nyx.util.tracker.Connection(created_timestamp, False, '127.0.0.1', 0, address, port, 'tcp') return Line(self, line_type, connection, self._circuit, fingerprint, nickname, locale) header_line = line(self._circuit.path[-1][0] if self._circuit.status == 'BUILT' else None, LineType.CIRCUIT_HEADER) @@ -281,6 +278,7 @@ class ConnectionPanel(panel.Panel, threading.Thread): self._client_locale_usage = {} self._exit_port_usage = {} + self._counted_connections = set() # If we're a bridge and been running over a day then prepopulates with the # last day's clients. @@ -673,18 +671,17 @@ class ConnectionPanel(panel.Panel, threading.Thread): new_entries.append(Entry.from_circuit(circ)) # update stats for client and exit connections - # TODO: this is counting connections each time they're resolved - totally broken :( for entry in new_entries: - entry_line = entry.get_lines()[0] + line = entry.get_lines()[0] - if entry.is_private(): - if entry.get_type() == Category.INBOUND: - if entry_line.locale: - self._client_locale_usage[entry_line.locale] = self._client_locale_usage.get(entry_line.locale, 0) + 1 + if entry.is_private() and line.connection not in self._counted_connections: + if entry.get_type() == Category.INBOUND and line.locale: + self._client_locale_usage[line.locale] = self._client_locale_usage.get(line.locale, 0) + 1 elif entry.get_type() == Category.EXIT: - exit_port = entry_line.connection.remote_port - self._exit_port_usage[exit_port] = self._exit_port_usage.get(exit_port, 0) + 1 + self._exit_port_usage[line.connection.remote_port] = self._exit_port_usage.get(line.connection.remote_port, 0) + 1 + + self._counted_connections.add(line.connection) self._entries = sorted(new_entries, key = lambda entry: [entry.sort_value(attr) for attr in self._sort_order]) self._last_resource_fetch = current_resolution_count

1 0

[nyx/master] Move get_listing_entry() into draw function
by atagar＠torproject.org 22 Sep '15

22 Sep '15

commit 9ea379dfd08bb5c308aaea69487d1c1f046ea35b Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Sep 7 14:34:07 2015 -0700 Move get_listing_entry() into draw function The ConnectionLines have both a get_listing_entry() and _get_listing_entry() method. The former is an uncached counterpart that includes the current time. Moving this top level bit into the draw methods. --- nyx/connection_panel.py | 76 +++++++++++++++++------------------------------ 1 file changed, 27 insertions(+), 49 deletions(-) diff --git a/nyx/connection_panel.py b/nyx/connection_panel.py index 92d4fed..e30c4fc 100644 --- a/nyx/connection_panel.py +++ b/nyx/connection_panel.py @@ -246,7 +246,8 @@ class ConnectionLine(object): nickname = nyx.util.tracker.get_consensus_tracker().get_relay_nickname(self.get_fingerprint()) return nickname if nickname else default - def get_listing_entry(self, width, current_time, listing_type): + @lru_cache() + def get_listing_entry(self, width, listing_type): """ Provides the tuple list for this connection's listing. Lines are composed of the following components: @@ -269,26 +270,9 @@ class ConnectionLine(object): Arguments: width - maximum length of the line - current_time - unix timestamp for what the results should consider to be - the current time listing_type - primary attribute we're listing connections by """ - # fetch our (most likely cached) display entry for the listing - - my_listing = self._get_listing_entry(width, listing_type) - - # fill in the current uptime and return the results - - time_prefix = '+' if self.connection.is_legacy else ' ' - - time_label = time_prefix + '%5s' % str_tools.time_label(current_time - self.connection.start_time, 1) - my_listing[2] = (time_label, my_listing[2][1]) - - return my_listing - - @lru_cache() - def _get_listing_entry(self, width, listing_type): entry_type = self._entry.get_type() # Lines are split into the following components in reverse: @@ -612,7 +596,8 @@ class CircLine(ConnectionLine): else: return (ord(' '), curses.ACS_VLINE, ord(' '), ord(' ')) - def get_listing_entry(self, width, current_time, listing_type): + @lru_cache() + def get_listing_entry(self, width, listing_type): """ Provides the [(msg, attr)...] listing for this relay in the circuilt listing. Lines are composed of the following components: @@ -626,10 +611,6 @@ class CircLine(ConnectionLine): listing_type - primary attribute we're listing connections by """ - return self._get_listing_entry(width, listing_type) - - @lru_cache() - def _get_listing_entry(self, width, listing_type): line_format = nyx.util.ui_tools.get_color(CONFIG['attr.connection.category_color'].get(self._entry.get_type(), 'white')) # The required widths are the sum of the following: @@ -1016,51 +997,36 @@ class ConnectionPanel(panel.Panel, threading.Thread): with self._vals_lock: lines = list(itertools.chain.from_iterable([entry.get_lines() for entry in self._entries])) selected = self._scroller.get_cursor_selection(lines) + current_time = self.get_pause_time() if (self.is_paused() or not self._is_tor_running) else time.time() + + is_showing_details = self._show_details and selected + details_offset = DETAILS_HEIGHT + 1 if is_showing_details else 0 - details_offset = DETAILS_HEIGHT + 1 if self._show_details else 0 is_scrollbar_visible = len(lines) > height - details_offset - 1 + scroll_offset = 2 if is_scrollbar_visible else 0 scroll_location = self._scroller.get_scroll_location(lines, height - details_offset - 1) if self.is_title_visible(): self._draw_title(self._entries, self._show_details) - if self._show_details and selected: + if is_showing_details: self._draw_details(selected, width, is_scrollbar_visible) - scroll_offset = 0 - if is_scrollbar_visible: - scroll_offset = 2 self.add_scroll_bar(scroll_location, scroll_location + height - details_offset - 1, len(lines), 1 + details_offset) - if self.is_paused() or not self._is_tor_running: - current_time = self.get_pause_time() - else: - current_time = time.time() - for line_number in range(scroll_location, len(lines)): + y = line_number + details_offset + 1 - scroll_location entry_line = lines[line_number] - - # hilighting if this is the selected line - - extra_format = curses.A_STANDOUT if entry_line == selected else curses.A_NORMAL - - draw_line = line_number + details_offset + 1 - scroll_location - prefix = entry_line.get_listing_prefix() for i in range(len(prefix)): - self.addch(draw_line, scroll_offset + i, prefix[i]) - - x_offset = scroll_offset + len(prefix) - draw_entry = entry_line.get_listing_entry(width - scroll_offset - len(prefix), current_time, self.get_listing_type()) + self.addch(y, scroll_offset + i, prefix[i]) - for msg, attr in draw_entry: - attr |= extra_format - self.addstr(draw_line, x_offset, msg, attr) - x_offset += len(msg) + x = scroll_offset + len(prefix) + self._draw_line(x, y, entry_line, entry_line == selected, width - scroll_offset - len(prefix), current_time, self.get_listing_type()) - if draw_line >= height: + if y >= height: break def _draw_title(self, entries, showing_details): @@ -1137,6 +1103,18 @@ class ConnectionPanel(panel.Panel, threading.Thread): if is_scrollbar_visible: self.addch(DETAILS_HEIGHT + 1, 1, curses.ACS_TTEE) + def _draw_line(self, x, y, line, is_selected, width, current_time, listing_type): + draw_entry = line.get_listing_entry(width, listing_type) + + if not isinstance(line, CircLine): + time_prefix = '+' if line.connection.is_legacy else ' ' + time_label = time_prefix + '%5s' % str_tools.time_label(current_time - line.connection.start_time, 1) + draw_entry[2] = (time_label, draw_entry[2][1]) + + for msg, attr in draw_entry: + attr |= curses.A_STANDOUT if is_selected else curses.A_NORMAL + x = self.addstr(y, x, msg, attr) + def stop(self): """ Halts further resolutions and terminates the thread.

1 0

[nyx/master] Drop get_listing_prefix() method
by atagar＠torproject.org 22 Sep '15

22 Sep '15

commit f32b19582c0ef594b6831da252331b64f8a5115b Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Sep 17 09:14:41 2015 -0700 Drop get_listing_prefix() method Class doesn't provide any benefit here either, merging into the draw method. --- nyx/connection_panel.py | 28 ++++++++++------------------ 1 file changed, 10 insertions(+), 18 deletions(-) diff --git a/nyx/connection_panel.py b/nyx/connection_panel.py index 75ef0e7..78a5e2c 100644 --- a/nyx/connection_panel.py +++ b/nyx/connection_panel.py @@ -195,13 +195,6 @@ class ConnectionLine(object): self._entry = entry self.connection = conn - def get_listing_prefix(self): - """ - Provides a list of characters to be appended before the listing entry. - """ - - return () - def get_locale(self, default = None): """ Provides the two letter country code for the remote endpoint. @@ -262,15 +255,14 @@ class CircLine(ConnectionLine): def __init__(self, entry, circ, fingerprint): relay_ip, relay_port = nyx.util.tracker.get_consensus_tracker().get_relay_address(fingerprint, ('192.168.0.1', 0)) ConnectionLine.__init__(self, entry, nyx.util.tracker.Connection(to_unix_time(circ.created), False, '127.0.0.1', 0, relay_ip, relay_port, 'tcp')) + self.circuit = circ self._fingerprint = fingerprint - self._is_last = False circ_path = [path_entry[0] for path_entry in circ.path] circ_index = circ_path.index(fingerprint) if circ_index == len(circ_path) - 1: placement_type = 'Exit' if circ.status == 'BUILT' else 'Extending' - self._is_last = True elif circ_index == 0: placement_type = 'Guard' else: @@ -279,13 +271,7 @@ class CircLine(ConnectionLine): self.placement_label = '%i / %s' % (circ_index + 1, placement_type) def get_fingerprint(self, default = None): - self._fingerprint - - def get_listing_prefix(self): - if self._is_last: - return (ord(' '), curses.ACS_LLCORNER, curses.ACS_HLINE, ord(' ')) - else: - return (ord(' '), curses.ACS_VLINE, ord(' '), ord(' ')) + return self._fingerprint class ConnectionPanel(panel.Panel, threading.Thread): @@ -675,8 +661,14 @@ class ConnectionPanel(panel.Panel, threading.Thread): self.addch(DETAILS_HEIGHT + 1, 1, curses.ACS_TTEE) def _draw_line(self, x, y, line, is_selected, width, current_time): - for char in line.get_listing_prefix(): - x = self.addch(y, x, char) + if isinstance(line, CircLine): + if line.circuit.path[-1][0] == line.get_fingerprint(): + prefix = (ord(' '), curses.ACS_LLCORNER, curses.ACS_HLINE, ord(' ')) + else: + prefix = (ord(' '), curses.ACS_VLINE, ord(' '), ord(' ')) + + for char in prefix: + x = self.addch(y, x, char) entry_type = line._entry.get_type() attr = nyx.util.ui_tools.get_color(CONFIG['attr.connection.category_color'].get(entry_type, 'white'))

1 0

[nyx/master] Simplify circuit line rendering
by atagar＠torproject.org 22 Sep '15

22 Sep '15

commit 5c4ea58cf5fe1f8bf291caf78fcea8025c4f62a8 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Sep 15 09:33:24 2015 -0700 Simplify circuit line rendering Condensing the remaining scraps used to render circuit lines. --- nyx/connection_panel.py | 27 ++++----------------------- 1 file changed, 4 insertions(+), 23 deletions(-) diff --git a/nyx/connection_panel.py b/nyx/connection_panel.py index 068c590..7d88050 100644 --- a/nyx/connection_panel.py +++ b/nyx/connection_panel.py @@ -791,29 +791,10 @@ class ConnectionPanel(panel.Panel, threading.Thread): x = self.addstr(y, x, entry_type.upper(), attr | curses.A_BOLD) x = self.addstr(y, x, ')', attr) else: - # The required widths are the sum of the following: - # initial space (1 character) - # bracketing (3 characters) - # placement_label (14 characters) - # gap between etc and placement label (5 characters) - - baseline_space = 14 + 5 - - dst, etc = '', '' - - # dst width is derived as: - # src (21) + dst (26) + divider (7) + right gap (2) - bracket (3) = 53 char - - dst = '%-53s' % get_destination_label(line, 53) - - # fills the nickname into the empty space here - - dst = '%s%-25s ' % (dst[:25], str_tools.crop(line.get_nickname('UNKNOWN'), 25, 0)) - - etc = line.get_etc_content(width - x - baseline_space - len(dst)) - - self.addstr(y, x, dst + etc, attr) - self.addstr(y, x + width - x - baseline_space + 5, '%-14s' % line.placement_label, attr) + self.addstr(y, x, get_destination_label(line, 25), attr) + self.addstr(y, x + 25, str_tools.crop(line.get_nickname('UNKNOWN'), 25, 0), attr) + self.addstr(y, x + 53, line.get_etc_content(width - x - 19 - 53), attr) + self.addstr(y, width - 14, line.placement_label, attr) def stop(self): """

1 0