November 2014 - tor-commits - lists.torproject.org

[tor/master] Document networkstatus-bridges
by nickm＠torproject.org 10 Nov '14

10 Nov '14

commit 26e7e519dc72aba1f00b9f0179f58e10fafda3d2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 10 09:03:11 2014 -0500 Document networkstatus-bridges Closes 13713; patch from 'tom' --- changes/bug13713 | 3 +++ doc/tor.1.txt | 5 +++++ 2 files changed, 8 insertions(+) diff --git a/changes/bug13713 b/changes/bug13713 new file mode 100644 index 0000000..412b406 --- /dev/null +++ b/changes/bug13713 @@ -0,0 +1,3 @@ + o Documentation: + - Document the bridge-authority-only 'networkstatus-bridges' + file. Closes ticket 13713; patch from "tom". diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 5810713..eb406e7 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -2409,6 +2409,11 @@ __DataDirectory__**/stats/conn-stats**:: Only used by servers. This file is used to collect approximate connection history (number of active connections over time). +__DataDirectory__**/networkstatus-bridges**:: + Only used by authoritative bridge directories. Contains information + about bridges that have self-reported themselves to the bridge + authority. + __HiddenServiceDirectory__**/hostname**:: The <base32-encoded-fingerprint>.onion domain name for this hidden service. If the hidden service is restricted to authorized clients only, this file

1 0

[tor/master] Fixing typo in manpage.
by nickm＠torproject.org 10 Nov '14

10 Nov '14

commit 7f7df97579ba1035594c1d7589b890360ee93033 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Sun Nov 9 16:34:34 2014 +0200 Fixing typo in manpage. --- changes/bug13707 | 4 ++++ doc/tor.1.txt | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/changes/bug13707 b/changes/bug13707 new file mode 100644 index 0000000..349495c --- /dev/null +++ b/changes/bug13707 @@ -0,0 +1,4 @@ + o Documentation: + - Fix typo in PredictedPortsRelevanceTime option description in + manpage. Resolves issue 13707. + diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 1c3be8c..5810713 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -550,7 +550,7 @@ GENERAL OPTIONS \'info'. (Default: 0) [[PredictedPortsRelevanceTime]] **PredictedPortsRelevanceTime** __NUM__:: - Set how long, after the client has mad an anonymized connection to a + Set how long, after the client has made an anonymized connection to a given port, we will try to make sure that we build circuits to exits that support that port. The maximum value for this option is 1 hour. (Default: 1 hour)

1 0

[tor-messenger-build/master] Disable the account picture dialog
by sukhbir＠torproject.org 10 Nov '14

10 Nov '14

commit 10f703266a22fc4dc62119a992801bf0c8c857d7 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon Nov 10 16:56:51 2014 +0530 Disable the account picture dialog --- projects/instantbird/config | 1 + projects/instantbird/picture.patch | 30 ++++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+) diff --git a/projects/instantbird/config b/projects/instantbird/config index 91414d0..8940c40 100644 --- a/projects/instantbird/config +++ b/projects/instantbird/config @@ -48,6 +48,7 @@ input_files: - filename: facebook.patch - filename: accountcreation.patch - filename: links.patch + - filename: picture.patch - filename: prepare-messages-for-displaying.patch - filename: 'mozconfig-[% c("var/osname") %]' name: mozconfig diff --git a/projects/instantbird/picture.patch b/projects/instantbird/picture.patch new file mode 100644 index 0000000..14a3ed3 --- /dev/null +++ b/projects/instantbird/picture.patch @@ -0,0 +1,30 @@ +# HG changeset patch +# User Sukhbir Singh <sukhbir(a)torproject.org> +# Date 1415618519 18000 +# Node ID 6193b9d64e63818366e61126625727543fb81d3f +# Parent 09d259c6155857eda3d4488c68a4a9d8d851138f +Disable the account picture dialog + +diff --git a/im/content/blist.xul b/im/content/blist.xul +--- a/im/content/blist.xul ++++ b/im/content/blist.xul +@@ -109,18 +109,17 @@ + </menupopup> + </popupset> + + <toolbox id="mainToolbox"> + <toolbar id="statusArea"> + <stack id="statusImageStack"> +  + <box id="userIconHolder"> +- <image id="userIcon" role="button" popup="changeUserIconPanel" +- aria-label="&userIcon.label;" tooltiptext="&userIcon.label;"/> ++ <image id="userIcon" role="button"/> + </box> + <panel id="changeUserIconPanel" + type="arrow" align="center" + onpopupshowing="buddyList.updateUserIconPanelItems();" + onpopuphiding="buddyList.stopWebcamStream();"> + <deck id="userIconPanel"> + <vbox class="userIconPanelMenu"> + <stack id="userIconPanelStack" flex="1">

1 0

[tor-messenger-build/master] Disable sounds on messaging events
by sukhbir＠torproject.org 10 Nov '14

10 Nov '14

commit 8c85f720e6809102036ed761256bd762a14f6b4a Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon Nov 10 14:45:57 2014 +0530 Disable sounds on messaging events --- projects/instantbird/preferences.patch | 2 ++ 1 file changed, 2 insertions(+) diff --git a/projects/instantbird/preferences.patch b/projects/instantbird/preferences.patch index 8d05d84..1b48a6e 100644 --- a/projects/instantbird/preferences.patch +++ b/projects/instantbird/preferences.patch @@ -86,6 +86,8 @@ diff --git a/im/app/profile/all-instantbird.js b/im/app/profile/all-instantbird. +pref("messenger.status.awayWhenIdle", false); +pref("messenger.status.defaultIdleAwayMessage", ""); +pref("messenger.status.reportIdle", false); ++// Do not play sounds on messaging events ++pref("messenger.options.playSounds.message", false); + +// Chat +// Do not show any quit message

1 0

[translation/torcheck_completed] Update translations for torcheck_completed
by translation＠torproject.org 10 Nov '14

10 Nov '14

commit bf2dee4da734ce291db9ed5c5e506fa869ecc137 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Nov 10 07:45:13 2014 +0000 Update translations for torcheck_completed --- sl_SI/torcheck.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sl_SI/torcheck.po b/sl_SI/torcheck.po index 7b31bbc..e1f6809 100644 --- a/sl_SI/torcheck.po +++ b/sl_SI/torcheck.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2014-11-06 17:31+0000\n" +"PO-Revision-Date: 2014-11-10 07:27+0000\n" "Last-Translator: Dušan <dusan.k(a)zoho.com>\n" "Language-Team: Slovenian (Slovenia) (http://www.transifex.com/projects/p/torproject/language/sl_SI/)\n" "MIME-Version: 1.0\n"

1 0

[translation/torcheck] Update translations for torcheck
by translation＠torproject.org 10 Nov '14

10 Nov '14

commit a7c007a168399a7b64171ab345564ab963b4ce16 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Nov 10 07:45:09 2014 +0000 Update translations for torcheck --- sl_SI/torcheck.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sl_SI/torcheck.po b/sl_SI/torcheck.po index 7b31bbc..e1f6809 100644 --- a/sl_SI/torcheck.po +++ b/sl_SI/torcheck.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2014-11-06 17:31+0000\n" +"PO-Revision-Date: 2014-11-10 07:27+0000\n" "Last-Translator: Dušan <dusan.k(a)zoho.com>\n" "Language-Team: Slovenian (Slovenia) (http://www.transifex.com/projects/p/torproject/language/sl_SI/)\n" "MIME-Version: 1.0\n"

1 0

[translation/torbutton-torbuttondtd] Update translations for torbutton-torbuttondtd
by translation＠torproject.org 10 Nov '14

10 Nov '14

commit 549686caa47016146b3f0034c88d1c61be37c436 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Nov 10 03:45:55 2014 +0000 Update translations for torbutton-torbuttondtd --- sco/torbutton.dtd | 92 ++++++++++++++++++++++++++--------------------------- 1 file changed, 46 insertions(+), 46 deletions(-) diff --git a/sco/torbutton.dtd b/sco/torbutton.dtd index 15ca330..52034e0 100644 --- a/sco/torbutton.dtd +++ b/sco/torbutton.dtd @@ -88,67 +88,67 @@ <!ENTITY torbutton.prefs.reload_crashed_jar "Relaid cookie jar/clear cookies oan Firefox crash (recommendit)"> <!ENTITY torbutton.prefs.dual_cookie_jars "Store baith Tor n Non-Tor cookies in fendit jars (dangerous)"> <!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommendit)"> -<!ENTITY torbutton.prefs.block_js_history "Isolate access to history navigation to Tor state (crucial)"> -<!ENTITY torbutton.prefs.resize_on_toggle "Resize windows to multiples of 50px during Tor usage (recommended)"> -<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)"> -<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)"> -<!ENTITY torbutton.prefs.block_links "Block link clicks and page reloads from different Tor states (optional)"> -<!ENTITY torbutton.prefs.jar_certs "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)"> -<!ENTITY torbutton.prefs.jar_ca_certs "Store CA certs in seperate jars for Tor/Non-Tor (recommended)"> -<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle"> -<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:"> -<!ENTITY torbutton.prefs.shutdown_state "Shutdown state"> -<!ENTITY torbutton.prefs.startup "Startup"> -<!ENTITY torbutton.prefs.block_tor_file_net "Block Tor access to network from file:// urls (recommended)"> -<!ENTITY torbutton.prefs.block_nontor_file_net "Block Non-Tor access to network from file:// urls"> -<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> -<!ENTITY torbutton.prefs.test_settings "Test Settings"> -<!ENTITY torbutton.prefs.test_auto "Test my Tor settings after the first time I toggle on every Firefox start"> -<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage"> -<!ENTITY torbutton.prefs.tor_memory_jar "Do not write Tor cookies to disk"> -<!ENTITY torbutton.prefs.nontor_memory_jar "Do not write Non-Tor cookies to disk"> -<!ENTITY torbutton.prefs.session_restore "Have the session store save and restore these tabs:"> -<!ENTITY torbutton.prefs.nontor_tabs "Tabs loaded in Non-Tor"> -<!ENTITY torbutton.prefs.tor_tabs "Tabs loaded in Tor"> +<!ENTITY torbutton.prefs.block_js_history "Isolate access tae histerie navigation tae Tor state (crucial)"> +<!ENTITY torbutton.prefs.resize_on_toggle "Resize windaes tae multiples o 50px durin Tor uissage (recommendit)"> +<!ENTITY torbutton.prefs.close_tor "Clase aw Tor windaes n tabs oan toggle (aen optie)"> +<!ENTITY torbutton.prefs.close_nontor "Clase aw Non-Tor windaes n tabs oan toggle (aen optie)"> +<!ENTITY torbutton.prefs.block_links "Block airtin claps n page relaids fae different Tor states (aen optie)"> +<!ENTITY torbutton.prefs.jar_certs "Store SSL certs in seperate jars fer Tor/Non-Tor (recommendit)"> +<!ENTITY torbutton.prefs.jar_ca_certs "Store CA certs in seperate jars fer Tor/Non-Tor (recommendit)"> +<!ENTITY torbutton.prefs.locked_mode "Disable Button n Hotkeys tae hinder accidental toggle"> +<!ENTITY torbutton.prefs.startup_state "Oan normal stairtup, set Tor state tae:"> +<!ENTITY torbutton.prefs.shutdown_state "Turnaff state"> +<!ENTITY torbutton.prefs.startup "Stairtup"> +<!ENTITY torbutton.prefs.block_tor_file_net "Block Tor access tae netwairk fae file:// urls (recommendit)"> +<!ENTITY torbutton.prefs.block_nontor_file_net "Block Non-Tor access tae netwairrk fae file:// urls"> +<!ENTITY torbutton.prefs.restore_defaults "Restore Defauts"> +<!ENTITY torbutton.prefs.test_settings "Test Settins"> +<!ENTITY torbutton.prefs.test_auto "Test ma Tor settins efter the first time that Ah toggle oan ilcka Firefox stairt"> +<!ENTITY torbutton.prefs.disable_livemarks "Disable livemaurks updates durin Tor uissage"> +<!ENTITY torbutton.prefs.tor_memory_jar "Dinna screeve Tor cookies tae disk"> +<!ENTITY torbutton.prefs.nontor_memory_jar "Dinna screeve Non-Tor cookies tae disk"> +<!ENTITY torbutton.prefs.session_restore "Hae the session store hain n restore thir tabs:"> +<!ENTITY torbutton.prefs.nontor_tabs "Tabs laidit in Non-Tor"> +<!ENTITY torbutton.prefs.tor_tabs "Tabs laidit in Tor"> <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4"> <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5"> -<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: "> -<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above"> +<!ENTITY torbutton.prefs.no_proxies_on "Nae Proxies fer: "> +<!ENTITY torbutton.prefs.no_proxy_warning "Warnishment: Avoid uisin onie hostnames abuin"> <!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh"> -<!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options"> +<!ENTITY torbutton.prefs.refereroptions "Referer Spoofin Opties"> <!ENTITY torbutton.prefs.nospoof "Nae referer spoof durin Tor uissage (sends referers aes normal)"> -<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page"> -<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer"> +<!ENTITY torbutton.prefs.spoofroot "Spoof the containin fauder o the page"> +<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain aes referer"> <!ENTITY torbutton.prefs.spoofblank "Spoof blank referer durin Tor uissage (micht break some steids)"> -<!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> -<!ENTITY torbutton.cookiedialog.lockCol "Protected"> +<!ENTITY torbutton.cookiedialog.title "Manage Cookie Fendins"> +<!ENTITY torbutton.cookiedialog.lockCol "Fendit"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> <!ENTITY torbutton.cookiedialog.nameCol "Name"> <!ENTITY torbutton.cookiedialog.pathCol "Path"> -<!ENTITY torbutton.cookiedialog.protectCookie "Protect Cookie"> -<!ENTITY torbutton.cookiedialog.removeCookie "Remove Cookie"> -<!ENTITY torbutton.cookiedialog.unprotectCookie "Unprotect Cookie"> -<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> -<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> -<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage"> -<!ENTITY torbutton.prefs.dtd_recommended "(recommended)"> -<!ENTITY torbutton.prefs.dtd_optional "(optional)"> +<!ENTITY torbutton.cookiedialog.protectCookie "Fend Cookie"> +<!ENTITY torbutton.cookiedialog.removeCookie "Remuiv Cookie"> +<!ENTITY torbutton.cookiedialog.unprotectCookie "Onfend Cookie"> +<!ENTITY torbutton.cookiedialog.removeAllBut "Remui Aw But Fendit"> +<!ENTITY torbutton.cookiedialog.saveAllCookies "Fend New Cookies"> +<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Dinna Fend New Cookies"> +<!ENTITY torbutton.prefs.disable_livemarks "Disable livemaurks updates durin Tor uissage"> +<!ENTITY torbutton.prefs.dtd_recommended "(recommendit)"> +<!ENTITY torbutton.prefs.dtd_optional "(aen optie)"> <!ENTITY torbutton.prefs.dtd_crucial "(crucial)"> -<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor"> -<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha:"> +<!ENTITY torbutton.prefs.update_torbutton_via_tor "Reguid Torbutton updates throo Tor"> +<!ENTITY torbutton.prefs.dodge_google_captcha "Autæmateeclie uise ae different rake engine whan presented wi ae 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.fix_google_srch "Strip platform and language off of Google Search Box queries"> -<!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)"> +<!ENTITY torbutton.prefs.fix_google_srch "Strip platform n leid aff o Google Rake Kist queries"> +<!ENTITY torbutton.prefs.transparentTor "Transparent Torifeecation (needs custom transproxy or Tor router)"> <!ENTITY torbutton.prefs.priv_caption "Privacy Settings"> -<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> -<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> -<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> -<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> +<!ENTITY torbutton.prefs.block_disk "Dinna record brousin histerie or wabsteid data (enables Preevate Brousin Mode)"> +<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third pairtie cookies n ither trackin data"> +<!ENTITY torbutton.prefs.block_plugins "Disable brouser plugins (lyk Flash)"> +<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish ye fae ither Tor Brouser uisers"> <!ENTITY torbutton.prefs.sec_caption "Security Level"> <!ENTITY torbutton.prefs.sec_low "Low (default)"> <!ENTITY torbutton.prefs.sec_med_low "Medium-Low">

1 0

[translation/torbutton-torbuttondtd] Update translations for torbutton-torbuttondtd
by translation＠torproject.org 10 Nov '14

10 Nov '14

commit 307baff90226c35e6dd128a34dd28c2bb716c905 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Nov 10 03:15:46 2014 +0000 Update translations for torbutton-torbuttondtd --- sco/torbutton.dtd | 130 ++++++++++++++++++++++++++--------------------------- 1 file changed, 65 insertions(+), 65 deletions(-) diff --git a/sco/torbutton.dtd b/sco/torbutton.dtd index ea9e284..15ca330 100644 --- a/sco/torbutton.dtd +++ b/sco/torbutton.dtd @@ -1,93 +1,93 @@ -<!ENTITY torbutton.prefs.title "Torbutton Preferences"> -<!ENTITY torbutton.prefs.tor_settings "Proxy Settings"> -<!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox"> -<!ENTITY torbutton.prefs.use_privoxy "Use Privoxy"> -<!ENTITY torbutton.prefs.use_polipo "Use Polipo"> -<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings"> +<!ENTITY torbutton.prefs.title "Torbutton Preeferences"> +<!ENTITY torbutton.prefs.tor_settings "Proxy Settins"> +<!ENTITY torbutton.prefs.recommended_settings "Uise the recommendit proxy settins fer ma version o Firefox"> +<!ENTITY torbutton.prefs.use_privoxy "Uise Privoxy"> +<!ENTITY torbutton.prefs.use_polipo "Uise Polipo"> +<!ENTITY torbutton.prefs.custom_settings "Uise custom proxy settins"> <!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.proxy.host.socks "SOCKS Host:"> +<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Hoast:"> <!ENTITY torbutton.prefs.proxy.port "Port:"> <!ENTITY torbutton.about.title "About Torbutton"> <!ENTITY torbutton.about.version "Version:"> -<!ENTITY torbutton.about.summary "Protects the privacy of your Tor browsing."> -<!ENTITY torbutton.about.code "Code Contributors:"> +<!ENTITY torbutton.about.summary "Pretects the preevacie o yer Tor brousin."> +<!ENTITY torbutton.about.code "Code Contreebuters:"> <!ENTITY torbutton.about.maintainer "Maintainer:"> -<!ENTITY torbutton.about.security_review "Security Review:"> -<!ENTITY torbutton.about.donate "If you like using Tor, you might consider"> -<!ENTITY torbutton.about.make_donation "making a donation."> -<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings."> -<!ENTITY torbutton.pref_connection.more_info "More information"> -<!ENTITY torbutton.pref_connection_more_info.title "Help"> -<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled. If you would like to change your non-Tor proxy settings, please disable Torbutton and return here. If you would like to change your Tor settings, please use the Torbutton preference window."> -<!ENTITY torbutton.context_menu.new_identity "New Identity"> +<!ENTITY torbutton.about.security_review "Securitie Luikower:"> +<!ENTITY torbutton.about.donate "Gif ye lyk uisin Tor, than ye micht conseeder"> +<!ENTITY torbutton.about.make_donation "donatin."> +<!ENTITY torbutton.pref_connection.notice "Disable Torbutton tae chynge thir settins."> +<!ENTITY torbutton.pref_connection.more_info "Mair information"> +<!ENTITY torbutton.pref_connection_more_info.title "Heelp"> +<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is nou enabled. Gif ye'd lyk tae chynge yer non-Tor proxy settins, please disable Torbutton n come back here. Gif ye'd lyk tae chynge yer Tor settins, please uise the Torbutton preeference windae."> +<!ENTITY torbutton.context_menu.new_identity "New Identitie"> <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.toggle "Toggle Tor status"> <!ENTITY torbutton.context_menu.toggle.key "T"> -<!ENTITY torbutton.context_menu.preferences "Preferences..."> +<!ENTITY torbutton.context_menu.preferences "Preeferences..."> <!ENTITY torbutton.context_menu.preferences.key "P"> -<!ENTITY torbutton.context_menu.about "About Torbutton..."> +<!ENTITY torbutton.context_menu.about "Aneat Torbutton..."> <!ENTITY torbutton.context_menu.about.key "A"> -<!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> +<!ENTITY torbutton.context_menu.networksettings "Apen Netwark Settins…"> <!ENTITY torbutton.context_menu.networksettings.key "S"> -<!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> +<!ENTITY torbutton.context_menu.downloadUpdate "Dounlaid the Tor Brouser Bundle Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> -<!ENTITY torbutton.context_menu.copyTor "Copy Tor URL"> +<!ENTITY torbutton.context_menu.copyTor "Capie Tor URL"> <!ENTITY torbutton.context_menu.copyTor.key "p"> -<!ENTITY torbutton.context_menu.openTorTab "Open Tor URL in new Tab"> +<!ENTITY torbutton.context_menu.openTorTab "Apen the Tor URL in ae new Tab"> <!ENTITY torbutton.context_menu.openTorTab.key "r"> -<!ENTITY torbutton.context_menu.openTorWindow "Open Tor URL in new Window"> +<!ENTITY torbutton.context_menu.openTorWindow "Apen the Tor URL in ae new Windae"> <!ENTITY torbutton.context_menu.openTorWindow.key "d"> <!ENTITY torbutton.button.label "Torbutton"> -<!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> +<!ENTITY torbutton.button.tooltip "Clap tae ineetialise Torbutton"> <!ENTITY torbutton.prefs.privacy_security_settings "Privacy and Security Settings"> -<!ENTITY torbutton.prefs.block_thread "Block history reads during Tor (crucial)"> -<!ENTITY torbutton.prefs.block_thwrite "Block history writes during Tor (recommended)"> -<!ENTITY torbutton.prefs.block_nthread "Block history reads during Non-Tor (optional)"> -<!ENTITY torbutton.prefs.block_nthwrite "Block history writes during Non-Tor (optional)"> -<!ENTITY torbutton.prefs.clear_history "Clear history on Tor toggle (optional)"> -<!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle"> -<!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor"> -<!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar"> -<!ENTITY torbutton.prefs.cookie_protection "Use the Cookie Protections Dialog to choose"> -<!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)"> -<!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle"> -<!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)"> -<!ENTITY torbutton.prefs.kill_bad_js "Hook dangerous javascript (crucial)"> -<!ENTITY torbutton.prefs.isolate_content "Isolate dynamic content to Tor state (crucial)"> -<!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage"> -<!ENTITY torbutton.prefs.set_uagent "Set user agent for Tor usage (crucial)"> -<!ENTITY torbutton.prefs.dynamic "Dynamic Content"> +<!ENTITY torbutton.prefs.block_thread "Block histerie reads durin Tor (crucial)"> +<!ENTITY torbutton.prefs.block_thwrite "Block histerie writes durin Tor (recommendit)"> +<!ENTITY torbutton.prefs.block_nthread "Block histerie reads durin Non-Tor (aen optie)"> +<!ENTITY torbutton.prefs.block_nthwrite "Block histerie writes durin Non-Tor (aen optie)"> +<!ENTITY torbutton.prefs.clear_history "Clear histerie oan Tor toggle (aen optiel)"> +<!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache n clear aw cache oan Tor toggle"> +<!ENTITY torbutton.prefs.block_cache "Block disk n memorie cache access durin Tor"> +<!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in ae fendit jar"> +<!ENTITY torbutton.prefs.cookie_protection "Uise the Cookie Fendins Dialog tae chuise"> +<!ENTITY torbutton.prefs.mmm_cookies "Ah'll manage ma cookies masel (dangerous)"> +<!ENTITY torbutton.prefs.clear_cookies "Clear cookies oan Tor toggle"> +<!ENTITY torbutton.prefs.disable_plugins "Disable plugins durin Tor uisage (crucial)"> +<!ENTITY torbutton.prefs.kill_bad_js "Huik dangerous javascript (crucial)"> +<!ENTITY torbutton.prefs.isolate_content "Isolate dynameec content tae Tor state (crucial)"> +<!ENTITY torbutton.prefs.no_updates "Disable updates durin Tor uissage"> +<!ENTITY torbutton.prefs.set_uagent "Set uiser agent fer Tor uissage (crucial)"> +<!ENTITY torbutton.prefs.dynamic "Dynameec Content"> <!ENTITY torbutton.prefs.cookies "Cookies"> <!ENTITY torbutton.prefs.cache "Cache"> -<!ENTITY torbutton.prefs.history "History"> -<!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (recommended)"> -<!ENTITY torbutton.prefs.shutdown "Shutdown"> -<!ENTITY torbutton.prefs.tor_shutdown "Clear Tor cookies during Tor-enabled browser shutdown"> -<!ENTITY torbutton.prefs.all_shutdown "Clear cookies during any browser shutdown"> -<!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown"> -<!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)"> -<!ENTITY torbutton.prefs.headers "Headers"> -<!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser"> -<!ENTITY torbutton.prefs.refererspoofing "Referer spoofing"> -<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)"> -<!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)"> -<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)"> -<!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage during Tor usage (crucial)"> +<!ENTITY torbutton.prefs.history "Histerie"> +<!ENTITY torbutton.prefs.no_search "Disable rake suggestions durin Tor (recommendit)"> +<!ENTITY torbutton.prefs.shutdown "Turn-aff"> +<!ENTITY torbutton.prefs.tor_shutdown "Clear Tor cookies durin Tor-enabled brouser turnaff"> +<!ENTITY torbutton.prefs.all_shutdown "Clear cookies durin onie brouser turnaff"> +<!ENTITY torbutton.prefs.no_shutdown "Dinna clear ma cookies at turnaff"> +<!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Hainin (recommendit)"> +<!ENTITY torbutton.prefs.headers "Heiders"> +<!ENTITY torbutton.prefs.spoof_english "Spoof US Ingils Brouser"> +<!ENTITY torbutton.prefs.refererspoofing "Referer spoofin"> +<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer durin Tor uissage (micht break some steids)"> +<!ENTITY torbutton.prefs.smartspoof "Smart referer spoof durin Tor uissage (spoofs cross domain referers)"> +<!ENTITY torbutton.prefs.nospoof "Nae referer spoof durin Tor uissage (sends referers aes normal)"> +<!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage durin Tor uissage (crucial)"> <!ENTITY torbutton.prefs.forms "Forms"> -<!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)"> -<!ENTITY torbutton.prefs.block_ntforms "Block password+form saving during Non-Tor (optional)"> +<!ENTITY torbutton.prefs.block_tforms "Block passwaird+form hainin durin Tor (recommendit)"> +<!ENTITY torbutton.prefs.block_ntforms "Block password+form hainin durin Non-Tor (aen optie)"> <!ENTITY torbutton.prefs.tor "Tor"> <!ENTITY torbutton.prefs.non_tor "Non-Tor"> -<!ENTITY torbutton.prefs.restore_tor "On session restored startup, set Tor state to:"> -<!ENTITY torbutton.prefs.startup_tor "On browser startup, set Tor state to:"> -<!ENTITY torbutton.prefs.reload_crashed_jar "Reload cookie jar/clear cookies on Firefox crash (recommended)"> -<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars (dangerous)"> -<!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)"> +<!ENTITY torbutton.prefs.restore_tor "Oan session restored stairtup, set Tor state tae:"> +<!ENTITY torbutton.prefs.startup_tor "Oan brouser stairtup, set Tor state tae:"> +<!ENTITY torbutton.prefs.reload_crashed_jar "Relaid cookie jar/clear cookies oan Firefox crash (recommendit)"> +<!ENTITY torbutton.prefs.dual_cookie_jars "Store baith Tor n Non-Tor cookies in fendit jars (dangerous)"> +<!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommendit)"> <!ENTITY torbutton.prefs.block_js_history "Isolate access to history navigation to Tor state (crucial)"> <!ENTITY torbutton.prefs.resize_on_toggle "Resize windows to multiples of 50px during Tor usage (recommended)"> <!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)"> @@ -116,10 +116,10 @@ <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above"> <!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh"> <!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options"> -<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)"> +<!ENTITY torbutton.prefs.nospoof "Nae referer spoof durin Tor uissage (sends referers aes normal)"> <!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page"> <!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer"> -<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)"> +<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer durin Tor uissage (micht break some steids)"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host">

1 0

[arm/master] Switching graph intervals back to an enum
by atagar＠torproject.org 10 Nov '14

10 Nov '14

commit c3729a065931ff13898a8e98807c801bd33e5b99 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Nov 9 18:19:22 2014 -0800 Switching graph intervals back to an enum This isn't a revert, but rather moving the interval back into the panel in a way that'll make this easier to maintain. This lets us do all config validation in the conf_handler(). That's what it's there for. ;) --- arm/config/attributes.cfg | 9 ---- arm/graph_panel.py | 108 ++++++++++++++++++++------------------------- arm/menu/actions.py | 6 +-- 3 files changed, 51 insertions(+), 72 deletions(-) diff --git a/arm/config/attributes.cfg b/arm/config/attributes.cfg index 7452a71..b592e11 100644 --- a/arm/config/attributes.cfg +++ b/arm/config/attributes.cfg @@ -27,15 +27,6 @@ attr.hibernate_color awake => green attr.hibernate_color soft => yellow attr.hibernate_color hard => red -attr.graph.intervals each second => 1 -attr.graph.intervals 5 seconds => 5 -attr.graph.intervals 30 seconds => 30 -attr.graph.intervals minutely => 60 -attr.graph.intervals 15 minute => 900 -attr.graph.intervals 30 minute => 1800 -attr.graph.intervals hourly => 3600 -attr.graph.intervals daily => 86400 - attr.graph.title bandwidth => Bandwidth attr.graph.title connections => Connection Count attr.graph.title resources => System Resources diff --git a/arm/graph_panel.py b/arm/graph_panel.py index 5af3fb0..0210b2e 100644 --- a/arm/graph_panel.py +++ b/arm/graph_panel.py @@ -27,8 +27,20 @@ from stem.control import Listener from stem.util import conf, enum, log, str_tools, system GraphStat = enum.Enum(('BANDWIDTH', 'bandwidth'), ('CONNECTIONS', 'connections'), ('SYSTEM_RESOURCES', 'resources')) +Interval = enum.Enum(('EACH_SECOND', 'each second'), ('FIVE_SECONDS', '5 seconds'), ('THIRTY_SECONDS', '30 seconds'), ('MINUTELY', 'minutely'), ('FIFTEEN_MINUTE', '15 minute'), ('THIRTY_MINUTE', '30 minute'), ('HOURLY', 'hourly'), ('DAILY', 'daily')) Bounds = enum.Enum(('GLOBAL_MAX', 'global_max'), ('LOCAL_MAX', 'local_max'), ('TIGHT', 'tight')) +INTERVAL_SECONDS = { + Interval.EACH_SECOND: 1, + Interval.FIVE_SECONDS: 5, + Interval.THIRTY_SECONDS: 30, + Interval.MINUTELY: 60, + Interval.FIFTEEN_MINUTE: 900, + Interval.THIRTY_MINUTE: 1800, + Interval.HOURLY: 3600, + Interval.DAILY: 86400, +} + PRIMARY_COLOR, SECONDARY_COLOR = 'green', 'cyan' ACCOUNTING_RATE = 5 @@ -42,20 +54,31 @@ def conf_handler(key, value): return max(1, value) elif key == 'features.graph.max_width': return max(1, value) + elif key == 'features.graph.type': + if value != 'none' and value not in GraphStat: + log.warn("'%s' isn't a valid graph type, options are: none, %s" % (CONFIG['features.graph.type'], ', '.join(GraphStat))) + return CONFIG['features.graph.type'] # keep the default + elif key == 'features.graph.interval': + if value not in Interval: + log.warn("'%s' isn't a valid graphing interval, options are: %s" % (value, ', '.join(Interval))) + return CONFIG['features.graph.interval'] # keep the default + elif key == 'features.graph.bound': + if value not in Bounds: + log.warn("'%s' isn't a valid graph bounds, options are: %s" % (value, ', '.join(Bounds))) + return CONFIG['features.graph.bound'] # keep the default CONFIG = conf.config_dict('arm', { 'attr.hibernate_color': {}, - 'attr.graph.intervals': {}, 'attr.graph.title': {}, 'attr.graph.header.primary': {}, 'attr.graph.header.secondary': {}, 'features.graph.height': 7, - 'features.graph.interval': 'each second', + 'features.graph.type': GraphStat.BANDWIDTH, + 'features.graph.interval': Interval.EACH_SECOND, 'features.graph.bound': Bounds.LOCAL_MAX, 'features.graph.max_width': 150, 'features.graph.showIntermediateBounds': True, - 'features.graph.type': 'bandwidth', 'features.panels.show.connection': True, 'features.graph.bw.prepopulate': True, 'features.graph.bw.transferInBytes': False, @@ -70,6 +93,8 @@ class Stat(object): :var int latest_value: last value we recorded :var int total: sum of all values we've recorded + :var int tick: number of events we've processed + :var float start_time: unix timestamp for when we started :var dict values: mapping of intervals to an array of samplings from newest to oldest :var dict max_value: mapping of intervals to the maximum value it has had """ @@ -88,17 +113,20 @@ class Stat(object): self.total = 0 self.tick = 0 self.start_time = time.time() - self.values = dict([(i, CONFIG['features.graph.max_width'] * [0]) for i in CONFIG['attr.graph.intervals']]) - self.max_value = dict([(i, 0) for i in CONFIG['attr.graph.intervals']]) - self._in_process_value = dict([(i, 0) for i in CONFIG['attr.graph.intervals']]) + self.values = dict([(i, CONFIG['features.graph.max_width'] * [0]) for i in Interval]) + self.max_value = dict([(i, 0) for i in Interval]) + self._in_process_value = dict([(i, 0) for i in Interval]) + + def average(self): + return self.total / max(1, self.tick) def update(self, new_value): self.latest_value = new_value self.total += new_value self.tick += 1 - for interval in CONFIG['attr.graph.intervals']: - interval_seconds = int(CONFIG['attr.graph.intervals'][interval]) + for interval in Interval: + interval_seconds = INTERVAL_SECONDS[interval] self._in_process_value[interval] += new_value if self.tick % interval_seconds == 0: @@ -147,7 +175,7 @@ class GraphCategory(object): :returns: **str** with our y-axis label """ - return '' + return str(value) def bandwidth_event(self, event): """ @@ -188,8 +216,6 @@ class BandwidthStats(GraphCategory): return str_tools.size_label(value, is_bytes = CONFIG['features.graph.bw.transferInBytes']) def bandwidth_event(self, event): - # scales units from B to KB for graphing - self.primary.update(event.read) self.secondary.update(event.written) @@ -244,9 +270,6 @@ class ConnectionStats(GraphCategory): Tracks number of inbound and outbound connections. """ - def y_axis_label(self, value, is_primary): - return str(value) - def bandwidth_event(self, event): inbound_count, outbound_count = 0, 0 @@ -266,11 +289,8 @@ class ConnectionStats(GraphCategory): self.primary.update(inbound_count) self.secondary.update(outbound_count) - avg = self.primary.total / max(1, self.primary.tick) - self.primary_header_stats = [str(self.primary.latest_value), ', avg: %s' % avg] - - avg = self.secondary.total / max(1, self.secondary.tick) - self.secondary_header_stats = [str(self.secondary.latest_value), ', avg: %s' % avg] + self.primary_header_stats = [str(self.primary.latest_value), ', avg: %s' % self.primary.average()] + self.secondary_header_stats = [str(self.secondary.latest_value), ', avg: %s' % self.secondary.average()] class ResourceStats(GraphCategory): @@ -279,18 +299,15 @@ class ResourceStats(GraphCategory): """ def y_axis_label(self, value, is_primary): - return "%i%%" % value if is_primary else str_tools.size_label(value) + return '%i%%' % value if is_primary else str_tools.size_label(value) def bandwidth_event(self, event): resources = arm.util.tracker.get_resource_tracker().get_value() self.primary.update(resources.cpu_sample * 100) # decimal percentage to whole numbers self.secondary.update(resources.memory_bytes) - avg = self.primary.total / max(1, self.primary.tick) - self.primary_header_stats = ['%0.1f%%' % self.primary.latest_value, ', avg: %0.1f%%' % avg] - - avg = self.secondary.total / max(1, self.secondary.tick) - self.secondary_header_stats = [str_tools.size_label(self.secondary.latest_value, 1), ', avg: %s' % str_tools.size_label(avg, 1)] + self.primary_header_stats = ['%0.1f%%' % self.primary.latest_value, ', avg: %0.1f%%' % self.primary.average()] + self.secondary_header_stats = [str_tools.size_label(self.secondary.latest_value, 1), ', avg: %s' % str_tools.size_label(self.secondary.average(), 1)] class GraphPanel(panel.Panel): @@ -302,20 +319,11 @@ class GraphPanel(panel.Panel): def __init__(self, stdscr): panel.Panel.__init__(self, stdscr, 'graph', 0) - if CONFIG['features.graph.interval'] in CONFIG['attr.graph.intervals']: - self.update_interval = CONFIG['features.graph.interval'] - else: - self.update_interval = 'each second' - log.warn("'%s' isn't a valid graphing interval, options are: %s" % (CONFIG['features.graph.interval'], ', '.join(CONFIG['attr.graph.intervals']))) - - if CONFIG['features.graph.bound'] in Bounds: - self.bounds = CONFIG['features.graph.bound'] - else: - self.bounds = Bounds.LOCAL_MAX - log.warn("'%s' isn't a valid graph bounds, options are: %s" % (CONFIG['features.graph.bound'], ', '.join(Bounds))) + self.current_display = None if CONFIG['features.graph.type'] == 'none' else CONFIG['features.graph.type'] + self.update_interval = CONFIG['features.graph.interval'] + self.bounds = CONFIG['features.graph.bound'] self.graph_height = max(1, CONFIG['features.graph.height']) - self.current_display = None # label of the stats currently being displayed self._accounting_stats = None self._last_redraw = 0 @@ -330,13 +338,6 @@ class GraphPanel(panel.Panel): self.set_pause_attr('stats') self.set_pause_attr('_accounting_stats') - if CONFIG['features.graph.type'] == 'none': - self.set_stats(None) - elif CONFIG['features.graph.type'] in GraphStat: - self.set_stats(CONFIG['features.graph.type']) - else: - log.warn("'%s' isn't a graph type." % CONFIG['features.graph.type']) - # prepopulates bandwidth values from state file controller = tor_controller() @@ -369,7 +370,7 @@ class GraphPanel(panel.Panel): arm.controller.get_controller().redraw() - update_rate = int(CONFIG['attr.graph.intervals'][self.update_interval]) + update_rate = INTERVAL_SECONDS[self.update_interval] if time.time() - self._last_redraw > update_rate: self.redraw(True) @@ -510,11 +511,10 @@ class GraphPanel(panel.Panel): elif key.match('i'): # provides menu to pick graph panel update interval - options = CONFIG['attr.graph.intervals'].keys() - selection = arm.popups.show_menu('Update Interval:', options, CONFIG['attr.graph.intervals'].keys().index(self.update_interval)) + selection = arm.popups.show_menu('Update Interval:', list(Interval), list(Interval).index(self.update_interval)) if selection != -1: - self.update_interval = CONFIG['attr.graph.intervals'].keys()[selection] + self.update_interval = list(Interval)[selection] else: return False @@ -632,7 +632,7 @@ class GraphPanel(panel.Panel): # bottom labeling of x-axis - interval_sec = int(CONFIG['attr.graph.intervals'][self.update_interval]) # seconds per labeling + interval_sec = INTERVAL_SECONDS[self.update_interval] interval_spacing = 10 if graph_column >= WIDE_LABELING_GRAPH_COL else 5 units_label, decimal_precision = None, 0 @@ -746,16 +746,6 @@ def prepopulate_from_state(stat): bw_read_entries = bw_read_entries[len(bw_read_entries) - entry_count:] bw_write_entries = bw_write_entries[len(bw_write_entries) - entry_count:] - # gets index for 15-minute interval - - interval_index = 0 - - for interval_rate in CONFIG['attr.graph.intervals'].values(): - if int(interval_rate) == 900: - break - else: - interval_index += 1 - # fills the graphing parameters with state information for i in range(entry_count): diff --git a/arm/menu/actions.py b/arm/menu/actions.py index 28e4e16..3f70e66 100644 --- a/arm/menu/actions.py +++ b/arm/menu/actions.py @@ -19,7 +19,6 @@ from stem.util import conf, str_tools CONFIG = conf.config_dict('arm', { 'features.log.showDuplicateEntries': False, - 'attr.graph.intervals': {}, }) @@ -168,9 +167,8 @@ def make_graph_menu(graph_panel): interval_menu = arm.menu.item.Submenu("Interval") interval_group = arm.menu.item.SelectionGroup(graph_panel.set_update_interval, graph_panel.get_update_interval()) - for interval in CONFIG['attr.graph.intervals']: - label = str_tools._to_camel_case(interval, divider = " ") - interval_menu.add(arm.menu.item.SelectionMenuItem(label, interval_group, interval)) + for interval in arm.graph_panel.Interval: + interval_menu.add(arm.menu.item.SelectionMenuItem(interval, interval_group, interval)) graph_menu.add(interval_menu)

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 10 Nov '14

10 Nov '14

commit ec7ca2f3fbfa03cc3f78d17c0729aae70f58f66c Author: Translation commit bot <translation(a)torproject.org> Date: Mon Nov 10 01:45:03 2014 +0000 Update translations for bridgedb --- he/LC_MESSAGES/bridgedb.po | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/he/LC_MESSAGES/bridgedb.po b/he/LC_MESSAGES/bridgedb.po index 512e53c..794b3ca 100644 --- a/he/LC_MESSAGES/bridgedb.po +++ b/he/LC_MESSAGES/bridgedb.po @@ -14,7 +14,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2014-07-26 02:11+0000\n" -"PO-Revision-Date: 2014-11-10 01:14+0000\n" +"PO-Revision-Date: 2014-11-10 01:26+0000\n" "Last-Translator: dave nicetry <ndvnis(a)gmail.com>\n" "Language-Team: Hebrew (http://www.transifex.com/projects/p/torproject/language/he/)\n" "MIME-Version: 1.0\n" @@ -62,7 +62,7 @@ msgstr "" #. TRANSLATORS: Please DO NOT translate the word "BridgeDB". #: lib/bridgedb/strings.py:28 msgid "Welcome to BridgeDB!" -msgstr "" +msgstr "ברוך הבא אל BridgeDB!" #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE". #: lib/bridgedb/strings.py:30 @@ -72,7 +72,7 @@ msgstr "" #: lib/bridgedb/strings.py:31 #, python-format msgid "Hey, %s!" -msgstr "" +msgstr "היי, %s!" #: lib/bridgedb/strings.py:32 msgid "Hello, friend!" @@ -80,7 +80,7 @@ msgstr "שלום, חבר!" #: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101 msgid "Public Keys" -msgstr "" +msgstr "מפתחות פומביים" #. TRANSLATORS: This string will end up saying something like: #. "This email was generated with rainbows, unicorns, and sparkles @@ -90,7 +90,7 @@ msgstr "" msgid "" "This email was generated with rainbows, unicorns, and sparkles\n" "for %s on %s at %s." -msgstr "" +msgstr "האימייל הזה נוצר עם קשתות בענן, חדי-קרן ונצנצים\nבשביל %s בתאריך %s בשעה %s." #. TRANSLATORS: Please DO NOT translate "BridgeDB". #. TRANSLATORS: Please DO NOT translate "Pluggable Transports". @@ -265,7 +265,7 @@ msgstr "דווח על תקלה" #: lib/bridgedb/templates/base.html:94 msgid "Source Code" -msgstr "" +msgstr "קוד המקור" #: lib/bridgedb/templates/base.html:97 msgid "Changelog" @@ -297,7 +297,7 @@ msgstr "" #: lib/bridgedb/templates/index.html:11 #, python-format msgid "Step %s1%s" -msgstr "" +msgstr "שלב %s1%s" #: lib/bridgedb/templates/index.html:13 #, python-format @@ -307,7 +307,7 @@ msgstr "" #: lib/bridgedb/templates/index.html:25 #, python-format msgid "Step %s2%s" -msgstr "" +msgstr "שלב %s2%s" #: lib/bridgedb/templates/index.html:27 #, python-format @@ -335,7 +335,7 @@ msgstr "" #: lib/bridgedb/templates/options.html:52 msgid "Advanced Options" -msgstr "" +msgstr "אפשרויות מתקדמות" #: lib/bridgedb/templates/options.html:88 msgid "No"

1 0