tor-commits March 2011

tor-commits@lists.torproject.org

18 participants
683 discussions

r24320: {website} minor fix (website/trunk)
by Runa Sandvik 09 Mar '11

09 Mar '11

Author: runa Date: 2011-03-09 17:55:38 +0000 (Wed, 09 Mar 2011) New Revision: 24320 Modified: website/trunk/Makefile.common Log: minor fix Modified: website/trunk/Makefile.common =================================================================== --- website/trunk/Makefile.common 2011-03-09 17:44:19 UTC (rev 24319) +++ website/trunk/Makefile.common 2011-03-09 17:55:38 UTC (rev 24320) @@ -17,8 +17,8 @@ -D DEVTAG=$(DEVTAG) \ -D STABLETAG=$(STABLETAG) -#LANGS=ar bms de … [View More]

1 0

r24319: {website} get us closer to being able to build a translation (website/trunk/include)
by Roger Dingledine 09 Mar '11

09 Mar '11

Author: arma Date: 2011-03-09 17:44:19 +0000 (Wed, 09 Mar 2011) New Revision: 24319 Modified: website/trunk/include/links.wmi Log: get us closer to being able to build a translation Modified: website/trunk/include/links.wmi =================================================================== --- website/trunk/include/links.wmi 2011-03-09 15:51:10 UTC (rev 24318) +++ website/trunk/include/links.wmi 2011-03-09 17:44:19 UTC (rev 24319) @@ -30,14 +30,14 @@ my ($page, $lang) = @_; … [View More]

1 0

r24318: {website} build the website with only english files for now (website/trunk)
by Runa Sandvik 09 Mar '11

09 Mar '11

Author: runa Date: 2011-03-09 15:51:10 +0000 (Wed, 09 Mar 2011) New Revision: 24318 Modified: website/trunk/Makefile.common Log: build the website with only english files for now Modified: website/trunk/Makefile.common =================================================================== --- website/trunk/Makefile.common 2011-03-09 13:06:44 UTC (rev 24317) +++ website/trunk/Makefile.common 2011-03-09 15:51:10 UTC (rev 24318) @@ -17,8 +17,8 @@ -D DEVTAG=$(DEVTAG) \ -D … [View More]

1 0

r4527: Update vidalia.pot (vidalia/trunk/src/vidalia/i18n/po/templates)
by vidalia-svn＠svn.torproject.org 09 Mar '11

09 Mar '11

Author: chiiph Date: 2011-03-09 13:13:42 +0000 (Wed, 09 Mar 2011) New Revision: 4527 Modified: vidalia/trunk/src/vidalia/i18n/po/templates/vidalia.pot Log: Update vidalia.pot Modified: vidalia/trunk/src/vidalia/i18n/po/templates/vidalia.pot =================================================================== --- vidalia/trunk/src/vidalia/i18n/po/templates/vidalia.pot 2011-03-02 14:22:16 UTC (rev 4526) +++ vidalia/trunk/src/vidalia/i18n/po/templates/vidalia.pot 2011-03-09 13:13:42 UTC (rev … [View More]4527) @@ -2,15 +2,14 @@ msgstr "" "Project-Id-Version: Vidalia\n" "Report-Msgid-Bugs-To: translations(a)vidalia-project.net\n" -"POT-Creation-Date: 2009-05-19 23:56+0000\n" +"POT-Creation-Date: 2011-03-09 13:05+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: \n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n" -"%100==4 ? 2 : 3);\n" +"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" "X-Generator: Vidalia ts2po 0.2\n" msgctxt "AboutDialog" @@ -33,22 +32,6 @@ msgid "Qt 4.4.2" msgstr "" -msgctxt "AboutDialog" -msgid "Vidalia" -msgstr "" - -msgctxt "AboutDialog" -msgid "Tor" -msgstr "" - -msgctxt "AboutDialog" -msgid "Qt" -msgstr "" - -msgctxt "AboutDialog" -msgid "version" -msgstr "" - msgctxt "AdvancedPage" msgid "'%1' is not a valid IP address." msgstr "" @@ -94,10 +77,6 @@ msgstr "" msgctxt "AdvancedPage" -msgid "Control Port" -msgstr "" - -msgctxt "AdvancedPage" msgid "Authentication:" msgstr "" @@ -154,6 +133,58 @@ msgstr "" msgctxt "AdvancedPage" +msgid "Tor Control" +msgstr "" + +msgctxt "AdvancedPage" +msgid "Use TCP connection (ControlPort)" +msgstr "" + +msgctxt "AdvancedPage" +msgid "Path:" +msgstr "" + +msgctxt "AdvancedPage" +msgid "Use Unix domain socket (ControlSocket)" +msgstr "" + +msgctxt "AdvancedPage" +msgid "Edit current torrc" +msgstr "" + +msgctxt "AdvancedPage" +msgid "NOTE: this will edit the currently loaded torrc" +msgstr "" + +msgctxt "AdvancedPage" +msgid "ControlSocket path doesn't exist." +msgstr "" + +msgctxt "AdvancedPage" +msgid "The specified Tor configuration file location contains characters that cannot be represented in your system's current 8-bit character encoding." +msgstr "" + +msgctxt "AdvancedPage" +msgid "The specified Tor data directory location contains characters that cannot be represented in your system's current 8-bit character encoding." +msgstr "" + +msgctxt "AdvancedPage" +msgid "Warning" +msgstr "" + +msgctxt "AdvancedPage" +msgid "You changed torrc path, would you like to restart Tor?" +msgstr "" + +msgctxt "AdvancedPage" +msgid "Tor Configuration File (torrc);;All Files (*)" +msgstr "" + +msgctxt "AdvancedPage" +msgid "Select a file to use for Tor socket path" +msgstr "" + +msgctxt "AdvancedPage" msgid "Vidalia was unable to remove the Tor service.\n" "\n" "You may need to remove it manually." @@ -1112,6 +1143,10 @@ msgstr "" msgctxt "CountryInfo" +msgid "Zaire" +msgstr "" + +msgctxt "CountryInfo" msgid "Albania" msgstr "" @@ -1207,6 +1242,54 @@ msgid "Taiwan" msgstr "" +msgctxt "CrashReportDialog" +msgid "Submit a Crash Report" +msgstr "" + +msgctxt "CrashReportDialog" +msgid "Vidalia encountered an error and needed to close" +msgstr "" + +msgctxt "CrashReportDialog" +msgid "A crash report has been created that you can automatically send to the Vidalia developers to help identify and fix the problem. The submitted report does not contain any personally identifying information, but your connection to the crash reporting server may not be anonymous." +msgstr "" + +msgctxt "CrashReportDialog" +msgid "Please also describe what you were doing before the application crashed (optional):" +msgstr "" + +msgctxt "CrashReportDialog" +msgid "Send my crash report to the Vidalia developers" +msgstr "" + +msgctxt "CrashReportDialog" +msgid "Restart Vidalia" +msgstr "" + +msgctxt "CrashReportDialog" +msgid "Don't Restart" +msgstr "" + +msgctxt "CrashReportDialog" +msgid "Unable to restart Vidalia" +msgstr "" + +msgctxt "CrashReportDialog" +msgid "We were unable to automatically restart Vidalia. Please restart Vidalia manually." +msgstr "" + +msgctxt "CrashReportUploader" +msgid "Connecting..." +msgstr "" + +msgctxt "CrashReportUploader" +msgid "Sending crash report..." +msgstr "" + +msgctxt "CrashReportUploader" +msgid "Receiving response..." +msgstr "" + msgctxt "GeneralPage" msgid "Executables (*.exe)" msgstr "" @@ -1224,10 +1307,6 @@ msgstr "" msgctxt "GeneralPage" -msgid "The proxy arguments specified are not properly formatted." -msgstr "" - -msgctxt "GeneralPage" msgid "Start Vidalia when my system starts" msgstr "" @@ -1479,6 +1558,30 @@ msgid "Unknown" msgstr "" +msgctxt "LogTreeItem" +msgid "Debug" +msgstr "" + +msgctxt "LogTreeItem" +msgid "Info" +msgstr "" + +msgctxt "LogTreeItem" +msgid "Notice" +msgstr "" + +msgctxt "LogTreeItem" +msgid "Warning" +msgstr "" + +msgctxt "LogTreeItem" +msgid "Error" +msgstr "" + +msgctxt "LogTreeItem" +msgid "Unknown" +msgstr "" + msgctxt "MainWindow" msgid "Start Tor" msgstr "" @@ -1884,10 +1987,6 @@ msgstr "" msgctxt "MainWindow" -msgid "One of your applications%1appears to be making a potentially unencrypted and unsafe connection to port %2. Anything sent over this connection could be monitored. Please check your application's configuration and use only encrypted protocols, such as SSL, if possible." -msgstr "" - -msgctxt "MainWindow" msgid "Tor has automatically closed your connection in order to protect your anonymity." msgstr "" @@ -1916,6 +2015,14 @@ msgstr "" msgctxt "MainWindow" +msgid "One of your applications%1appears to be making a potentially unencrypted and unsafe connection to port %2." +msgstr "" + +msgctxt "MainWindow" +msgid "Anything sent over this connection could be monitored. Please check your application's configuration and use only encrypted protocols, such as SSL, if possible." +msgstr "" + +msgctxt "MainWindow" msgid "failed (%1)" msgstr "" @@ -1944,26 +2051,6 @@ msgid ", probably an email client," msgstr "" -msgctxt "MainWindow" -msgid "Vidalia" -msgstr "" - -msgctxt "MainWindow" -msgid "File" -msgstr "" - -msgctxt "MainWindow" -msgid "About Vidalia" -msgstr "" - -msgctxt "MainWindow" -msgid "Home" -msgstr "" - -msgctxt "MainWindow" -msgid "Check For Updates" -msgstr "" - msgctxt "MessageLog" msgid "Error Setting Filter" msgstr "" @@ -2205,10 +2292,6 @@ msgstr "" msgctxt "MessageLog" -msgid "Always Save New Log Messages" -msgstr "" - -msgctxt "MessageLog" msgid "Browse" msgstr "" @@ -2221,6 +2304,22 @@ msgstr "" msgctxt "MessageLog" +msgid "Basic" +msgstr "" + +msgctxt "MessageLog" +msgid "Tor Status" +msgstr "" + +msgctxt "MessageLog" +msgid "Advanced" +msgstr "" + +msgctxt "MessageLog" +msgid "Always Save New Log Messages" +msgstr "" + +msgctxt "MessageLog" msgid "Messages that appear when something has \n" "gone very wrong and Tor cannot proceed." msgstr "" @@ -2394,18 +2493,10 @@ msgstr "" msgctxt "NetworkPage" -msgid "HTTP Proxy:" -msgstr "" - -msgctxt "NetworkPage" msgid "Username:" msgstr "" msgctxt "NetworkPage" -msgid "Use this proxy for HTTPS also" -msgstr "" - -msgctxt "NetworkPage" msgid "Password:" msgstr "" @@ -2446,18 +2537,10 @@ msgstr "" msgctxt "NetworkPage" -msgid "The Tor software you are currently running does not support bridges. <br>Directory connections will still be encrypted." -msgstr "" - -msgctxt "NetworkPage" msgid "Add a Bridge:" msgstr "" msgctxt "NetworkPage" -msgid "<a href=\"bridges.finding\">How do I find a bridge?</a>" -msgstr "" - -msgctxt "NetworkPage" msgid "Remove the selected bridges from the list" msgstr "" @@ -2485,6 +2568,34 @@ msgid "Click Help to see other methods of finding new bridges." msgstr "" +msgctxt "NetworkPage" +msgid "Address:" +msgstr "" + +msgctxt "NetworkPage" +msgid "Type:" +msgstr "" + +msgctxt "NetworkPage" +msgid "You must select the proxy type." +msgstr "" + +msgctxt "NetworkPage" +msgid "SOCKS 4" +msgstr "" + +msgctxt "NetworkPage" +msgid "SOCKS 5" +msgstr "" + +msgctxt "NetworkPage" +msgid "HTTP" +msgstr "" + +msgctxt "NetworkPage" +msgid "HTTP / HTTPS" +msgstr "" + msgctxt "Policy" msgid "accept" msgstr "" @@ -2886,6 +2997,14 @@ msgstr "" msgctxt "ServerPage" +msgid "<a href=\"#bridgeHelp\">What's this?</a>" +msgstr "" + +msgctxt "ServerPage" +msgid "Automatically distribute my bridge address" +msgstr "" + +msgctxt "ServerPage" msgid "Mirror the Relay Directory" msgstr "" @@ -2974,6 +3093,182 @@ msgid "Created by Tor" msgstr "" +msgctxt "StatusEventWidget" +msgid "Copy to Clipboard" +msgstr "" + +msgctxt "StatusEventWidget" +msgid "The Tor Software is Running" +msgstr "" + +msgctxt "StatusEventWidget" +msgid "You are currently running version \"%1\" of the Tor software." +msgstr "" + +msgctxt "StatusEventWidget" +msgid "The Tor Software is not Running" +msgstr "" + +msgctxt "StatusEventWidget" +msgid "Click \"Start Tor\" in the Vidalia Control Panel to restart the Tor software. If Tor exited unexpectedly, select the \"Advanced\" tab above for details about any errors encountered." +msgstr "" + +msgctxt "StatusEventWidget" +msgid "You are currently running version \"%1\" of the Tor software, which is no longer recommended. Please upgrade to the most recent version of the software, which may contain important security, reliability and performance fixes." +msgstr "" + +msgctxt "StatusEventWidget" +msgid "You are currently running version \"%1\" of the Tor software, which may no longer work with the current Tor network. Please upgrade to the most recent version of the software, which may contain important security, reliability and performance fixes." +msgstr "" + +msgctxt "StatusEventWidget" +msgid "Your Tor Software is Out-of-date" +msgstr "" + +msgctxt "StatusEventWidget" +msgid "Connected to the Tor Network" +msgstr "" + +msgctxt "StatusEventWidget" +msgid "We were able to successfully establish a connection to the Tor network. You can now configure your applications to use the Internet anonymously." +msgstr "" + +msgctxt "StatusEventWidget" +msgid "Tor Software Error" +msgstr "" + +msgctxt "StatusEventWidget" +msgid "The Tor software encountered an internal bug. Please report the following error message to the Tor developers at bugs.torproject.org: \"%1\"" +msgstr "" + +msgctxt "StatusEventWidget" +msgid "Tor has determined that your computer's clock may be set to %1 seconds in the past compared to the source \"%2\". If your clock is not correct, Tor will not be able to function. Please verify your computer displays the correct time." +msgstr "" + +msgctxt "StatusEventWidget" +msgid "Tor has determined that your computer's clock may be set to %1 seconds in the future compared to the source \"%2\". If your clock is not correct, Tor will not be able to function. Please verify your computer displays the correct time." +msgstr "" + +msgctxt "StatusEventWidget" +msgid "Your Computer's Clock is Potentially Incorrect" +msgstr "" + +msgctxt "StatusEventWidget" +msgid "One of the applications on your computer may have attempted to make an unencrypted connection through Tor to port %1. Sending unencrypted information over the Tor network is dangerous and not recommended. For your protection, Tor has automatically closed this connection." +msgstr "" + +msgctxt "StatusEventWidget" +msgid "One of the applications on your computer may have attempted to make an unencrypted connection through Tor to port %1. Sending unencrypted information over the Tor network is dangerous and not recommended." +msgstr "" + +msgctxt "StatusEventWidget" +msgid "Potentially Dangerous Connection!" +msgstr "" + +msgctxt "StatusEventWidget" +msgid "One of your applications established a connection through Tor to \"%1\" using a protocol that may leak information about your destination. Please ensure you configure your applications to use only SOCKS4a or SOCKS5 with remote hostname resolution." +msgstr "" + +msgctxt "StatusEventWidget" +msgid "Unknown SOCKS Protocol" +msgstr "" + +msgctxt "StatusEventWidget" +msgid "One of your applications tried to establish a connection through Tor using a protocol that Tor does not understand. Please ensure you configure your applications to use only SOCKS4a or SOCKS5 with remote hostname resolution." +msgstr "" + +msgctxt "StatusEventWidget" +msgid "Invalid Destination Hostname" +msgstr "" + +msgctxt "StatusEventWidget" +msgid "One of your applications tried to establish a connection through Tor to \"%1\", which Tor does not recognize as a valid hostname. Please check your application's configuration." +msgstr "" + +msgctxt "StatusEventWidget" +msgid "External IP Address Changed" +msgstr "" + +msgctxt "StatusEventWidget" +msgid "Tor has determined your relay's public IP address is currently %1%2. If that is not correct, please consider setting the 'Address' option in your relay's configuration." +msgstr "" + +msgctxt "StatusEventWidget" +msgid "DNS Hijacking Detected" +msgstr "" + +msgctxt "StatusEventWidget" +msgid "Tor detected that your DNS provider is providing false responses for domains that do not exist. Some ISPs and other DNS providers, such as OpenDNS, are known to do this in order to display their own search or advertising pages." +msgstr "" + +msgctxt "StatusEventWidget" +msgid "Tor detected that your DNS provider is providing false responses for well known domains. Since clients rely on Tor network relays to provide accurate DNS repsonses, your relay will not be configured as an exit relay." +msgstr "" + +msgctxt "StatusEventWidget" +msgid "Checking Server Port Reachability" +msgstr "" + +msgctxt "StatusEventWidget" +msgid "Tor is trying to determine if your relay's server port is reachable from the Tor network by connecting to itself at %1:%2. This test could take several minutes." +msgstr "" + +msgctxt "StatusEventWidget" +msgid "Server Port Reachability Test Successful!" +msgstr "" + +msgctxt "StatusEventWidget" +msgid "Your relay's server port is reachable from the Tor network!" +msgstr "" + +msgctxt "StatusEventWidget" +msgid "Server Port Reachability Test Failed" +msgstr "" + +msgctxt "StatusEventWidget" +msgid "Your relay's server port is not reachable by other Tor clients. This can happen if you are behind a router or firewall that requires you to set up port forwarding. If %1:%2 is not your correct IP address and server port, please check your relay's configuration." +msgstr "" + +msgctxt "StatusEventWidget" +msgid "Checking Directory Port Reachability" +msgstr "" + +msgctxt "StatusEventWidget" +msgid "Tor is trying to determine if your relay's directory port is reachable from the Tor network by connecting to itself at %1:%2. This test could take several minutes." +msgstr "" + +msgctxt "StatusEventWidget" +msgid "Directory Port Reachability Test Successful!" +msgstr "" + +msgctxt "StatusEventWidget" +msgid "Your relay's directory port is reachable from the Tor network!" +msgstr "" + +msgctxt "StatusEventWidget" +msgid "Directory Port Reachability Test Failed" +msgstr "" + +msgctxt "StatusEventWidget" +msgid "Your relay's directory port is not reachable by other Tor clients. This can happen if you are behind a router or firewall that requires you to set up port forwarding. If %1:%2 is not your correct IP address and directory port, please check your relay's configuration." +msgstr "" + +msgctxt "StatusEventWidget" +msgid "Relay Descriptor Rejected" +msgstr "" + +msgctxt "StatusEventWidget" +msgid "Your relay's descriptor, which enables clients to connect to your relay, was rejected by the directory server at %1:%2. The reason given was: %3" +msgstr "" + +msgctxt "StatusEventWidget" +msgid "Your Relay is Online" +msgstr "" + +msgctxt "StatusEventWidget" +msgid "Your relay is now online and available for Tor clients to use. You should see an increase in network traffic shown by the Bandwidth Graph within a few hours as more clients learn about your relay. Thank you for contributing to the Tor network!" +msgstr "" + msgctxt "Stream" msgid "New" msgstr "" @@ -3026,6 +3321,66 @@ msgid "Failed to hash the control password." msgstr "" +msgctxt "TorrcDialog" +msgid "Editing torrc" +msgstr "" + +msgctxt "TorrcDialog" +msgid "Save settings. If unchecked it will only apply settings to the current Tor instance." +msgstr "" + +msgctxt "TorrcDialog" +msgid "Cut" +msgstr "" + +msgctxt "TorrcDialog" +msgid "Copy" +msgstr "" + +msgctxt "TorrcDialog" +msgid "Paste" +msgstr "" + +msgctxt "TorrcDialog" +msgid "Undo" +msgstr "" + +msgctxt "TorrcDialog" +msgid "Redo" +msgstr "" + +msgctxt "TorrcDialog" +msgid "Select All" +msgstr "" + +msgctxt "TorrcDialog" +msgid "Apply all" +msgstr "" + +msgctxt "TorrcDialog" +msgid "Apply selection only" +msgstr "" + +msgctxt "TorrcDialog" +msgid "Error connecting to Tor" +msgstr "" + +msgctxt "TorrcDialog" +msgid "Selection is empty. Please select some text, or check \"Apply all\"" +msgstr "" + +msgctxt "TorrcDialog" +msgid "Error at line %1: \"%2\"" +msgstr "" + +msgctxt "TorrcDialog" +msgid "Error" +msgstr "" + +msgctxt "TorrcDialog" +msgid "An error ocurred while opening torrc file" +msgstr "" + msgctxt "UPNPControl" msgid "Success" msgstr "" @@ -3150,6 +3505,14 @@ msgid "Version" msgstr "" +msgctxt "UploadProgressDialog" +msgid "Uploading Crash Report" +msgstr "" + +msgctxt "UploadProgressDialog" +msgid "Unable to send report: %1" +msgstr "" + msgctxt "VMessageBox" msgid "OK" msgstr "" [View Less]

1 0

r24317: {website} updated the makefile to include translations and copied wmi (in website/trunk: . about/ar about/es about/fr about/pl about/ru docs/ar docs/fr docs/my docs/pl docs/ru donate/pl fr getinvolved/pl pl press/pl projects/fr projects/pl ru torbutton/pl)
by Runa Sandvik 09 Mar '11

09 Mar '11

Author: runa Date: 2011-03-09 13:06:44 +0000 (Wed, 09 Mar 2011) New Revision: 24317 Added: website/trunk/about/ar/sidenav.wmi website/trunk/about/es/sidenav.wmi website/trunk/about/fr/sidenav.wmi website/trunk/about/pl/sidenav.wmi website/trunk/about/ru/sidenav.wmi website/trunk/docs/ar/sidenav.wmi website/trunk/docs/fr/sidenav.wmi website/trunk/docs/my/sidenav.wmi website/trunk/docs/pl/sidenav.wmi website/trunk/docs/ru/sidenav.wmi website/trunk/donate/pl/info.… [View More]wmi website/trunk/donate/pl/sidenav.wmi website/trunk/fr/navigation.wmi website/trunk/getinvolved/pl/sidenav.wmi website/trunk/pl/navigation.wmi website/trunk/press/pl/info.wmi website/trunk/press/pl/sidenav.wmi website/trunk/projects/fr/sidenav.wmi website/trunk/projects/pl/sidenav.wmi website/trunk/ru/navigation.wmi website/trunk/torbutton/pl/sidenav.wmi Modified: website/trunk/Makefile.common Log: updated the makefile to include translations and copied wmi files to various language directories Modified: website/trunk/Makefile.common =================================================================== --- website/trunk/Makefile.common 2011-03-09 13:01:17 UTC (rev 24316) +++ website/trunk/Makefile.common 2011-03-09 13:06:44 UTC (rev 24317) @@ -17,8 +17,8 @@ -D DEVTAG=$(DEVTAG) \ -D STABLETAG=$(STABLETAG) -#LANGS=ar bms de en es et fa it fi fr ja ko nl no pl pt ru se tr zh-cn -LANGS=en +LANGS=ar bms de en es et fa it fi fr ja ko nl no pl pt ru se tr zh-cn +#LANGS=en WMLFILES=$(wildcard $(patsubst %, %/*.wml, $(LANGS))) WMIFILES=$(wildcard $(patsubst %, %/*.wmi, $(LANGS)) $(WMLBASE)/include/*.wmi ) Copied: website/trunk/about/ar/sidenav.wmi (from rev 24315, website/trunk/about/en/sidenav.wmi) =================================================================== --- website/trunk/about/ar/sidenav.wmi (rev 0) +++ website/trunk/about/ar/sidenav.wmi 2011-03-09 13:06:44 UTC (rev 24317) @@ -0,0 +1,56 @@ +## translation metadata +# Revision: $Revision: 0 $ +# Translation-Priority: 2-medium + +# this structure defines the side nav bar for the /about pages +# and is the input for include/side.wmi + +# fields: +# +# url - the path to the wml page, as used the the <page> tag. This tag ensures +# that links will point to the current language if supported, and alternately +# the english version +# +# txt - the link text to be displayed. Different translations will +# need to supply alternate txt + +<: + my $sidenav; + $sidenav = [ + {'url' => 'about/overview', + 'txt' => 'Tor Overview', + }, + {'url' => 'about/torusers', + 'txt' => 'Users of Tor', + }, + + {'url' => 'about/corepeople', + 'txt' => 'Tor People', + 'subelements' => [ + {'url' => 'about/board', + 'txt' => 'Board of Directors', + }, + {'url' => 'about/translators', + 'txt' => 'Translators', + }, + {'url' => 'about/volunteers', + 'txt' => 'Volunteers', + }, + {'url' => 'about/contributors', + 'txt' => 'Past Contributors', + }] + }, + {'url' => 'about/sponsors', + 'txt' => 'Sponsors', + }, + {'url' => 'about/financials', + 'txt' => 'Financial Reports', + }, + {'url' => 'projects/projects', + 'txt' => 'Projects', + }, + {'url' => 'docs/documentation', + 'txt' => 'Documentation', + }, + ]; +:> Copied: website/trunk/about/es/sidenav.wmi (from rev 24315, website/trunk/about/en/sidenav.wmi) =================================================================== --- website/trunk/about/es/sidenav.wmi (rev 0) +++ website/trunk/about/es/sidenav.wmi 2011-03-09 13:06:44 UTC (rev 24317) @@ -0,0 +1,56 @@ +## translation metadata +# Revision: $Revision: 0 $ +# Translation-Priority: 2-medium + +# this structure defines the side nav bar for the /about pages +# and is the input for include/side.wmi + +# fields: +# +# url - the path to the wml page, as used the the <page> tag. This tag ensures +# that links will point to the current language if supported, and alternately +# the english version +# +# txt - the link text to be displayed. Different translations will +# need to supply alternate txt + +<: + my $sidenav; + $sidenav = [ + {'url' => 'about/overview', + 'txt' => 'Tor Overview', + }, + {'url' => 'about/torusers', + 'txt' => 'Users of Tor', + }, + + {'url' => 'about/corepeople', + 'txt' => 'Tor People', + 'subelements' => [ + {'url' => 'about/board', + 'txt' => 'Board of Directors', + }, + {'url' => 'about/translators', + 'txt' => 'Translators', + }, + {'url' => 'about/volunteers', + 'txt' => 'Volunteers', + }, + {'url' => 'about/contributors', + 'txt' => 'Past Contributors', + }] + }, + {'url' => 'about/sponsors', + 'txt' => 'Sponsors', + }, + {'url' => 'about/financials', + 'txt' => 'Financial Reports', + }, + {'url' => 'projects/projects', + 'txt' => 'Projects', + }, + {'url' => 'docs/documentation', + 'txt' => 'Documentation', + }, + ]; +:> Copied: website/trunk/about/fr/sidenav.wmi (from rev 24315, website/trunk/about/en/sidenav.wmi) =================================================================== --- website/trunk/about/fr/sidenav.wmi (rev 0) +++ website/trunk/about/fr/sidenav.wmi 2011-03-09 13:06:44 UTC (rev 24317) @@ -0,0 +1,56 @@ +## translation metadata +# Revision: $Revision: 0 $ +# Translation-Priority: 2-medium + +# this structure defines the side nav bar for the /about pages +# and is the input for include/side.wmi + +# fields: +# +# url - the path to the wml page, as used the the <page> tag. This tag ensures +# that links will point to the current language if supported, and alternately +# the english version +# +# txt - the link text to be displayed. Different translations will +# need to supply alternate txt + +<: + my $sidenav; + $sidenav = [ + {'url' => 'about/overview', + 'txt' => 'Tor Overview', + }, + {'url' => 'about/torusers', + 'txt' => 'Users of Tor', + }, + + {'url' => 'about/corepeople', + 'txt' => 'Tor People', + 'subelements' => [ + {'url' => 'about/board', + 'txt' => 'Board of Directors', + }, + {'url' => 'about/translators', + 'txt' => 'Translators', + }, + {'url' => 'about/volunteers', + 'txt' => 'Volunteers', + }, + {'url' => 'about/contributors', + 'txt' => 'Past Contributors', + }] + }, + {'url' => 'about/sponsors', + 'txt' => 'Sponsors', + }, + {'url' => 'about/financials', + 'txt' => 'Financial Reports', + }, + {'url' => 'projects/projects', + 'txt' => 'Projects', + }, + {'url' => 'docs/documentation', + 'txt' => 'Documentation', + }, + ]; +:> Copied: website/trunk/about/pl/sidenav.wmi (from rev 24315, website/trunk/about/en/sidenav.wmi) =================================================================== --- website/trunk/about/pl/sidenav.wmi (rev 0) +++ website/trunk/about/pl/sidenav.wmi 2011-03-09 13:06:44 UTC (rev 24317) @@ -0,0 +1,56 @@ +## translation metadata +# Revision: $Revision: 0 $ +# Translation-Priority: 2-medium + +# this structure defines the side nav bar for the /about pages +# and is the input for include/side.wmi + +# fields: +# +# url - the path to the wml page, as used the the <page> tag. This tag ensures +# that links will point to the current language if supported, and alternately +# the english version +# +# txt - the link text to be displayed. Different translations will +# need to supply alternate txt + +<: + my $sidenav; + $sidenav = [ + {'url' => 'about/overview', + 'txt' => 'Tor Overview', + }, + {'url' => 'about/torusers', + 'txt' => 'Users of Tor', + }, + + {'url' => 'about/corepeople', + 'txt' => 'Tor People', + 'subelements' => [ + {'url' => 'about/board', + 'txt' => 'Board of Directors', + }, + {'url' => 'about/translators', + 'txt' => 'Translators', + }, + {'url' => 'about/volunteers', + 'txt' => 'Volunteers', + }, + {'url' => 'about/contributors', + 'txt' => 'Past Contributors', + }] + }, + {'url' => 'about/sponsors', + 'txt' => 'Sponsors', + }, + {'url' => 'about/financials', + 'txt' => 'Financial Reports', + }, + {'url' => 'projects/projects', + 'txt' => 'Projects', + }, + {'url' => 'docs/documentation', + 'txt' => 'Documentation', + }, + ]; +:> Copied: website/trunk/about/ru/sidenav.wmi (from rev 24315, website/trunk/about/en/sidenav.wmi) =================================================================== --- website/trunk/about/ru/sidenav.wmi (rev 0) +++ website/trunk/about/ru/sidenav.wmi 2011-03-09 13:06:44 UTC (rev 24317) @@ -0,0 +1,56 @@ +## translation metadata +# Revision: $Revision: 0 $ +# Translation-Priority: 2-medium + +# this structure defines the side nav bar for the /about pages +# and is the input for include/side.wmi + +# fields: +# +# url - the path to the wml page, as used the the <page> tag. This tag ensures +# that links will point to the current language if supported, and alternately +# the english version +# +# txt - the link text to be displayed. Different translations will +# need to supply alternate txt + +<: + my $sidenav; + $sidenav = [ + {'url' => 'about/overview', + 'txt' => 'Tor Overview', + }, + {'url' => 'about/torusers', + 'txt' => 'Users of Tor', + }, + + {'url' => 'about/corepeople', + 'txt' => 'Tor People', + 'subelements' => [ + {'url' => 'about/board', + 'txt' => 'Board of Directors', + }, + {'url' => 'about/translators', + 'txt' => 'Translators', + }, + {'url' => 'about/volunteers', + 'txt' => 'Volunteers', + }, + {'url' => 'about/contributors', + 'txt' => 'Past Contributors', + }] + }, + {'url' => 'about/sponsors', + 'txt' => 'Sponsors', + }, + {'url' => 'about/financials', + 'txt' => 'Financial Reports', + }, + {'url' => 'projects/projects', + 'txt' => 'Projects', + }, + {'url' => 'docs/documentation', + 'txt' => 'Documentation', + }, + ]; +:> Copied: website/trunk/docs/ar/sidenav.wmi (from rev 24315, website/trunk/docs/en/sidenav.wmi) =================================================================== --- website/trunk/docs/ar/sidenav.wmi (rev 0) +++ website/trunk/docs/ar/sidenav.wmi 2011-03-09 13:06:44 UTC (rev 24317) @@ -0,0 +1,97 @@ +## translation metadata +# Revision: $Revision: 0 $ +# Translation-Priority: 2-medium + +# this structure defines the side nav bar for the /about pages +# and is the input for include/side.wmi + +# fields: +# +# url - the path to the wml page, as used the the <page> tag. This tag ensures +# that links will point to the current language if supported, and alternately +# the english version +# +# txt - the link text to be displayed. Different translations will +# need to supply alternate txt + +<: + my $sidenav; + $sidenav = [ + {'url' => 'docs/documentation', + 'txt' => 'Documentation Overview', + }, + { + 'url' => 'docs/installguide', + 'txt' => 'Installation Guides', + 'subelements' => [ + {'url' => 'docs/tor-doc-windows', + 'txt' => 'Installing on Windows', + }, + {'url' => 'docs/tor-doc-unix', + 'txt' => 'Installing on Linux/BSD/Unix', + }, + {'url' => 'docs/tor-doc-osx', + 'txt' => 'Installing on Mac OS X', + }, + {'url' => 'docs/android', + 'txt' => 'Installing on Android', + }, + {'url' => 'docs/N900', + 'txt' => 'Installing on Maemo/N900', + }, + {'url' => 'docs/verifying-signatures', + 'txt' => 'Verify our GPG signatures', + }, + {'url' => 'docs/tor-doc-web', + 'txt' => 'Configuring your browser to use Tor', + }], + }, + {'url' => 'docs/manual', + 'txt' => 'Manuals', + 'subelements' => [ + {'url' => 'docs/tor-doc-relay', + 'txt' => 'Configuring a Relay', + }, + {'url' => 'docs/tor-hidden-service', + 'txt' => 'Configuring a Hidden Service', + }, + {'url' => 'docs/bridges', + 'txt' => 'Configuring a Bridge Relay', + }, + {'url' => 'docs/running-a-mirror', + 'txt' => 'Configuring a Mirror', + }, +# {'url' => 'docs/tor-manual', +# 'txt' => 'Tor -stable Manual', +# }, + {'url' => 'docs/tor-manual-dev', + 'txt' => 'Tor -alpha Manual', + }, + {'url' => 'docs/proxychain', + 'txt' => 'Configuring Tor to use a Proxy Server', + }], + }, + { + 'url' => '<wiki>', + 'txt' => 'Tor Wiki', + }, + {'url' => 'docs/faq', + 'txt' => 'General FAQ', + }, + {'url' => 'torbutton/torbutton-faq', + 'txt' => 'Torbutton FAQ', + }, + {'url' => 'docs/faq-abuse', + 'txt' => 'Abuse FAQ', + }, + {'url' => 'docs/trademark-faq', + 'txt' => 'Trademark FAQ', + }, + {'url' => 'eff/tor-legal-faq', + 'txt' => 'Tor Legal FAQ', + }, + {'url' => 'eff/tor-dmca-response', + 'txt' => 'Tor DMCA Response', + }, + ]; +:> Copied: website/trunk/docs/fr/sidenav.wmi (from rev 24315, website/trunk/docs/en/sidenav.wmi) =================================================================== --- website/trunk/docs/fr/sidenav.wmi (rev 0) +++ website/trunk/docs/fr/sidenav.wmi 2011-03-09 13:06:44 UTC (rev 24317) @@ -0,0 +1,97 @@ +## translation metadata +# Revision: $Revision: 0 $ +# Translation-Priority: 2-medium + +# this structure defines the side nav bar for the /about pages +# and is the input for include/side.wmi + +# fields: +# +# url - the path to the wml page, as used the the <page> tag. This tag ensures +# that links will point to the current language if supported, and alternately +# the english version +# +# txt - the link text to be displayed. Different translations will +# need to supply alternate txt + +<: + my $sidenav; + $sidenav = [ + {'url' => 'docs/documentation', + 'txt' => 'Documentation Overview', + }, + { + 'url' => 'docs/installguide', + 'txt' => 'Installation Guides', + 'subelements' => [ + {'url' => 'docs/tor-doc-windows', + 'txt' => 'Installing on Windows', + }, + {'url' => 'docs/tor-doc-unix', + 'txt' => 'Installing on Linux/BSD/Unix', + }, + {'url' => 'docs/tor-doc-osx', + 'txt' => 'Installing on Mac OS X', + }, + {'url' => 'docs/android', + 'txt' => 'Installing on Android', + }, + {'url' => 'docs/N900', + 'txt' => 'Installing on Maemo/N900', + }, + {'url' => 'docs/verifying-signatures', + 'txt' => 'Verify our GPG signatures', + }, + {'url' => 'docs/tor-doc-web', + 'txt' => 'Configuring your browser to use Tor', + }], + }, + {'url' => 'docs/manual', + 'txt' => 'Manuals', + 'subelements' => [ + {'url' => 'docs/tor-doc-relay', + 'txt' => 'Configuring a Relay', + }, + {'url' => 'docs/tor-hidden-service', + 'txt' => 'Configuring a Hidden Service', + }, + {'url' => 'docs/bridges', + 'txt' => 'Configuring a Bridge Relay', + }, + {'url' => 'docs/running-a-mirror', + 'txt' => 'Configuring a Mirror', + }, +# {'url' => 'docs/tor-manual', +# 'txt' => 'Tor -stable Manual', +# }, + {'url' => 'docs/tor-manual-dev', + 'txt' => 'Tor -alpha Manual', + }, + {'url' => 'docs/proxychain', + 'txt' => 'Configuring Tor to use a Proxy Server', + }], + }, + { + 'url' => '<wiki>', + 'txt' => 'Tor Wiki', + }, + {'url' => 'docs/faq', + 'txt' => 'General FAQ', + }, + {'url' => 'torbutton/torbutton-faq', + 'txt' => 'Torbutton FAQ', + }, + {'url' => 'docs/faq-abuse', + 'txt' => 'Abuse FAQ', + }, + {'url' => 'docs/trademark-faq', + 'txt' => 'Trademark FAQ', + }, + {'url' => 'eff/tor-legal-faq', + 'txt' => 'Tor Legal FAQ', + }, + {'url' => 'eff/tor-dmca-response', + 'txt' => 'Tor DMCA Response', + }, + ]; +:> Copied: website/trunk/docs/my/sidenav.wmi (from rev 24315, website/trunk/docs/en/sidenav.wmi) =================================================================== --- website/trunk/docs/my/sidenav.wmi (rev 0) +++ website/trunk/docs/my/sidenav.wmi 2011-03-09 13:06:44 UTC (rev 24317) @@ -0,0 +1,97 @@ +## translation metadata +# Revision: $Revision: 0 $ +# Translation-Priority: 2-medium + +# this structure defines the side nav bar for the /about pages +# and is the input for include/side.wmi + +# fields: +# +# url - the path to the wml page, as used the the <page> tag. This tag ensures +# that links will point to the current language if supported, and alternately +# the english version +# +# txt - the link text to be displayed. Different translations will +# need to supply alternate txt + +<: + my $sidenav; + $sidenav = [ + {'url' => 'docs/documentation', + 'txt' => 'Documentation Overview', + }, + { + 'url' => 'docs/installguide', + 'txt' => 'Installation Guides', + 'subelements' => [ + {'url' => 'docs/tor-doc-windows', + 'txt' => 'Installing on Windows', + }, + {'url' => 'docs/tor-doc-unix', + 'txt' => 'Installing on Linux/BSD/Unix', + }, + {'url' => 'docs/tor-doc-osx', + 'txt' => 'Installing on Mac OS X', + }, + {'url' => 'docs/android', + 'txt' => 'Installing on Android', + }, + {'url' => 'docs/N900', + 'txt' => 'Installing on Maemo/N900', + }, + {'url' => 'docs/verifying-signatures', + 'txt' => 'Verify our GPG signatures', + }, + {'url' => 'docs/tor-doc-web', + 'txt' => 'Configuring your browser to use Tor', + }], + }, + {'url' => 'docs/manual', + 'txt' => 'Manuals', + 'subelements' => [ + {'url' => 'docs/tor-doc-relay', + 'txt' => 'Configuring a Relay', + }, + {'url' => 'docs/tor-hidden-service', + 'txt' => 'Configuring a Hidden Service', + }, + {'url' => 'docs/bridges', + 'txt' => 'Configuring a Bridge Relay', + }, + {'url' => 'docs/running-a-mirror', + 'txt' => 'Configuring a Mirror', + }, +# {'url' => 'docs/tor-manual', +# 'txt' => 'Tor -stable Manual', +# }, + {'url' => 'docs/tor-manual-dev', + 'txt' => 'Tor -alpha Manual', + }, + {'url' => 'docs/proxychain', + 'txt' => 'Configuring Tor to use a Proxy Server', + }], + }, + { + 'url' => '<wiki>', + 'txt' => 'Tor Wiki', + }, + {'url' => 'docs/faq', + 'txt' => 'General FAQ', + }, + {'url' => 'torbutton/torbutton-faq', + 'txt' => 'Torbutton FAQ', + }, + {'url' => 'docs/faq-abuse', + 'txt' => 'Abuse FAQ', + }, + {'url' => 'docs/trademark-faq', + 'txt' => 'Trademark FAQ', + }, + {'url' => 'eff/tor-legal-faq', + 'txt' => 'Tor Legal FAQ', + }, + {'url' => 'eff/tor-dmca-response', + 'txt' => 'Tor DMCA Response', + }, + ]; +:> Copied: website/trunk/docs/pl/sidenav.wmi (from rev 24315, website/trunk/docs/en/sidenav.wmi) =================================================================== --- website/trunk/docs/pl/sidenav.wmi (rev 0) +++ website/trunk/docs/pl/sidenav.wmi 2011-03-09 13:06:44 UTC (rev 24317) @@ -0,0 +1,97 @@ +## translation metadata +# Revision: $Revision: 0 $ +# Translation-Priority: 2-medium + +# this structure defines the side nav bar for the /about pages +# and is the input for include/side.wmi + +# fields: +# +# url - the path to the wml page, as used the the <page> tag. This tag ensures +# that links will point to the current language if supported, and alternately +# the english version +# +# txt - the link text to be displayed. Different translations will +# need to supply alternate txt + +<: + my $sidenav; + $sidenav = [ + {'url' => 'docs/documentation', + 'txt' => 'Documentation Overview', + }, + { + 'url' => 'docs/installguide', + 'txt' => 'Installation Guides', + 'subelements' => [ + {'url' => 'docs/tor-doc-windows', + 'txt' => 'Installing on Windows', + }, + {'url' => 'docs/tor-doc-unix', + 'txt' => 'Installing on Linux/BSD/Unix', + }, + {'url' => 'docs/tor-doc-osx', + 'txt' => 'Installing on Mac OS X', + }, + {'url' => 'docs/android', + 'txt' => 'Installing on Android', + }, + {'url' => 'docs/N900', + 'txt' => 'Installing on Maemo/N900', + }, + {'url' => 'docs/verifying-signatures', + 'txt' => 'Verify our GPG signatures', + }, + {'url' => 'docs/tor-doc-web', + 'txt' => 'Configuring your browser to use Tor', + }], + }, + {'url' => 'docs/manual', + 'txt' => 'Manuals', + 'subelements' => [ + {'url' => 'docs/tor-doc-relay', + 'txt' => 'Configuring a Relay', + }, + {'url' => 'docs/tor-hidden-service', + 'txt' => 'Configuring a Hidden Service', + }, + {'url' => 'docs/bridges', + 'txt' => 'Configuring a Bridge Relay', + }, + {'url' => 'docs/running-a-mirror', + 'txt' => 'Configuring a Mirror', + }, +# {'url' => 'docs/tor-manual', +# 'txt' => 'Tor -stable Manual', +# }, + {'url' => 'docs/tor-manual-dev', + 'txt' => 'Tor -alpha Manual', + }, + {'url' => 'docs/proxychain', + 'txt' => 'Configuring Tor to use a Proxy Server', + }], + }, + { + 'url' => '<wiki>', + 'txt' => 'Tor Wiki', + }, + {'url' => 'docs/faq', + 'txt' => 'General FAQ', + }, + {'url' => 'torbutton/torbutton-faq', + 'txt' => 'Torbutton FAQ', + }, + {'url' => 'docs/faq-abuse', + 'txt' => 'Abuse FAQ', + }, + {'url' => 'docs/trademark-faq', + 'txt' => 'Trademark FAQ', + }, + {'url' => 'eff/tor-legal-faq', + 'txt' => 'Tor Legal FAQ', + }, + {'url' => 'eff/tor-dmca-response', + 'txt' => 'Tor DMCA Response', + }, + ]; +:> Copied: website/trunk/docs/ru/sidenav.wmi (from rev 24315, website/trunk/docs/en/sidenav.wmi) =================================================================== --- website/trunk/docs/ru/sidenav.wmi (rev 0) +++ website/trunk/docs/ru/sidenav.wmi 2011-03-09 13:06:44 UTC (rev 24317) @@ -0,0 +1,97 @@ +## translation metadata +# Revision: $Revision: 0 $ +# Translation-Priority: 2-medium + +# this structure defines the side nav bar for the /about pages +# and is the input for include/side.wmi + +# fields: +# +# url - the path to the wml page, as used the the <page> tag. This tag ensures +# that links will point to the current language if supported, and alternately +# the english version +# +# txt - the link text to be displayed. Different translations will +# need to supply alternate txt + +<: + my $sidenav; + $sidenav = [ + {'url' => 'docs/documentation', + 'txt' => 'Documentation Overview', + }, + { + 'url' => 'docs/installguide', + 'txt' => 'Installation Guides', + 'subelements' => [ + {'url' => 'docs/tor-doc-windows', + 'txt' => 'Installing on Windows', + }, + {'url' => 'docs/tor-doc-unix', + 'txt' => 'Installing on Linux/BSD/Unix', + }, + {'url' => 'docs/tor-doc-osx', + 'txt' => 'Installing on Mac OS X', + }, + {'url' => 'docs/android', + 'txt' => 'Installing on Android', + }, + {'url' => 'docs/N900', + 'txt' => 'Installing on Maemo/N900', + }, + {'url' => 'docs/verifying-signatures', + 'txt' => 'Verify our GPG signatures', + }, + {'url' => 'docs/tor-doc-web', + 'txt' => 'Configuring your browser to use Tor', + }], + }, + {'url' => 'docs/manual', + 'txt' => 'Manuals', + 'subelements' => [ + {'url' => 'docs/tor-doc-relay', + 'txt' => 'Configuring a Relay', + }, + {'url' => 'docs/tor-hidden-service', + 'txt' => 'Configuring a Hidden Service', + }, + {'url' => 'docs/bridges', + 'txt' => 'Configuring a Bridge Relay', + }, + {'url' => 'docs/running-a-mirror', + 'txt' => 'Configuring a Mirror', + }, +# {'url' => 'docs/tor-manual', +# 'txt' => 'Tor -stable Manual', +# }, + {'url' => 'docs/tor-manual-dev', + 'txt' => 'Tor -alpha Manual', + }, + {'url' => 'docs/proxychain', + 'txt' => 'Configuring Tor to use a Proxy Server', + }], + }, + { + 'url' => '<wiki>', + 'txt' => 'Tor Wiki', + }, + {'url' => 'docs/faq', + 'txt' => 'General FAQ', + }, + {'url' => 'torbutton/torbutton-faq', + 'txt' => 'Torbutton FAQ', + }, + {'url' => 'docs/faq-abuse', + 'txt' => 'Abuse FAQ', + }, + {'url' => 'docs/trademark-faq', + 'txt' => 'Trademark FAQ', + }, + {'url' => 'eff/tor-legal-faq', + 'txt' => 'Tor Legal FAQ', + }, + {'url' => 'eff/tor-dmca-response', + 'txt' => 'Tor DMCA Response', + }, + ]; +:> Copied: website/trunk/donate/pl/info.wmi (from rev 24315, website/trunk/donate/en/info.wmi) =================================================================== --- website/trunk/donate/pl/info.wmi (rev 0) +++ website/trunk/donate/pl/info.wmi 2011-03-09 13:06:44 UTC (rev 24317) @@ -0,0 +1,16 @@ +## translation metadata +# Revision: $Revision: 0 $ +# Translation-Priority: 2-medium + +<div class="img-shadow"> + <div class="important-infoblock"> + <h2>What happens to my donation?</h2> + <p>If you've just donated, thank you for your donation. Your funds + are deposited into our general fund. You join thousands of other + individual <a href="<page about/sponsors>">sponsors</a> in funding + the future of Tor and online anonymity. </p> + <p>Our <a href="<page about/financials>">financial documents</a> + are available for your review.</p> + </div> +</div> + Copied: website/trunk/donate/pl/sidenav.wmi (from rev 24315, website/trunk/donate/en/sidenav.wmi) =================================================================== --- website/trunk/donate/pl/sidenav.wmi (rev 0) +++ website/trunk/donate/pl/sidenav.wmi 2011-03-09 13:06:44 UTC (rev 24317) @@ -0,0 +1,38 @@ +#!/usr/bin/wml + +## translation metadata +# Revision: $Revision: 0 $ +# Translation-Priority: 2-medium + +# this structure defines the side nav bar for the /about pages +# and is the input for include/side.wmi + +# fields: +# +# url - the path to the wml page, as used the the <page> tag. This tag ensures +# that links will point to the current language if supported, and alternately +# the english version +# +# txt - the link text to be displayed. Different translations will +# need to supply alternate txt + +<: + my $sidenav; + $sidenav = [ + {'url' => 'donate/donate', + 'txt' => 'Monetary Donations', + }, + {'url' => 'donate/donate-hardware', + 'txt' => 'Hardware Donations', + }, + {'url' => 'donate/donate-service', + 'txt' => 'Service Donations', + }, + {'url' => 'donate/matching-program', + 'txt' => 'Matching Program', + }, + {'url' => 'donate/become-sponsor', + 'txt' => 'Become a Sponsor', + }, + ]; +:> Copied: website/trunk/fr/navigation.wmi (from rev 24315, website/trunk/en/navigation.wmi) =================================================================== --- website/trunk/fr/navigation.wmi (rev 0) +++ website/trunk/fr/navigation.wmi 2011-03-09 13:06:44 UTC (rev 24317) @@ -0,0 +1,24 @@ +#!/usr/bin/wml + +## translation metadata +# Revision: $Revision: 22069 $ +# Translation-Priority: 1-high + +<: + # path link text + my @navigation = ( + 'index' , 'Home', + 'about/overview' , 'About Tor', + 'docs/documentation' , 'Documentation', + 'projects/projects' , 'Projects', + 'press/press' , 'Press', + '<blog>' , 'Blog', + 'http://printfection.com/torprojectstore' , 'Store', + ); + my @calltoaction = ( + 'download/download' , 'Download', + 'donate/donate' , 'Donate', + 'getinvolved/volunteer' , 'Get Involved', + ); + +:> Copied: website/trunk/getinvolved/pl/sidenav.wmi (from rev 24315, website/trunk/getinvolved/en/sidenav.wmi) =================================================================== --- website/trunk/getinvolved/pl/sidenav.wmi (rev 0) +++ website/trunk/getinvolved/pl/sidenav.wmi 2011-03-09 13:06:44 UTC (rev 24317) @@ -0,0 +1,32 @@ +#!/usr/bin/wml + +## translation metadata +# Revision: $Revision: 0 $ +# Translation-Priority: 2-medium + +# this structure defines the side nav bar for the /about pages +# and is the input for include/side.wmi + +# fields: +# +# url - the path to the wml page, as used the the <page> tag. This tag ensures +# that links will point to the current language if supported, and alternately +# the english version +# +# txt - the link text to be displayed. Different translations will +# need to supply alternate txt + +<: + my $sidenav; + $sidenav = [ + {'url' => 'getinvolved/volunteer', + 'txt' => 'Get Involved', + }, + {'url' => 'getinvolved/research', + 'txt' => 'Research', + }, + {'url' => 'donate/donate', + 'txt' => 'Donate', + }, + ]; +:> Copied: website/trunk/pl/navigation.wmi (from rev 24315, website/trunk/en/navigation.wmi) =================================================================== --- website/trunk/pl/navigation.wmi (rev 0) +++ website/trunk/pl/navigation.wmi 2011-03-09 13:06:44 UTC (rev 24317) @@ -0,0 +1,24 @@ +#!/usr/bin/wml + +## translation metadata +# Revision: $Revision: 22069 $ +# Translation-Priority: 1-high + +<: + # path link text + my @navigation = ( + 'index' , 'Home', + 'about/overview' , 'About Tor', + 'docs/documentation' , 'Documentation', + 'projects/projects' , 'Projects', + 'press/press' , 'Press', + '<blog>' , 'Blog', + 'http://printfection.com/torprojectstore' , 'Store', + ); + my @calltoaction = ( + 'download/download' , 'Download', + 'donate/donate' , 'Donate', + 'getinvolved/volunteer' , 'Get Involved', + ); + +:> Copied: website/trunk/press/pl/info.wmi (from rev 24315, website/trunk/press/en/info.wmi) =================================================================== --- website/trunk/press/pl/info.wmi (rev 0) +++ website/trunk/press/pl/info.wmi 2011-03-09 13:06:44 UTC (rev 24317) @@ -0,0 +1,17 @@ +## translation metadata +# Revision: $Revision: 0 $ +# Translation-Priority: 2-medium +#!/usr/bin/env wml +<div class="img-shadow"> + <div class="infoblock"> + <h2 class="media">Press Contact</h2> + <p> + <b>Andrew Lewman</b><br> + Executive Director<br> + execdir(a)torproject.org<br> + +1-781-424-9877<br> + </p> + </div> +  +</div> + Copied: website/trunk/press/pl/sidenav.wmi (from rev 24315, website/trunk/press/en/sidenav.wmi) =================================================================== --- website/trunk/press/pl/sidenav.wmi (rev 0) +++ website/trunk/press/pl/sidenav.wmi 2011-03-09 13:06:44 UTC (rev 24317) @@ -0,0 +1,32 @@ +#!/usr/bin/wml + +## translation metadata +# Revision: $Revision: 0 $ +# Translation-Priority: 2-medium + +# this structure defines the side nav bar for the /about pages +# and is the input for include/side.wmi + +# fields: +# +# url - the path to the wml page, as used the the <page> tag. This tag ensures +# that links will point to the current language if supported, and alternately +# the english version +# +# txt - the link text to be displayed. Different translations will +# need to supply alternate txt + +<: + my $sidenav; + $sidenav = [ + {'url' => 'press/press', + 'txt' => 'Press Releases', + }, + {'url' => 'press/inthemedia', + 'txt' => 'Tor in the Media', + }, + {'url' => 'https://blog.torproject.org/', + 'txt' => 'Tor Blog', + }, + ]; +:> Copied: website/trunk/projects/fr/sidenav.wmi (from rev 24315, website/trunk/projects/en/sidenav.wmi) =================================================================== --- website/trunk/projects/fr/sidenav.wmi (rev 0) +++ website/trunk/projects/fr/sidenav.wmi 2011-03-09 13:06:44 UTC (rev 24317) @@ -0,0 +1,52 @@ +#!/usr/bin/wml + +## translation metadata +# Revision: $Revision: 0 $ +# Translation-Priority: 2-medium + +# this structure defines the side nav bar for the /about pages +# and is the input for include/side.wmi + +# fields: +# +# name - the $WML_SRC_BASENAME of the file. It should uniquely identify the +# page because at build-time it is used to determine what view of the +# navigation menu to generate +# +# url - the path to the wml page, as used the the <page> tag. This tag ensures +# that links will point to the current language if supported, and alternately +# the english version +# +# txt - the link text to be displayed. Different translations will +# need to supply alternate txt + +<: + my $sidenav; + $sidenav = [ + {'url' => 'projects/projects', + 'txt' => 'Software & Services', + 'subelements' => [ + {'url' => 'torbutton/index', + 'txt' => 'TorButton', + }, + {'url' => 'projects/torbrowser', + 'txt' => 'Tor Browser Bundle', + }, + {'url' => 'projects/vidalia', + 'txt' => 'Vidalia', + }, + {'url' => 'projects/arm', + 'txt' => 'Arm', + }, + {'url' => '<wiki>projects/TorBulkExitlist', + 'txt' => 'TorBEL', + }, + {'url' => 'https://check.torproject.org', + 'txt' => 'TorCheck', + }, + {'url' => 'projects/gettor', + 'txt' => 'GetTor', + } + ] + }]; +:> Copied: website/trunk/projects/pl/sidenav.wmi (from rev 24315, website/trunk/projects/en/sidenav.wmi) =================================================================== --- website/trunk/projects/pl/sidenav.wmi (rev 0) +++ website/trunk/projects/pl/sidenav.wmi 2011-03-09 13:06:44 UTC (rev 24317) @@ -0,0 +1,52 @@ +#!/usr/bin/wml + +## translation metadata +# Revision: $Revision: 0 $ +# Translation-Priority: 2-medium + +# this structure defines the side nav bar for the /about pages +# and is the input for include/side.wmi + +# fields: +# +# name - the $WML_SRC_BASENAME of the file. It should uniquely identify the +# page because at build-time it is used to determine what view of the +# navigation menu to generate +# +# url - the path to the wml page, as used the the <page> tag. This tag ensures +# that links will point to the current language if supported, and alternately +# the english version +# +# txt - the link text to be displayed. Different translations will +# need to supply alternate txt + +<: + my $sidenav; + $sidenav = [ + {'url' => 'projects/projects', + 'txt' => 'Software & Services', + 'subelements' => [ + {'url' => 'torbutton/index', + 'txt' => 'TorButton', + }, + {'url' => 'projects/torbrowser', + 'txt' => 'Tor Browser Bundle', + }, + {'url' => 'projects/vidalia', + 'txt' => 'Vidalia', + }, + {'url' => 'projects/arm', + 'txt' => 'Arm', + }, + {'url' => '<wiki>projects/TorBulkExitlist', + 'txt' => 'TorBEL', + }, + {'url' => 'https://check.torproject.org', + 'txt' => 'TorCheck', + }, + {'url' => 'projects/gettor', + 'txt' => 'GetTor', + } + ] + }]; +:> Copied: website/trunk/ru/navigation.wmi (from rev 24315, website/trunk/en/navigation.wmi) =================================================================== --- website/trunk/ru/navigation.wmi (rev 0) +++ website/trunk/ru/navigation.wmi 2011-03-09 13:06:44 UTC (rev 24317) @@ -0,0 +1,24 @@ +#!/usr/bin/wml + +## translation metadata +# Revision: $Revision: 22069 $ +# Translation-Priority: 1-high + +<: + # path link text + my @navigation = ( + 'index' , 'Home', + 'about/overview' , 'About Tor', + 'docs/documentation' , 'Documentation', + 'projects/projects' , 'Projects', + 'press/press' , 'Press', + '<blog>' , 'Blog', + 'http://printfection.com/torprojectstore' , 'Store', + ); + my @calltoaction = ( + 'download/download' , 'Download', + 'donate/donate' , 'Donate', + 'getinvolved/volunteer' , 'Get Involved', + ); + +:> Copied: website/trunk/torbutton/pl/sidenav.wmi (from rev 24315, website/trunk/torbutton/en/sidenav.wmi) =================================================================== --- website/trunk/torbutton/pl/sidenav.wmi (rev 0) +++ website/trunk/torbutton/pl/sidenav.wmi 2011-03-09 13:06:44 UTC (rev 24317) @@ -0,0 +1,36 @@ +#!/usr/bin/wml + +## translation metadata +# Revision: $Revision: 0 $ +# Translation-Priority: 2-medium + +# this structure defines the side nav bar for the /about pages +# and is the input for include/side.wmi + +# fields: +# +# name - the $WML_SRC_BASENAME of the file. It should uniquely identify the +# page because at build-time it is used to determine what view of the +# navigation menu to generate +# +# url - the path to the wml page, as used the the <page> tag. This tag ensures +# that links will point to the current language if supported, and alternately +# the english version +# +# txt - the link text to be displayed. Different translations will +# need to supply alternate txt + +<: + my $sidenav; + $sidenav = [ + {'url' => 'torbutton/index', + 'txt' => 'Torbutton', + 'subelements' => [ + {'url' => 'torbutton/torbutton-options', + 'txt' => 'Torbutton Options', + }, + {'url' => 'torbutton/torbutton-faq', + 'txt' => 'Torbutton FAQ', + }] + }] +:> [View Less]

1 0

r24316: {} rename a couple of language directories (in website/trunk: . about docs donate download getinvolved press projects torbutton)
by Runa Sandvik 09 Mar '11

09 Mar '11

Author: runa Date: 2011-03-09 13:01:17 +0000 (Wed, 09 Mar 2011) New Revision: 24316 Added: website/trunk/about/pl/ website/trunk/docs/fr/ website/trunk/docs/pl/ website/trunk/donate/pl/ website/trunk/download/pl/ website/trunk/getinvolved/pl/ website/trunk/pl/ website/trunk/press/pl/ website/trunk/projects/fr/ website/trunk/projects/pl/ website/trunk/torbutton/pl/ Removed: website/trunk/about/fr_FR/ website/trunk/about/pl_PL/ website/trunk/docs/fr_FR/ … [View More]

1 0

r24315: {arm} Defaulting to the new connection panel now that it has featu (in arm/trunk: . src/interface)
by Damian Johnson 09 Mar '11

09 Mar '11

Author: atagar Date: 2011-03-09 03:56:58 +0000 (Wed, 09 Mar 2011) New Revision: 24315 Modified: arm/trunk/armrc.sample arm/trunk/src/interface/controller.py Log: Defaulting to the new connection panel now that it has feature parity with the previous version. Modified: arm/trunk/armrc.sample =================================================================== --- arm/trunk/armrc.sample 2011-03-09 03:53:11 UTC (rev 24314) +++ arm/trunk/armrc.sample 2011-03-09 03:56:58 UTC (rev 24315) @@ -… [View More]

1 0

r24314: {arm} Sorting and custom list type funcitonality for the new conne (in arm/trunk: . src/interface src/interface/connections src/util)
by Damian Johnson 09 Mar '11

09 Mar '11

Author: atagar Date: 2011-03-09 03:53:11 +0000 (Wed, 09 Mar 2011) New Revision: 24314 Modified: arm/trunk/armrc.sample arm/trunk/src/interface/connections/connPanel.py arm/trunk/src/interface/connections/listings.py arm/trunk/src/interface/controller.py arm/trunk/src/util/enum.py Log: Sorting and custom list type funcitonality for the new connection panel. Modified: arm/trunk/armrc.sample =================================================================== --- arm/trunk/armrc.… [View More]sample 2011-03-09 01:12:30 UTC (rev 24313) +++ arm/trunk/armrc.sample 2011-03-09 03:53:11 UTC (rev 24314) @@ -155,18 +155,29 @@ # --------------------------------- # oldPanel # includes the old connection panel in the interface +# newPanel +# includes the new connection panel in the interface +# listingType +# the primary category of information shown by default, options including: +# 0 -> IP Address / Port 1 -> Hostname +# 2 -> Fingerprint 3 -> Nickname +# order +# three comma separated configuration attributes, options including: +# 0 -> Category, 1 -> Uptime, 2 -> Listing, 3 -> IP Address, +# 4 -> Port, 5 -> Hostname, 6 -> Fingerprint, 7 -> Nickname, +# 8 -> Country # refreshRate # rate at which the connection panel contents is redrawn (if higher than the # connection resolution rate then reducing this won't casue new data to # appear more frequently - just increase the rate at which the uptime field # is updated) -# newPanel -# includes the new connection panel in the interface # showColumn.* # toggles the visability of the connection table columns features.connection.oldPanel true features.connection.newPanel false +features.connection.listingType 0 +features.connection.order 0, 2, 1 features.connection.refreshRate 10 features.connection.showColumn.fingerprint true features.connection.showColumn.nickname true Modified: arm/trunk/src/interface/connections/connPanel.py =================================================================== --- arm/trunk/src/interface/connections/connPanel.py 2011-03-09 01:12:30 UTC (rev 24313) +++ arm/trunk/src/interface/connections/connPanel.py 2011-03-09 03:53:11 UTC (rev 24314) @@ -9,14 +9,17 @@ from interface.connections import listings from util import connections, enum, log, panel, torTools, uiTools -DEFAULT_CONFIG = {"features.connection.refreshRate": 10} +DEFAULT_CONFIG = {"features.connection.listingType": 0, + "features.connection.refreshRate": 10} # height of the detail panel content, not counting top and bottom border DETAILS_HEIGHT = 7 # listing types -Listing = enum.Enum(("IP", "IP Address"), "HOSTNAME", "FINGERPRINT", "NICKNAME") +Listing = enum.Enum(("IP_ADDRESS", "IP Address"), "HOSTNAME", "FINGERPRINT", "NICKNAME") +DEFAULT_SORT_ORDER = (listings.SortAttr.CATEGORY, listings.SortAttr.LISTING, listings.SortAttr.UPTIME) + class ConnectionPanel(panel.Panel, threading.Thread): """ Listing of connections tor is making, with information correlated against @@ -28,16 +31,21 @@ threading.Thread.__init__(self) self.setDaemon(True) - #self.sortOrdering = DEFAULT_SORT_ORDER + self._sortOrdering = DEFAULT_SORT_ORDER self._config = dict(DEFAULT_CONFIG) if config: config.update(self._config, { + "features.connection.listingType": (0, len(Listing.values()) - 1), "features.connection.refreshRate": 1}) - # TODO: test and add to the sample armrc - #self.sortOrdering = config.getIntCSV("features.connections.order", self.sortOrdering, 3, 0, 6) + sortFields = listings.SortAttr.values() + customOrdering = config.getIntCSV("features.connection.order", None, 3, 0, len(sortFields)) + + if customOrdering: + self._sortOrdering = [sortFields[i] for i in customOrdering] - self.scroller = uiTools.Scroller(True) + self._listingType = Listing.values()[self._config["features.connection.listingType"]] + self._scroller = uiTools.Scroller(True) self._title = "Connections:" # title line of the panel self._connections = [] # last fetched connections self._showDetails = False # presents the details panel if true @@ -75,13 +83,44 @@ # and being paused self.redraw(True) + def setSortOrder(self, ordering = None): + """ + Sets the connection attributes we're sorting by and resorts the contents. + + Arguments: + ordering - new ordering, if undefined then this resorts with the last + set ordering + """ + + self.valsLock.acquire() + if ordering: self._sortOrdering = ordering + self._connections.sort(key=lambda i: (i.getSortValues(self._sortOrdering, self._listingType))) + self.valsLock.release() + + def setListingType(self, listingType): + """ + Sets the priority information presented by the panel. + + Arguments: + listingType - Listing instance for the primary information to be shown + """ + + self.valsLock.acquire() + self._listingType = listingType + + # if we're sorting by the listing then we need to resort + if listings.SortAttr.LISTING in self._sortOrdering: + self.setSortOrder() + + self.valsLock.release() + def handleKey(self, key): self.valsLock.acquire() if uiTools.isScrollKey(key): pageHeight = self.getPreferredSize()[0] - 1 if self._showDetails: pageHeight -= (DETAILS_HEIGHT + 1) - isChanged = self.scroller.handleKey(key, self._connections, pageHeight) + isChanged = self._scroller.handleKey(key, self._connections, pageHeight) if isChanged: self.redraw(True) elif uiTools.isSelectionKey(key): self._showDetails = not self._showDetails @@ -115,8 +154,8 @@ detailPanelOffset = DETAILS_HEIGHT + 1 if self._showDetails else 0 isScrollbarVisible = len(self._connections) > height - detailPanelOffset - 1 - scrollLoc = self.scroller.getScrollLoc(self._connections, height - detailPanelOffset - 1) - cursorSelection = self.scroller.getCursorSelection(self._connections) + scrollLoc = self._scroller.getScrollLoc(self._connections, height - detailPanelOffset - 1) + cursorSelection = self._scroller.getCursorSelection(self._connections) # draws the detail panel if currently displaying it if self._showDetails: @@ -147,7 +186,7 @@ # prefix (entry data which is largely static, plus the time label) # the right content (time and type) takes seventeen columns - entryLabel = entry.getLabel(Listing.IP, width - scrollOffset - 17) + entryLabel = entry.getLabel(self._listingType, width - scrollOffset - 17) timeLabel = uiTools.getTimeLabel(currentTime - entry.startTime, 1) prefixLabel = "%s%5s (" % (entryLabel, timeLabel) @@ -205,14 +244,13 @@ for lIp, lPort, fIp, fPort in currentConnections: newConnections.append(listings.ConnectionEntry(lIp, lPort, fIp, fPort)) - # if it's changed then sort the results - #if newConnections != self._connections: - # newConnections.sort(key=lambda i: (i.getAll(self.sortOrdering))) + # Counts the relays in each of the categories. This also flushes the + # type cache for all of the connections (in case its changed since last + # fetched). - # counts the relays in each of the categories categoryTypes = listings.Category.values() typeCounts = dict((type, 0) for type in categoryTypes) - for conn in newConnections: typeCounts[conn.getType()] += 1 + for conn in newConnections: typeCounts[conn.getType(True)] += 1 # makes labels for all the categories with connections (ie, # "21 outbound", "1 control", etc) @@ -226,6 +264,7 @@ else: self._title = "Connections:" self._connections = newConnections + self.setSortOrder() self._lastResourceFetch = currentResolutionCount self.valsLock.release() Modified: arm/trunk/src/interface/connections/listings.py =================================================================== --- arm/trunk/src/interface/connections/listings.py 2011-03-09 01:12:30 UTC (rev 24313) +++ arm/trunk/src/interface/connections/listings.py 2011-03-09 03:53:11 UTC (rev 24314) @@ -22,6 +22,14 @@ Category.APPLICATION: "yellow", Category.DIRECTORY: "magenta", Category.CONTROL: "red"} +SortAttr = enum.Enum("CATEGORY", "UPTIME", "LISTING", "IP_ADDRESS", "PORT", + "HOSTNAME", "FINGERPRINT", "NICKNAME", "COUNTRY") +SORT_COLORS = {SortAttr.CATEGORY: "red", SortAttr.UPTIME: "yellow", + SortAttr.LISTING: "green", SortAttr.IP_ADDRESS: "blue", + SortAttr.PORT: "blue", SortAttr.HOSTNAME: "magenta", + SortAttr.FINGERPRINT: "cyan", SortAttr.NICKNAME: "cyan", + SortAttr.COUNTRY: "blue"} + # static data for listing format # <src> --> <dst> <etc><padding> LABEL_FORMAT = "%s --> %s %s%s" @@ -74,9 +82,17 @@ default - return value if no hostname is available """ - myHostname = hostnames.resolve(self.ipAddr) - if not myHostname: return default - else: return myHostname + # TODO: skipping all hostname resolution to be safe for now + #try: + # myHostname = hostnames.resolve(self.ipAddr) + #except: + # # either a ValueError or IOError depending on the source of the lookup failure + # myHostname = None + # + #if not myHostname: return default + #else: return myHostname + + return default def getLocale(self): """ @@ -161,61 +177,29 @@ else: self.baseType = Category.OUTBOUND self.foreign.isORPort = True + + self.cachedType = None + + # cached immutable values used for sorting + self.sortIpAddr = _ipToInt(self.foreign.getIpAddr()) + self.sortPort = int(self.foreign.getPort()) - def getType(self): + def getType(self, reset=False): """ Provides the category this connection belongs to. This isn't always static since it can rely on dynamic information (like the current consensus). + + Arguments: + reset - determines if the type has changed if true, otherwise this + provides the same result as the last call """ - if self.baseType == Category.OUTBOUND: - # Currently the only non-static categories are OUTBOUND vs... - # - EXIT since this depends on the current consensus - # - CLIENT if this is likely to belong to our guard usage - # - DIRECTORY if this is a single-hop circuit (directory mirror?) - # - # The exitability, circuits, and fingerprints are all cached by the - # torTools util keeping this a quick lookup. - - conn = torTools.getConn() - destFingerprint = self.foreign.getFingerprint() - - if destFingerprint == "UNKNOWN": - # Not a known relay. This might be an exit connection. - - if conn.isExitingAllowed(self.foreign.getIpAddr(), self.foreign.getPort()): - return Category.EXIT - elif self._possibleClient or self._possibleDirectory: - # This belongs to a known relay. If we haven't eliminated ourselves as - # a possible client or directory connection then check if it still - # holds true. - - myCircuits = conn.getCircuits() - - if self._possibleClient: - # Checks that this belongs to the first hop in a circuit that's - # either unestablished or longer than a single hop (ie, anything but - # a built 1-hop connection since those are most likely a directory - # mirror). - - for status, _, path in myCircuits: - if path[0] == destFingerprint and (status != "BUILT" or len(path) > 1): - return Category.CLIENT # matched a probable guard connection - - # fell through, we can eliminate ourselves as a guard in the future - self._possibleClient = False - - if self._possibleDirectory: - # Checks if we match a built, single hop circuit. - - for status, _, path in myCircuits: - if path[0] == destFingerprint and status == "BUILT" and len(path) == 1: - return Category.DIRECTORY - - # fell through, eliminate ourselves as a directory connection - self._possibleDirectory = False + # caches both to simplify the calls and to keep the type consistent until + # we want to reflect changes + if reset or not self.cachedType: + self.cachedType = self._getType() - return self.baseType + return self.cachedType def getDestinationLabel(self, maxLength, extraAttr=DestAttr.NONE): """ @@ -293,6 +277,18 @@ # for everything else this isn't a concern return False + def getSortValues(self, sortAttrs, listingType): + """ + Provides the value used in comparisons to sort based on the given + attribute. + + Arguments: + sortAttrs - list of SortAttr values for the field being sorted on + listingType - primary attribute we're listing connections by + """ + + return [self._getSortValue(attr, listingType) for attr in sortAttrs] + def getLabel(self, listingType, width): """ Provides the formatted display string for this entry in the listing with @@ -300,7 +296,7 @@ <src> --> <dst> <etc> <uptime> (<type>) this provides the first three components padded to fill up to the uptime. - Listing.IP: + Listing.IP_ADDRESS: src - <internal addr:port> --> <external addr:port> dst - <destination addr:port> etc - <fingerprint> <nickname> @@ -345,7 +341,7 @@ usedSpace = len(LABEL_FORMAT % tuple([""] * 4)) + LABEL_MIN_PADDING src, dst, etc = "", "", "" - if listingType == connPanel.Listing.IP: + if listingType == connPanel.Listing.IP_ADDRESS: myExternalIpAddr = conn.getInfo("address", self.local.getIpAddr()) addrDiffer = myExternalIpAddr != self.local.getIpAddr() @@ -375,7 +371,7 @@ elif listingType == connPanel.Listing.HOSTNAME: # 15 characters for source, and a min of 40 reserved for the destination src = "localhost:%-5s" % self.local.getPort() - usedSpace += len(stc) + usedSpace += len(src) minHostnameSpace = 40 if width > usedSpace + minHostnameSpace + 28 and CONFIG["features.connection.showColumn.destination"]: @@ -396,19 +392,17 @@ usedSpace += (nicknameSpace + 2) hostnameSpace = width - usedSpace - usedSpace = width + usedSpace = width # prevents padding at the end if self.isPrivate(): dst = ("%%-%is" % hostnameSpace) % "<scrubbed>" else: hostname = self.foreign.getHostname(self.foreign.getIpAddr()) port = self.foreign.getPort() - # exclude space needed for the ':<port>' - hostnameSpace -= len(port) + 1 - # truncates long hostnames and sets dst to <hostname>:<port> hostname = uiTools.cropStr(hostname, hostnameSpace, 0) - dst = ("%%-%is:%%-5s" % hostnameSpace) % (hostname, port) + dst = "%s:%-5s" % (hostname, port) + dst = ("%%-%is" % hostnameSpace) % dst elif listingType == connPanel.Listing.FINGERPRINT: src = "localhost" if myType == Category.CONTROL: dst = "localhost" @@ -428,7 +422,7 @@ if isIpLocaleIncluded: nicknameSpace -= 28 if CONFIG["features.connection.showColumn.nickname"]: - nicknameSpace = width - usedSpace - 28 if isIpLocaleVisible else width - usedSpace + nicknameSpace = width - usedSpace - 28 if isIpLocaleIncluded else width - usedSpace nicknameLabel = uiTools.cropStr(self.foreign.getNickname(), nicknameSpace, 0) etc += ("%%-%is " % nicknameSpace) % nicknameLabel usedSpace += nicknameSpace + 2 @@ -454,6 +448,8 @@ usedSpace += 28 baseSpace = width - usedSpace + usedSpace = width # prevents padding at the end + if len(src) + len(dst) > baseSpace: src = uiTools.cropStr(src, baseSpace / 3) dst = uiTools.cropStr(dst, baseSpace - len(src)) @@ -467,4 +463,108 @@ self._labelCacheArgs = (listingType, width) return self._labelCache + + def _getType(self): + """ + Provides our best guess at the current type of the connection. This + depends on consensus results, our current client circuts, etc. + """ + + if self.baseType == Category.OUTBOUND: + # Currently the only non-static categories are OUTBOUND vs... + # - EXIT since this depends on the current consensus + # - CLIENT if this is likely to belong to our guard usage + # - DIRECTORY if this is a single-hop circuit (directory mirror?) + # + # The exitability, circuits, and fingerprints are all cached by the + # torTools util keeping this a quick lookup. + + conn = torTools.getConn() + destFingerprint = self.foreign.getFingerprint() + + if destFingerprint == "UNKNOWN": + # Not a known relay. This might be an exit connection. + + if conn.isExitingAllowed(self.foreign.getIpAddr(), self.foreign.getPort()): + return Category.EXIT + elif self._possibleClient or self._possibleDirectory: + # This belongs to a known relay. If we haven't eliminated ourselves as + # a possible client or directory connection then check if it still + # holds true. + + myCircuits = conn.getCircuits() + + if self._possibleClient: + # Checks that this belongs to the first hop in a circuit that's + # either unestablished or longer than a single hop (ie, anything but + # a built 1-hop connection since those are most likely a directory + # mirror). + + for status, _, path in myCircuits: + if path[0] == destFingerprint and (status != "BUILT" or len(path) > 1): + return Category.CLIENT # matched a probable guard connection + + # fell through, we can eliminate ourselves as a guard in the future + self._possibleClient = False + + if self._possibleDirectory: + # Checks if we match a built, single hop circuit. + + for status, _, path in myCircuits: + if path[0] == destFingerprint and status == "BUILT" and len(path) == 1: + return Category.DIRECTORY + + # fell through, eliminate ourselves as a directory connection + self._possibleDirectory = False + + return self.baseType + + def _getSortValue(self, sortAttr, listingType): + """ + Provides the value of a single attribute used for sorting purposes. + """ + + from interface.connections import connPanel + + if sortAttr == SortAttr.IP_ADDRESS: return self.sortIpAddr + elif sortAttr == SortAttr.PORT: return self.sortPort + elif sortAttr == SortAttr.HOSTNAME: return self.foreign.getHostname("") + elif sortAttr == SortAttr.FINGERPRINT: return self.foreign.getFingerprint() + elif sortAttr == SortAttr.NICKNAME: + myNickname = self.foreign.getNickname() + + if myNickname == "UNKNOWN": return "z" * 20 # orders at the end + else: return myNickname.lower() + elif sortAttr == SortAttr.CATEGORY: return Category.indexOf(self.getType()) + elif sortAttr == SortAttr.UPTIME: return self.startTime + elif sortAttr == SortAttr.COUNTRY: + if connections.isIpAddressPrivate(self.foreign.getIpAddr()): return "" + else: return self.foreign.getLocale() + elif sortAttr == SortAttr.LISTING: + if listingType == connPanel.Listing.IP_ADDRESS: + return self._getSortValue(SortAttr.IP_ADDRESS, listingType) + elif listingType == connPanel.Listing.HOSTNAME: + return self._getSortValue(SortAttr.HOSTNAME, listingType) + elif listingType == connPanel.Listing.FINGERPRINT: + return self._getSortValue(SortAttr.FINGERPRINT, listingType) + elif listingType == connPanel.Listing.NICKNAME: + return self._getSortValue(SortAttr.NICKNAME, listingType) + + return "" +def _ipToInt(ipAddr): + """ + Provides an integer representation of the ip address, suitable for sorting. + + Arguments: + ipAddr - ip address to be converted + """ + + total = 0 + + for comp in ipAddr.split("."): + total *= 255 + total += int(comp) + + return total + Modified: arm/trunk/src/interface/controller.py =================================================================== --- arm/trunk/src/interface/controller.py 2011-03-09 01:12:30 UTC (rev 24313) +++ arm/trunk/src/interface/controller.py 2011-03-09 03:53:11 UTC (rev 24314) @@ -1003,7 +1003,11 @@ popup.addfstr(3, 2, "<b>enter</b>: edit configuration option") popup.addfstr(3, 41, "<b>w</b>: save current configuration") - popup.addfstr(4, 2, "<b>s</b>: sort ordering") + + listingType = panels["conn2"]._listingType.lower() + popup.addfstr(4, 2, "<b>l</b>: listed identity (<b>%s</b>)" % listingType) + + popup.addfstr(4, 41, "<b>s</b>: sort ordering") elif page == 3: popup.addfstr(1, 2, "<b>up arrow</b>: scroll up a line") popup.addfstr(1, 41, "<b>down arrow</b>: scroll down a line") @@ -1596,6 +1600,39 @@ setPauseState(panels, isPaused, page) finally: panel.CURSES_LOCK.release() + elif page == 2 and (key == ord('l') or key == ord('L')): + # provides a menu to pick the primary information we list connections by + options = interface.connections.connPanel.Listing.values() + initialSelection = options.index(panels["conn2"]._listingType) + + # hides top label of connection panel and pauses the display + panelTitle = panels["conn2"]._title + panels["conn2"]._title = "" + panels["conn2"].redraw(True) + setPauseState(panels, isPaused, page, True) + + selection = showMenu(stdscr, panels["popup"], "List By:", options, initialSelection) + + # reverts changes made for popup + panels["conn2"]._title = panelTitle + setPauseState(panels, isPaused, page) + + # applies new setting + if selection != -1 and options[selection] != panels["conn2"]._listingType: + panels["conn2"].setListingType(options[selection]) + panels["conn2"].redraw(True) + elif page == 2 and (key == ord('s') or key == ord('S')): + # set ordering for connection options + titleLabel = "Connection Ordering:" + options = interface.connections.listings.SortAttr.values() + oldSelection = panels["conn2"]._sortOrdering + optionColors = dict([(attr, interface.connections.listings.SORT_COLORS[attr]) for attr in options]) + results = showSortDialog(stdscr, panels, isPaused, page, titleLabel, options, oldSelection, optionColors) + + if results: + panels["conn2"].setSortOrder(results) + + panels["conn2"].redraw(True) elif page == 3 and (key == ord('c') or key == ord('C')) and False: # TODO: disabled for now (probably gonna be going with separate pages # rather than popup menu) Modified: arm/trunk/src/util/enum.py =================================================================== --- arm/trunk/src/util/enum.py 2011-03-09 01:12:30 UTC (rev 24313) +++ arm/trunk/src/util/enum.py 2011-03-09 03:53:11 UTC (rev 24314) @@ -62,6 +62,17 @@ return list(self.orderedValues) + def indexOf(self, value): + """ + Provides the index of the given value in the collection. This raises a + ValueError if no such element exists. + + Arguments: + value - entry to be looked up + """ + + return self.orderedValues.index(value) + def next(self, value): """ Provides the next enumeration after the given value, raising a ValueError [View Less]

1 0

r24313: {projects} updated the date for monday's presentation. (projects/presentations)
by Andrew Lewman 09 Mar '11

09 Mar '11

Author: phobos Date: 2011-03-09 01:12:30 +0000 (Wed, 09 Mar 2011) New Revision: 24313 Modified: projects/presentations/Censorship-HighLevel-Presentation.pdf Log: updated the date for monday's presentation. Modified: projects/presentations/Censorship-HighLevel-Presentation.pdf =================================================================== (Binary files differ)

1 0

[torbrowser/master] bump tbb linux 1.1.5-dev to tor-0.2.2.23-alpha and fix release date
by erinn＠torproject.org 09 Mar '11

09 Mar '11

commit b362d9d6d07a41248cf4f2a61c43bae41c13cf43 Author: Erinn Clark <erinn(a)torproject.org> Date: Wed Mar 9 01:13:53 2011 +0100 bump tbb linux 1.1.5-dev to tor-0.2.2.23-alpha and fix release date --- README.Linux | 5 +++-- build-scripts/linux.mk | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/README.Linux b/README.Linux index 3fca65d..ddf2561 100644 --- a/README.Linux +++ b/README.Linux @@ -5,7 +5,7 @@ Included applications ----------------… [View More]

1 0

← Newer
1
...
42
43
44
45
46
47
48
...
69
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits March 2011