diff --git a/en/index.wml b/en/index.wml index b188a717..196d5fcb 100644 --- a/en/index.wml +++ b/en/index.wml @@ -54,25 +54,31 @@ <tr> <td> <img src="images/icon-default.jpg" alt="Default Icon" /> - <h3><a href="<page torbutton/index>">TorButton</a></h3> - <p>Torbutton is a 1-click way for Firefox users to enable or disable the browser's use of Tor. </p> + <h3><a href="<page torbutton/index>">Torbutton</a></h3> + <p>Torbutton is a 1-click way for Firefox users to enable + or disable Tor in Firefox.</p> </td> <td> <img src="images/icon-default.jpg" alt="Default Icon" /> - <h3><a href="<page projects/torweather>">Tor Weather</a></h3> - <p>Tor Weather is a tool to notify Tor relay operators about the status of their relay.</p> + <h3><a href="https://check.torproject.org">Check</a></h3> + <p>Check will tell you if you are using browsing with + Tor successfully.</p> </td> </tr> <tr> <td> - <img src="images/icon-default.jpg" alt="Default Icon" /> - <h3><a href="<page projects/puppettor>">PuppeTor</a></h3> - <p>PuppeTor is a Tor Network simulator.</p> + <img src="images/icon-default.jpg" alt="Default Icon" /> + <h3><a href="<page projects/vidalia>">Vidalia</a></h3> + <p>Vidalia is a graphical tool to allow you to see where + your connections are in the world and configure Tor without + getting into configuration files and code.</p> </td> <td> - <img src="images/icon-default.jpg" alt="Default Icon" /> - <h3><a href="https://check.torproject.org">check.torproject.org</a></h3> - <p>Tor Check is a site where one can find out whether or not their web browser is using Tor successfully.</p> + <img src="images/icon-default.jpg" alt="Default Icon" /> + <h3><a href="<page projects/torbrowser>">Tor + Browser</a></h3> + <p>Tor Browser contains everything you need to safely + browse the Internet. </p> </td> </tr> </table> diff --git a/projects/en/sidenav.wmi b/projects/en/sidenav.wmi index b757cdca..9f15fed9 100644 --- a/projects/en/sidenav.wmi +++ b/projects/en/sidenav.wmi @@ -26,7 +26,7 @@ {'url' => 'projects/projects', 'txt' => 'Software & Services', 'subelements' => [ - {'url' => 'torbutton/index', + {'url' => 'torbutton/torbutton', 'txt' => 'TorButton', 'subelements' => [ {'url' => 'torbutton/torbutton-options', diff --git a/torbutton/en/index.wml b/torbutton/en/index.wml index 848eb1c9..2e245a8b 100644 --- a/torbutton/en/index.wml +++ b/torbutton/en/index.wml @@ -6,7 +6,7 @@ <div id="content" class="clearfix"> <div id="breadcrumbs"> <a href="<page index>">Home » </a> - <a href="<page torbutton>">TorButton</a> + <a href="<page torbutton/index>">Torbutton</a> </div> <div id="maincol"> <!-- PUT CONTENT AFTER THIS TAG --> diff --git a/torbutton/en/sidenav.wmi b/torbutton/en/sidenav.wmi new file mode 100644 index 00000000..70ed78b7 --- /dev/null +++ b/torbutton/en/sidenav.wmi @@ -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', + }] + }] +:> diff --git a/torbutton/en/torbutton-faq.wml b/torbutton/en/torbutton-faq.wml index 8243a1d0..6865a41e 100644 --- a/torbutton/en/torbutton-faq.wml +++ b/torbutton/en/torbutton-faq.wml @@ -6,8 +6,8 @@ <div id="content" class="clearfix"> <div id="breadcrumbs"> <a href="<page index>">Home » </a> - <a href="<page torbutton/>">TorButton » </a> - <a href="<page torbutton/torbutton-faq>">TorButton FAQ</a> + <a href="<page torbutton/index>">Torbutton » </a> + <a href="<page torbutton/torbutton-faq>">Torbutton FAQ</a> </div> <div id="maincol"> <!-- PUT CONTENT AFTER THIS TAG --> diff --git a/torbutton/en/torbutton-options.wml b/torbutton/en/torbutton-options.wml index 989e5fa6..3a674b54 100644 --- a/torbutton/en/torbutton-options.wml +++ b/torbutton/en/torbutton-options.wml @@ -6,8 +6,8 @@ <div id="content" class="clearfix"> <div id="breadcrumbs"> <a href="<page index>">Home » </a> - <a href="<page torbutton>">TorButton » </a> - <a href="<page torbutton/torbutton-options>">TorButton Options</a> + <a href="<page torbutton/torbutton>">Torbutton » </a> + <a href="<page torbutton/torbutton-options>">Torbutton Options</a> </div> <div id="maincol"> <!-- PUT CONTENT AFTER THIS TAG -->