- tor-commits - lists.torproject.org

[translation/tails-onioncircuits] Update translations for tails-onioncircuits
by translation＠torproject.org 01 Apr '16

01 Apr '16

commit 885dc29698b9d0192faf128751987771652826ef Author: Translation commit bot <translation(a)torproject.org> Date: Fri Apr 1 20:46:56 2016 +0000 Update translations for tails-onioncircuits --- uk/onioncircuits.pot | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/uk/onioncircuits.pot b/uk/onioncircuits.pot index 8f76955..0380607 100644 --- a/uk/onioncircuits.pot +++ b/uk/onioncircuits.pot @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-03-31 21:31+0200\n" -"PO-Revision-Date: 2016-04-01 20:13+0000\n" +"PO-Revision-Date: 2016-04-01 20:18+0000\n" "Last-Translator: Volodymyr Buberenko <v.buberenko(a)gmail.com>\n" "Language-Team: Ukrainian (http://www.transifex.com/otf/torproject/language/uk/)\n" "MIME-Version: 1.0\n" @@ -21,7 +21,7 @@ msgstr "" #: ../onioncircuits:81 msgid "" "Cannot connect to the Tor daemon. Onion Circuits will try to reconnect..." -msgstr "" +msgstr "Не можу підключитися до демона Tor. Onion Circuits спробують перепідключитися..." #: ../onioncircuits:94 msgid "Onion Circuits" @@ -58,7 +58,7 @@ msgstr "Підключено до демона Tor! Ви тепер можете #: ../onioncircuits:314 msgid "Building..." -msgstr "" +msgstr "Будуємо..." #: ../onioncircuits:339 #, c-format

1 0

[translation/torbutton-torbuttondtd] Update translations for torbutton-torbuttondtd
by translation＠torproject.org 01 Apr '16

01 Apr '16

commit f9aba6f83e118ce330321967d043c453ca3a3df2 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Apr 1 20:45:56 2016 +0000 Update translations for torbutton-torbuttondtd --- nb/torbutton.dtd | 112 +++++++++++++++++++++++++++---------------------------- 1 file changed, 56 insertions(+), 56 deletions(-) diff --git a/nb/torbutton.dtd b/nb/torbutton.dtd index adc507d..8030cb1 100644 --- a/nb/torbutton.dtd +++ b/nb/torbutton.dtd @@ -3,11 +3,11 @@ <!ENTITY torbutton.prefs.recommended_settings "Bruk anbefalte proxyinnstillinger for min versjon av Firefox"> <!ENTITY torbutton.prefs.use_privoxy "Bruk Privoxy"> <!ENTITY torbutton.prefs.use_polipo "Bruk Polipo"> -<!ENTITY torbutton.prefs.custom_settings "Bruk egne proxyinnstillinger"> -<!ENTITY torbutton.prefs.proxy.host.http "HTTP-proxy:"> -<!ENTITY torbutton.prefs.proxy.host.https "SSL-proxy:"> -<!ENTITY torbutton.prefs.proxy.host.ftp "FTP-proxy:"> -<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher-proxy:"> +<!ENTITY torbutton.prefs.custom_settings "Bruk egne mellomtjenerinnstillinger"> +<!ENTITY torbutton.prefs.proxy.host.http "HTTP-mellomtjener:"> +<!ENTITY torbutton.prefs.proxy.host.https "SSL-mellomtjener:"> +<!ENTITY torbutton.prefs.proxy.host.ftp "FTP-mellomtjener:"> +<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher-mellomtjener:"> <!ENTITY torbutton.prefs.proxy.host.socks "SOCKS-vert:"> <!ENTITY torbutton.prefs.proxy.port "Port:"> <!ENTITY torbutton.about.title "Om Torbutton"> @@ -17,7 +17,7 @@ <!ENTITY torbutton.about.maintainer "Vedlikeholder:"> <!ENTITY torbutton.about.security_review "Sikkerhetsgjennomgang:"> <!ENTITY torbutton.about.donate "Hvis du liker Tor, så kan du vurdere å"> -<!ENTITY torbutton.about.make_donation "donére"> +<!ENTITY torbutton.about.make_donation "donere"> <!ENTITY torbutton.pref_connection.notice "Deaktiver Torbutton for å endre på disse innstillingene."> <!ENTITY torbutton.pref_connection.more_info "Mer informasjon"> <!ENTITY torbutton.pref_connection_more_info.title "Hjelp"> @@ -26,53 +26,53 @@ <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.new_circuit "Ny Tor-krets for denne siden"> <!ENTITY torbutton.context_menu.new_circuit_key "C"> -<!ENTITY torbutton.context_menu.toggle "Endre Tor status"> +<!ENTITY torbutton.context_menu.toggle "Endre Tor-status"> <!ENTITY torbutton.context_menu.toggle.key "T"> <!ENTITY torbutton.context_menu.preferences "Personvern og sikkerhetsinnstillinger..."> <!ENTITY torbutton.context_menu.preferences.key "P"> -<!ENTITY torbutton.context_menu.about "Om Torbutton..."> +<!ENTITY torbutton.context_menu.about "Om Torbutton…"> <!ENTITY torbutton.context_menu.about.key "A"> -<!ENTITY torbutton.context_menu.networksettings "Nettverksinnstillinger for TOR..."> +<!ENTITY torbutton.context_menu.networksettings "Nettverksinnstillinger for TOR…"> <!ENTITY torbutton.context_menu.networksettings.key "S"> -<!ENTITY torbutton.context_menu.downloadUpdate "Se etter oppdatering for TOR nettleser..."> +<!ENTITY torbutton.context_menu.downloadUpdate "Se etter oppdatering for TOR-nettleser…"> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> -<!ENTITY torbutton.context_menu.cookieProtections "Cookie beskyttelse..."> +<!ENTITY torbutton.context_menu.cookieProtections "Informasjonskapsels-beskyttelse…"> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> -<!ENTITY torbutton.context_menu.copyTor "Kopier Tor URL"> +<!ENTITY torbutton.context_menu.copyTor "Kopier Tor-URL"> <!ENTITY torbutton.context_menu.copyTor.key "p"> -<!ENTITY torbutton.context_menu.openTorTab "Åpne Tor URL i ny fane"> +<!ENTITY torbutton.context_menu.openTorTab "Åpne Tor-URL i ny fane"> <!ENTITY torbutton.context_menu.openTorTab.key "r"> <!ENTITY torbutton.context_menu.openTorWindow "Åpne Tor URL i nytt vindu"> <!ENTITY torbutton.context_menu.openTorWindow.key "d"> <!ENTITY torbutton.button.label "Torbutton"> -<!ENTITY torbutton.button.tooltip "Klikk for å initialisere Torbutton"> -<!ENTITY torbutton.prefs.privacy_security_settings "Personvern og sikkerhets innstillinger"> +<!ENTITY torbutton.button.tooltip "Klikk for å igangsette Torbutton"> +<!ENTITY torbutton.prefs.privacy_security_settings "Personvern og sikkerhetsinnstillinger"> <!ENTITY torbutton.prefs.block_thread "Blokker historielesing under Tor (avgjørende)"> <!ENTITY torbutton.prefs.block_thwrite "Blokker historieskriving under Tor (anbefales)"> <!ENTITY torbutton.prefs.block_nthread "Blokker historielesing under ikke-Tor (valgfritt)"> <!ENTITY torbutton.prefs.block_nthwrite "Blokker historie-skriving under ikke-Tor (valgfritt)"> -<!ENTITY torbutton.prefs.clear_history "Slett historie på Tor toggle (valgfritt)"> -<!ENTITY torbutton.prefs.clear_cache "Blokker Tor disk cache og slett all cache på Tor toggle"> -<!ENTITY torbutton.prefs.block_cache "Blokker adgang til disk og minne-cache under Tor"> +<!ENTITY torbutton.prefs.clear_history "Slett historie ved bruk av Tor-toggle (valgfritt)"> +<!ENTITY torbutton.prefs.clear_cache "Blokker Tor diskmellomlager og slett hele mellomlageret ved Tor-toggle"> +<!ENTITY torbutton.prefs.block_cache "Blokker adgang til disk og mellomlagringsminne under Tor"> <!ENTITY torbutton.prefs.cookie_jars "Lagre ikke-Tor informasjonskapsler i en beskyttet jar"> <!ENTITY torbutton.prefs.cookie_protection "Bruk informasjonskapslenes dialogboks til å velge"> <!ENTITY torbutton.prefs.mmm_cookies "Jeg vil manuelt administrere mine informasjonskapsler (farlig)"> -<!ENTITY torbutton.prefs.clear_cookies "Slett informasjonskapsler på Tor toggle"> -<!ENTITY torbutton.prefs.disable_plugins "Deaktiver tillegg under Tor (avgjørende)"> -<!ENTITY torbutton.prefs.kill_bad_js "Fjern farlige javascript (avgjørende)"> +<!ENTITY torbutton.prefs.clear_cookies "Slett informasjonskapsler ved Tor-toggle"> +<!ENTITY torbutton.prefs.disable_plugins "Skru av programtillegg under Tor (avgjørende)"> +<!ENTITY torbutton.prefs.kill_bad_js "Fjern farlige JavaScript (avgjørende)"> <!ENTITY torbutton.prefs.isolate_content "Isoler dynamisk innhold til Tor-tilstand (avgjørende)"> -<!ENTITY torbutton.prefs.no_updates "Deaktiver oppdateringer under Tor"> -<!ENTITY torbutton.prefs.set_uagent "Sett bruker-agent for bruk av Tor (avgjørende)"> +<!ENTITY torbutton.prefs.no_updates "Skru av oppdateringer under bruk av Tor"> +<!ENTITY torbutton.prefs.set_uagent "Sett bruker-agent for Tor-bruk (avgjørende)"> <!ENTITY torbutton.prefs.dynamic "Dynamisk Innhold"> <!ENTITY torbutton.prefs.cookies "Informasjonskapsler"> <!ENTITY torbutton.prefs.cache "Hurtiglager"> -<!ENTITY torbutton.prefs.history "Historie"> -<!ENTITY torbutton.prefs.no_search "Deaktiver søkeforslag under Tor (anbefalt)"> -<!ENTITY torbutton.prefs.shutdown "Skru av"> +<!ENTITY torbutton.prefs.history "Historikk"> +<!ENTITY torbutton.prefs.no_search "Skru av søkeforslag under Tor (anbefalt)"> +<!ENTITY torbutton.prefs.shutdown "Slå av"> <!ENTITY torbutton.prefs.tor_shutdown "Slett Tor-informasjonskapsler når nettleseren med Tor aktivert avsluttes"> <!ENTITY torbutton.prefs.all_shutdown "Slett informasjonskapsler hver gang nettleseren avsluttes"> <!ENTITY torbutton.prefs.no_shutdown "Ikke slett informasjonskapslene mine under avslutning"> -<!ENTITY torbutton.prefs.disable_sessionstore "Deaktiver lagring av sesjoner (anbefalt)"> +<!ENTITY torbutton.prefs.disable_sessionstore "Skru av lagring av økter (anbefalt)"> <!ENTITY torbutton.prefs.headers "Topptekst"> <!ENTITY torbutton.prefs.refererspoofing "Referent-simulering"> <!ENTITY torbutton.prefs.spoofblank "Simuler blank referent når du bruker Tor (kan gjøre at enkelte sider ikke fungerer)"> @@ -88,32 +88,32 @@ <!ENTITY torbutton.prefs.startup_tor "Under nettleserens oppstart, sett Tor-status til:"> <!ENTITY torbutton.prefs.reload_crashed_jar "Last jar med informasjonskapsler på nytt / slett informasjonskapsler når Firefox kræsjer (anbefalt)"> <!ENTITY torbutton.prefs.dual_cookie_jars "Lagre informasjonskapsler for både Tor og ikke-Tor i beskyttende jar (farlig)"> -<!ENTITY torbutton.prefs.clear_http_auth "Slett HTTP-autentiserte sesjoner (anbefalt)"> +<!ENTITY torbutton.prefs.clear_http_auth "Slett HTTP-autentiserte økter (anbefalt)"> <!ENTITY torbutton.prefs.block_js_history "Isoler tilgang til historienavigering til Tor-status (kritisk)"> <!ENTITY torbutton.prefs.resize_on_toggle "Gjennopprett vinduer til størrelsen 50px under Tor (anbefalt)"> -<!ENTITY torbutton.prefs.close_tor "Lukk alle Tor-vinduer og faner på toggle (valgfritt)"> -<!ENTITY torbutton.prefs.close_nontor "Lukk alle ikke-tor-vinduer og faner på toggle (valgfritt)"> +<!ENTITY torbutton.prefs.close_tor "Lukk alle Tor-vinduer og faner ved veksling (valgfritt)"> +<!ENTITY torbutton.prefs.close_nontor "Lukk alle ikke-tor-vinduer og faner ved veksling (valgfritt)"> <!ENTITY torbutton.prefs.block_links "Blokker klikking av linker og oppdatering av sider fra forskjellige Tor-statuser (valgfritt)"> <!ENTITY torbutton.prefs.jar_certs "Lagre SSL-sertifikater i forskjellige jars for Tor/ikke-Tor (anbefalt)"> <!ENTITY torbutton.prefs.jar_ca_certs "Lagre CA-sertifikater i forskjellige jars for Tor/ikke-Tor (anbefalt)"> -<!ENTITY torbutton.prefs.locked_mode "Deaktiver Knappen og Hurtigtaster for å unngå uhell med toggle"> +<!ENTITY torbutton.prefs.locked_mode "Deaktiver Knappen og Hurtigtaster for å unngå uhell med veksling"> <!ENTITY torbutton.prefs.startup_state "Under normal oppstart, sett Tor-status til:"> <!ENTITY torbutton.prefs.shutdown_state "Avslutningsmodus"> <!ENTITY torbutton.prefs.startup "Oppstart"> <!ENTITY torbutton.prefs.block_tor_file_net "Blokker Tor-tilgang til nettverket fra URL-er av typen file:// (anbefalt)"> <!ENTITY torbutton.prefs.block_nontor_file_net "Blokker ikke-Tor-tilgang til nettverket fra URL-er av typen file://"> -<!ENTITY torbutton.prefs.restore_defaults "Gjenopprett standard"> +<!ENTITY torbutton.prefs.restore_defaults "Gjenopprett forvalg"> <!ENTITY torbutton.prefs.test_settings "Test innstillinger"> -<!ENTITY torbutton.prefs.test_auto "Test mine Tor-innstillinger etter første gang jeg aktiverer den hver gang Firefox starter opp"> -<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage"> +<!ENTITY torbutton.prefs.test_auto "Test mine Tor-innstillinger første gang jeg veksler hver gang Firefox starter opp"> +<!ENTITY torbutton.prefs.disable_livemarks "Skru av livemarks-oppdateringer under Tor-bruk"> <!ENTITY torbutton.prefs.tor_memory_jar "Ikke skriv Tor-informasjonskapsler til disk"> <!ENTITY torbutton.prefs.nontor_memory_jar "Ikke skriv ikke-Tor informasjonskapsler til disk"> -<!ENTITY torbutton.prefs.session_restore "La sesjonen lagre og gjennopprette følgende faner:"> +<!ENTITY torbutton.prefs.session_restore "La økta lagre og gjennopprette følgende faner:"> <!ENTITY torbutton.prefs.nontor_tabs "Faner lastet under ikke-Tor"> <!ENTITY torbutton.prefs.tor_tabs "Faner lastet under Tor"> <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4"> <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5"> -<!ENTITY torbutton.prefs.no_proxies_on "Ingen proxyer for:"> +<!ENTITY torbutton.prefs.no_proxies_on "Ingen mellomtjenere for:"> <!ENTITY torbutton.prefs.no_proxy_warning "Advarsel: Unngå å bruke noen av vertsnavnene ovenfor"> <!ENTITY torbutton.prefs.spoofreresh "Simuler oppdatering av siden"> <!ENTITY torbutton.prefs.refereroptions "Innstillinger for referent-simulering"> @@ -121,7 +121,7 @@ <!ENTITY torbutton.prefs.spoofroot "Simuler mappen som inneholder siden"> <!ENTITY torbutton.prefs.spoofdomain "Simuler domenet som referent"> <!ENTITY torbutton.prefs.spoofblank "Simuler blank referent når du bruker Tor (kan gjøre at enkelte sider ikke fungerer)"> -<!ENTITY torbutton.cookiedialog.title "Administrér Informasjonskapslenes Beskyttelser"> +<!ENTITY torbutton.cookiedialog.title "Administrer beskyttelse av informasjonskapsler"> <!ENTITY torbutton.cookiedialog.lockCol "Beskyttet"> <!ENTITY torbutton.cookiedialog.domainCol "Vert"> <!ENTITY torbutton.cookiedialog.nameCol "Navn"> @@ -129,53 +129,53 @@ <!ENTITY torbutton.cookiedialog.protectCookie "Beskytt Informasjonskapsel"> <!ENTITY torbutton.cookiedialog.removeCookie "Fjern Informasjonskapsel"> <!ENTITY torbutton.cookiedialog.unprotectCookie "Ikke Beskytt Informasjonskapsel"> -<!ENTITY torbutton.cookiedialog.removeAllBut "Fjern Alle Bortsett Fra Beskyttede"> -<!ENTITY torbutton.cookiedialog.saveAllCookies "Beskytt Nye Informasjonskapsler"> -<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Ikke Beskytt Nye Informasjonskapsler"> -<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage"> +<!ENTITY torbutton.cookiedialog.removeAllBut "Fjern alle bortsett fra beskyttede"> +<!ENTITY torbutton.cookiedialog.saveAllCookies "Beskytt nye informasjonskapsler"> +<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Ikke beskytt nye informasjonskapsler"> +<!ENTITY torbutton.prefs.disable_livemarks "Skru av livemarks-oppdateringer under Tor-bruk"> <!ENTITY torbutton.prefs.dtd_recommended "(anbefalt)"> <!ENTITY torbutton.prefs.dtd_optional "(valgfritt)"> <!ENTITY torbutton.prefs.dtd_crucial "(kritisk)"> -<!ENTITY torbutton.prefs.update_torbutton_via_tor "Send Torbutton-oppdateringer gjennom Tor"> -<!ENTITY torbutton.prefs.dodge_google_captcha "Bruk automatisk en annen søkemotor når du får presentert en Google Captcha:"> +<!ENTITY torbutton.prefs.update_torbutton_via_tor "Omdiriger Torbutton-oppdateringer gjennom Tor"> +<!ENTITY torbutton.prefs.dodge_google_captcha "Bruk automatisk en annen søkemotor når du får presentert en Google-CAPTCHA:"> <!ENTITY torbutton.prefs.engine1 "ixquick.com"> <!ENTITY torbutton.prefs.engine2 "Bing.com"> <!ENTITY torbutton.prefs.engine3 "Yahoo.com"> <!ENTITY torbutton.prefs.engine4 "startpage.com"> <!ENTITY torbutton.prefs.engine5 "duckduckgo.com"> <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (krever egendefinert transproxy eller Tor-router)"> -<!ENTITY torbutton.prefs.priv_caption "Personvern Innstillinger"> -<!ENTITY torbutton.prefs.block_disk "Ikke lagre nettleserhistorikk eller nettsidedata (aktiverer privat nettleser økt)"> +<!ENTITY torbutton.prefs.priv_caption "Personvernsinnstillinger"> +<!ENTITY torbutton.prefs.block_disk "Ikke lagre nettleserhistorikk eller nettsidedata (aktiverer privat nettleserøkt)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Begrens tredjeparts informasjonskapsler og andre sporingsdata."> -<!ENTITY torbutton.prefs.block_plugins "Deaktiver nettlesertillegg (som f.eks Flash)"> -<!ENTITY torbutton.prefs.resist_fingerprinting "Endre detaljer som skiller deg fra andre Tor Browser brukere."> -<!ENTITY torbutton.prefs.sec_caption "Sikkerhets nivå"> -<!ENTITY torbutton.prefs.sec_low "Lav (standard)"> +<!ENTITY torbutton.prefs.block_plugins "Skru av nettlesertillegg (som f.eks Flash)"> +<!ENTITY torbutton.prefs.resist_fingerprinting "Endre detaljer som skiller deg fra andre brukere av Tor-nettleseren."> +<!ENTITY torbutton.prefs.sec_caption "Sikkerhetsnivå"> +<!ENTITY torbutton.prefs.sec_low "Lav (forvalg)"> <!ENTITY torbutton.prefs.sec_low_usable_desc "Dette gir den mest brukbare opplevelsen."> <!ENTITY torbutton.prefs.sec_low_desc "På dette sikkerhetsnivået er alle nettleser-funksjoner påskrudd."> <!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "SVG-OpenType-font tegningsmekanisme avskrudd."> <!ENTITY torbutton.prefs.sec_med_low "Medium-lav"> -<!ENTITY torbutton.prefs.sec_gen_desc "På dette sikkerhetsnivået vil de følgende forandringene bli brukt (mus over for detaljer):"> -<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video og lyd media vil bli klikk-for-å-spille via NoScript."> -<!ENTITY torbutton.prefs.sec_html5_tooltip "På noen sider kan du trenge NoScript verktøylinje knappen for å aktivere disse media objektene."> +<!ENTITY torbutton.prefs.sec_gen_desc "På dette sikkerhetsnivået vil følgende forandringene bli brukt (mus over for detaljer):"> +<!ENTITY torbutton.prefs.sec_html5_desc "HTML5- video og -lydmedia vil bli klikk-for-spille-av via NoScript."> +<!ENTITY torbutton.prefs.sec_html5_tooltip "På noen sider kan du trenge NoScript-verktøylinjeknappen for å aktivere disse media-objektene."> <!ENTITY torbutton.prefs.sec_some_jit_desc "Noen ytelsesforbedringer for JavaScript er avskrudd."> <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS."> <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT."> <!ENTITY torbutton.prefs.sec_jit_slower_desc "Skript på noen sider kan kjøre saktere."> -<!ENTITY torbutton.prefs.sec_jar_desc "Eksterne JAR filer er blokkert."> +<!ENTITY torbutton.prefs.sec_jar_desc "Eksterne JAR-filer blokkert."> <!ENTITY torbutton.prefs.sec_jar_tooltip "JAR filer er svært sjeldne på nett, men kan være en kilde til XSS og andre angrep."> <!ENTITY torbutton.prefs.sec_mathml_desc "Noen mekanismer for å vise matteformler er skrudd av."> <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML er avskrudd."> <!ENTITY torbutton.prefs.sec_med_high "Medium-høy"> <!ENTITY torbutton.prefs.sec_all_jit_desc "Alle ytelsesforbedringer for JavaScript er avskrudd."> <!ENTITY torbutton.prefs.sec_font_rend_desc "Noen fonttegningsfunksjoner er avskrudd."> -<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "Graphite font visningsmekanismen er skrudd av."> +<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "Graphite font-visningsmekanismen er skrudd av."> <!ENTITY torbutton.prefs.sec_svg_desc "Noen typer bilder er avskrudd."> <!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG-bilder er avskrudd."> <!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript er avskrudd som forvalg på alle sider som ikke er HTTPS."> -<!ENTITY torbutton.prefs.sec_js_desc_tooltip "Javascript kan skrus på pr side via NoScript funksjonsknappen."> +<!ENTITY torbutton.prefs.sec_js_desc_tooltip "Javascript kan skrus på per side via NoScript-funksjonsknappen."> <!ENTITY torbutton.prefs.sec_high "Høy"> -<!ENTITY torbutton.prefs.sec_all_js_desc "Javascript er standard slått av for alle nettsteder."> +<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript er som forvalg slått av for alle nettsteder."> <!ENTITY torbutton.prefs.sec_audio_video_desc "De fleste lyd og video -formatene er avskrudd."> <!ENTITY torbutton.prefs.sec_audio_video_desc_tooltip "WebM er det eneste kodeket som fremdeles er påskrudd."> <!ENTITY torbutton.prefs.sec_webfonts_desc "Noen fonter og ikoner vises kanskje ikke riktig.">

1 0

[translation/tails-onioncircuits] Update translations for tails-onioncircuits
by translation＠torproject.org 01 Apr '16

01 Apr '16

commit 710170f784f35c28f05c46cd49b1541bffdc02b7 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Apr 1 20:16:51 2016 +0000 Update translations for tails-onioncircuits --- uk/onioncircuits.pot | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/uk/onioncircuits.pot b/uk/onioncircuits.pot index b91ac07..8f76955 100644 --- a/uk/onioncircuits.pot +++ b/uk/onioncircuits.pot @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Volodymyr Buberenko <v.buberenko(a)gmail.com>, 2016 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-26 00:31+0100\n" -"PO-Revision-Date: 2016-03-30 03:31+0000\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"POT-Creation-Date: 2016-03-31 21:31+0200\n" +"PO-Revision-Date: 2016-04-01 20:13+0000\n" +"Last-Translator: Volodymyr Buberenko <v.buberenko(a)gmail.com>\n" "Language-Team: Ukrainian (http://www.transifex.com/otf/torproject/language/uk/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -24,11 +25,11 @@ msgstr "" #: ../onioncircuits:94 msgid "Onion Circuits" -msgstr "" +msgstr "Onion Circuits" #: ../onioncircuits:95 msgid "Display Tor circuits and streams" -msgstr "" +msgstr "Показати кола Tor та потоки" #: ../onioncircuits:107 msgid "OK" @@ -44,16 +45,16 @@ msgstr "Статус" #: ../onioncircuits:141 msgid "Click on a path to get details" -msgstr "" +msgstr "Клікніть на шляху, щоб побачити деталі" #: ../onioncircuits:215 msgid "" "Lost connection to the Tor daemon. Onion Circuits will try to reconnect..." -msgstr "" +msgstr "Втрачено підключення до демона Tor. Onion Circuits спробують перепідключитися..." #: ../onioncircuits:232 msgid "Connected to the Tor daemon! You can use now Onion Circuits." -msgstr "" +msgstr "Підключено до демона Tor! Ви тепер можете використовувати Onion Circuits." #: ../onioncircuits:314 msgid "Building..." @@ -62,7 +63,7 @@ msgstr "" #: ../onioncircuits:339 #, c-format msgid "%s: %s" -msgstr "" +msgstr "%s: %s" #: ../onioncircuits:564 msgid "Fingerprint:" @@ -70,22 +71,22 @@ msgstr "Відбитки пальців:" #: ../onioncircuits:565 msgid "Published:" -msgstr "" +msgstr "Опубліковано:" #: ../onioncircuits:566 msgid "IP:" -msgstr "" +msgstr "IP:" #: ../onioncircuits:566 #, c-format msgid "%s (%s)" -msgstr "" +msgstr "%s (%s)" #: ../onioncircuits:567 msgid "Bandwidth:" -msgstr "" +msgstr "Пропускна здатність:" #: ../onioncircuits:567 #, c-format msgid "%.2f Mb/s" -msgstr "" +msgstr "%.2f Мб/с"

1 0

[translation/tails-onioncircuits] Update translations for tails-onioncircuits
by translation＠torproject.org 01 Apr '16

01 Apr '16

commit 3b0dd7e90ff38b85b8d9a493d7d5e192211b38e9 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Apr 1 19:46:51 2016 +0000 Update translations for tails-onioncircuits --- pt_BR/onioncircuits.pot | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pt_BR/onioncircuits.pot b/pt_BR/onioncircuits.pot index faf8e7c..fd59abb 100644 --- a/pt_BR/onioncircuits.pot +++ b/pt_BR/onioncircuits.pot @@ -4,13 +4,14 @@ # # Translators: # Communia <ameaneantie(a)riseup.net>, 2016 +# Maicon Grahl <maicongrahl(a)hotmail.com>, 2016 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-26 00:31+0100\n" -"PO-Revision-Date: 2016-03-30 19:54+0000\n" -"Last-Translator: Communia <ameaneantie(a)riseup.net>\n" +"POT-Creation-Date: 2016-03-31 21:31+0200\n" +"PO-Revision-Date: 2016-04-01 19:42+0000\n" +"Last-Translator: Maicon Grahl <maicongrahl(a)hotmail.com>\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/otf/torproject/language/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n"

1 0

[tor/master] Merge branch 'incoming_queue_symbol_fix'
by nickm＠torproject.org 01 Apr '16

01 Apr '16

commit 705d3b221e4011b4d041dd486c98f42201322193 Merge: 4b3e6c4 beba70e Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Apr 1 14:16:49 2016 -0400 Merge branch 'incoming_queue_symbol_fix' src/or/channel.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor/master] Don't declare "incoming_queue" in every file including channel.h
by nickm＠torproject.org 01 Apr '16

01 Apr '16

commit beba70ec77a0306a7769f1bdbee839c0af8e853b Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 29 13:55:14 2016 -0400 Don't declare "incoming_queue" in every file including channel.h Found with my wacky symbol-usage-enforcer. --- src/or/channel.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/or/channel.h b/src/or/channel.h index 129c0c2..a8c337e 100644 --- a/src/or/channel.h +++ b/src/or/channel.h @@ -18,7 +18,7 @@ typedef void (*channel_cell_handler_fn_ptr)(channel_t *, cell_t *); typedef void (*channel_var_cell_handler_fn_ptr)(channel_t *, var_cell_t *); struct cell_queue_entry_s; -TOR_SIMPLEQ_HEAD(chan_cell_queue, cell_queue_entry_s) incoming_queue; +TOR_SIMPLEQ_HEAD(chan_cell_queue, cell_queue_entry_s); typedef struct chan_cell_queue chan_cell_queue_t; /**

1 0

[translation/torbutton-aboutdialogdtd] Update translations for torbutton-aboutdialogdtd
by translation＠torproject.org 01 Apr '16

01 Apr '16

commit 3b15e3c2d092f7d12683c38892c11a072d4a612d Author: Translation commit bot <translation(a)torproject.org> Date: Fri Apr 1 18:16:08 2016 +0000 Update translations for torbutton-aboutdialogdtd --- ar/aboutdialog.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ar/aboutdialog.dtd b/ar/aboutdialog.dtd index 64efda9..251186d 100644 --- a/ar/aboutdialog.dtd +++ b/ar/aboutdialog.dtd @@ -1,4 +1,4 @@ -<!ENTITY project.start "&brandShortName; is developed by "> +<!ENTITY project.start "مطوْر من طرف &brandShortName;">  <!ENTITY project.tpoLink "the &vendorShortName;"> <!ENTITY project.end "لاتهدف للربح تعمل على حماية خصوصيتك وحريتك على الأنترنت">

1 0

[translation/mat-gui] Update translations for mat-gui
by translation＠torproject.org 01 Apr '16

01 Apr '16

commit 64d2b5d0be9315ece746108bd89bf61017ef5912 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Apr 1 18:15:32 2016 +0000 Update translations for mat-gui --- ar.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ar.po b/ar.po index a50f108..0f6613c 100644 --- a/ar.po +++ b/ar.po @@ -5,6 +5,7 @@ # Translators: # Ahmed Alhammadi <6622227a(a)gmail.com>, 2016 # Asim Jaweesh <asim.abdo_20(a)hotmail.com>, 2013 +# Fortas Abdeldjalil <dr.fcmam5(a)gmail.com>, 2016 # Mayalynn <mayalynn(a)live.com>, 2014 # Sherief Alaa <sheriefalaa.w(a)gmail.com>, 2013 # محيي الدين <tx99h4(a)hotmail.com>, 2014 @@ -13,8 +14,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-02-10 23:06+0100\n" -"PO-Revision-Date: 2016-03-21 16:34+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"PO-Revision-Date: 2016-04-01 18:06+0000\n" +"Last-Translator: Fortas Abdeldjalil <dr.fcmam5(a)gmail.com>\n" "Language-Team: Arabic (http://www.transifex.com/otf/torproject/language/ar/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -78,7 +79,7 @@ msgstr "قلل جودة وحجم ملف الـPDF المنتج" #: mat-gui:238 msgid "Remove unsupported file from archives" -msgstr "" +msgstr "حذف الملفات الغير مدعومة من الأرشيف" #: mat-gui:241 msgid "Remove non-supported (and so non-anonymised) file from output archive"

1 0

[nyx/master] Replace handle_key() and get_help() with key handlers
by atagar＠torproject.org 01 Apr '16

01 Apr '16

commit b6503d30cb60fffae52f3955f1e3493d5a1cab21 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Apr 1 10:05:04 2016 -0700 Replace handle_key() and get_help() with key handlers Having a single KeyHandler struct that provides both help information and triggers the actions it describes. Besides being cleaner this provides an assurance that the keybindings we display are in sync with the handler. --- nyx/controller.py | 6 +-- nyx/panel/__init__.py | 53 ++++++++++++++-------- nyx/panel/config.py | 32 +++++--------- nyx/panel/connection.py | 115 +++++++++++++++++++++++------------------------- nyx/panel/graph.py | 30 +++++-------- nyx/panel/header.py | 18 ++++---- nyx/panel/log.py | 45 ++++++++----------- nyx/panel/torrc.py | 25 ++++------- nyx/popups.py | 2 +- 9 files changed, 152 insertions(+), 174 deletions(-) diff --git a/nyx/controller.py b/nyx/controller.py index 3f0d32e..b70b218 100644 --- a/nyx/controller.py +++ b/nyx/controller.py @@ -363,7 +363,5 @@ def start_nyx(): control.redraw(True) else: for panel_impl in display_panels: - is_keystroke_consumed = panel_impl.handle_key(key) - - if is_keystroke_consumed: - break + for keybinding in panel_impl.key_handlers(): + keybinding.handle(key) diff --git a/nyx/panel/__init__.py b/nyx/panel/__init__.py index b725e20..34a6af1 100644 --- a/nyx/panel/__init__.py +++ b/nyx/panel/__init__.py @@ -3,6 +3,7 @@ Panels consisting the nyx interface. """ import collections +import inspect import time import curses import curses.ascii @@ -19,6 +20,7 @@ PASS = -1 __all__ = [ 'config', 'connection', + 'graph', 'header', 'log', 'torrc', @@ -37,17 +39,43 @@ CONFIG = conf.config_dict('nyx', { HALT_ACTIVITY = False # prevents curses redraws if set -class Help(collections.namedtuple('Help', ['key', 'description', 'current'])): +class KeyHandler(collections.namedtuple('Help', ['key', 'description', 'current'])): """ - Help information about keybindings the panel handles. + Action that can be taken via a given keybinding. :var str key: key the user can press :var str description: description of what it does :var str current: optional current value + + :param str key: key the user can press + :param str description: description of what it does + :param func action: action to be taken, this can optionally take a single + argument which is the keypress + :param str current: current value to be displayed + :param func key_func: custom function to determine if this key was pressed """ - def __new__(self, key, description, current = None): - return super(Help, self).__new__(self, key, description, current) + def __new__(self, key, description = None, action = None, current = None, key_func = None): + instance = super(KeyHandler, self).__new__(self, key, description, current) + instance._action = action + instance._key_func = key_func + return instance + + def handle(self, key): + """ + Triggers action if our key was pressed. + + :param nyx.curses.KeyInput key: keypress to be matched against + """ + + if self._action: + is_match = self._key_func(key) if self._key_func else key.match(self.key) + + if is_match: + if inspect.getargspec(self._action).args == ['key']: + self._action(key) + else: + self._action() class BasicValidator(object): @@ -272,21 +300,10 @@ class Panel(object): return (new_height, new_width) - def handle_key(self, key): - """ - Handler for user input. This returns true if the key press was consumed, - false otherwise. - - Arguments: - key - keycode for the key pressed - """ - - return False - - def get_help(self): + def key_handlers(self): """ - Provides help information for the controls this page provides. This is a - tuple of :class:`~nyx.panel.Help` instances. + Provides options this panel supports. This is a tuple of + :class:`~nyx.panel.KeyHandler` instances. """ return () diff --git a/nyx/panel/config.py b/nyx/panel/config.py index f0eac85..dbbe65b 100644 --- a/nyx/panel/config.py +++ b/nyx/panel/config.py @@ -233,14 +233,15 @@ class ConfigPanel(nyx.panel.Panel): self.redraw(True) - def handle_key(self, key): - if key.is_scroll(): + def key_handlers(self): + def _scroll(key): page_height = self.get_preferred_size()[0] - DETAILS_HEIGHT is_changed = self._scroller.handle_key(key, self._get_config_options(), page_height) if is_changed: self.redraw(True) - elif key.is_selection(): + + def _edit_selected_value(): selected = self._scroller.selection(self._get_config_options()) initial_value = selected.value() if selected.is_set() else '' new_value = nyx.controller.input_prompt('%s Value (esc to cancel): ' % selected.name, initial_value) @@ -261,28 +262,17 @@ class ConfigPanel(nyx.panel.Panel): self.redraw(True) except Exception as exc: nyx.controller.show_message('%s (press any key)' % exc, HIGHLIGHT, max_wait = 30) - elif key.match('a'): + + def _toggle_show_all(): self._show_all = not self._show_all self.redraw(True) - elif key.match('s'): - self.show_sort_dialog() - elif key.match('w'): - self.show_write_dialog() - else: - return False - - return True - def get_help(self): return ( - nyx.panel.Help('up arrow', 'scroll up a line'), - nyx.panel.Help('down arrow', 'scroll down a line'), - nyx.panel.Help('page up', 'scroll up a page'), - nyx.panel.Help('page down', 'scroll down a page'), - nyx.panel.Help('enter', 'edit configuration option'), - nyx.panel.Help('w', 'write torrc'), - nyx.panel.Help('a', 'toggle filtering'), - nyx.panel.Help('s', 'sort ordering'), + nyx.panel.KeyHandler('arrows', 'scroll up and down', _scroll, key_func = lambda key: key.is_scroll()), + nyx.panel.KeyHandler('enter', 'edit configuration option', _edit_selected_value, key_func = lambda key: key.is_selection()), + nyx.panel.KeyHandler('w', 'write torrc', self.show_write_dialog), + nyx.panel.KeyHandler('a', 'toggle filtering', _toggle_show_all), + nyx.panel.KeyHandler('s', 'sort ordering', self.show_sort_dialog), ) def draw(self, width, height): diff --git a/nyx/panel/connection.py b/nyx/panel/connection.py index 127cd12..76d123f 100644 --- a/nyx/panel/connection.py +++ b/nyx/panel/connection.py @@ -314,10 +314,36 @@ class ConnectionPanel(nyx.panel.Panel, threading.Thread): self._sort_order = results self._entries = sorted(self._entries, key = lambda entry: [entry.sort_value(attr) for attr in self._sort_order]) - def handle_key(self, key): - user_traffic_allowed = tor_controller().is_user_traffic_allowed() + def run(self): + """ + Keeps connections listing updated, checking for new entries at a set rate. + """ + + last_ran = -1 + + while not self._halt: + if self.is_paused() or not tor_controller().is_alive() or (time.time() - last_ran) < UPDATE_RATE: + with self._pause_condition: + if not self._halt: + self._pause_condition.wait(0.2) + + continue # done waiting, try again + + self._update() + self.redraw(True) + + # TODO: The following is needed to show results *but* causes curses to + # flicker. For our plans on this see... + # + # https://trac.torproject.org/projects/tor/ticket/18547#comment:1 + + # if last_ran == -1: + # nyx.tracker.get_consensus_tracker().update(tor_controller().get_network_statuses([])) + + last_ran = time.time() - if key.is_scroll(): + def key_handlers(self): + def _scroll(key): page_height = self.get_preferred_size()[0] - 1 if self._show_details: @@ -328,22 +354,12 @@ class ConnectionPanel(nyx.panel.Panel, threading.Thread): if is_changed: self.redraw(True) - elif key.is_selection(): + + def _show_details(): self._show_details = not self._show_details self.redraw(True) - elif key.match('s'): - self.show_sort_dialog() - elif key.match('r'): - connection_tracker = nyx.tracker.get_connection_tracker() - options = ['auto'] + list(connection.Resolver) + list(nyx.tracker.CustomResolver) - - resolver = connection_tracker.get_custom_resolver() - selected_index = 0 if resolver is None else options.index(resolver) - selected = nyx.popups.show_menu('Connection Resolver:', options, selected_index) - if selected != -1: - connection_tracker.set_custom_resolver(None if selected == 0 else options[selected]) - elif key.match('d'): + def _show_descriptor(): entries = self._entries while True: @@ -367,9 +383,22 @@ class ConnectionPanel(nyx.panel.Panel, threading.Thread): self.handle_key(nyx.curses.KeyInput(curses.KEY_DOWN)) self.redraw(True) - elif key.match('c') and user_traffic_allowed.inbound: + + def _pick_connection_resolver(): + connection_tracker = nyx.tracker.get_connection_tracker() + options = ['auto'] + list(connection.Resolver) + list(nyx.tracker.CustomResolver) + + resolver = connection_tracker.get_custom_resolver() + selected_index = 0 if resolver is None else options.index(resolver) + selected = nyx.popups.show_menu('Connection Resolver:', options, selected_index) + + if selected != -1: + connection_tracker.set_custom_resolver(None if selected == 0 else options[selected]) + + def _show_client_locales(): nyx.popups.show_count_dialog('Client Locales', self._client_locale_usage) - elif key.match('e') and user_traffic_allowed.outbound: + + def _show_exiting_port_usage(): counts = {} key_width = max(map(len, self._exit_port_usage.keys())) @@ -382,59 +411,23 @@ class ConnectionPanel(nyx.panel.Panel, threading.Thread): counts[k] = v nyx.popups.show_count_dialog('Exiting Port Usage', counts) - else: - return False - - return True - - def run(self): - """ - Keeps connections listing updated, checking for new entries at a set rate. - """ - - last_ran = -1 - - while not self._halt: - if self.is_paused() or not tor_controller().is_alive() or (time.time() - last_ran) < UPDATE_RATE: - with self._pause_condition: - if not self._halt: - self._pause_condition.wait(0.2) - - continue # done waiting, try again - - self._update() - self.redraw(True) - - # TODO: The following is needed to show results *but* causes curses to - # flicker. For our plans on this see... - # - # https://trac.torproject.org/projects/tor/ticket/18547#comment:1 - - # if last_ran == -1: - # nyx.tracker.get_consensus_tracker().update(tor_controller().get_network_statuses([])) - - last_ran = time.time() - def get_help(self): resolver = nyx.tracker.get_connection_tracker().get_custom_resolver() user_traffic_allowed = tor_controller().is_user_traffic_allowed() options = [ - nyx.panel.Help('up arrow', 'scroll up a line'), - nyx.panel.Help('down arrow', 'scroll down a line'), - nyx.panel.Help('page up', 'scroll up a page'), - nyx.panel.Help('page down', 'scroll down a page'), - nyx.panel.Help('enter', 'show connection details'), - nyx.panel.Help('d', 'raw consensus descriptor'), - nyx.panel.Help('s', 'sort ordering'), - nyx.panel.Help('r', 'connection resolver', 'auto' if resolver is None else resolver), + nyx.panel.KeyHandler('arrows', 'scroll up and down', _scroll, key_func = lambda key: key.is_scroll()), + nyx.panel.KeyHandler('enter', 'show connection details', _show_details, key_func = lambda key: key.is_selection()), + nyx.panel.KeyHandler('d', 'raw consensus descriptor', _show_descriptor), + nyx.panel.KeyHandler('s', 'sort ordering', self.show_sort_dialog), + nyx.panel.KeyHandler('r', 'connection resolver', _pick_connection_resolver, 'auto' if resolver is None else resolver), ] if user_traffic_allowed.inbound: - options.append(nyx.panel.Help('c', 'client locale usage summary')) + options.append(nyx.panel.KeyHandler('c', 'client locale usage summary', _show_client_locales)) if user_traffic_allowed.outbound: - options.append(nyx.panel.Help('e', 'exit port usage summary')) + options.append(nyx.panel.KeyHandler('e', 'exit port usage summary', _show_exiting_port_usage)) return tuple(options) diff --git a/nyx/panel/graph.py b/nyx/panel/graph.py index b09c8b8..b092ecc 100644 --- a/nyx/panel/graph.py +++ b/nyx/panel/graph.py @@ -501,14 +501,8 @@ class GraphPanel(nyx.panel.Panel): finally: nyx.controller.show_message() - def handle_key(self, key): - if key.match('r'): - self.resize_graph() - elif key.match('b'): - # uses the next boundary type - self.bounds_type = Bounds.next(self.bounds_type) - self.redraw(True) - elif key.match('s'): + def key_handlers(self): + def _pick_stats(): # provides a menu to pick the graphed stats available_stats = sorted(self.stat_options()) @@ -523,26 +517,24 @@ class GraphPanel(nyx.panel.Panel): self.displayed_stat = None elif selection != -1: self.displayed_stat = available_stats[selection - 1] - elif key.match('i'): - # provides menu to pick graph panel update interval + def _next_bounds(): + self.bounds_type = Bounds.next(self.bounds_type) + self.redraw(True) + + def _pick_interval(): selection = nyx.popups.show_menu('Update Interval:', list(Interval), list(Interval).index(self.update_interval)) if selection != -1: self.update_interval = list(Interval)[selection] self.redraw(True) - else: - return False - - return True - def get_help(self): return ( - nyx.panel.Help('r', 'resize graph'), - nyx.panel.Help('s', 'graphed stats', self.displayed_stat if self.displayed_stat else 'none'), - nyx.panel.Help('b', 'graph bounds', self.bounds_type.replace('_', ' ')), - nyx.panel.Help('i', 'graph update interval', self.update_interval), + nyx.panel.KeyHandler('r', 'resize graph', self.resize_graph), + nyx.panel.KeyHandler('s', 'graphed stats', _pick_stats, self.displayed_stat if self.displayed_stat else 'none'), + nyx.panel.KeyHandler('b', 'graph bounds', _next_bounds, self.bounds_type.replace('_', ' ')), + nyx.panel.KeyHandler('i', 'graph update interval', _pick_interval, self.update_interval), ) def set_paused(self, is_pause): diff --git a/nyx/panel/header.py b/nyx/panel/header.py index 00d3ff2..065ade1 100644 --- a/nyx/panel/header.py +++ b/nyx/panel/header.py @@ -130,10 +130,11 @@ class HeaderPanel(nyx.panel.Panel, threading.Thread): if not self.is_wide(): self.show_message('Requesting a new identity', HIGHLIGHT, max_wait = 1) - def handle_key(self, key): - if key.match('n'): - self.send_newnym() - elif key.match('r') and not self._vals.is_connected: + def key_handlers(self): + def _reconnect(): + if self._vals.is_connected: + return + # TODO: This is borked. Not quite sure why but our attempt to call # PROTOCOLINFO fails with a socket error, followed by completely freezing # nyx. This is exposing two bugs... @@ -141,7 +142,7 @@ class HeaderPanel(nyx.panel.Panel, threading.Thread): # * This should be working. That's a stem issue. # * Our interface shouldn't be locking up. That's an nyx issue. - return True + return controller = tor_controller() @@ -161,10 +162,11 @@ class HeaderPanel(nyx.panel.Panel, threading.Thread): except Exception as exc: self.show_message('Unable to reconnect (%s)' % exc, HIGHLIGHT, max_wait = 3) controller.close() - else: - return False - return True + return ( + nyx.panel.KeyHandler('n', action = self.send_newnym), + nyx.panel.KeyHandler('r', action = _reconnect), + ) def draw(self, width, height): vals = self._vals # local reference to avoid concurrency concerns diff --git a/nyx/panel/log.py b/nyx/panel/log.py index 8a0a9c7..fc11aee 100644 --- a/nyx/panel/log.py +++ b/nyx/panel/log.py @@ -222,23 +222,15 @@ class LogPanel(nyx.panel.Panel, threading.Thread): except Exception as exc: raise IOError("unable to write to '%s': %s" % (path, exc)) - def handle_key(self, key): - if key.is_scroll(): + def key_handlers(self): + def _scroll(key): page_height = self.get_preferred_size()[0] - 1 is_changed = self._scroller.handle_key(key, self._last_content_height, page_height) if is_changed: self.redraw(True) - elif key.match('u'): - self.set_duplicate_visability(not self._show_duplicates) - self.redraw(True) - elif key.match('c'): - msg = 'This will clear the log. Are you sure (c again to confirm)?' - key_press = nyx.controller.show_message(msg, BOLD, max_wait = 30) - if key_press.match('c'): - self.clear() - elif key.match('f'): + def _pick_filter(): with nyx.curses.CURSES_LOCK: initial_selection = 1 if self._filter.selection() else 0 options = ['None'] + self._filter.latest_selections() + ['New...'] @@ -251,24 +243,25 @@ class LogPanel(nyx.panel.Panel, threading.Thread): self.show_filter_prompt() elif selection != -1: self._filter.select(self._filter.latest_selections()[selection - 1]) - elif key.match('e'): - self.show_event_selection_prompt() - elif key.match('a'): - self.show_snapshot_prompt() - else: - return False - return True + def _toggle_deduplication(): + self.set_duplicate_visability(not self._show_duplicates) + self.redraw(True) + + def _clear_log(): + msg = 'This will clear the log. Are you sure (c again to confirm)?' + key_press = nyx.controller.show_message(msg, BOLD, max_wait = 30) + + if key_press.match('c'): + self.clear() - def get_help(self): return ( - nyx.panel.Help('up arrow', 'scroll log up a line'), - nyx.panel.Help('down arrow', 'scroll log down a line'), - nyx.panel.Help('a', 'save snapshot of the log'), - nyx.panel.Help('e', 'change logged events'), - nyx.panel.Help('f', 'log regex filter', 'enabled' if self._filter.selection() else 'disabled'), - nyx.panel.Help('u', 'duplicate log entries', 'visible' if self._show_duplicates else 'hidden'), - nyx.panel.Help('c', 'clear event log'), + nyx.panel.KeyHandler('arrows', 'scroll up and down', _scroll, key_func = lambda key: key.is_scroll()), + nyx.panel.KeyHandler('a', 'save snapshot of the log', self.show_snapshot_prompt), + nyx.panel.KeyHandler('e', 'change logged events', self.show_event_selection_prompt), + nyx.panel.KeyHandler('f', 'log regex filter', _pick_filter, 'enabled' if self._filter.selection() else 'disabled'), + nyx.panel.KeyHandler('u', 'duplicate log entries', _toggle_deduplication, 'visible' if self._show_duplicates else 'hidden'), + nyx.panel.KeyHandler('c', 'clear event log', _clear_log), ) def set_paused(self, is_pause): diff --git a/nyx/panel/torrc.py b/nyx/panel/torrc.py index 560afb3..1e08742 100644 --- a/nyx/panel/torrc.py +++ b/nyx/panel/torrc.py @@ -80,31 +80,24 @@ class TorrcPanel(panel.Panel): self._show_line_numbers = is_visible self.redraw(True) - def handle_key(self, key): - if key.is_scroll(): + def key_handlers(self): + def _scroll(key): page_height = self.get_preferred_size()[0] - 1 is_changed = self._scroller.handle_key(key, self._last_content_height, page_height) if is_changed: self.redraw(True) - elif key.match('l'): - self.set_line_number_visible(not self._show_line_numbers) - elif key.match('s'): + + def _toggle_comment_stripping(): self.set_comments_visible(not self._show_comments) - else: - return False - return True + def _toggle_line_numbers(): + self.set_line_number_visible(not self._show_line_numbers) - def get_help(self): return ( - nyx.panel.Help('up arrow', 'scroll up a line'), - nyx.panel.Help('down arrow', 'scroll down a line'), - nyx.panel.Help('page up', 'scroll up a page'), - nyx.panel.Help('page down', 'scroll down a page'), - nyx.panel.Help('s', 'comment stripping', 'off' if self._show_comments else 'on'), - nyx.panel.Help('l', 'line numbering', 'on' if self._show_line_numbers else 'off'), - nyx.panel.Help('x', 'reset tor (issue sighup)'), + nyx.panel.KeyHandler('arrows', 'scroll up and down', _scroll, key_func = lambda key: key.is_scroll()), + nyx.panel.KeyHandler('s', 'comment stripping', _toggle_comment_stripping, 'off' if self._show_comments else 'on'), + nyx.panel.KeyHandler('l', 'line numbering', _toggle_line_numbers, 'on' if self._show_line_numbers else 'off'), ) def draw(self, width, height): diff --git a/nyx/popups.py b/nyx/popups.py index 0952a8d..b01815c 100644 --- a/nyx/popups.py +++ b/nyx/popups.py @@ -87,7 +87,7 @@ def show_help_popup(): help_options = [] for panel in reversed(control.get_display_panels()): - help_options += panel.get_help() + help_options += [handler for handler in panel.key_handlers() if handler.description] def _render(subwindow): subwindow.box()

1 0

[translation/tails-onioncircuits] Update translations for tails-onioncircuits
by translation＠torproject.org 01 Apr '16

01 Apr '16

commit 7b275cfb55618a1b77a5dae268beb99f6eec63c7 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Apr 1 16:46:44 2016 +0000 Update translations for tails-onioncircuits --- id/onioncircuits.pot | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/id/onioncircuits.pot b/id/onioncircuits.pot index 3d4d7d3..6a17112 100644 --- a/id/onioncircuits.pot +++ b/id/onioncircuits.pot @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Al Kautsar <nurudduja(a)gmail.com>, 2016 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-26 00:31+0100\n" -"PO-Revision-Date: 2016-03-30 03:31+0000\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"POT-Creation-Date: 2016-03-31 21:31+0200\n" +"PO-Revision-Date: 2016-04-01 16:40+0000\n" +"Last-Translator: Al Kautsar <nurudduja(a)gmail.com>\n" "Language-Team: Indonesian (http://www.transifex.com/otf/torproject/language/id/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -57,7 +58,7 @@ msgstr "" #: ../onioncircuits:314 msgid "Building..." -msgstr "" +msgstr "Membangun ...." #: ../onioncircuits:339 #, c-format @@ -70,16 +71,16 @@ msgstr "Sidik jari:" #: ../onioncircuits:565 msgid "Published:" -msgstr "" +msgstr "Diterbitkan:" #: ../onioncircuits:566 msgid "IP:" -msgstr "" +msgstr "IP:" #: ../onioncircuits:566 #, c-format msgid "%s (%s)" -msgstr "" +msgstr "%s (%s)" #: ../onioncircuits:567 msgid "Bandwidth:" @@ -88,4 +89,4 @@ msgstr "Bandwidth:" #: ../onioncircuits:567 #, c-format msgid "%.2f Mb/s" -msgstr "" +msgstr "%.2f Mb/detik"

1 0