[tor-commits] [vidalia/master] Updated html files

chiiph at torproject.org chiiph at torproject.org
Sat Jun 11 15:21:34 UTC 2011


commit da63c3a8daf83ba032d61fdd55191e802e7f39c4
Author: Runa A. Sandvik <runa.sandvik at gmail.com>
Date:   Thu Jun 9 19:55:11 2011 +0100

    Updated html files
---
 src/vidalia/help/content/cs/bridges.html          |   71 ++++++
 src/vidalia/help/content/cs/config.html           |  185 ++++++++++++++++
 src/vidalia/help/content/cs/index.html            |   41 ++++
 src/vidalia/help/content/cs/links.html            |   67 ++++++
 src/vidalia/help/content/cs/log.html              |  102 +++++++++
 src/vidalia/help/content/cs/netview.html          |  174 +++++++++++++++
 src/vidalia/help/content/cs/running.html          |  105 +++++++++
 src/vidalia/help/content/cs/server.html           |  238 +++++++++++++++++++++
 src/vidalia/help/content/cs/services.html         |  138 ++++++++++++
 src/vidalia/help/content/cs/troubleshooting.html  |  155 +++++++++++++
 src/vidalia/help/content/eo/bridges.html          |   71 ++++++
 src/vidalia/help/content/eo/config.html           |  185 ++++++++++++++++
 src/vidalia/help/content/eo/index.html            |   41 ++++
 src/vidalia/help/content/eo/links.html            |   67 ++++++
 src/vidalia/help/content/eo/log.html              |  102 +++++++++
 src/vidalia/help/content/eo/netview.html          |  174 +++++++++++++++
 src/vidalia/help/content/eo/running.html          |  105 +++++++++
 src/vidalia/help/content/eo/server.html           |  238 +++++++++++++++++++++
 src/vidalia/help/content/eo/services.html         |  138 ++++++++++++
 src/vidalia/help/content/eo/troubleshooting.html  |  155 +++++++++++++
 src/vidalia/help/content/eu/bridges.html          |   71 ++++++
 src/vidalia/help/content/eu/config.html           |  185 ++++++++++++++++
 src/vidalia/help/content/eu/index.html            |   41 ++++
 src/vidalia/help/content/eu/links.html            |   67 ++++++
 src/vidalia/help/content/eu/log.html              |  102 +++++++++
 src/vidalia/help/content/eu/netview.html          |  174 +++++++++++++++
 src/vidalia/help/content/eu/running.html          |  105 +++++++++
 src/vidalia/help/content/eu/server.html           |  238 +++++++++++++++++++++
 src/vidalia/help/content/eu/services.html         |  138 ++++++++++++
 src/vidalia/help/content/eu/troubleshooting.html  |  155 +++++++++++++
 src/vidalia/help/content/fo/bridges.html          |   71 ++++++
 src/vidalia/help/content/fo/log.html              |  102 +++++++++
 src/vidalia/help/content/fo/netview.html          |  174 +++++++++++++++
 src/vidalia/help/content/fo/running.html          |  105 +++++++++
 src/vidalia/help/content/fo/services.html         |  138 ++++++++++++
 src/vidalia/help/content/fo/troubleshooting.html  |  155 +++++++++++++
 src/vidalia/help/content/he/bridges.html          |   71 ++++++
 src/vidalia/help/content/he/config.html           |  185 ++++++++++++++++
 src/vidalia/help/content/he/index.html            |   41 ++++
 src/vidalia/help/content/he/links.html            |   67 ++++++
 src/vidalia/help/content/he/log.html              |  102 +++++++++
 src/vidalia/help/content/he/netview.html          |  174 +++++++++++++++
 src/vidalia/help/content/he/running.html          |  105 +++++++++
 src/vidalia/help/content/he/server.html           |  238 +++++++++++++++++++++
 src/vidalia/help/content/he/services.html         |  138 ++++++++++++
 src/vidalia/help/content/he/troubleshooting.html  |  155 +++++++++++++
 src/vidalia/help/content/ka/bridges.html          |   71 ++++++
 src/vidalia/help/content/ka/config.html           |  185 ++++++++++++++++
 src/vidalia/help/content/ka/index.html            |   41 ++++
 src/vidalia/help/content/ka/links.html            |   67 ++++++
 src/vidalia/help/content/ka/log.html              |  102 +++++++++
 src/vidalia/help/content/ka/netview.html          |  174 +++++++++++++++
 src/vidalia/help/content/ka/running.html          |  105 +++++++++
 src/vidalia/help/content/ka/server.html           |  238 +++++++++++++++++++++
 src/vidalia/help/content/ka/services.html         |  138 ++++++++++++
 src/vidalia/help/content/ka/troubleshooting.html  |  155 +++++++++++++
 src/vidalia/help/content/nap/bridges.html         |   71 ++++++
 src/vidalia/help/content/nap/config.html          |  185 ++++++++++++++++
 src/vidalia/help/content/nap/index.html           |   41 ++++
 src/vidalia/help/content/nap/links.html           |   67 ++++++
 src/vidalia/help/content/nap/log.html             |  102 +++++++++
 src/vidalia/help/content/nap/netview.html         |  174 +++++++++++++++
 src/vidalia/help/content/nap/running.html         |  105 +++++++++
 src/vidalia/help/content/nap/server.html          |  238 +++++++++++++++++++++
 src/vidalia/help/content/nap/services.html        |  138 ++++++++++++
 src/vidalia/help/content/nap/troubleshooting.html |  155 +++++++++++++
 66 files changed, 8401 insertions(+), 0 deletions(-)

diff --git a/src/vidalia/help/content/cs/bridges.html b/src/vidalia/help/content/cs/bridges.html
new file mode 100644
index 0000000..77439b5
--- /dev/null
+++ b/src/vidalia/help/content/cs/bridges.html
@@ -0,0 +1,71 @@
+
+
+<!--
+**  $Id$
+** 
+**  This file is part of Vidalia, and is subject to the license terms in the
+**  LICENSE file, found in the top level directory of this distribution. If 
+**  you did not receive the LICENSE file with this file, you may obtain it
+**  from the Vidalia source package distributed by the Vidalia Project at
+**  http://www.torproject.org/projects/vidalia.html. No part of Vidalia, 
+**  including this file, may be copied, modified, propagated, or distributed 
+**  except according to the terms described in the LICENSE file.
+-->
+<html>
+<body>
+
+<h1>Bridge Relays</h1>
+<hr />
+
+<a name="about"/>
+<h3>What are bridge relays?</h3>
+<p>
+Some Internet Service Providers (ISPs) attempt to prevent users from
+accessing the Tor network by blocking connections to known Tor
+relays. Bridge relays (or <i>bridges</i> for short) are relays that help
+these censored users access the Tor network. Unlike other Tor relays,
+bridges are not listed in the same public directories as normal
+relays. Since there is no complete public list of them, even if your ISP is
+filtering connections to all the known Tor relays, they probably won't be
+able to block all the bridges.
+</p>
+
+<a name="finding"/>
+<h3>How do I find a bridge relay?</h3>
+<p>
+There are two main ways to learn about a bridge address: 
+<ol>
+  <li>Get some friends to run private bridges for you</li>
+  <li>Use some of the public bridges</li>
+</ol>
+</p>
+
+<p>
+To use private bridges, ask your friends to run Vidalia and Tor in an
+uncensored area of the Internet, and then click on <i>Help censored
+users</i> in Vidalia's <a href="server.html">Relay settings page</a>. Then
+they should privately send you the <i>Bridge address</i> line at the bottom
+of their Relay page. Unlike running an exit relay, running a bridge relay
+just passes data to and from the Tor network, so it shouldn't expose the
+operator to any abuse complaints.
+</p>
+
+<p>
+You can find public bridge addresses by visiting
+<b>https://bridges.torproject.org</b>.  The answers you get from that page
+will change every few days, so check back periodically if you need more
+bridge addresses. Another way to find public bridge addresses is to send
+mail to <b>bridges at torproject.org</b> with the line <b>get bridges</b> by
+itself in the body of the mail. However, so we can make it harder for an
+attacker to learn lots of bridge addresses, you must send this request from
+a Gmail account.
+</p>
+
+<p>
+Configuring more than one bridge address will make your Tor connection more
+stable, in case some of the bridges become unreachable.
+</p>
+
+</body>
+</html>
+
diff --git a/src/vidalia/help/content/cs/config.html b/src/vidalia/help/content/cs/config.html
new file mode 100644
index 0000000..35fc842
--- /dev/null
+++ b/src/vidalia/help/content/cs/config.html
@@ -0,0 +1,185 @@
+
+
+<!--
+**  $Id$
+** 
+**  This file is part of Vidalia, and is subject to the license terms in the
+**  LICENSE file, found in the top level directory of this distribution. If 
+**  you did not receive the LICENSE file with this file, you may obtain it
+**  from the Vidalia source package distributed by the Vidalia Project at
+**  http://www.torproject.org/projects/vidalia.html. No part of Vidalia, 
+**  including this file, may be copied, modified, propagated, or distributed 
+**  except according to the terms described in the LICENSE file.
+-->
+<html>
+<body>
+
+<h1>Configuring Vidalia and Tor</h1>
+<hr />
+
+<p>
+Vidalia allows you to configure some of the most commonly modified aspects
+of Vidalia and Tor. It also lets you set up and manage a <a
+href="server.html">Tor relay</a> so you can help the Tor network grow.
+</p>
+
+<a name="general"/>
+<h3>General Settings</h3>
+<p>
+Settings on the <i>General</i> page are the most commonly modified settings.
+</p>
+<ul>
+  <li><b>Tor Executable</b>: This is the Tor executable that Vidalia will run when
+you select <i>Start</i> from the tray menu. If you have multiple versions of
+Tor installed, you can tell Vidalia which version you would like to run by
+clicking the <i>Browse</i> button and navigating to the particular Tor
+installation you want.
+  </li>
+  <li><b>Startup Options</b>: This setting allows you to have Vidalia
+automatically start Tor when Vidalia starts. You can also configure Vidalia
+to run when your system starts (<i>Windows only</i>).
+  </li>
+</ul>
+
+<a name="network"/>
+<h3>Network Settings</h3>
+<p>
+The <i>Network</i> settings page lets you change how Tor connects to the Tor
+network.
+</p>
+<ul>
+  <li><b>I use a proxy to access the Internet</b>: If your Internet connection
+requires an HTTP proxy, you can configure Tor to send all of its directory
+requests and Tor relay connections through your proxy. You must specify at
+least the hostname or address of your proxy, and the port on which your
+proxy is listening for connections. If your proxy requires authentication,
+you can also enter the <i>Username</i> and <i>Password</i> you use to
+connect to your proxy.  Otherwise, you can leave those fields blank.
+  </li>
+  <li><b>My firewall only lets me connect to certain ports</b>: If you are behind
+a restrictive firewall or proxy that limits the ports you are able to
+connect to, you can configure Tor to connect directly only to relays
+listening on the ports allowed by your firewall or proxy. Simply enter a
+list of ports permitted by your firewall or proxy, separated by
+commas. (<i>Example: 80,443,8080</i>)
+  </li>
+  <li><b>My ISP blocks connections to the Tor network</b>: If your ISP (Internet
+Service Provider) blocks connections to the Tor network, Tor can attempt to
+avoid being filtered by encrypting its directory connections and connecting
+to the Tor network through relays called <i>bridges</i> (Tor 0.2.0.3-alpha
+or newer only). You can add bridge relays by specifying either their address
+and port number, or their address, port number, and fingerprint.<br/>
+
+    Below are examples of valid bridge address formats:
+    <ul>
+      <li>
+        128.213.48.13:8080
+      </li>
+      <li>
+        128.213.48.13:8080 1054 13B1 DBDA F867 B226 74D2 52DF 3D9F A367 1F73
+      </li>
+      <li>
+        128.213.48.13:8080 105413B1DBDAF867B22674D252DF3D9FA3671F73
+      </li>
+    </ul>
+    Even if you do not know any bridge relay addresses, checking this checkbox
+may still be helpful. Tor will encrypt its directory requests, which can
+defeat blocking mechanisms that try to filter Tor's requests for information
+about other relays. If connections to normal Tor relays are also blocked,
+then you will need to learn a bridge relay address somehow and add it
+here. See the help topic on <a href="bridges.html#finding">finding bridge
+relays</a> for more information on how to learn new bridge relay addresses
+and fingerprints.
+  </li>
+</ul>
+
+<a name="relay"/>
+<h3>Relay Settings</h3>
+<p>
+<i> See <a href="server.html">this help topic</a> for detailed information
+about setting up and managing a Tor relay.  </i>
+</p>
+
+<a name="appearance"/>
+<h3>Appearance Settings</h3>
+<p>
+The settings on the <i>Appearance</i> page allow you to customize the look
+and feel of Vidalia.
+</p>
+<ul>
+  <li><b>Language</b>: Vidalia's interface has been translated into many languages
+by helpful volunteers. When Vidalia is first run, it will try to guess which
+language your computer is currently using. If Vidalia guesses incorrectly,
+or if you prefer a different language, you can choose another language from
+the dropdown box. You will need to restart Vidalia after changing the
+displayed language for the changes to take effect.
+  </li>
+  <li><b>Style</b>: In most cases, Vidalia will default to using your platform's
+default interface style. If you dislike the default, you can choose
+whichever interface style you prefer from the dropdown box.
+  </li>
+</ul>
+
+<a name="advanced"/>
+<h3>Advanced Settings</h3>
+<p>
+The settings on the <i>Advanced</i> page should generally only be modified
+by more experienced users.
+</p>
+<ul>
+  <li><b>Control Address &amp; Port</b>: The <i>Control Port</i> is the port which
+Vidalia uses to talk to Tor.  This doesn't need to be changed unless you
+have a conflict with another service on your machine, or if you are using
+Vidalia to control and monitor a Tor process running on another machine.
+  </li>
+  <li><b>Control Port Authentication</b>: Control port authentication is used to
+limit the applications on your machine that can connect to and reconfigure
+your Tor installation. The available authentication methods are:
+    <ul>  
+      <li>
+        <b>None</b> -- No authentication is required. Use of this option is
+<b>strongly</b> discouraged. Any application or user on your computer can
+reconfigure your Tor installation.
+      </li>
+      <li> 
+        <b>Password</b> <i>(Default)</i> -- If this method is selected, you can
+specify a password that Tor will require each time a user or application
+connects to Tor's control port. If Vidalia starts Tor for you, you can have
+Vidalia randomly generate a new password each time it starts Tor by checking
+the <i>Randomly Generate</i> checkbox.
+      </li>
+      <li>
+        <b>Cookie</b> -- If cookie authentication is selected, Tor will write a file
+(or, <i>cookie</i>) containing random bytes to its data directory when it
+starts. Any user or application that tries to connect to Tor's control port
+must be able to provide the contents of this cookie.
+      </li>
+    </ul>
+  </li>
+  <li><b>Tor Configuration File</b> <i>(optional)</i>: You can use this option to
+have Vidalia start Tor using a specific <i>torrc</i>, Tor's configuration
+file. If you leave this field blank, Tor will uses its own default torrc
+location.
+  </li>
+  <li><b>Tor Data Directory</b> <i>(optional)</i>: You can specify the directory
+in which Tor will store its saved data, such as cached Tor relay
+information, Tor relay keys, and configuration files. If you leave this
+field blank, Tor will use its own default data directory location.
+  </li>
+  <li><b>Permissions</b> <i>(optional, not available on Windows)</i>: If you enter
+a value for <b>Run as User</b>, Tor will <i>setuid</i> to this user when it
+starts.  If you enter a value for <b>Run as Group</b>, Tor will
+<i>setgid</i> to this group when it starts.
+  </li>
+</ul>
+
+<a name="services"/>
+<h3>Hidden Service Settings</h3>
+<p>
+Hidden services allow you to provide any kind of TCP-based service, e.g.  an
+HTTP service, to others without revealing your IP address.
+</p>
+
+</body>
+</html>
+
diff --git a/src/vidalia/help/content/cs/index.html b/src/vidalia/help/content/cs/index.html
new file mode 100644
index 0000000..378a4cd
--- /dev/null
+++ b/src/vidalia/help/content/cs/index.html
@@ -0,0 +1,41 @@
+
+
+<!--
+**  $Id$
+** 
+**  This file is part of Vidalia, and is subject to the license terms in the
+**  LICENSE file, found in the top level directory of this distribution. If 
+**  you did not receive the LICENSE file with this file, you may obtain it
+**  from the Vidalia source package distributed by the Vidalia Project at
+**  http://www.torproject.org/projects/vidalia.html. No part of Vidalia, 
+**  including this file, may be copied, modified, propagated, or distributed 
+**  except according to the terms described in the LICENSE file.
+-->
+<html>
+<body>
+
+<h1>Vidalia Help</h1>
+<hr />
+
+<p>
+Select a help topic from the tree on the left or click on the Search button
+above the list of topics to search through all available help topics.
+</p>
+
+<p>
+You can use the <i>Find</i> button on the toolbar above to search within a
+particular help topic.
+</p>
+
+<p>
+The <i>Home</i> button above will bring you back to this home page.
+</p>
+
+<p>
+See the <a href="links.html">Helpful Links</a> topic for some places you can
+visit to find additional help and information about Vidalia and Tor.
+</p>
+
+</body>
+</html>
+
diff --git a/src/vidalia/help/content/cs/links.html b/src/vidalia/help/content/cs/links.html
new file mode 100644
index 0000000..d2f441a
--- /dev/null
+++ b/src/vidalia/help/content/cs/links.html
@@ -0,0 +1,67 @@
+
+
+<!--
+**  $Id$
+** 
+**  This file is part of Vidalia, and is subject to the license terms in the
+**  LICENSE file, found in the top level directory of this distribution. If 
+**  you did not receive the LICENSE file with this file, you may obtain it
+**  from the Vidalia source package distributed by the Vidalia Project at
+**  http://www.torproject.org/projects/vidalia.html. No part of Vidalia, 
+**  including this file, may be copied, modified, propagated, or distributed 
+**  except according to the terms described in the LICENSE file.
+-->
+<html>
+<body>
+
+<h1>Helpful Links</h1>
+<hr />
+
+<h3>Vidalia</h3>
+<table>
+<tr>
+  <td>&nbsp;&nbsp;&nbsp;</td>
+  <td>Homepage</td>
+  <td>
+    <a href="https://www.torproject.org/vidalia/">
+https://www.torproject.org/vidalia/</a>
+  </td>
+</tr>
+<tr>
+  <td>&nbsp;&nbsp;&nbsp;</td>
+  <td>Wiki and Bugtracker</td>
+  <td>
+    <a href="http://trac.torproject.org/"> http://trac.torproject.org/</a>
+  </td>
+</tr>
+</table>
+
+<h3>Tor</h3>
+<table>
+<tr>
+  <td>&nbsp;&nbsp;&nbsp;</td>
+  <td>Homepage</td>
+  <td>
+    <a href="https://www.torproject.org/">https://www.torproject.org/</a>
+  </td>
+</tr>
+<tr>
+  <td>&nbsp;&nbsp;&nbsp;</td>
+  <td>FAQ</td>
+  <td>
+    <a href="https://www.torproject.org/docs/faq.html">
+https://www.torproject.org/docs/faq.html</a>
+  </td>
+</tr>
+<tr>
+  <td>&nbsp;&nbsp;&nbsp;</td>
+  <td>Wiki and Bugtracker</td>
+  <td>
+    <a href="https://trac.torproject.org/"> https://trac.torproject.org/</a>
+  </td>
+</tr>
+</table>
+
+</body>
+</html>
+
diff --git a/src/vidalia/help/content/cs/log.html b/src/vidalia/help/content/cs/log.html
new file mode 100644
index 0000000..b0ef886
--- /dev/null
+++ b/src/vidalia/help/content/cs/log.html
@@ -0,0 +1,102 @@
+
+
+<!--
+**  $Id$
+** 
+**  This file is part of Vidalia, and is subject to the license terms in the
+**  LICENSE file, found in the top level directory of this distribution. If 
+**  you did not receive the LICENSE file with this file, you may obtain it
+**  from the Vidalia source package distributed by the Vidalia Project at
+**  http://www.torproject.org/projects/vidalia.html. No part of Vidalia, 
+**  including this file, may be copied, modified, propagated, or distributed 
+**  except according to the terms described in the LICENSE file.
+-->
+<html>
+<body>
+
+<h1>Message Log</h1>
+<hr />
+
+The message log lets you see status information about a running Tor
+process.  <a name="basic"/> Each message has a <i>severity</i> associated
+with it, ranging from <b>Error</b> (most serious) to <b>Debug</b> (most
+verbose). See the help section on <a href="#severities">message
+severities</a> for more information.  <a name="severities"/>
+<h3>Message Severities</h3>
+<p>
+A message's severity tells you how important the message is. A higher
+severity message usually indicates that something has gone wrong with
+Tor. Lower severity messages appear frequently during normal Tor operations
+and usually do not need to be logged.
+</p>
+
+<p>
+The possible message severities, from most severe to least severe, are:
+</p>
+<ul>
+  <li>
+    <b>Error</b>: Messages that appear when something has gone very wrong and
+Tor cannot proceed. These messages will be highlighted in <i>red</i> in the
+message log.
+  </li>
+  <li>
+    <b>Warning</b>: Messages that only appear when something has gone wrong with
+Tor, but are not fatal and Tor will continue running. These messages will be
+highlighted in <i>yellow</i>.
+  </li>
+  <li>
+    <b>Notice</b>: Messages that appear infrequently during normal Tor operation
+and are not considered errors, but you still may care about.
+  </li>
+  <li>
+    <b>Info</b>: Messages that appear frequently during normal Tor operation and
+are not usually of interest to most users.
+  </li>
+  <li>
+    <b>Debug</b>: Extremely verbose messages that are primarily of interest to
+developers. You should generally not log debug messages unless you know what
+you are doing.
+  </li>
+</ul>
+
+<p>
+Most users should only log <i>Error</i>, <i>Warning</i>, and <i>Notice</i>
+messages.
+</p>
+
+<p>
+To select which message severities you would like to see, do the following:
+<ol>
+  <li>Open the message log from the Vidalia tray menu.</li>
+  <li>Click on <i>Settings</i> at the top of the message log window.</li>
+  <li>
+    Check message severities you would like to see from the Message Filter group
+on the left and uncheck message severities you would like to hide.
+  </li>
+  <li>Click <i>Save Settings</i> to apply your new message filter.</li>
+</ol>
+</p>
+
+
+<a name="logfile"/>
+<h3>Logging to a File</h3>
+<p>
+Vidalia can also write log messages to a file, as well as logging them in
+the message log window. To enable logging to a file, follow these steps:
+</p>
+
+<ol>
+  <li>Open the message log from the Vidalia tray menu.</li>
+  <li>Click on <i>Settings</i> at the top of the message log window.</li>
+  <li>Check the box labeled <i>Automatically save new log messages to a file</i>.</li>
+  <li>
+    If you would like to change the file to which messages will be written,
+either type the path and filename into the text box, or click <i>Browse</i>
+to navigate to a location for your log file.
+  </li>
+  <li>Click <i>Save Settings</i> to save your log destination.</li>
+</ol>
+
+</body>
+</html>
+
diff --git a/src/vidalia/help/content/cs/netview.html b/src/vidalia/help/content/cs/netview.html
new file mode 100644
index 0000000..bdb2f50
--- /dev/null
+++ b/src/vidalia/help/content/cs/netview.html
@@ -0,0 +1,174 @@
+
+
+<!--
+**  $Id$
+** 
+**  This file is part of Vidalia, and is subject to the license terms in the
+**  LICENSE file, found in the top level directory of this distribution. If 
+**  you did not receive the LICENSE file with this file, you may obtain it
+**  from the Vidalia source package distributed by the Vidalia Project at
+**  http://www.torproject.org/projects/vidalia.html. No part of Vidalia, 
+**  including this file, may be copied, modified, propagated, or distributed 
+**  except according to the terms described in the LICENSE file.
+-->
+<html>
+<body>
+
+<h1>Network Viewer</h1>
+<hr />
+
+<p>
+The network viewer lets you see relays in the Tor network and where your
+traffic is going.
+</p>
+
+
+<a name="overview"/>
+<h3>Overview</h3>
+<p>
+When you want to communicate anonymously through Tor (say, connecting to a
+website), Tor creates a tunnel, or <i>circuit</i>, of encrypted connections
+through a series of relays on the network. Your application's traffic is
+then sent as a <i>stream</i> through that circuit. For efficiency, multiple
+streams may share the same circuit.
+</p>
+
+<a name="netmap"/>
+<h3>Network Map</h3>
+<p>
+The network map consists of a map of the world, with red pinpoints
+indicating the geographic location of relays in the Tor network. Green lines
+are drawn between relays to indicate the path of circuits that your Tor
+client has created through the Tor network.
+</p>
+<p>
+You can zoom in on locations in the map by clicking the <b>Zoom In</b> and
+<b>Zoom Out</b> buttons in the toolbar. You can also scroll around on the
+map by clicking on the map and then dragging it in whatever direction you
+would like to move the map.
+</p>
+<p>
+The geographic location of a Tor relay is determined by looking up the IP
+address of the relay in a GeoIP database, created by MaxMind and located at
+geoip.vidalia-project.net.
+</p>
+<p>
+In the middle of the dialog, below the network map, you will see a list of
+your current circuits, as well as any application traffic currently on those
+circuits. When the network map first loads, you will probably see a
+connection to geoip.vidalia-project.net, which occurs when Vidalia is
+looking up geographic information for the list of Tor relays. It is
+important to note that this request is done through Tor, so your location is
+not revealed to the GeoIP relay. The results of the lookups will be cached
+locally in order to reduce load on Vidalia's GeoIP relays.
+</p>
+
+
+<a name="relaylist"/>
+<h3>Relay Status</h3>
+<p>
+On the left side of the network view, you will see a list of relays in the
+Tor network. Next to each relay is an icon indicating that relay's status.
+The following table summarizes the possible relay status icons:
+</p>
+<p>
+<table border="1">
+<tr>
+  <td><img src="qrc:/images/icons/node-unresponsive.png"/></td>
+  <td valign="middle">
+    The relay is offline or simply not responding.
+  </td>
+</tr>
+<tr>
+  <td><img src="qrc:/images/icons/node-hibernating.png"/></td>
+  <td valign="middle">
+    The relay is <i>hibernating</i>, meaning it is online, but has used up as
+much bandwidth as the operator is willing to allow for a given time period.
+  </td>
+</tr>
+<tr>
+  <td><img src="qrc:/images/icons/node-bw-none.png"/></td>
+  <td valign="middle">
+    The relay is online, but has shown only minimal throughput.
+  </td>
+</tr>
+<tr>
+  <td><img src="qrc:/images/icons/node-bw-low.png"/></td>
+  <td valign="middle">
+    The relay is online and has shown a throughput &gt;= 20 KB/s.
+  </td>
+</tr>
+<tr>
+  <td><img src="qrc:/images/icons/node-bw-med.png"/></td>
+  <td valign="middle">
+    The relay is online and has shown a throughput &gt;= 60 KB/s.
+  </td>
+</tr>
+<tr>
+  <td><img src="qrc:/images/icons/node-bw-high.png"/></td>
+  <td valign="middle">
+    The relay is online and has shown a throughput &gt;= 400 KB/s.
+  </td>
+</tr>
+</table>
+</p>
+<p>
+All bandwidth values are estimates based on the minimum of either the
+maximum bandwidth sustained input or output over any ten second period in
+the past day.
+</p>
+
+
+<a name="details"/>
+<h3>Relay Details</h3>
+<p>
+The relay details panel at the right side of the screen gives you details
+about the relay or relays currently selected in the <a
+href="#relaylist">relay list</a>. If you have selected a circuit or stream
+in the list of your current circuits and streams, this panel will show you
+details about each relay through which your traffic is currently being sent.
+</p>
+<p>
+The fields that you may see in the panel are as follows (<i>Note</i>: not
+all of these fields will always be present):
+</p>
+<p>
+<table>
+<tr>
+  <td><b>Location</b></td>
+  <td>The geographic location of this Tor relay.</td>
+</tr>
+<tr>
+  <td><b>IP Address</b></td>
+  <td>IP address at which this Tor relay can be reached.</td>
+</tr>
+<tr>
+  <td><b>Platform</b></td>
+  <td>
+    Operating system information and Tor version on which this relay is
+currently running.
+  </td>
+</tr>
+<tr>
+  <td><b>Bandwidth</b></td>
+  <td>
+    Estimated maximum amount of bandwidth that the directory relays have seen
+this relay handle recently.
+  </td>
+</tr>
+<tr>
+  <td><b>Uptime</b></td>
+  <td>
+    Length of time this relay has been available, which can be used to help
+estimate this relay's stability.
+  </td>
+</tr>
+<tr>
+  <td><b>Last Updated</b></td>
+  <td>Date this relay's information was last updated.</td>
+</tr>
+</table>
+</p>
+</body>
+</html>
+
diff --git a/src/vidalia/help/content/cs/running.html b/src/vidalia/help/content/cs/running.html
new file mode 100644
index 0000000..2e84804
--- /dev/null
+++ b/src/vidalia/help/content/cs/running.html
@@ -0,0 +1,105 @@
+
+
+<!--
+**  $Id$
+** 
+**  This file is part of Vidalia, and is subject to the license terms in the
+**  LICENSE file, found in the top level directory of this distribution. If 
+**  you did not receive the LICENSE file with this file, you may obtain it
+**  from the Vidalia source package distributed by the Vidalia Project at
+**  http://www.torproject.org/projects/vidalia.html. No part of Vidalia, 
+**  including this file, may be copied, modified, propagated, or distributed 
+**  except according to the terms described in the LICENSE file.
+-->
+<html>
+<body>
+
+<h1>Running Tor</h1>
+<hr />
+
+<p>
+Vidalia can help you control your Tor process by letting you start and stop
+Tor, as well as monitoring Tor's status and letting you know if it exits
+unexpectedly.
+</p>
+
+<a name="starting"/>
+<h3>Starting and Stopping Tor</h3>
+<p>
+To <i>start</i> Tor,
+<ol>
+  <li>Select <i>Start</i> from Vidalia's tray menu or press <i>Ctrl+S</i></li>.
+  <li>
+    Vidalia's tray icon will change from an onion with a red X to a green onion
+when Tor has started.
+  </li>
+</ol>
+If Vidalia is unable to start Tor, Vidalia will display an error message
+telling you what went wrong. You can also look at your <a
+href="log.html">message log</a> to see if Tor printed any more information
+about what went wrong.
+</p>
+
+<p>
+To <i>stop</i> Tor,
+<ol>
+  <li>Select <i>Stop</i> from Vidalia's tray menu or press <i>Ctrl+T</i></li>.
+  <li>
+    Vidalia's tray icon will change from a green onion to a gray onion with a
+red X when Tor has stopped.
+  </li>
+</ol>
+If Vidalia was unable to stop Tor, Vidalia will display an error message
+telling you what went wrong. You can also look at your <a
+href="log.html">message log</a> to see if Tor printed any more information
+about what went wrong.
+</p>
+
+<a name="monitoring"/>
+<h3>Monitoring Tor's Status</h3>
+<p>
+Vidalia tells you about the status of Tor by displaying an icon in your
+system tray or dock area. The following table shows the different states
+indicated by an icon in your system's notification area:
+</p>
+<p>
+<table border="1">
+<tr>
+    <td><img src="qrc:/images/32x32/tor-off.png"/></td>
+    <td valign="middle">
+      Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor.
+    </td>
+</tr>
+<tr>
+    <td><img src="qrc:/images/32x32/tor-starting.png"/></td>
+    <td valign="middle">
+      Tor is starting up. You can check the <a href="log.html">message log</a> for
+status information about Tor while it is starting.
+    </td>
+</tr>
+<tr>
+    <td><img src="qrc:/images/32x32/tor-on.png"/></td>
+    <td valign="middle">
+      Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia
+menu. Tor will print informational messages to the <a
+href="log.html">message log</a> while it is running, if you want to see what
+Tor is doing.
+    </td>
+</tr>
+<tr>
+    <td><img src="qrc:/images/32x32/tor-stopping.png"/></td>
+    <td valign="middle">Tor is in the process of shutting down.</td>
+</tr>
+</table>
+</p>
+
+<p>
+If Tor exits unexpectedly, Vidalia will change its icon to the dark onion
+with a red X and display an error message letting you know what went
+wrong. You can also check the <a href="log.html">message log</a> for details
+about any problems Tor encountered before it exited.
+</p>
+
+</body>
+</html>
+
diff --git a/src/vidalia/help/content/cs/server.html b/src/vidalia/help/content/cs/server.html
new file mode 100644
index 0000000..f7baa0f
--- /dev/null
+++ b/src/vidalia/help/content/cs/server.html
@@ -0,0 +1,238 @@
+
+
+<!--
+**  $Id$
+** 
+**  This file is part of Vidalia, and is subject to the license terms in the
+**  LICENSE file, found in the top level directory of this distribution. If 
+**  you did not receive the LICENSE file with this file, you may obtain it
+**  from the Vidalia source package distributed by the Vidalia Project at
+**  http://www.torproject.org/projects/vidalia.html. No part of Vidalia, 
+**  including this file, may be copied, modified, propagated, or distributed 
+**  except according to the terms described in the LICENSE file.
+-->
+<html>
+<body>
+
+<h1>Setting Up a Tor Relay</h1>
+<hr />
+
+The Tor network is made up of volunteers all over the world who donate some
+of their spare bandwidth by running a Tor relay. Vidalia helps you do your
+part by making it easy to set up a relay of your own.  <a name="basic"/>
+<h3>Basic Settings</h3>
+<p>
+If you decide you want to help the Tor network grow by running a relay, you
+can follow these steps to get started:
+</p>
+<ol>
+  <li>
+    Open the <i>Configuration Dialog</i> by selecting <i>Settings</i> from the
+tray menu or <i>Preferences</i> from your system menubar on Macintosh
+systems.
+  </li>
+  <li>Select the <i>Relay</i> configuration page.</li>
+  <li>
+    Decide whether you want to run a normal Tor relay or a <i>bridge</i> relay
+(Tor 0.2.0.8-alpha or newer). Bridge relays help censored Tor users who are
+blocked from accessing the Tor network directly.  Check the box labeled
+<i>Relay traffic for the Tor network</i> if you want to run a normal Tor
+relay or <i>Help censored users reach the Tor network</i> if you want to run
+a bridge relay.
+  </li>
+  <li>Enter the following information:</li>
+    <ul>
+      <li><b>Nickname</b>: The name which your relay will be known as on the Tor
+network. An example of a relay nickname is "MyVidaliaRelay".
+      </li>
+      <li><b>Contact Info</b>: Your e-mail address. This address will only be used to
+contact you in case there is an important Tor security update or something
+goes wrong with your relay. You might also include your PGP or GPG key ID
+and fingerprint.
+      </li>
+      <li><b>Relay Port</b>: The port on which your relay will listen for traffic from
+clients or other Tor relays.
+      </li>
+    </ul>
+  <li>
+    If you would like to mirror Tor's directory of relays for others on the
+network you can check the box labeled <i>Mirror the Relay Directory</i>.  If
+you do not have much bandwidth, uncheck this box. If you do decide to mirror
+the relay directory, make sure the <i>Directory Port</i> is different than
+the <i>Relay port</i> you entered above. Bridge relays <i>must</i> mirror
+the relay directory.
+  </li>
+</ol>
+
+<a name="bandwidth"/>
+<h3>Bandwidth Limits</h3>
+<p>
+Running a Tor relay can consume a large amount of bandwidth; however, Tor
+allows you to limit the amount of bandwidth that you are willing to
+contribute to the Tor network. You can run a relay, while still keeping your
+network connection usable for your own use.
+</p>
+<p>
+You should select the option in the dropdown box that best matches your
+connection speed. If you select <i>Custom</i>, you will be able to specify
+your own limits.
+</p>
+<h4>Custom Limits</h4>
+<p>
+The <i>maximum rate</i> is a pool of bytes used to fulfill requests during
+short periods of traffic higher than your specified <i>average rate</i>, but
+still maintains the average over a long period. A low average rate but a
+high maximum rate enforces a long-term average while still allowing more
+traffic during peak times if the average hasn't been reached lately. If your
+average rate is the same as your <i>maximum rate</i>, then Tor will never
+exceed the specified rate. Your <i>maximum rate</i> must always be greater
+than or equal to your <i>average rate</i>.
+</p>
+<p>
+The <i>average rate</i> is the maximum long-term average bandwidth allowed
+(in kilobytes per second). For example, you might want to choose 2 megabytes
+per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable
+connection). Tor requires a minimum of 20 kilobytes per second to run a
+relay.
+</p>
+<p>
+It is important to remember that Tor measures bandwidth in <b>bytes</b>, not
+bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For
+example, if your relay acts as a directory mirror, you may be sending more
+outgoing bytes than incoming. If you find this is the case and is putting
+too much strain on your bandwidth, you should consider unchecking the
+checkbox labeled <i>Mirror the relay directory</i>.
+</p>
+
+<a name="exitpolicy"/>
+<h3>Exit Policies</h3>
+<p>
+Exit policies give you a way to specify what kinds of resources on the
+Internet you are willing let other Tor users access from your Tor relay.
+Tor uses a default list of exit policies that restrict some services, such
+as mail to prevent spam and some default file sharing ports to reduce abuse
+of the Tor network. 
+</p>
+<p>
+Each of the checkboxes represents a type of resource that you can allow Tor
+users to access through your relay. If you uncheck the box next to a
+particular type of resource, Tor users will not be allowed to access that
+resource from your relay. If the box labeled <i>Misc Other Services</i> is
+checked, Tor users will be able to access other services not covered by the
+other checkboxes or Tor's default exit policy.
+</p>
+
+<p>
+For completeness, the following table lists the specific port numbers
+represented by each of the exit policy checkboxes. The <b>Description</b>
+column describes the resources Tor clients will be allowed to access through
+your relay, if the associated box is checked.
+</p>
+
+<table border="1">
+<tr>
+  <td><b>Checkbox</b></td>
+  <td><b>Ports</b></td>
+  <td><b>Description</b></td>
+</tr>
+<tr>
+  <td>Websites</td>
+  <td valign="middle">80</td>
+  <td>Normal, unencrypted Web browsing</td>
+</tr>
+<tr>
+  <td>Secure Websites (SSL)</td>
+  <td valign="middle">443</td>
+  <td>Encrypted Web browsing</td>
+</tr>
+<tr>
+  <td>Retrieve Mail (POP, IMAP)</td>
+  <td valign="middle">110, 143, 993, 995</td>
+  <td>Downloading email (does not permit sending email)</td>
+</tr>
+<tr>
+  <td>Instant Messaging (IM)</td>
+  <td valign="middle">703, 1863, 5050, 5190, 5222, 5223, 8300, 8888</td>
+  <td>Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber</td>
+</tr>
+<tr>
+  <td>Internet Relay Chat (IRC)</td>
+  <td valign="middle">6660-6669, 6697, 7000-7001</td>
+  <td>IRC clients and servers</td>
+</tr>
+<tr>
+  <td>Misc. Other Services</td>
+  <td valign="middle">*</td>
+  <td>All other applications that aren't covered by the previous checkboxes</td>
+</tr>
+</table>
+
+<p>
+If you do not want to let other Tor users make connections outside the Tor
+network from your relay, you can uncheck all of the checkboxes. Even if you
+uncheck all of the checkboxes, your relay is still useful to the Tor
+network.  Your relay will allow other Tor users to connect to the Tor
+network and will help relay traffic between other Tor relays.
+</p>
+<p>
+If you chose to run a bridge relay, the <i>Exit Policies</i> tab will be
+grayed out, since bridge relays do not allow exit connections. Bridges are
+only used by Tor clients to connect to the Tor network.
+</p>
+
+
+<a name="upnp"/>
+<h3>Port Forwarding</h3>
+<p>
+Many home users connect to the Internet via a <i>router</i>, which allows
+multiple computers on a local network to share the same Internet
+connection.  Some users may also be behind a <i>firewall</i> that blocks
+incoming connections to your computer from other computers on the Internet.
+If you want to run a Tor relay, however, other Tor clients and relays must
+be able to connect to your relay through your home router or firewall. 
+</p>
+
+<p>
+To make your relay publicly accessible, your router or firewall needs to
+know which ports to allow through to your computer by setting up what is
+known as <i>port forwarding</i>. Port forwarding configures your router or
+firewall to "forward" all connections to certain ports on your router or
+firewall to local ports on your computer.
+</p>
+
+<p>
+If you check the box labeled <i>Attempt to automatically configure port
+forwarding</i>, Vidalia will attempt to automatically set up port forwarding
+on your local network connection so that other Tor clients can connect to
+your relay. Not all routers support automatic port forwarding, though. You
+can use the <i>Test</i> button next to the checkbox to find out if Vidalia
+is able to automatically set up port forwarding for you.
+</p>
+
+<p>
+If the <i>Test</i> button finds that Vidalia is unable to set up port
+forwarding for you, you may need to enable this feature on your router or
+set up port forwarding manually. Some network devices have a feature called
+<i>Universal Plug-and-Play</i> (UPnP). If you can access your router's
+administrative interface, you should look for an option to enable UPnP. The
+administrative interface for most routers can be accessed by opening <a
+href="http://192.168.0.1/">http://192.168.0.1</a> or <a
+href="http://192.168.1.1/">http://192.168.1.1</a> in your Web browser. You
+should consult your router's instruction manual for more information.
+</p>
+
+<p>
+If you need to set up port forwarding manually, the website <a
+href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm">
+portforward.com</a> has instructions for how to set up port forwarding for
+many types of routers and firewalls. At a minimum, you will need to forward
+your <i>Relay Port</i>, which defaults to port 443 on Windows and 9001 on
+all other operating systems. If you also checked the checkbox labeled
+<i>Mirror the relay directory</i>, then you will also need to forward your
+<i>Directory Port</i>. The <i>Directory Port</i> is set to port 9030 by
+default on all operating systems.
+</p>
+
+</body>
+</html>
+
diff --git a/src/vidalia/help/content/cs/services.html b/src/vidalia/help/content/cs/services.html
new file mode 100644
index 0000000..9d30a80
--- /dev/null
+++ b/src/vidalia/help/content/cs/services.html
@@ -0,0 +1,138 @@
+
+
+<!--
+**  $Id $
+** 
+**  This file is part of Vidalia, and is subject to the license terms in the
+**  LICENSE file, found in the top level directory of this distribution. If 
+**  you did not receive the LICENSE file with this file, you may obtain it
+**  from the Vidalia source package distributed by the Vidalia Project at
+**  http://www.torproject.org/projects/vidalia.html. No part of Vidalia, 
+**  including this file, may be copied, modified, propagated, or distributed 
+**  except according to the terms described in the LICENSE file.
+-->
+<html>
+<body>
+
+<h1>Hidden Services</h1>
+<hr />
+
+Remark: Support for hidden services is new in Vidalia. You should expect it
+to have bugs, some of which possibly corrupting your hidden service
+configuration. So, don't rely on it, or rather, don't blame us if something
+goes wrong. If you find bugs or have comments on this new feature, please
+let us know! We need your feedback.  <a name="about"/>
+<h3>What is a hidden service?</h3>
+<p>
+Hidden services allow you to provide any kind of TCP-based service, e.g. an
+HTTP service, to others without revealing your IP address. The protocol to
+provide a hidden service is built on top of the same circuits that Tor uses
+for anonymous browsing and roughly has similar anonymity properties.
+</p>
+
+<p>
+For more information on hidden service you may want to read section 5 of
+Tor's design paper (doc/design-paper/tor-design.pdf) or the Rendezvous
+Specification (doc/spec/rend-spec.txt).
+</p>
+
+<a name="provide"/>
+<h3>How do I provide a hidden service?</h3>
+<p>
+Providing a hidden service consists of at least two steps:
+<ol>
+  <li>Install a web server locally (or a server for whatever service you want to
+provide, e.g. IRC) to listen for local requests.</li>
+  <li>Configure your hidden service, so that Tor relays requests coming from Tor
+users to your local server.</li>
+</ol>
+There is a fine tutorial on the Tor website
+(https://www.torproject.org/docs/tor-hidden-service.html) that describes
+these steps in more detail.
+</p>
+
+<a name="data"/>
+<h3>What data do I need to provide?</h3>
+<p>
+The services table contains five columns containing data about configured
+hidden services:
+<ul>
+  <li>Onion Address (generated): The service (or onion) address is generated by
+Tor to uniquely identify your service. Give this onion address to the people
+who shall be able to access your service. You may use the "Copy to
+clipboard" button for that to avoid typos. If you have just created a hidden
+service, the field says "[Created by Tor]"; in order to make it display the
+real onion address, you need to save your configuration and re-open the
+settings window.</li>
+  <li>Virtual Port (required): This is the TCP port that clients will need to know
+in order to access your service. Typically, you will want to use the
+service-specific port here, e.g. port 80 for HTTP. Note that the virtual
+port usually has nothing to do with firewall settings, because it is only
+used Tor-internally.</li>
+  <li>Target (optional): Usually you want Tor to relay connection requests to
+localhost on a different port than the one you specified in "Virtual
+Port". Therefore, you can specify a target consisting of physical address
+and port to which requests to your hidden service are redirected, e.g. to
+localhost:5222 (or on whatever port your server is listening). If you don't
+specify any target, Tor will redirect requests to the port specified in
+"Virtual Port" on localhost.</li>
+  <li>Service Directory (required): Tor needs to store some hidden-service
+specific files in a separate directory, e.g. a private key and a hostname
+file containing the onion address. This directory should be distinct from a
+directory containing content that the service provides. A good place for a
+service directory might be a sub directory in Tor's data directory. -- Note
+that you cannot change the directory of a running service (it wouldn't make
+much sense to allow it, because Vidalia is not supposed to move directories
+on your hard disk!). If you want to move a hidden service to another
+directory, please proceed as follows: Start by disabling the service in
+Vidalia and save the configuration. Then move the directory on your hard
+disk to the new place. Finally, change the directory in Vidalia to the new
+location, enable the service again, and save the new configuration.</li>
+  <li>Enabled: If this checkbox is disabled, Vidalia will not configure the given
+hidden service in Tor. This can be useful for keeping the configuration of a
+currently unused service for later use. All non-enabled services are stored
+in the Vidalia-specific configuration file vidalia.conf.</li>
+</ul>
+</p>
+
+<a name="buttons"/>
+<h3>What are the five buttons used for?</h3>
+<p>
+<ul>
+  <li>Add service: Creates a new empty service configuration.</li>
+  <li>Remove service: Permanently removes a hidden service configuration.  (If you
+want to temporarily remove a service, uncheck its Enabled checkbox.)</li>
+  <li>Copy to clipboard: Copies the onion address to the clipboard, so that you
+can tell it to whoever shall be able to use your service.</li>
+  <li>Browse: Lets you browse to find a local hidden service directory.</li>
+</ul>
+</p>
+
+<a name="advanced"/>
+<h3>How can I configure advanced hidden service settings?</h3>
+<p>
+Tor allows configuration of more specific settings for hidden services,
+e.g. forcing to use (or avoiding) certain nodes as introduction points, or
+providing multiple virtual ports for the same service.
+</p>
+
+<p>
+However, we decided to simplify things in Vidalia and provide only the most
+common settings. If you want to configure advanced settings, you need to do
+so in Tor's torrc file. Vidalia will not remove those settings even when you
+are editing your hidden services. If you specify more than one virtual port,
+only the first will be displayed and be editable.
+</p>
+
+<a name="client"/>
+<h3>How does Vidalia help me to access other hidden services?</h3>
+<p>
+Not at all. There is no need to do so. If you want to access another hidden
+service, type the service's onion address in your browser (or appropriate
+client application if it's not a web service), and Tor does the rest for
+you. There is no need to specifically configure Tor for that.
+</p>
+
+</body>
+</html>
+
diff --git a/src/vidalia/help/content/cs/troubleshooting.html b/src/vidalia/help/content/cs/troubleshooting.html
new file mode 100644
index 0000000..69b8367
--- /dev/null
+++ b/src/vidalia/help/content/cs/troubleshooting.html
@@ -0,0 +1,155 @@
+
+
+<!--
+**  $Id$
+** 
+**  This file is part of Vidalia, and is subject to the license terms in the
+**  LICENSE file, found in the top level directory of this distribution. If 
+**  you did not receive the LICENSE file with this file, you may obtain it
+**  from the Vidalia source package distributed by the Vidalia Project at
+**  http://www.torproject.org/projects/vidalia.html. No part of Vidalia, 
+**  including this file, may be copied, modified, propagated, or distributed 
+**  except according to the terms described in the LICENSE file.
+-->
+<html>
+<body>
+
+<h1>Troubleshooting</h1>
+<hr />
+
+Listed below are some of the common problems or questions people have while
+running Tor. If you can't find anything about the particular problem you're
+having, check out our website at <i>www.vidalia-project.net</i> for more
+support and information.  <a name="start"/>
+<h3>I Can't Start Tor</h3>
+<p>
+The most likely reason that Vidalia could not start Tor is because Vidalia
+is looking for your Tor installation in the wrong directory. You can tell
+Vidalia where Tor is located by updating the <i>Tor Executable</i> option in
+the <a href="config.html#general">general configuration settings</a>.
+</p>
+<p>
+Another possible reason that Tor cannot start is because there is already
+another Tor process running. Check your list of running process and stop the
+previous Tor process, if you find one. Then, try running Tor again.
+</p>
+<p>
+If that did not help, check your <a href="log.html">message log</a> to see
+if Tor printed any information about errors it encountered while trying to
+start.
+</p>
+
+<a name="connect"/>
+<h3>Vidalia Can't Connect to Tor</h3>
+<p>
+Vidalia manages Tor by communicating with it via Tor's <i>control port</i>. 
+</p>
+<p>
+The most common reason that Vidalia cannot connect to Tor is because Tor
+started, but encountered an error and exited immediately. You should check
+your <a href="log.html">message log</a> to see if Tor reported any errors
+while it started.
+</p>
+<p>
+If Tor is listening on a different port than Vidalia expects, Vidalia will
+be unable to connect to Tor. You rarely need to change this setting, but if
+there is another service running on your machine that conflicts with Tor's
+control port, you will need to specify a different port. You can change this
+setting in Vidalia's <a href="config.html#advanced">advanced configuration
+settings</a>.
+</p>
+
+<a name="password"/>
+<h3>Why is Vidalia asking me for a "control password"?</h3>
+<p>
+Vidalia interacts with the Tor software via Tor's "control port". The
+control port lets Vidalia receive status updates from Tor, request a new
+identity, configure Tor's settings, etc. Each time Vidalia starts Tor,
+Vidalia sets a random password for Tor's control port to prevent other
+applications from also connecting to the control port and potentially
+compromising your anonymity.
+</p>
+
+<p>
+Usually this process of generating and setting a random control password
+happens in the background. There are three common situations, though, where
+Vidalia may prompt you for a password:
+</p>
+
+<ul>
+  <li>
+    You're already running Vidalia and Tor. For example, this situation can
+happen if you installed the Vidalia bundle and now you're trying to run the
+Tor Browser Bundle. In that case, you'll need to close the old Vidalia and
+Tor before you can run this one.
+  </li>
+
+  <li>
+    <p>Vidalia crashed, but left Tor running with the last known random
+password. After you restart Vidalia, it generates a new random password, but
+Vidalia can't talk to Tor, because the random passwords are different.</p>
+    
+    <p>If the dialog that prompts you for a control password has a <i>Reset</i>
+button, you can click the button and Vidalia will restart Tor with a new
+random control password.
+    </p>
+    
+    <p>If you do not see a <i>Reset</i> button, or if Vidalia is unable to restart
+Tor for you, you can still fix the problem manually. Simply go into your
+process or task manager, and terminate the Tor process. Then use Vidalia to
+restart Tor and all will work again.</p>
+  </li>
+
+  <li>
+    <p>You had previously set Tor to run as a service. When Tor is set to run as a
+service, it starts up when the system boots. If you configured Tor to start
+as a service through Vidalia, a random password was set and saved in
+Tor. When you reboot, Tor starts up and uses the random password it saved.
+You login and start up Vidalia. Vidalia attempts to talk to the already
+running Tor. Vidalia generates a random password, but it is different than
+the saved password in the Tor service.</p>
+  
+    <p>You need to reconfigure Tor to not be a service. See the Tor wiki page on
+running <a
+href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService">
+Tor as a service</a> for more information on how to remove the Tor service.</p>
+  </li>
+</ul>
+
+
+<a name="torexited"/> 
+<h3>Tor Exited Unexpectedly</h3> 
+<p> 
+If Tor exits immediately after trying to start, you most likely have another
+Tor process already running. Check the <a href="log.html">message log</a> to
+see if any of the last few messages in the list are highlighted in yellow
+and contain a message similar to the following:
+</p>
+<pre>
+connection_create_listener(): Could not bind to 127.0.0.1:9050: Address already in use. 
+Is Tor already running?
+</pre>
+<p>
+If you find an error message like the one above, you will need to stop the
+other Tor process before starting a new one with Vidalia. On Windows, you
+would need to look for <i>tor.exe</i> in your Task Manager. On most other
+operating systems, the <i>ps</i> command can help you find the other Tor
+process.
+</p>
+<p>
+If Tor had been running successfully for awhile (that is, longer than a few
+seconds), then you should check the <a href="log.html">message log</a> for
+information about any errors Tor experienced before it exited. Such errors
+will be highlighted in either red or yellow.
+</p>
+
+<a name="stop"/>
+<h3>Vidalia Can't Stop Tor</h3>
+<p>
+If Vidalia cannot stop Tor, you should check your <a href="log.html">message
+log</a> to see if Tor reported any errors while trying to exit.
+</p>
+
+</body>
+</html>
+
diff --git a/src/vidalia/help/content/eo/bridges.html b/src/vidalia/help/content/eo/bridges.html
new file mode 100644
index 0000000..77439b5
--- /dev/null
+++ b/src/vidalia/help/content/eo/bridges.html
@@ -0,0 +1,71 @@
+
+
+<!--
+**  $Id$
+** 
+**  This file is part of Vidalia, and is subject to the license terms in the
+**  LICENSE file, found in the top level directory of this distribution. If 
+**  you did not receive the LICENSE file with this file, you may obtain it
+**  from the Vidalia source package distributed by the Vidalia Project at
+**  http://www.torproject.org/projects/vidalia.html. No part of Vidalia, 
+**  including this file, may be copied, modified, propagated, or distributed 
+**  except according to the terms described in the LICENSE file.
+-->
+<html>
+<body>
+
+<h1>Bridge Relays</h1>
+<hr />
+
+<a name="about"/>
+<h3>What are bridge relays?</h3>
+<p>
+Some Internet Service Providers (ISPs) attempt to prevent users from
+accessing the Tor network by blocking connections to known Tor
+relays. Bridge relays (or <i>bridges</i> for short) are relays that help
+these censored users access the Tor network. Unlike other Tor relays,
+bridges are not listed in the same public directories as normal
+relays. Since there is no complete public list of them, even if your ISP is
+filtering connections to all the known Tor relays, they probably won't be
+able to block all the bridges.
+</p>
+
+<a name="finding"/>
+<h3>How do I find a bridge relay?</h3>
+<p>
+There are two main ways to learn about a bridge address: 
+<ol>
+  <li>Get some friends to run private bridges for you</li>
+  <li>Use some of the public bridges</li>
+</ol>
+</p>
+
+<p>
+To use private bridges, ask your friends to run Vidalia and Tor in an
+uncensored area of the Internet, and then click on <i>Help censored
+users</i> in Vidalia's <a href="server.html">Relay settings page</a>. Then
+they should privately send you the <i>Bridge address</i> line at the bottom
+of their Relay page. Unlike running an exit relay, running a bridge relay
+just passes data to and from the Tor network, so it shouldn't expose the
+operator to any abuse complaints.
+</p>
+
+<p>
+You can find public bridge addresses by visiting
+<b>https://bridges.torproject.org</b>.  The answers you get from that page
+will change every few days, so check back periodically if you need more
+bridge addresses. Another way to find public bridge addresses is to send
+mail to <b>bridges at torproject.org</b> with the line <b>get bridges</b> by
+itself in the body of the mail. However, so we can make it harder for an
+attacker to learn lots of bridge addresses, you must send this request from
+a Gmail account.
+</p>
+
+<p>
+Configuring more than one bridge address will make your Tor connection more
+stable, in case some of the bridges become unreachable.
+</p>
+
+</body>
+</html>
+
diff --git a/src/vidalia/help/content/eo/config.html b/src/vidalia/help/content/eo/config.html
new file mode 100644
index 0000000..35fc842
--- /dev/null
+++ b/src/vidalia/help/content/eo/config.html
@@ -0,0 +1,185 @@
+
+
+<!--
+**  $Id$
+** 
+**  This file is part of Vidalia, and is subject to the license terms in the
+**  LICENSE file, found in the top level directory of this distribution. If 
+**  you did not receive the LICENSE file with this file, you may obtain it
+**  from the Vidalia source package distributed by the Vidalia Project at
+**  http://www.torproject.org/projects/vidalia.html. No part of Vidalia, 
+**  including this file, may be copied, modified, propagated, or distributed 
+**  except according to the terms described in the LICENSE file.
+-->
+<html>
+<body>
+
+<h1>Configuring Vidalia and Tor</h1>
+<hr />
+
+<p>
+Vidalia allows you to configure some of the most commonly modified aspects
+of Vidalia and Tor. It also lets you set up and manage a <a
+href="server.html">Tor relay</a> so you can help the Tor network grow.
+</p>
+
+<a name="general"/>
+<h3>General Settings</h3>
+<p>
+Settings on the <i>General</i> page are the most commonly modified settings.
+</p>
+<ul>
+  <li><b>Tor Executable</b>: This is the Tor executable that Vidalia will run when
+you select <i>Start</i> from the tray menu. If you have multiple versions of
+Tor installed, you can tell Vidalia which version you would like to run by
+clicking the <i>Browse</i> button and navigating to the particular Tor
+installation you want.
+  </li>
+  <li><b>Startup Options</b>: This setting allows you to have Vidalia
+automatically start Tor when Vidalia starts. You can also configure Vidalia
+to run when your system starts (<i>Windows only</i>).
+  </li>
+</ul>
+
+<a name="network"/>
+<h3>Network Settings</h3>
+<p>
+The <i>Network</i> settings page lets you change how Tor connects to the Tor
+network.
+</p>
+<ul>
+  <li><b>I use a proxy to access the Internet</b>: If your Internet connection
+requires an HTTP proxy, you can configure Tor to send all of its directory
+requests and Tor relay connections through your proxy. You must specify at
+least the hostname or address of your proxy, and the port on which your
+proxy is listening for connections. If your proxy requires authentication,
+you can also enter the <i>Username</i> and <i>Password</i> you use to
+connect to your proxy.  Otherwise, you can leave those fields blank.
+  </li>
+  <li><b>My firewall only lets me connect to certain ports</b>: If you are behind
+a restrictive firewall or proxy that limits the ports you are able to
+connect to, you can configure Tor to connect directly only to relays
+listening on the ports allowed by your firewall or proxy. Simply enter a
+list of ports permitted by your firewall or proxy, separated by
+commas. (<i>Example: 80,443,8080</i>)
+  </li>
+  <li><b>My ISP blocks connections to the Tor network</b>: If your ISP (Internet
+Service Provider) blocks connections to the Tor network, Tor can attempt to
+avoid being filtered by encrypting its directory connections and connecting
+to the Tor network through relays called <i>bridges</i> (Tor 0.2.0.3-alpha
+or newer only). You can add bridge relays by specifying either their address
+and port number, or their address, port number, and fingerprint.<br/>
+
+    Below are examples of valid bridge address formats:
+    <ul>
+      <li>
+        128.213.48.13:8080
+      </li>
+      <li>
+        128.213.48.13:8080 1054 13B1 DBDA F867 B226 74D2 52DF 3D9F A367 1F73
+      </li>
+      <li>
+        128.213.48.13:8080 105413B1DBDAF867B22674D252DF3D9FA3671F73
+      </li>
+    </ul>
+    Even if you do not know any bridge relay addresses, checking this checkbox
+may still be helpful. Tor will encrypt its directory requests, which can
+defeat blocking mechanisms that try to filter Tor's requests for information
+about other relays. If connections to normal Tor relays are also blocked,
+then you will need to learn a bridge relay address somehow and add it
+here. See the help topic on <a href="bridges.html#finding">finding bridge
+relays</a> for more information on how to learn new bridge relay addresses
+and fingerprints.
+  </li>
+</ul>
+
+<a name="relay"/>
+<h3>Relay Settings</h3>
+<p>
+<i> See <a href="server.html">this help topic</a> for detailed information
+about setting up and managing a Tor relay.  </i>
+</p>
+
+<a name="appearance"/>
+<h3>Appearance Settings</h3>
+<p>
+The settings on the <i>Appearance</i> page allow you to customize the look
+and feel of Vidalia.
+</p>
+<ul>
+  <li><b>Language</b>: Vidalia's interface has been translated into many languages
+by helpful volunteers. When Vidalia is first run, it will try to guess which
+language your computer is currently using. If Vidalia guesses incorrectly,
+or if you prefer a different language, you can choose another language from
+the dropdown box. You will need to restart Vidalia after changing the
+displayed language for the changes to take effect.
+  </li>
+  <li><b>Style</b>: In most cases, Vidalia will default to using your platform's
+default interface style. If you dislike the default, you can choose
+whichever interface style you prefer from the dropdown box.
+  </li>
+</ul>
+
+<a name="advanced"/>
+<h3>Advanced Settings</h3>
+<p>
+The settings on the <i>Advanced</i> page should generally only be modified
+by more experienced users.
+</p>
+<ul>
+  <li><b>Control Address &amp; Port</b>: The <i>Control Port</i> is the port which
+Vidalia uses to talk to Tor.  This doesn't need to be changed unless you
+have a conflict with another service on your machine, or if you are using
+Vidalia to control and monitor a Tor process running on another machine.
+  </li>
+  <li><b>Control Port Authentication</b>: Control port authentication is used to
+limit the applications on your machine that can connect to and reconfigure
+your Tor installation. The available authentication methods are:
+    <ul>  
+      <li>
+        <b>None</b> -- No authentication is required. Use of this option is
+<b>strongly</b> discouraged. Any application or user on your computer can
+reconfigure your Tor installation.
+      </li>
+      <li> 
+        <b>Password</b> <i>(Default)</i> -- If this method is selected, you can
+specify a password that Tor will require each time a user or application
+connects to Tor's control port. If Vidalia starts Tor for you, you can have
+Vidalia randomly generate a new password each time it starts Tor by checking
+the <i>Randomly Generate</i> checkbox.
+      </li>
+      <li>
+        <b>Cookie</b> -- If cookie authentication is selected, Tor will write a file
+(or, <i>cookie</i>) containing random bytes to its data directory when it
+starts. Any user or application that tries to connect to Tor's control port
+must be able to provide the contents of this cookie.
+      </li>
+    </ul>
+  </li>
+  <li><b>Tor Configuration File</b> <i>(optional)</i>: You can use this option to
+have Vidalia start Tor using a specific <i>torrc</i>, Tor's configuration
+file. If you leave this field blank, Tor will uses its own default torrc
+location.
+  </li>
+  <li><b>Tor Data Directory</b> <i>(optional)</i>: You can specify the directory
+in which Tor will store its saved data, such as cached Tor relay
+information, Tor relay keys, and configuration files. If you leave this
+field blank, Tor will use its own default data directory location.
+  </li>
+  <li><b>Permissions</b> <i>(optional, not available on Windows)</i>: If you enter
+a value for <b>Run as User</b>, Tor will <i>setuid</i> to this user when it
+starts.  If you enter a value for <b>Run as Group</b>, Tor will
+<i>setgid</i> to this group when it starts.
+  </li>
+</ul>
+
+<a name="services"/>
+<h3>Hidden Service Settings</h3>
+<p>
+Hidden services allow you to provide any kind of TCP-based service, e.g.  an
+HTTP service, to others without revealing your IP address.
+</p>
+
+</body>
+</html>
+
diff --git a/src/vidalia/help/content/eo/index.html b/src/vidalia/help/content/eo/index.html
new file mode 100644
index 0000000..378a4cd
--- /dev/null
+++ b/src/vidalia/help/content/eo/index.html
@@ -0,0 +1,41 @@
+
+
+<!--
+**  $Id$
+** 
+**  This file is part of Vidalia, and is subject to the license terms in the
+**  LICENSE file, found in the top level directory of this distribution. If 
+**  you did not receive the LICENSE file with this file, you may obtain it
+**  from the Vidalia source package distributed by the Vidalia Project at
+**  http://www.torproject.org/projects/vidalia.html. No part of Vidalia, 
+**  including this file, may be copied, modified, propagated, or distributed 
+**  except according to the terms described in the LICENSE file.
+-->
+<html>
+<body>
+
+<h1>Vidalia Help</h1>
+<hr />
+
+<p>
+Select a help topic from the tree on the left or click on the Search button
+above the list of topics to search through all available help topics.
+</p>
+
+<p>
+You can use the <i>Find</i> button on the toolbar above to search within a
+particular help topic.
+</p>
+
+<p>
+The <i>Home</i> button above will bring you back to this home page.
+</p>
+
+<p>
+See the <a href="links.html">Helpful Links</a> topic for some places you can
+visit to find additional help and information about Vidalia and Tor.
+</p>
+
+</body>
+</html>
+
diff --git a/src/vidalia/help/content/eo/links.html b/src/vidalia/help/content/eo/links.html
new file mode 100644
index 0000000..d2f441a
--- /dev/null
+++ b/src/vidalia/help/content/eo/links.html
@@ -0,0 +1,67 @@
+
+
+<!--
+**  $Id$
+** 
+**  This file is part of Vidalia, and is subject to the license terms in the
+**  LICENSE file, found in the top level directory of this distribution. If 
+**  you did not receive the LICENSE file with this file, you may obtain it
+**  from the Vidalia source package distributed by the Vidalia Project at
+**  http://www.torproject.org/projects/vidalia.html. No part of Vidalia, 
+**  including this file, may be copied, modified, propagated, or distributed 
+**  except according to the terms described in the LICENSE file.
+-->
+<html>
+<body>
+
+<h1>Helpful Links</h1>
+<hr />
+
+<h3>Vidalia</h3>
+<table>
+<tr>
+  <td>&nbsp;&nbsp;&nbsp;</td>
+  <td>Homepage</td>
+  <td>
+    <a href="https://www.torproject.org/vidalia/">
+https://www.torproject.org/vidalia/</a>
+  </td>
+</tr>
+<tr>
+  <td>&nbsp;&nbsp;&nbsp;</td>
+  <td>Wiki and Bugtracker</td>
+  <td>
+    <a href="http://trac.torproject.org/"> http://trac.torproject.org/</a>
+  </td>
+</tr>
+</table>
+
+<h3>Tor</h3>
+<table>
+<tr>
+  <td>&nbsp;&nbsp;&nbsp;</td>
+  <td>Homepage</td>
+  <td>
+    <a href="https://www.torproject.org/">https://www.torproject.org/</a>
+  </td>
+</tr>
+<tr>
+  <td>&nbsp;&nbsp;&nbsp;</td>
+  <td>FAQ</td>
+  <td>
+    <a href="https://www.torproject.org/docs/faq.html">
+https://www.torproject.org/docs/faq.html</a>
+  </td>
+</tr>
+<tr>
+  <td>&nbsp;&nbsp;&nbsp;</td>
+  <td>Wiki and Bugtracker</td>
+  <td>
+    <a href="https://trac.torproject.org/"> https://trac.torproject.org/</a>
+  </td>
+</tr>
+</table>
+
+</body>
+</html>
+
diff --git a/src/vidalia/help/content/eo/log.html b/src/vidalia/help/content/eo/log.html
new file mode 100644
index 0000000..b0ef886
--- /dev/null
+++ b/src/vidalia/help/content/eo/log.html
@@ -0,0 +1,102 @@
+
+
+<!--
+**  $Id$
+** 
+**  This file is part of Vidalia, and is subject to the license terms in the
+**  LICENSE file, found in the top level directory of this distribution. If 
+**  you did not receive the LICENSE file with this file, you may obtain it
+**  from the Vidalia source package distributed by the Vidalia Project at
+**  http://www.torproject.org/projects/vidalia.html. No part of Vidalia, 
+**  including this file, may be copied, modified, propagated, or distributed 
+**  except according to the terms described in the LICENSE file.
+-->
+<html>
+<body>
+
+<h1>Message Log</h1>
+<hr />
+
+The message log lets you see status information about a running Tor
+process.  <a name="basic"/> Each message has a <i>severity</i> associated
+with it, ranging from <b>Error</b> (most serious) to <b>Debug</b> (most
+verbose). See the help section on <a href="#severities">message
+severities</a> for more information.  <a name="severities"/>
+<h3>Message Severities</h3>
+<p>
+A message's severity tells you how important the message is. A higher
+severity message usually indicates that something has gone wrong with
+Tor. Lower severity messages appear frequently during normal Tor operations
+and usually do not need to be logged.
+</p>
+
+<p>
+The possible message severities, from most severe to least severe, are:
+</p>
+<ul>
+  <li>
+    <b>Error</b>: Messages that appear when something has gone very wrong and
+Tor cannot proceed. These messages will be highlighted in <i>red</i> in the
+message log.
+  </li>
+  <li>
+    <b>Warning</b>: Messages that only appear when something has gone wrong with
+Tor, but are not fatal and Tor will continue running. These messages will be
+highlighted in <i>yellow</i>.
+  </li>
+  <li>
+    <b>Notice</b>: Messages that appear infrequently during normal Tor operation
+and are not considered errors, but you still may care about.
+  </li>
+  <li>
+    <b>Info</b>: Messages that appear frequently during normal Tor operation and
+are not usually of interest to most users.
+  </li>
+  <li>
+    <b>Debug</b>: Extremely verbose messages that are primarily of interest to
+developers. You should generally not log debug messages unless you know what
+you are doing.
+  </li>
+</ul>
+
+<p>
+Most users should only log <i>Error</i>, <i>Warning</i>, and <i>Notice</i>
+messages.
+</p>
+
+<p>
+To select which message severities you would like to see, do the following:
+<ol>
+  <li>Open the message log from the Vidalia tray menu.</li>
+  <li>Click on <i>Settings</i> at the top of the message log window.</li>
+  <li>
+    Check message severities you would like to see from the Message Filter group
+on the left and uncheck message severities you would like to hide.
+  </li>
+  <li>Click <i>Save Settings</i> to apply your new message filter.</li>
+</ol>
+</p>
+
+
+<a name="logfile"/>
+<h3>Logging to a File</h3>
+<p>
+Vidalia can also write log messages to a file, as well as logging them in
+the message log window. To enable logging to a file, follow these steps:
+</p>
+
+<ol>
+  <li>Open the message log from the Vidalia tray menu.</li>
+  <li>Click on <i>Settings</i> at the top of the message log window.</li>
+  <li>Check the box labeled <i>Automatically save new log messages to a file</i>.</li>
+  <li>
+    If you would like to change the file to which messages will be written,
+either type the path and filename into the text box, or click <i>Browse</i>
+to navigate to a location for your log file.
+  </li>
+  <li>Click <i>Save Settings</i> to save your log destination.</li>
+</ol>
+
+</body>
+</html>
+
diff --git a/src/vidalia/help/content/eo/netview.html b/src/vidalia/help/content/eo/netview.html
new file mode 100644
index 0000000..bdb2f50
--- /dev/null
+++ b/src/vidalia/help/content/eo/netview.html
@@ -0,0 +1,174 @@
+
+
+<!--
+**  $Id$
+** 
+**  This file is part of Vidalia, and is subject to the license terms in the
+**  LICENSE file, found in the top level directory of this distribution. If 
+**  you did not receive the LICENSE file with this file, you may obtain it
+**  from the Vidalia source package distributed by the Vidalia Project at
+**  http://www.torproject.org/projects/vidalia.html. No part of Vidalia, 
+**  including this file, may be copied, modified, propagated, or distributed 
+**  except according to the terms described in the LICENSE file.
+-->
+<html>
+<body>
+
+<h1>Network Viewer</h1>
+<hr />
+
+<p>
+The network viewer lets you see relays in the Tor network and where your
+traffic is going.
+</p>
+
+
+<a name="overview"/>
+<h3>Overview</h3>
+<p>
+When you want to communicate anonymously through Tor (say, connecting to a
+website), Tor creates a tunnel, or <i>circuit</i>, of encrypted connections
+through a series of relays on the network. Your application's traffic is
+then sent as a <i>stream</i> through that circuit. For efficiency, multiple
+streams may share the same circuit.
+</p>
+
+<a name="netmap"/>
+<h3>Network Map</h3>
+<p>
+The network map consists of a map of the world, with red pinpoints
+indicating the geographic location of relays in the Tor network. Green lines
+are drawn between relays to indicate the path of circuits that your Tor
+client has created through the Tor network.
+</p>
+<p>
+You can zoom in on locations in the map by clicking the <b>Zoom In</b> and
+<b>Zoom Out</b> buttons in the toolbar. You can also scroll around on the
+map by clicking on the map and then dragging it in whatever direction you
+would like to move the map.
+</p>
+<p>
+The geographic location of a Tor relay is determined by looking up the IP
+address of the relay in a GeoIP database, created by MaxMind and located at
+geoip.vidalia-project.net.
+</p>
+<p>
+In the middle of the dialog, below the network map, you will see a list of
+your current circuits, as well as any application traffic currently on those
+circuits. When the network map first loads, you will probably see a
+connection to geoip.vidalia-project.net, which occurs when Vidalia is
+looking up geographic information for the list of Tor relays. It is
+important to note that this request is done through Tor, so your location is
+not revealed to the GeoIP relay. The results of the lookups will be cached
+locally in order to reduce load on Vidalia's GeoIP relays.
+</p>
+
+
+<a name="relaylist"/>
+<h3>Relay Status</h3>
+<p>
+On the left side of the network view, you will see a list of relays in the
+Tor network. Next to each relay is an icon indicating that relay's status.
+The following table summarizes the possible relay status icons:
+</p>
+<p>
+<table border="1">
+<tr>
+  <td><img src="qrc:/images/icons/node-unresponsive.png"/></td>
+  <td valign="middle">
+    The relay is offline or simply not responding.
+  </td>
+</tr>
+<tr>
+  <td><img src="qrc:/images/icons/node-hibernating.png"/></td>
+  <td valign="middle">
+    The relay is <i>hibernating</i>, meaning it is online, but has used up as
+much bandwidth as the operator is willing to allow for a given time period.
+  </td>
+</tr>
+<tr>
+  <td><img src="qrc:/images/icons/node-bw-none.png"/></td>
+  <td valign="middle">
+    The relay is online, but has shown only minimal throughput.
+  </td>
+</tr>
+<tr>
+  <td><img src="qrc:/images/icons/node-bw-low.png"/></td>
+  <td valign="middle">
+    The relay is online and has shown a throughput &gt;= 20 KB/s.
+  </td>
+</tr>
+<tr>
+  <td><img src="qrc:/images/icons/node-bw-med.png"/></td>
+  <td valign="middle">
+    The relay is online and has shown a throughput &gt;= 60 KB/s.
+  </td>
+</tr>
+<tr>
+  <td><img src="qrc:/images/icons/node-bw-high.png"/></td>
+  <td valign="middle">
+    The relay is online and has shown a throughput &gt;= 400 KB/s.
+  </td>
+</tr>
+</table>
+</p>
+<p>
+All bandwidth values are estimates based on the minimum of either the
+maximum bandwidth sustained input or output over any ten second period in
+the past day.
+</p>
+
+
+<a name="details"/>
+<h3>Relay Details</h3>
+<p>
+The relay details panel at the right side of the screen gives you details
+about the relay or relays currently selected in the <a
+href="#relaylist">relay list</a>. If you have selected a circuit or stream
+in the list of your current circuits and streams, this panel will show you
+details about each relay through which your traffic is currently being sent.
+</p>
+<p>
+The fields that you may see in the panel are as follows (<i>Note</i>: not
+all of these fields will always be present):
+</p>
+<p>
+<table>
+<tr>
+  <td><b>Location</b></td>
+  <td>The geographic location of this Tor relay.</td>
+</tr>
+<tr>
+  <td><b>IP Address</b></td>
+  <td>IP address at which this Tor relay can be reached.</td>
+</tr>
+<tr>
+  <td><b>Platform</b></td>
+  <td>
+    Operating system information and Tor version on which this relay is
+currently running.
+  </td>
+</tr>
+<tr>
+  <td><b>Bandwidth</b></td>
+  <td>
+    Estimated maximum amount of bandwidth that the directory relays have seen
+this relay handle recently.
+  </td>
+</tr>
+<tr>
+  <td><b>Uptime</b></td>
+  <td>
+    Length of time this relay has been available, which can be used to help
+estimate this relay's stability.
+  </td>
+</tr>
+<tr>
+  <td><b>Last Updated</b></td>
+  <td>Date this relay's information was last updated.</td>
+</tr>
+</table>
+</p>
+</body>
+</html>
+
diff --git a/src/vidalia/help/content/eo/running.html b/src/vidalia/help/content/eo/running.html
new file mode 100644
index 0000000..2e84804
--- /dev/null
+++ b/src/vidalia/help/content/eo/running.html
@@ -0,0 +1,105 @@
+
+
+<!--
+**  $Id$
+** 
+**  This file is part of Vidalia, and is subject to the license terms in the
+**  LICENSE file, found in the top level directory of this distribution. If 
+**  you did not receive the LICENSE file with this file, you may obtain it
+**  from the Vidalia source package distributed by the Vidalia Project at
+**  http://www.torproject.org/projects/vidalia.html. No part of Vidalia, 
+**  including this file, may be copied, modified, propagated, or distributed 
+**  except according to the terms described in the LICENSE file.
+-->
+<html>
+<body>
+
+<h1>Running Tor</h1>
+<hr />
+
+<p>
+Vidalia can help you control your Tor process by letting you start and stop
+Tor, as well as monitoring Tor's status and letting you know if it exits
+unexpectedly.
+</p>
+
+<a name="starting"/>
+<h3>Starting and Stopping Tor</h3>
+<p>
+To <i>start</i> Tor,
+<ol>
+  <li>Select <i>Start</i> from Vidalia's tray menu or press <i>Ctrl+S</i></li>.
+  <li>
+    Vidalia's tray icon will change from an onion with a red X to a green onion
+when Tor has started.
+  </li>
+</ol>
+If Vidalia is unable to start Tor, Vidalia will display an error message
+telling you what went wrong. You can also look at your <a
+href="log.html">message log</a> to see if Tor printed any more information
+about what went wrong.
+</p>
+
+<p>
+To <i>stop</i> Tor,
+<ol>
+  <li>Select <i>Stop</i> from Vidalia's tray menu or press <i>Ctrl+T</i></li>.
+  <li>
+    Vidalia's tray icon will change from a green onion to a gray onion with a
+red X when Tor has stopped.
+  </li>
+</ol>
+If Vidalia was unable to stop Tor, Vidalia will display an error message
+telling you what went wrong. You can also look at your <a
+href="log.html">message log</a> to see if Tor printed any more information
+about what went wrong.
+</p>
+
+<a name="monitoring"/>
+<h3>Monitoring Tor's Status</h3>
+<p>
+Vidalia tells you about the status of Tor by displaying an icon in your
+system tray or dock area. The following table shows the different states
+indicated by an icon in your system's notification area:
+</p>
+<p>
+<table border="1">
+<tr>
+    <td><img src="qrc:/images/32x32/tor-off.png"/></td>
+    <td valign="middle">
+      Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor.
+    </td>
+</tr>
+<tr>
+    <td><img src="qrc:/images/32x32/tor-starting.png"/></td>
+    <td valign="middle">
+      Tor is starting up. You can check the <a href="log.html">message log</a> for
+status information about Tor while it is starting.
+    </td>
+</tr>
+<tr>
+    <td><img src="qrc:/images/32x32/tor-on.png"/></td>
+    <td valign="middle">
+      Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia
+menu. Tor will print informational messages to the <a
+href="log.html">message log</a> while it is running, if you want to see what
+Tor is doing.
+    </td>
+</tr>
+<tr>
+    <td><img src="qrc:/images/32x32/tor-stopping.png"/></td>
+    <td valign="middle">Tor is in the process of shutting down.</td>
+</tr>
+</table>
+</p>
+
+<p>
+If Tor exits unexpectedly, Vidalia will change its icon to the dark onion
+with a red X and display an error message letting you know what went
+wrong. You can also check the <a href="log.html">message log</a> for details
+about any problems Tor encountered before it exited.
+</p>
+
+</body>
+</html>
+
diff --git a/src/vidalia/help/content/eo/server.html b/src/vidalia/help/content/eo/server.html
new file mode 100644
index 0000000..f7baa0f
--- /dev/null
+++ b/src/vidalia/help/content/eo/server.html
@@ -0,0 +1,238 @@
+
+
+<!--
+**  $Id$
+** 
+**  This file is part of Vidalia, and is subject to the license terms in the
+**  LICENSE file, found in the top level directory of this distribution. If 
+**  you did not receive the LICENSE file with this file, you may obtain it
+**  from the Vidalia source package distributed by the Vidalia Project at
+**  http://www.torproject.org/projects/vidalia.html. No part of Vidalia, 
+**  including this file, may be copied, modified, propagated, or distributed 
+**  except according to the terms described in the LICENSE file.
+-->
+<html>
+<body>
+
+<h1>Setting Up a Tor Relay</h1>
+<hr />
+
+The Tor network is made up of volunteers all over the world who donate some
+of their spare bandwidth by running a Tor relay. Vidalia helps you do your
+part by making it easy to set up a relay of your own.  <a name="basic"/>
+<h3>Basic Settings</h3>
+<p>
+If you decide you want to help the Tor network grow by running a relay, you
+can follow these steps to get started:
+</p>
+<ol>
+  <li>
+    Open the <i>Configuration Dialog</i> by selecting <i>Settings</i> from the
+tray menu or <i>Preferences</i> from your system menubar on Macintosh
+systems.
+  </li>
+  <li>Select the <i>Relay</i> configuration page.</li>
+  <li>
+    Decide whether you want to run a normal Tor relay or a <i>bridge</i> relay
+(Tor 0.2.0.8-alpha or newer). Bridge relays help censored Tor users who are
+blocked from accessing the Tor network directly.  Check the box labeled
+<i>Relay traffic for the Tor network</i> if you want to run a normal Tor
+relay or <i>Help censored users reach the Tor network</i> if you want to run
+a bridge relay.
+  </li>
+  <li>Enter the following information:</li>
+    <ul>
+      <li><b>Nickname</b>: The name which your relay will be known as on the Tor
+network. An example of a relay nickname is "MyVidaliaRelay".
+      </li>
+      <li><b>Contact Info</b>: Your e-mail address. This address will only be used to
+contact you in case there is an important Tor security update or something
+goes wrong with your relay. You might also include your PGP or GPG key ID
+and fingerprint.
+      </li>
+      <li><b>Relay Port</b>: The port on which your relay will listen for traffic from
+clients or other Tor relays.
+      </li>
+    </ul>
+  <li>
+    If you would like to mirror Tor's directory of relays for others on the
+network you can check the box labeled <i>Mirror the Relay Directory</i>.  If
+you do not have much bandwidth, uncheck this box. If you do decide to mirror
+the relay directory, make sure the <i>Directory Port</i> is different than
+the <i>Relay port</i> you entered above. Bridge relays <i>must</i> mirror
+the relay directory.
+  </li>
+</ol>
+
+<a name="bandwidth"/>
+<h3>Bandwidth Limits</h3>
+<p>
+Running a Tor relay can consume a large amount of bandwidth; however, Tor
+allows you to limit the amount of bandwidth that you are willing to
+contribute to the Tor network. You can run a relay, while still keeping your
+network connection usable for your own use.
+</p>
+<p>
+You should select the option in the dropdown box that best matches your
+connection speed. If you select <i>Custom</i>, you will be able to specify
+your own limits.
+</p>
+<h4>Custom Limits</h4>
+<p>
+The <i>maximum rate</i> is a pool of bytes used to fulfill requests during
+short periods of traffic higher than your specified <i>average rate</i>, but
+still maintains the average over a long period. A low average rate but a
+high maximum rate enforces a long-term average while still allowing more
+traffic during peak times if the average hasn't been reached lately. If your
+average rate is the same as your <i>maximum rate</i>, then Tor will never
+exceed the specified rate. Your <i>maximum rate</i> must always be greater
+than or equal to your <i>average rate</i>.
+</p>
+<p>
+The <i>average rate</i> is the maximum long-term average bandwidth allowed
+(in kilobytes per second). For example, you might want to choose 2 megabytes
+per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable
+connection). Tor requires a minimum of 20 kilobytes per second to run a
+relay.
+</p>
+<p>
+It is important to remember that Tor measures bandwidth in <b>bytes</b>, not
+bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For
+example, if your relay acts as a directory mirror, you may be sending more
+outgoing bytes than incoming. If you find this is the case and is putting
+too much strain on your bandwidth, you should consider unchecking the
+checkbox labeled <i>Mirror the relay directory</i>.
+</p>
+
+<a name="exitpolicy"/>
+<h3>Exit Policies</h3>
+<p>
+Exit policies give you a way to specify what kinds of resources on the
+Internet you are willing let other Tor users access from your Tor relay.
+Tor uses a default list of exit policies that restrict some services, such
+as mail to prevent spam and some default file sharing ports to reduce abuse
+of the Tor network. 
+</p>
+<p>
+Each of the checkboxes represents a type of resource that you can allow Tor
+users to access through your relay. If you uncheck the box next to a
+particular type of resource, Tor users will not be allowed to access that
+resource from your relay. If the box labeled <i>Misc Other Services</i> is
+checked, Tor users will be able to access other services not covered by the
+other checkboxes or Tor's default exit policy.
+</p>
+
+<p>
+For completeness, the following table lists the specific port numbers
+represented by each of the exit policy checkboxes. The <b>Description</b>
+column describes the resources Tor clients will be allowed to access through
+your relay, if the associated box is checked.
+</p>
+
+<table border="1">
+<tr>
+  <td><b>Checkbox</b></td>
+  <td><b>Ports</b></td>
+  <td><b>Description</b></td>
+</tr>
+<tr>
+  <td>Websites</td>
+  <td valign="middle">80</td>
+  <td>Normal, unencrypted Web browsing</td>
+</tr>
+<tr>
+  <td>Secure Websites (SSL)</td>
+  <td valign="middle">443</td>
+  <td>Encrypted Web browsing</td>
+</tr>
+<tr>
+  <td>Retrieve Mail (POP, IMAP)</td>
+  <td valign="middle">110, 143, 993, 995</td>
+  <td>Downloading email (does not permit sending email)</td>
+</tr>
+<tr>
+  <td>Instant Messaging (IM)</td>
+  <td valign="middle">703, 1863, 5050, 5190, 5222, 5223, 8300, 8888</td>
+  <td>Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber</td>
+</tr>
+<tr>
+  <td>Internet Relay Chat (IRC)</td>
+  <td valign="middle">6660-6669, 6697, 7000-7001</td>
+  <td>IRC clients and servers</td>
+</tr>
+<tr>
+  <td>Misc. Other Services</td>
+  <td valign="middle">*</td>
+  <td>All other applications that aren't covered by the previous checkboxes</td>
+</tr>
+</table>
+
+<p>
+If you do not want to let other Tor users make connections outside the Tor
+network from your relay, you can uncheck all of the checkboxes. Even if you
+uncheck all of the checkboxes, your relay is still useful to the Tor
+network.  Your relay will allow other Tor users to connect to the Tor
+network and will help relay traffic between other Tor relays.
+</p>
+<p>
+If you chose to run a bridge relay, the <i>Exit Policies</i> tab will be
+grayed out, since bridge relays do not allow exit connections. Bridges are
+only used by Tor clients to connect to the Tor network.
+</p>
+
+
+<a name="upnp"/>
+<h3>Port Forwarding</h3>
+<p>
+Many home users connect to the Internet via a <i>router</i>, which allows
+multiple computers on a local network to share the same Internet
+connection.  Some users may also be behind a <i>firewall</i> that blocks
+incoming connections to your computer from other computers on the Internet.
+If you want to run a Tor relay, however, other Tor clients and relays must
+be able to connect to your relay through your home router or firewall. 
+</p>
+
+<p>
+To make your relay publicly accessible, your router or firewall needs to
+know which ports to allow through to your computer by setting up what is
+known as <i>port forwarding</i>. Port forwarding configures your router or
+firewall to "forward" all connections to certain ports on your router or
+firewall to local ports on your computer.
+</p>
+
+<p>
+If you check the box labeled <i>Attempt to automatically configure port
+forwarding</i>, Vidalia will attempt to automatically set up port forwarding
+on your local network connection so that other Tor clients can connect to
+your relay. Not all routers support automatic port forwarding, though. You
+can use the <i>Test</i> button next to the checkbox to find out if Vidalia
+is able to automatically set up port forwarding for you.
+</p>
+
+<p>
+If the <i>Test</i> button finds that Vidalia is unable to set up port
+forwarding for you, you may need to enable this feature on your router or
+set up port forwarding manually. Some network devices have a feature called
+<i>Universal Plug-and-Play</i> (UPnP). If you can access your router's
+administrative interface, you should look for an option to enable UPnP. The
+administrative interface for most routers can be accessed by opening <a
+href="http://192.168.0.1/">http://192.168.0.1</a> or <a
+href="http://192.168.1.1/">http://192.168.1.1</a> in your Web browser. You
+should consult your router's instruction manual for more information.
+</p>
+
+<p>
+If you need to set up port forwarding manually, the website <a
+href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm">
+portforward.com</a> has instructions for how to set up port forwarding for
+many types of routers and firewalls. At a minimum, you will need to forward
+your <i>Relay Port</i>, which defaults to port 443 on Windows and 9001 on
+all other operating systems. If you also checked the checkbox labeled
+<i>Mirror the relay directory</i>, then you will also need to forward your
+<i>Directory Port</i>. The <i>Directory Port</i> is set to port 9030 by
+default on all operating systems.
+</p>
+
+</body>
+</html>
+
diff --git a/src/vidalia/help/content/eo/services.html b/src/vidalia/help/content/eo/services.html
new file mode 100644
index 0000000..9d30a80
--- /dev/null
+++ b/src/vidalia/help/content/eo/services.html
@@ -0,0 +1,138 @@
+
+
+<!--
+**  $Id $
+** 
+**  This file is part of Vidalia, and is subject to the license terms in the
+**  LICENSE file, found in the top level directory of this distribution. If 
+**  you did not receive the LICENSE file with this file, you may obtain it
+**  from the Vidalia source package distributed by the Vidalia Project at
+**  http://www.torproject.org/projects/vidalia.html. No part of Vidalia, 
+**  including this file, may be copied, modified, propagated, or distributed 
+**  except according to the terms described in the LICENSE file.
+-->
+<html>
+<body>
+
+<h1>Hidden Services</h1>
+<hr />
+
+Remark: Support for hidden services is new in Vidalia. You should expect it
+to have bugs, some of which possibly corrupting your hidden service
+configuration. So, don't rely on it, or rather, don't blame us if something
+goes wrong. If you find bugs or have comments on this new feature, please
+let us know! We need your feedback.  <a name="about"/>
+<h3>What is a hidden service?</h3>
+<p>
+Hidden services allow you to provide any kind of TCP-based service, e.g. an
+HTTP service, to others without revealing your IP address. The protocol to
+provide a hidden service is built on top of the same circuits that Tor uses
+for anonymous browsing and roughly has similar anonymity properties.
+</p>
+
+<p>
+For more information on hidden service you may want to read section 5 of
+Tor's design paper (doc/design-paper/tor-design.pdf) or the Rendezvous
+Specification (doc/spec/rend-spec.txt).
+</p>
+
+<a name="provide"/>
+<h3>How do I provide a hidden service?</h3>
+<p>
+Providing a hidden service consists of at least two steps:
+<ol>
+  <li>Install a web server locally (or a server for whatever service you want to
+provide, e.g. IRC) to listen for local requests.</li>
+  <li>Configure your hidden service, so that Tor relays requests coming from Tor
+users to your local server.</li>
+</ol>
+There is a fine tutorial on the Tor website
+(https://www.torproject.org/docs/tor-hidden-service.html) that describes
+these steps in more detail.
+</p>
+
+<a name="data"/>
+<h3>What data do I need to provide?</h3>
+<p>
+The services table contains five columns containing data about configured
+hidden services:
+<ul>
+  <li>Onion Address (generated): The service (or onion) address is generated by
+Tor to uniquely identify your service. Give this onion address to the people
+who shall be able to access your service. You may use the "Copy to
+clipboard" button for that to avoid typos. If you have just created a hidden
+service, the field says "[Created by Tor]"; in order to make it display the
+real onion address, you need to save your configuration and re-open the
+settings window.</li>
+  <li>Virtual Port (required): This is the TCP port that clients will need to know
+in order to access your service. Typically, you will want to use the
+service-specific port here, e.g. port 80 for HTTP. Note that the virtual
+port usually has nothing to do with firewall settings, because it is only
+used Tor-internally.</li>
+  <li>Target (optional): Usually you want Tor to relay connection requests to
+localhost on a different port than the one you specified in "Virtual
+Port". Therefore, you can specify a target consisting of physical address
+and port to which requests to your hidden service are redirected, e.g. to
+localhost:5222 (or on whatever port your server is listening). If you don't
+specify any target, Tor will redirect requests to the port specified in
+"Virtual Port" on localhost.</li>
+  <li>Service Directory (required): Tor needs to store some hidden-service
+specific files in a separate directory, e.g. a private key and a hostname
+file containing the onion address. This directory should be distinct from a
+directory containing content that the service provides. A good place for a
+service directory might be a sub directory in Tor's data directory. -- Note
+that you cannot change the directory of a running service (it wouldn't make
+much sense to allow it, because Vidalia is not supposed to move directories
+on your hard disk!). If you want to move a hidden service to another
+directory, please proceed as follows: Start by disabling the service in
+Vidalia and save the configuration. Then move the directory on your hard
+disk to the new place. Finally, change the directory in Vidalia to the new
+location, enable the service again, and save the new configuration.</li>
+  <li>Enabled: If this checkbox is disabled, Vidalia will not configure the given
+hidden service in Tor. This can be useful for keeping the configuration of a
+currently unused service for later use. All non-enabled services are stored
+in the Vidalia-specific configuration file vidalia.conf.</li>
+</ul>
+</p>
+
+<a name="buttons"/>
+<h3>What are the five buttons used for?</h3>
+<p>
+<ul>
+  <li>Add service: Creates a new empty service configuration.</li>
+  <li>Remove service: Permanently removes a hidden service configuration.  (If you
+want to temporarily remove a service, uncheck its Enabled checkbox.)</li>
+  <li>Copy to clipboard: Copies the onion address to the clipboard, so that you
+can tell it to whoever shall be able to use your service.</li>
+  <li>Browse: Lets you browse to find a local hidden service directory.</li>
+</ul>
+</p>
+
+<a name="advanced"/>
+<h3>How can I configure advanced hidden service settings?</h3>
+<p>
+Tor allows configuration of more specific settings for hidden services,
+e.g. forcing to use (or avoiding) certain nodes as introduction points, or
+providing multiple virtual ports for the same service.
+</p>
+
+<p>
+However, we decided to simplify things in Vidalia and provide only the most
+common settings. If you want to configure advanced settings, you need to do
+so in Tor's torrc file. Vidalia will not remove those settings even when you
+are editing your hidden services. If you specify more than one virtual port,
+only the first will be displayed and be editable.
+</p>
+
+<a name="client"/>
+<h3>How does Vidalia help me to access other hidden services?</h3>
+<p>
+Not at all. There is no need to do so. If you want to access another hidden
+service, type the service's onion address in your browser (or appropriate
+client application if it's not a web service), and Tor does the rest for
+you. There is no need to specifically configure Tor for that.
+</p>
+
+</body>
+</html>
+
diff --git a/src/vidalia/help/content/eo/troubleshooting.html b/src/vidalia/help/content/eo/troubleshooting.html
new file mode 100644
index 0000000..69b8367
--- /dev/null
+++ b/src/vidalia/help/content/eo/troubleshooting.html
@@ -0,0 +1,155 @@
+
+
+<!--
+**  $Id$
+** 
+**  This file is part of Vidalia, and is subject to the license terms in the
+**  LICENSE file, found in the top level directory of this distribution. If 
+**  you did not receive the LICENSE file with this file, you may obtain it
+**  from the Vidalia source package distributed by the Vidalia Project at
+**  http://www.torproject.org/projects/vidalia.html. No part of Vidalia, 
+**  including this file, may be copied, modified, propagated, or distributed 
+**  except according to the terms described in the LICENSE file.
+-->
+<html>
+<body>
+
+<h1>Troubleshooting</h1>
+<hr />
+
+Listed below are some of the common problems or questions people have while
+running Tor. If you can't find anything about the particular problem you're
+having, check out our website at <i>www.vidalia-project.net</i> for more
+support and information.  <a name="start"/>
+<h3>I Can't Start Tor</h3>
+<p>
+The most likely reason that Vidalia could not start Tor is because Vidalia
+is looking for your Tor installation in the wrong directory. You can tell
+Vidalia where Tor is located by updating the <i>Tor Executable</i> option in
+the <a href="config.html#general">general configuration settings</a>.
+</p>
+<p>
+Another possible reason that Tor cannot start is because there is already
+another Tor process running. Check your list of running process and stop the
+previous Tor process, if you find one. Then, try running Tor again.
+</p>
+<p>
+If that did not help, check your <a href="log.html">message log</a> to see
+if Tor printed any information about errors it encountered while trying to
+start.
+</p>
+
+<a name="connect"/>
+<h3>Vidalia Can't Connect to Tor</h3>
+<p>
+Vidalia manages Tor by communicating with it via Tor's <i>control port</i>. 
+</p>
+<p>
+The most common reason that Vidalia cannot connect to Tor is because Tor
+started, but encountered an error and exited immediately. You should check
+your <a href="log.html">message log</a> to see if Tor reported any errors
+while it started.
+</p>
+<p>
+If Tor is listening on a different port than Vidalia expects, Vidalia will
+be unable to connect to Tor. You rarely need to change this setting, but if
+there is another service running on your machine that conflicts with Tor's
+control port, you will need to specify a different port. You can change this
+setting in Vidalia's <a href="config.html#advanced">advanced configuration
+settings</a>.
+</p>
+
+<a name="password"/>
+<h3>Why is Vidalia asking me for a "control password"?</h3>
+<p>
+Vidalia interacts with the Tor software via Tor's "control port". The
+control port lets Vidalia receive status updates from Tor, request a new
+identity, configure Tor's settings, etc. Each time Vidalia starts Tor,
+Vidalia sets a random password for Tor's control port to prevent other
+applications from also connecting to the control port and potentially
+compromising your anonymity.
+</p>
+
+<p>
+Usually this process of generating and setting a random control password
+happens in the background. There are three common situations, though, where
+Vidalia may prompt you for a password:
+</p>
+
+<ul>
+  <li>
+    You're already running Vidalia and Tor. For example, this situation can
+happen if you installed the Vidalia bundle and now you're trying to run the
+Tor Browser Bundle. In that case, you'll need to close the old Vidalia and
+Tor before you can run this one.
+  </li>
+
+  <li>
+    <p>Vidalia crashed, but left Tor running with the last known random
+password. After you restart Vidalia, it generates a new random password, but
+Vidalia can't talk to Tor, because the random passwords are different.</p>
+    
+    <p>If the dialog that prompts you for a control password has a <i>Reset</i>
+button, you can click the button and Vidalia will restart Tor with a new
+random control password.
+    </p>
+    
+    <p>If you do not see a <i>Reset</i> button, or if Vidalia is unable to restart
+Tor for you, you can still fix the problem manually. Simply go into your
+process or task manager, and terminate the Tor process. Then use Vidalia to
+restart Tor and all will work again.</p>
+  </li>
+
+  <li>
+    <p>You had previously set Tor to run as a service. When Tor is set to run as a
+service, it starts up when the system boots. If you configured Tor to start
+as a service through Vidalia, a random password was set and saved in
+Tor. When you reboot, Tor starts up and uses the random password it saved.
+You login and start up Vidalia. Vidalia attempts to talk to the already
+running Tor. Vidalia generates a random password, but it is different than
+the saved password in the Tor service.</p>
+  
+    <p>You need to reconfigure Tor to not be a service. See the Tor wiki page on
+running <a
+href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService">
+Tor as a service</a> for more information on how to remove the Tor service.</p>
+  </li>
+</ul>
+
+
+<a name="torexited"/> 
+<h3>Tor Exited Unexpectedly</h3> 
+<p> 
+If Tor exits immediately after trying to start, you most likely have another
+Tor process already running. Check the <a href="log.html">message log</a> to
+see if any of the last few messages in the list are highlighted in yellow
+and contain a message similar to the following:
+</p>
+<pre>
+connection_create_listener(): Could not bind to 127.0.0.1:9050: Address already in use. 
+Is Tor already running?
+</pre>
+<p>
+If you find an error message like the one above, you will need to stop the
+other Tor process before starting a new one with Vidalia. On Windows, you
+would need to look for <i>tor.exe</i> in your Task Manager. On most other
+operating systems, the <i>ps</i> command can help you find the other Tor
+process.
+</p>
+<p>
+If Tor had been running successfully for awhile (that is, longer than a few
+seconds), then you should check the <a href="log.html">message log</a> for
+information about any errors Tor experienced before it exited. Such errors
+will be highlighted in either red or yellow.
+</p>
+
+<a name="stop"/>
+<h3>Vidalia Can't Stop Tor</h3>
+<p>
+If Vidalia cannot stop Tor, you should check your <a href="log.html">message
+log</a> to see if Tor reported any errors while trying to exit.
+</p>
+
+</body>
+</html>
+
diff --git a/src/vidalia/help/content/eu/bridges.html b/src/vidalia/help/content/eu/bridges.html
new file mode 100644
index 0000000..77439b5
--- /dev/null
+++ b/src/vidalia/help/content/eu/bridges.html
@@ -0,0 +1,71 @@
+
+
+<!--
+**  $Id$
+** 
+**  This file is part of Vidalia, and is subject to the license terms in the
+**  LICENSE file, found in the top level directory of this distribution. If 
+**  you did not receive the LICENSE file with this file, you may obtain it
+**  from the Vidalia source package distributed by the Vidalia Project at
+**  http://www.torproject.org/projects/vidalia.html. No part of Vidalia, 
+**  including this file, may be copied, modified, propagated, or distributed 
+**  except according to the terms described in the LICENSE file.
+-->
+<html>
+<body>
+
+<h1>Bridge Relays</h1>
+<hr />
+
+<a name="about"/>
+<h3>What are bridge relays?</h3>
+<p>
+Some Internet Service Providers (ISPs) attempt to prevent users from
+accessing the Tor network by blocking connections to known Tor
+relays. Bridge relays (or <i>bridges</i> for short) are relays that help
+these censored users access the Tor network. Unlike other Tor relays,
+bridges are not listed in the same public directories as normal
+relays. Since there is no complete public list of them, even if your ISP is
+filtering connections to all the known Tor relays, they probably won't be
+able to block all the bridges.
+</p>
+
+<a name="finding"/>
+<h3>How do I find a bridge relay?</h3>
+<p>
+There are two main ways to learn about a bridge address: 
+<ol>
+  <li>Get some friends to run private bridges for you</li>
+  <li>Use some of the public bridges</li>
+</ol>
+</p>
+
+<p>
+To use private bridges, ask your friends to run Vidalia and Tor in an
+uncensored area of the Internet, and then click on <i>Help censored
+users</i> in Vidalia's <a href="server.html">Relay settings page</a>. Then
+they should privately send you the <i>Bridge address</i> line at the bottom
+of their Relay page. Unlike running an exit relay, running a bridge relay
+just passes data to and from the Tor network, so it shouldn't expose the
+operator to any abuse complaints.
+</p>
+
+<p>
+You can find public bridge addresses by visiting
+<b>https://bridges.torproject.org</b>.  The answers you get from that page
+will change every few days, so check back periodically if you need more
+bridge addresses. Another way to find public bridge addresses is to send
+mail to <b>bridges at torproject.org</b> with the line <b>get bridges</b> by
+itself in the body of the mail. However, so we can make it harder for an
+attacker to learn lots of bridge addresses, you must send this request from
+a Gmail account.
+</p>
+
+<p>
+Configuring more than one bridge address will make your Tor connection more
+stable, in case some of the bridges become unreachable.
+</p>
+
+</body>
+</html>
+
diff --git a/src/vidalia/help/content/eu/config.html b/src/vidalia/help/content/eu/config.html
new file mode 100644
index 0000000..35fc842
--- /dev/null
+++ b/src/vidalia/help/content/eu/config.html
@@ -0,0 +1,185 @@
+
+
+<!--
+**  $Id$
+** 
+**  This file is part of Vidalia, and is subject to the license terms in the
+**  LICENSE file, found in the top level directory of this distribution. If 
+**  you did not receive the LICENSE file with this file, you may obtain it
+**  from the Vidalia source package distributed by the Vidalia Project at
+**  http://www.torproject.org/projects/vidalia.html. No part of Vidalia, 
+**  including this file, may be copied, modified, propagated, or distributed 
+**  except according to the terms described in the LICENSE file.
+-->
+<html>
+<body>
+
+<h1>Configuring Vidalia and Tor</h1>
+<hr />
+
+<p>
+Vidalia allows you to configure some of the most commonly modified aspects
+of Vidalia and Tor. It also lets you set up and manage a <a
+href="server.html">Tor relay</a> so you can help the Tor network grow.
+</p>
+
+<a name="general"/>
+<h3>General Settings</h3>
+<p>
+Settings on the <i>General</i> page are the most commonly modified settings.
+</p>
+<ul>
+  <li><b>Tor Executable</b>: This is the Tor executable that Vidalia will run when
+you select <i>Start</i> from the tray menu. If you have multiple versions of
+Tor installed, you can tell Vidalia which version you would like to run by
+clicking the <i>Browse</i> button and navigating to the particular Tor
+installation you want.
+  </li>
+  <li><b>Startup Options</b>: This setting allows you to have Vidalia
+automatically start Tor when Vidalia starts. You can also configure Vidalia
+to run when your system starts (<i>Windows only</i>).
+  </li>
+</ul>
+
+<a name="network"/>
+<h3>Network Settings</h3>
+<p>
+The <i>Network</i> settings page lets you change how Tor connects to the Tor
+network.
+</p>
+<ul>
+  <li><b>I use a proxy to access the Internet</b>: If your Internet connection
+requires an HTTP proxy, you can configure Tor to send all of its directory
+requests and Tor relay connections through your proxy. You must specify at
+least the hostname or address of your proxy, and the port on which your
+proxy is listening for connections. If your proxy requires authentication,
+you can also enter the <i>Username</i> and <i>Password</i> you use to
+connect to your proxy.  Otherwise, you can leave those fields blank.
+  </li>
+  <li><b>My firewall only lets me connect to certain ports</b>: If you are behind
+a restrictive firewall or proxy that limits the ports you are able to
+connect to, you can configure Tor to connect directly only to relays
+listening on the ports allowed by your firewall or proxy. Simply enter a
+list of ports permitted by your firewall or proxy, separated by
+commas. (<i>Example: 80,443,8080</i>)
+  </li>
+  <li><b>My ISP blocks connections to the Tor network</b>: If your ISP (Internet
+Service Provider) blocks connections to the Tor network, Tor can attempt to
+avoid being filtered by encrypting its directory connections and connecting
+to the Tor network through relays called <i>bridges</i> (Tor 0.2.0.3-alpha
+or newer only). You can add bridge relays by specifying either their address
+and port number, or their address, port number, and fingerprint.<br/>
+
+    Below are examples of valid bridge address formats:
+    <ul>
+      <li>
+        128.213.48.13:8080
+      </li>
+      <li>
+        128.213.48.13:8080 1054 13B1 DBDA F867 B226 74D2 52DF 3D9F A367 1F73
+      </li>
+      <li>
+        128.213.48.13:8080 105413B1DBDAF867B22674D252DF3D9FA3671F73
+      </li>
+    </ul>
+    Even if you do not know any bridge relay addresses, checking this checkbox
+may still be helpful. Tor will encrypt its directory requests, which can
+defeat blocking mechanisms that try to filter Tor's requests for information
+about other relays. If connections to normal Tor relays are also blocked,
+then you will need to learn a bridge relay address somehow and add it
+here. See the help topic on <a href="bridges.html#finding">finding bridge
+relays</a> for more information on how to learn new bridge relay addresses
+and fingerprints.
+  </li>
+</ul>
+
+<a name="relay"/>
+<h3>Relay Settings</h3>
+<p>
+<i> See <a href="server.html">this help topic</a> for detailed information
+about setting up and managing a Tor relay.  </i>
+</p>
+
+<a name="appearance"/>
+<h3>Appearance Settings</h3>
+<p>
+The settings on the <i>Appearance</i> page allow you to customize the look
+and feel of Vidalia.
+</p>
+<ul>
+  <li><b>Language</b>: Vidalia's interface has been translated into many languages
+by helpful volunteers. When Vidalia is first run, it will try to guess which
+language your computer is currently using. If Vidalia guesses incorrectly,
+or if you prefer a different language, you can choose another language from
+the dropdown box. You will need to restart Vidalia after changing the
+displayed language for the changes to take effect.
+  </li>
+  <li><b>Style</b>: In most cases, Vidalia will default to using your platform's
+default interface style. If you dislike the default, you can choose
+whichever interface style you prefer from the dropdown box.
+  </li>
+</ul>
+
+<a name="advanced"/>
+<h3>Advanced Settings</h3>
+<p>
+The settings on the <i>Advanced</i> page should generally only be modified
+by more experienced users.
+</p>
+<ul>
+  <li><b>Control Address &amp; Port</b>: The <i>Control Port</i> is the port which
+Vidalia uses to talk to Tor.  This doesn't need to be changed unless you
+have a conflict with another service on your machine, or if you are using
+Vidalia to control and monitor a Tor process running on another machine.
+  </li>
+  <li><b>Control Port Authentication</b>: Control port authentication is used to
+limit the applications on your machine that can connect to and reconfigure
+your Tor installation. The available authentication methods are:
+    <ul>  
+      <li>
+        <b>None</b> -- No authentication is required. Use of this option is
+<b>strongly</b> discouraged. Any application or user on your computer can
+reconfigure your Tor installation.
+      </li>
+      <li> 
+        <b>Password</b> <i>(Default)</i> -- If this method is selected, you can
+specify a password that Tor will require each time a user or application
+connects to Tor's control port. If Vidalia starts Tor for you, you can have
+Vidalia randomly generate a new password each time it starts Tor by checking
+the <i>Randomly Generate</i> checkbox.
+      </li>
+      <li>
+        <b>Cookie</b> -- If cookie authentication is selected, Tor will write a file
+(or, <i>cookie</i>) containing random bytes to its data directory when it
+starts. Any user or application that tries to connect to Tor's control port
+must be able to provide the contents of this cookie.
+      </li>
+    </ul>
+  </li>
+  <li><b>Tor Configuration File</b> <i>(optional)</i>: You can use this option to
+have Vidalia start Tor using a specific <i>torrc</i>, Tor's configuration
+file. If you leave this field blank, Tor will uses its own default torrc
+location.
+  </li>
+  <li><b>Tor Data Directory</b> <i>(optional)</i>: You can specify the directory
+in which Tor will store its saved data, such as cached Tor relay
+information, Tor relay keys, and configuration files. If you leave this
+field blank, Tor will use its own default data directory location.
+  </li>
+  <li><b>Permissions</b> <i>(optional, not available on Windows)</i>: If you enter
+a value for <b>Run as User</b>, Tor will <i>setuid</i> to this user when it
+starts.  If you enter a value for <b>Run as Group</b>, Tor will
+<i>setgid</i> to this group when it starts.
+  </li>
+</ul>
+
+<a name="services"/>
+<h3>Hidden Service Settings</h3>
+<p>
+Hidden services allow you to provide any kind of TCP-based service, e.g.  an
+HTTP service, to others without revealing your IP address.
+</p>
+
+</body>
+</html>
+
diff --git a/src/vidalia/help/content/eu/index.html b/src/vidalia/help/content/eu/index.html
new file mode 100644
index 0000000..378a4cd
--- /dev/null
+++ b/src/vidalia/help/content/eu/index.html
@@ -0,0 +1,41 @@
+
+
+<!--
+**  $Id$
+** 
+**  This file is part of Vidalia, and is subject to the license terms in the
+**  LICENSE file, found in the top level directory of this distribution. If 
+**  you did not receive the LICENSE file with this file, you may obtain it
+**  from the Vidalia source package distributed by the Vidalia Project at
+**  http://www.torproject.org/projects/vidalia.html. No part of Vidalia, 
+**  including this file, may be copied, modified, propagated, or distributed 
+**  except according to the terms described in the LICENSE file.
+-->
+<html>
+<body>
+
+<h1>Vidalia Help</h1>
+<hr />
+
+<p>
+Select a help topic from the tree on the left or click on the Search button
+above the list of topics to search through all available help topics.
+</p>
+
+<p>
+You can use the <i>Find</i> button on the toolbar above to search within a
+particular help topic.
+</p>
+
+<p>
+The <i>Home</i> button above will bring you back to this home page.
+</p>
+
+<p>
+See the <a href="links.html">Helpful Links</a> topic for some places you can
+visit to find additional help and information about Vidalia and Tor.
+</p>
+
+</body>
+</html>
+
diff --git a/src/vidalia/help/content/eu/links.html b/src/vidalia/help/content/eu/links.html
new file mode 100644
index 0000000..d2f441a
--- /dev/null
+++ b/src/vidalia/help/content/eu/links.html
@@ -0,0 +1,67 @@
+
+
+<!--
+**  $Id$
+** 
+**  This file is part of Vidalia, and is subject to the license terms in the
+**  LICENSE file, found in the top level directory of this distribution. If 
+**  you did not receive the LICENSE file with this file, you may obtain it
+**  from the Vidalia source package distributed by the Vidalia Project at
+**  http://www.torproject.org/projects/vidalia.html. No part of Vidalia, 
+**  including this file, may be copied, modified, propagated, or distributed 
+**  except according to the terms described in the LICENSE file.
+-->
+<html>
+<body>
+
+<h1>Helpful Links</h1>
+<hr />
+
+<h3>Vidalia</h3>
+<table>
+<tr>
+  <td>&nbsp;&nbsp;&nbsp;</td>
+  <td>Homepage</td>
+  <td>
+    <a href="https://www.torproject.org/vidalia/">
+https://www.torproject.org/vidalia/</a>
+  </td>
+</tr>
+<tr>
+  <td>&nbsp;&nbsp;&nbsp;</td>
+  <td>Wiki and Bugtracker</td>
+  <td>
+    <a href="http://trac.torproject.org/"> http://trac.torproject.org/</a>
+  </td>
+</tr>
+</table>
+
+<h3>Tor</h3>
+<table>
+<tr>
+  <td>&nbsp;&nbsp;&nbsp;</td>
+  <td>Homepage</td>
+  <td>
+    <a href="https://www.torproject.org/">https://www.torproject.org/</a>
+  </td>
+</tr>
+<tr>
+  <td>&nbsp;&nbsp;&nbsp;</td>
+  <td>FAQ</td>
+  <td>
+    <a href="https://www.torproject.org/docs/faq.html">
+https://www.torproject.org/docs/faq.html</a>
+  </td>
+</tr>
+<tr>
+  <td>&nbsp;&nbsp;&nbsp;</td>
+  <td>Wiki and Bugtracker</td>
+  <td>
+    <a href="https://trac.torproject.org/"> https://trac.torproject.org/</a>
+  </td>
+</tr>
+</table>
+
+</body>
+</html>
+
diff --git a/src/vidalia/help/content/eu/log.html b/src/vidalia/help/content/eu/log.html
new file mode 100644
index 0000000..b0ef886
--- /dev/null
+++ b/src/vidalia/help/content/eu/log.html
@@ -0,0 +1,102 @@
+
+
+<!--
+**  $Id$
+** 
+**  This file is part of Vidalia, and is subject to the license terms in the
+**  LICENSE file, found in the top level directory of this distribution. If 
+**  you did not receive the LICENSE file with this file, you may obtain it
+**  from the Vidalia source package distributed by the Vidalia Project at
+**  http://www.torproject.org/projects/vidalia.html. No part of Vidalia, 
+**  including this file, may be copied, modified, propagated, or distributed 
+**  except according to the terms described in the LICENSE file.
+-->
+<html>
+<body>
+
+<h1>Message Log</h1>
+<hr />
+
+The message log lets you see status information about a running Tor
+process.  <a name="basic"/> Each message has a <i>severity</i> associated
+with it, ranging from <b>Error</b> (most serious) to <b>Debug</b> (most
+verbose). See the help section on <a href="#severities">message
+severities</a> for more information.  <a name="severities"/>
+<h3>Message Severities</h3>
+<p>
+A message's severity tells you how important the message is. A higher
+severity message usually indicates that something has gone wrong with
+Tor. Lower severity messages appear frequently during normal Tor operations
+and usually do not need to be logged.
+</p>
+
+<p>
+The possible message severities, from most severe to least severe, are:
+</p>
+<ul>
+  <li>
+    <b>Error</b>: Messages that appear when something has gone very wrong and
+Tor cannot proceed. These messages will be highlighted in <i>red</i> in the
+message log.
+  </li>
+  <li>
+    <b>Warning</b>: Messages that only appear when something has gone wrong with
+Tor, but are not fatal and Tor will continue running. These messages will be
+highlighted in <i>yellow</i>.
+  </li>
+  <li>
+    <b>Notice</b>: Messages that appear infrequently during normal Tor operation
+and are not considered errors, but you still may care about.
+  </li>
+  <li>
+    <b>Info</b>: Messages that appear frequently during normal Tor operation and
+are not usually of interest to most users.
+  </li>
+  <li>
+    <b>Debug</b>: Extremely verbose messages that are primarily of interest to
+developers. You should generally not log debug messages unless you know what
+you are doing.
+  </li>
+</ul>
+
+<p>
+Most users should only log <i>Error</i>, <i>Warning</i>, and <i>Notice</i>
+messages.
+</p>
+
+<p>
+To select which message severities you would like to see, do the following:
+<ol>
+  <li>Open the message log from the Vidalia tray menu.</li>
+  <li>Click on <i>Settings</i> at the top of the message log window.</li>
+  <li>
+    Check message severities you would like to see from the Message Filter group
+on the left and uncheck message severities you would like to hide.
+  </li>
+  <li>Click <i>Save Settings</i> to apply your new message filter.</li>
+</ol>
+</p>
+
+
+<a name="logfile"/>
+<h3>Logging to a File</h3>
+<p>
+Vidalia can also write log messages to a file, as well as logging them in
+the message log window. To enable logging to a file, follow these steps:
+</p>
+
+<ol>
+  <li>Open the message log from the Vidalia tray menu.</li>
+  <li>Click on <i>Settings</i> at the top of the message log window.</li>
+  <li>Check the box labeled <i>Automatically save new log messages to a file</i>.</li>
+  <li>
+    If you would like to change the file to which messages will be written,
+either type the path and filename into the text box, or click <i>Browse</i>
+to navigate to a location for your log file.
+  </li>
+  <li>Click <i>Save Settings</i> to save your log destination.</li>
+</ol>
+
+</body>
+</html>
+
diff --git a/src/vidalia/help/content/eu/netview.html b/src/vidalia/help/content/eu/netview.html
new file mode 100644
index 0000000..bdb2f50
--- /dev/null
+++ b/src/vidalia/help/content/eu/netview.html
@@ -0,0 +1,174 @@
+
+
+<!--
+**  $Id$
+** 
+**  This file is part of Vidalia, and is subject to the license terms in the
+**  LICENSE file, found in the top level directory of this distribution. If 
+**  you did not receive the LICENSE file with this file, you may obtain it
+**  from the Vidalia source package distributed by the Vidalia Project at
+**  http://www.torproject.org/projects/vidalia.html. No part of Vidalia, 
+**  including this file, may be copied, modified, propagated, or distributed 
+**  except according to the terms described in the LICENSE file.
+-->
+<html>
+<body>
+
+<h1>Network Viewer</h1>
+<hr />
+
+<p>
+The network viewer lets you see relays in the Tor network and where your
+traffic is going.
+</p>
+
+
+<a name="overview"/>
+<h3>Overview</h3>
+<p>
+When you want to communicate anonymously through Tor (say, connecting to a
+website), Tor creates a tunnel, or <i>circuit</i>, of encrypted connections
+through a series of relays on the network. Your application's traffic is
+then sent as a <i>stream</i> through that circuit. For efficiency, multiple
+streams may share the same circuit.
+</p>
+
+<a name="netmap"/>
+<h3>Network Map</h3>
+<p>
+The network map consists of a map of the world, with red pinpoints
+indicating the geographic location of relays in the Tor network. Green lines
+are drawn between relays to indicate the path of circuits that your Tor
+client has created through the Tor network.
+</p>
+<p>
+You can zoom in on locations in the map by clicking the <b>Zoom In</b> and
+<b>Zoom Out</b> buttons in the toolbar. You can also scroll around on the
+map by clicking on the map and then dragging it in whatever direction you
+would like to move the map.
+</p>
+<p>
+The geographic location of a Tor relay is determined by looking up the IP
+address of the relay in a GeoIP database, created by MaxMind and located at
+geoip.vidalia-project.net.
+</p>
+<p>
+In the middle of the dialog, below the network map, you will see a list of
+your current circuits, as well as any application traffic currently on those
+circuits. When the network map first loads, you will probably see a
+connection to geoip.vidalia-project.net, which occurs when Vidalia is
+looking up geographic information for the list of Tor relays. It is
+important to note that this request is done through Tor, so your location is
+not revealed to the GeoIP relay. The results of the lookups will be cached
+locally in order to reduce load on Vidalia's GeoIP relays.
+</p>
+
+
+<a name="relaylist"/>
+<h3>Relay Status</h3>
+<p>
+On the left side of the network view, you will see a list of relays in the
+Tor network. Next to each relay is an icon indicating that relay's status.
+The following table summarizes the possible relay status icons:
+</p>
+<p>
+<table border="1">
+<tr>
+  <td><img src="qrc:/images/icons/node-unresponsive.png"/></td>
+  <td valign="middle">
+    The relay is offline or simply not responding.
+  </td>
+</tr>
+<tr>
+  <td><img src="qrc:/images/icons/node-hibernating.png"/></td>
+  <td valign="middle">
+    The relay is <i>hibernating</i>, meaning it is online, but has used up as
+much bandwidth as the operator is willing to allow for a given time period.
+  </td>
+</tr>
+<tr>
+  <td><img src="qrc:/images/icons/node-bw-none.png"/></td>
+  <td valign="middle">
+    The relay is online, but has shown only minimal throughput.
+  </td>
+</tr>
+<tr>
+  <td><img src="qrc:/images/icons/node-bw-low.png"/></td>
+  <td valign="middle">
+    The relay is online and has shown a throughput &gt;= 20 KB/s.
+  </td>
+</tr>
+<tr>
+  <td><img src="qrc:/images/icons/node-bw-med.png"/></td>
+  <td valign="middle">
+    The relay is online and has shown a throughput &gt;= 60 KB/s.
+  </td>
+</tr>
+<tr>
+  <td><img src="qrc:/images/icons/node-bw-high.png"/></td>
+  <td valign="middle">
+    The relay is online and has shown a throughput &gt;= 400 KB/s.
+  </td>
+</tr>
+</table>
+</p>
+<p>
+All bandwidth values are estimates based on the minimum of either the
+maximum bandwidth sustained input or output over any ten second period in
+the past day.
+</p>
+
+
+<a name="details"/>
+<h3>Relay Details</h3>
+<p>
+The relay details panel at the right side of the screen gives you details
+about the relay or relays currently selected in the <a
+href="#relaylist">relay list</a>. If you have selected a circuit or stream
+in the list of your current circuits and streams, this panel will show you
+details about each relay through which your traffic is currently being sent.
+</p>
+<p>
+The fields that you may see in the panel are as follows (<i>Note</i>: not
+all of these fields will always be present):
+</p>
+<p>
+<table>
+<tr>
+  <td><b>Location</b></td>
+  <td>The geographic location of this Tor relay.</td>
+</tr>
+<tr>
+  <td><b>IP Address</b></td>
+  <td>IP address at which this Tor relay can be reached.</td>
+</tr>
+<tr>
+  <td><b>Platform</b></td>
+  <td>
+    Operating system information and Tor version on which this relay is
+currently running.
+  </td>
+</tr>
+<tr>
+  <td><b>Bandwidth</b></td>
+  <td>
+    Estimated maximum amount of bandwidth that the directory relays have seen
+this relay handle recently.
+  </td>
+</tr>
+<tr>
+  <td><b>Uptime</b></td>
+  <td>
+    Length of time this relay has been available, which can be used to help
+estimate this relay's stability.
+  </td>
+</tr>
+<tr>
+  <td><b>Last Updated</b></td>
+  <td>Date this relay's information was last updated.</td>
+</tr>
+</table>
+</p>
+</body>
+</html>
+
diff --git a/src/vidalia/help/content/eu/running.html b/src/vidalia/help/content/eu/running.html
new file mode 100644
index 0000000..2e84804
--- /dev/null
+++ b/src/vidalia/help/content/eu/running.html
@@ -0,0 +1,105 @@
+
+
+<!--
+**  $Id$
+** 
+**  This file is part of Vidalia, and is subject to the license terms in the
+**  LICENSE file, found in the top level directory of this distribution. If 
+**  you did not receive the LICENSE file with this file, you may obtain it
+**  from the Vidalia source package distributed by the Vidalia Project at
+**  http://www.torproject.org/projects/vidalia.html. No part of Vidalia, 
+**  including this file, may be copied, modified, propagated, or distributed 
+**  except according to the terms described in the LICENSE file.
+-->
+<html>
+<body>
+
+<h1>Running Tor</h1>
+<hr />
+
+<p>
+Vidalia can help you control your Tor process by letting you start and stop
+Tor, as well as monitoring Tor's status and letting you know if it exits
+unexpectedly.
+</p>
+
+<a name="starting"/>
+<h3>Starting and Stopping Tor</h3>
+<p>
+To <i>start</i> Tor,
+<ol>
+  <li>Select <i>Start</i> from Vidalia's tray menu or press <i>Ctrl+S</i></li>.
+  <li>
+    Vidalia's tray icon will change from an onion with a red X to a green onion
+when Tor has started.
+  </li>
+</ol>
+If Vidalia is unable to start Tor, Vidalia will display an error message
+telling you what went wrong. You can also look at your <a
+href="log.html">message log</a> to see if Tor printed any more information
+about what went wrong.
+</p>
+
+<p>
+To <i>stop</i> Tor,
+<ol>
+  <li>Select <i>Stop</i> from Vidalia's tray menu or press <i>Ctrl+T</i></li>.
+  <li>
+    Vidalia's tray icon will change from a green onion to a gray onion with a
+red X when Tor has stopped.
+  </li>
+</ol>
+If Vidalia was unable to stop Tor, Vidalia will display an error message
+telling you what went wrong. You can also look at your <a
+href="log.html">message log</a> to see if Tor printed any more information
+about what went wrong.
+</p>
+
+<a name="monitoring"/>
+<h3>Monitoring Tor's Status</h3>
+<p>
+Vidalia tells you about the status of Tor by displaying an icon in your
+system tray or dock area. The following table shows the different states
+indicated by an icon in your system's notification area:
+</p>
+<p>
+<table border="1">
+<tr>
+    <td><img src="qrc:/images/32x32/tor-off.png"/></td>
+    <td valign="middle">
+      Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor.
+    </td>
+</tr>
+<tr>
+    <td><img src="qrc:/images/32x32/tor-starting.png"/></td>
+    <td valign="middle">
+      Tor is starting up. You can check the <a href="log.html">message log</a> for
+status information about Tor while it is starting.
+    </td>
+</tr>
+<tr>
+    <td><img src="qrc:/images/32x32/tor-on.png"/></td>
+    <td valign="middle">
+      Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia
+menu. Tor will print informational messages to the <a
+href="log.html">message log</a> while it is running, if you want to see what
+Tor is doing.
+    </td>
+</tr>
+<tr>
+    <td><img src="qrc:/images/32x32/tor-stopping.png"/></td>
+    <td valign="middle">Tor is in the process of shutting down.</td>
+</tr>
+</table>
+</p>
+
+<p>
+If Tor exits unexpectedly, Vidalia will change its icon to the dark onion
+with a red X and display an error message letting you know what went
+wrong. You can also check the <a href="log.html">message log</a> for details
+about any problems Tor encountered before it exited.
+</p>
+
+</body>
+</html>
+
diff --git a/src/vidalia/help/content/eu/server.html b/src/vidalia/help/content/eu/server.html
new file mode 100644
index 0000000..f7baa0f
--- /dev/null
+++ b/src/vidalia/help/content/eu/server.html
@@ -0,0 +1,238 @@
+
+
+<!--
+**  $Id$
+** 
+**  This file is part of Vidalia, and is subject to the license terms in the
+**  LICENSE file, found in the top level directory of this distribution. If 
+**  you did not receive the LICENSE file with this file, you may obtain it
+**  from the Vidalia source package distributed by the Vidalia Project at
+**  http://www.torproject.org/projects/vidalia.html. No part of Vidalia, 
+**  including this file, may be copied, modified, propagated, or distributed 
+**  except according to the terms described in the LICENSE file.
+-->
+<html>
+<body>
+
+<h1>Setting Up a Tor Relay</h1>
+<hr />
+
+The Tor network is made up of volunteers all over the world who donate some
+of their spare bandwidth by running a Tor relay. Vidalia helps you do your
+part by making it easy to set up a relay of your own.  <a name="basic"/>
+<h3>Basic Settings</h3>
+<p>
+If you decide you want to help the Tor network grow by running a relay, you
+can follow these steps to get started:
+</p>
+<ol>
+  <li>
+    Open the <i>Configuration Dialog</i> by selecting <i>Settings</i> from the
+tray menu or <i>Preferences</i> from your system menubar on Macintosh
+systems.
+  </li>
+  <li>Select the <i>Relay</i> configuration page.</li>
+  <li>
+    Decide whether you want to run a normal Tor relay or a <i>bridge</i> relay
+(Tor 0.2.0.8-alpha or newer). Bridge relays help censored Tor users who are
+blocked from accessing the Tor network directly.  Check the box labeled
+<i>Relay traffic for the Tor network</i> if you want to run a normal Tor
+relay or <i>Help censored users reach the Tor network</i> if you want to run
+a bridge relay.
+  </li>
+  <li>Enter the following information:</li>
+    <ul>
+      <li><b>Nickname</b>: The name which your relay will be known as on the Tor
+network. An example of a relay nickname is "MyVidaliaRelay".
+      </li>
+      <li><b>Contact Info</b>: Your e-mail address. This address will only be used to
+contact you in case there is an important Tor security update or something
+goes wrong with your relay. You might also include your PGP or GPG key ID
+and fingerprint.
+      </li>
+      <li><b>Relay Port</b>: The port on which your relay will listen for traffic from
+clients or other Tor relays.
+      </li>
+    </ul>
+  <li>
+    If you would like to mirror Tor's directory of relays for others on the
+network you can check the box labeled <i>Mirror the Relay Directory</i>.  If
+you do not have much bandwidth, uncheck this box. If you do decide to mirror
+the relay directory, make sure the <i>Directory Port</i> is different than
+the <i>Relay port</i> you entered above. Bridge relays <i>must</i> mirror
+the relay directory.
+  </li>
+</ol>
+
+<a name="bandwidth"/>
+<h3>Bandwidth Limits</h3>
+<p>
+Running a Tor relay can consume a large amount of bandwidth; however, Tor
+allows you to limit the amount of bandwidth that you are willing to
+contribute to the Tor network. You can run a relay, while still keeping your
+network connection usable for your own use.
+</p>
+<p>
+You should select the option in the dropdown box that best matches your
+connection speed. If you select <i>Custom</i>, you will be able to specify
+your own limits.
+</p>
+<h4>Custom Limits</h4>
+<p>
+The <i>maximum rate</i> is a pool of bytes used to fulfill requests during
+short periods of traffic higher than your specified <i>average rate</i>, but
+still maintains the average over a long period. A low average rate but a
+high maximum rate enforces a long-term average while still allowing more
+traffic during peak times if the average hasn't been reached lately. If your
+average rate is the same as your <i>maximum rate</i>, then Tor will never
+exceed the specified rate. Your <i>maximum rate</i> must always be greater
+than or equal to your <i>average rate</i>.
+</p>
+<p>
+The <i>average rate</i> is the maximum long-term average bandwidth allowed
+(in kilobytes per second). For example, you might want to choose 2 megabytes
+per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable
+connection). Tor requires a minimum of 20 kilobytes per second to run a
+relay.
+</p>
+<p>
+It is important to remember that Tor measures bandwidth in <b>bytes</b>, not
+bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For
+example, if your relay acts as a directory mirror, you may be sending more
+outgoing bytes than incoming. If you find this is the case and is putting
+too much strain on your bandwidth, you should consider unchecking the
+checkbox labeled <i>Mirror the relay directory</i>.
+</p>
+
+<a name="exitpolicy"/>
+<h3>Exit Policies</h3>
+<p>
+Exit policies give you a way to specify what kinds of resources on the
+Internet you are willing let other Tor users access from your Tor relay.
+Tor uses a default list of exit policies that restrict some services, such
+as mail to prevent spam and some default file sharing ports to reduce abuse
+of the Tor network. 
+</p>
+<p>
+Each of the checkboxes represents a type of resource that you can allow Tor
+users to access through your relay. If you uncheck the box next to a
+particular type of resource, Tor users will not be allowed to access that
+resource from your relay. If the box labeled <i>Misc Other Services</i> is
+checked, Tor users will be able to access other services not covered by the
+other checkboxes or Tor's default exit policy.
+</p>
+
+<p>
+For completeness, the following table lists the specific port numbers
+represented by each of the exit policy checkboxes. The <b>Description</b>
+column describes the resources Tor clients will be allowed to access through
+your relay, if the associated box is checked.
+</p>
+
+<table border="1">
+<tr>
+  <td><b>Checkbox</b></td>
+  <td><b>Ports</b></td>
+  <td><b>Description</b></td>
+</tr>
+<tr>
+  <td>Websites</td>
+  <td valign="middle">80</td>
+  <td>Normal, unencrypted Web browsing</td>
+</tr>
+<tr>
+  <td>Secure Websites (SSL)</td>
+  <td valign="middle">443</td>
+  <td>Encrypted Web browsing</td>
+</tr>
+<tr>
+  <td>Retrieve Mail (POP, IMAP)</td>
+  <td valign="middle">110, 143, 993, 995</td>
+  <td>Downloading email (does not permit sending email)</td>
+</tr>
+<tr>
+  <td>Instant Messaging (IM)</td>
+  <td valign="middle">703, 1863, 5050, 5190, 5222, 5223, 8300, 8888</td>
+  <td>Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber</td>
+</tr>
+<tr>
+  <td>Internet Relay Chat (IRC)</td>
+  <td valign="middle">6660-6669, 6697, 7000-7001</td>
+  <td>IRC clients and servers</td>
+</tr>
+<tr>
+  <td>Misc. Other Services</td>
+  <td valign="middle">*</td>
+  <td>All other applications that aren't covered by the previous checkboxes</td>
+</tr>
+</table>
+
+<p>
+If you do not want to let other Tor users make connections outside the Tor
+network from your relay, you can uncheck all of the checkboxes. Even if you
+uncheck all of the checkboxes, your relay is still useful to the Tor
+network.  Your relay will allow other Tor users to connect to the Tor
+network and will help relay traffic between other Tor relays.
+</p>
+<p>
+If you chose to run a bridge relay, the <i>Exit Policies</i> tab will be
+grayed out, since bridge relays do not allow exit connections. Bridges are
+only used by Tor clients to connect to the Tor network.
+</p>
+
+
+<a name="upnp"/>
+<h3>Port Forwarding</h3>
+<p>
+Many home users connect to the Internet via a <i>router</i>, which allows
+multiple computers on a local network to share the same Internet
+connection.  Some users may also be behind a <i>firewall</i> that blocks
+incoming connections to your computer from other computers on the Internet.
+If you want to run a Tor relay, however, other Tor clients and relays must
+be able to connect to your relay through your home router or firewall. 
+</p>
+
+<p>
+To make your relay publicly accessible, your router or firewall needs to
+know which ports to allow through to your computer by setting up what is
+known as <i>port forwarding</i>. Port forwarding configures your router or
+firewall to "forward" all connections to certain ports on your router or
+firewall to local ports on your computer.
+</p>
+
+<p>
+If you check the box labeled <i>Attempt to automatically configure port
+forwarding</i>, Vidalia will attempt to automatically set up port forwarding
+on your local network connection so that other Tor clients can connect to
+your relay. Not all routers support automatic port forwarding, though. You
+can use the <i>Test</i> button next to the checkbox to find out if Vidalia
+is able to automatically set up port forwarding for you.
+</p>
+
+<p>
+If the <i>Test</i> button finds that Vidalia is unable to set up port
+forwarding for you, you may need to enable this feature on your router or
+set up port forwarding manually. Some network devices have a feature called
+<i>Universal Plug-and-Play</i> (UPnP). If you can access your router's
+administrative interface, you should look for an option to enable UPnP. The
+administrative interface for most routers can be accessed by opening <a
+href="http://192.168.0.1/">http://192.168.0.1</a> or <a
+href="http://192.168.1.1/">http://192.168.1.1</a> in your Web browser. You
+should consult your router's instruction manual for more information.
+</p>
+
+<p>
+If you need to set up port forwarding manually, the website <a
+href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm">
+portforward.com</a> has instructions for how to set up port forwarding for
+many types of routers and firewalls. At a minimum, you will need to forward
+your <i>Relay Port</i>, which defaults to port 443 on Windows and 9001 on
+all other operating systems. If you also checked the checkbox labeled
+<i>Mirror the relay directory</i>, then you will also need to forward your
+<i>Directory Port</i>. The <i>Directory Port</i> is set to port 9030 by
+default on all operating systems.
+</p>
+
+</body>
+</html>
+
diff --git a/src/vidalia/help/content/eu/services.html b/src/vidalia/help/content/eu/services.html
new file mode 100644
index 0000000..9d30a80
--- /dev/null
+++ b/src/vidalia/help/content/eu/services.html
@@ -0,0 +1,138 @@
+
+
+<!--
+**  $Id $
+** 
+**  This file is part of Vidalia, and is subject to the license terms in the
+**  LICENSE file, found in the top level directory of this distribution. If 
+**  you did not receive the LICENSE file with this file, you may obtain it
+**  from the Vidalia source package distributed by the Vidalia Project at
+**  http://www.torproject.org/projects/vidalia.html. No part of Vidalia, 
+**  including this file, may be copied, modified, propagated, or distributed 
+**  except according to the terms described in the LICENSE file.
+-->
+<html>
+<body>
+
+<h1>Hidden Services</h1>
+<hr />
+
+Remark: Support for hidden services is new in Vidalia. You should expect it
+to have bugs, some of which possibly corrupting your hidden service
+configuration. So, don't rely on it, or rather, don't blame us if something
+goes wrong. If you find bugs or have comments on this new feature, please
+let us know! We need your feedback.  <a name="about"/>
+<h3>What is a hidden service?</h3>
+<p>
+Hidden services allow you to provide any kind of TCP-based service, e.g. an
+HTTP service, to others without revealing your IP address. The protocol to
+provide a hidden service is built on top of the same circuits that Tor uses
+for anonymous browsing and roughly has similar anonymity properties.
+</p>
+
+<p>
+For more information on hidden service you may want to read section 5 of
+Tor's design paper (doc/design-paper/tor-design.pdf) or the Rendezvous
+Specification (doc/spec/rend-spec.txt).
+</p>
+
+<a name="provide"/>
+<h3>How do I provide a hidden service?</h3>
+<p>
+Providing a hidden service consists of at least two steps:
+<ol>
+  <li>Install a web server locally (or a server for whatever service you want to
+provide, e.g. IRC) to listen for local requests.</li>
+  <li>Configure your hidden service, so that Tor relays requests coming from Tor
+users to your local server.</li>
+</ol>
+There is a fine tutorial on the Tor website
+(https://www.torproject.org/docs/tor-hidden-service.html) that describes
+these steps in more detail.
+</p>
+
+<a name="data"/>
+<h3>What data do I need to provide?</h3>
+<p>
+The services table contains five columns containing data about configured
+hidden services:
+<ul>
+  <li>Onion Address (generated): The service (or onion) address is generated by
+Tor to uniquely identify your service. Give this onion address to the people
+who shall be able to access your service. You may use the "Copy to
+clipboard" button for that to avoid typos. If you have just created a hidden
+service, the field says "[Created by Tor]"; in order to make it display the
+real onion address, you need to save your configuration and re-open the
+settings window.</li>
+  <li>Virtual Port (required): This is the TCP port that clients will need to know
+in order to access your service. Typically, you will want to use the
+service-specific port here, e.g. port 80 for HTTP. Note that the virtual
+port usually has nothing to do with firewall settings, because it is only
+used Tor-internally.</li>
+  <li>Target (optional): Usually you want Tor to relay connection requests to
+localhost on a different port than the one you specified in "Virtual
+Port". Therefore, you can specify a target consisting of physical address
+and port to which requests to your hidden service are redirected, e.g. to
+localhost:5222 (or on whatever port your server is listening). If you don't
+specify any target, Tor will redirect requests to the port specified in
+"Virtual Port" on localhost.</li>
+  <li>Service Directory (required): Tor needs to store some hidden-service
+specific files in a separate directory, e.g. a private key and a hostname
+file containing the onion address. This directory should be distinct from a
+directory containing content that the service provides. A good place for a
+service directory might be a sub directory in Tor's data directory. -- Note
+that you cannot change the directory of a running service (it wouldn't make
+much sense to allow it, because Vidalia is not supposed to move directories
+on your hard disk!). If you want to move a hidden service to another
+directory, please proceed as follows: Start by disabling the service in
+Vidalia and save the configuration. Then move the directory on your hard
+disk to the new place. Finally, change the directory in Vidalia to the new
+location, enable the service again, and save the new configuration.</li>
+  <li>Enabled: If this checkbox is disabled, Vidalia will not configure the given
+hidden service in Tor. This can be useful for keeping the configuration of a
+currently unused service for later use. All non-enabled services are stored
+in the Vidalia-specific configuration file vidalia.conf.</li>
+</ul>
+</p>
+
+<a name="buttons"/>
+<h3>What are the five buttons used for?</h3>
+<p>
+<ul>
+  <li>Add service: Creates a new empty service configuration.</li>
+  <li>Remove service: Permanently removes a hidden service configuration.  (If you
+want to temporarily remove a service, uncheck its Enabled checkbox.)</li>
+  <li>Copy to clipboard: Copies the onion address to the clipboard, so that you
+can tell it to whoever shall be able to use your service.</li>
+  <li>Browse: Lets you browse to find a local hidden service directory.</li>
+</ul>
+</p>
+
+<a name="advanced"/>
+<h3>How can I configure advanced hidden service settings?</h3>
+<p>
+Tor allows configuration of more specific settings for hidden services,
+e.g. forcing to use (or avoiding) certain nodes as introduction points, or
+providing multiple virtual ports for the same service.
+</p>
+
+<p>
+However, we decided to simplify things in Vidalia and provide only the most
+common settings. If you want to configure advanced settings, you need to do
+so in Tor's torrc file. Vidalia will not remove those settings even when you
+are editing your hidden services. If you specify more than one virtual port,
+only the first will be displayed and be editable.
+</p>
+
+<a name="client"/>
+<h3>How does Vidalia help me to access other hidden services?</h3>
+<p>
+Not at all. There is no need to do so. If you want to access another hidden
+service, type the service's onion address in your browser (or appropriate
+client application if it's not a web service), and Tor does the rest for
+you. There is no need to specifically configure Tor for that.
+</p>
+
+</body>
+</html>
+
diff --git a/src/vidalia/help/content/eu/troubleshooting.html b/src/vidalia/help/content/eu/troubleshooting.html
new file mode 100644
index 0000000..69b8367
--- /dev/null
+++ b/src/vidalia/help/content/eu/troubleshooting.html
@@ -0,0 +1,155 @@
+
+
+<!--
+**  $Id$
+** 
+**  This file is part of Vidalia, and is subject to the license terms in the
+**  LICENSE file, found in the top level directory of this distribution. If 
+**  you did not receive the LICENSE file with this file, you may obtain it
+**  from the Vidalia source package distributed by the Vidalia Project at
+**  http://www.torproject.org/projects/vidalia.html. No part of Vidalia, 
+**  including this file, may be copied, modified, propagated, or distributed 
+**  except according to the terms described in the LICENSE file.
+-->
+<html>
+<body>
+
+<h1>Troubleshooting</h1>
+<hr />
+
+Listed below are some of the common problems or questions people have while
+running Tor. If you can't find anything about the particular problem you're
+having, check out our website at <i>www.vidalia-project.net</i> for more
+support and information.  <a name="start"/>
+<h3>I Can't Start Tor</h3>
+<p>
+The most likely reason that Vidalia could not start Tor is because Vidalia
+is looking for your Tor installation in the wrong directory. You can tell
+Vidalia where Tor is located by updating the <i>Tor Executable</i> option in
+the <a href="config.html#general">general configuration settings</a>.
+</p>
+<p>
+Another possible reason that Tor cannot start is because there is already
+another Tor process running. Check your list of running process and stop the
+previous Tor process, if you find one. Then, try running Tor again.
+</p>
+<p>
+If that did not help, check your <a href="log.html">message log</a> to see
+if Tor printed any information about errors it encountered while trying to
+start.
+</p>
+
+<a name="connect"/>
+<h3>Vidalia Can't Connect to Tor</h3>
+<p>
+Vidalia manages Tor by communicating with it via Tor's <i>control port</i>. 
+</p>
+<p>
+The most common reason that Vidalia cannot connect to Tor is because Tor
+started, but encountered an error and exited immediately. You should check
+your <a href="log.html">message log</a> to see if Tor reported any errors
+while it started.
+</p>
+<p>
+If Tor is listening on a different port than Vidalia expects, Vidalia will
+be unable to connect to Tor. You rarely need to change this setting, but if
+there is another service running on your machine that conflicts with Tor's
+control port, you will need to specify a different port. You can change this
+setting in Vidalia's <a href="config.html#advanced">advanced configuration
+settings</a>.
+</p>
+
+<a name="password"/>
+<h3>Why is Vidalia asking me for a "control password"?</h3>
+<p>
+Vidalia interacts with the Tor software via Tor's "control port". The
+control port lets Vidalia receive status updates from Tor, request a new
+identity, configure Tor's settings, etc. Each time Vidalia starts Tor,
+Vidalia sets a random password for Tor's control port to prevent other
+applications from also connecting to the control port and potentially
+compromising your anonymity.
+</p>
+
+<p>
+Usually this process of generating and setting a random control password
+happens in the background. There are three common situations, though, where
+Vidalia may prompt you for a password:
+</p>
+
+<ul>
+  <li>
+    You're already running Vidalia and Tor. For example, this situation can
+happen if you installed the Vidalia bundle and now you're trying to run the
+Tor Browser Bundle. In that case, you'll need to close the old Vidalia and
+Tor before you can run this one.
+  </li>
+
+  <li>
+    <p>Vidalia crashed, but left Tor running with the last known random
+password. After you restart Vidalia, it generates a new random password, but
+Vidalia can't talk to Tor, because the random passwords are different.</p>
+    
+    <p>If the dialog that prompts you for a control password has a <i>Reset</i>
+button, you can click the button and Vidalia will restart Tor with a new
+random control password.
+    </p>
+    
+    <p>If you do not see a <i>Reset</i> button, or if Vidalia is unable to restart
+Tor for you, you can still fix the problem manually. Simply go into your
+process or task manager, and terminate the Tor process. Then use Vidalia to
+restart Tor and all will work again.</p>
+  </li>
+
+  <li>
+    <p>You had previously set Tor to run as a service. When Tor is set to run as a
+service, it starts up when the system boots. If you configured Tor to start
+as a service through Vidalia, a random password was set and saved in
+Tor. When you reboot, Tor starts up and uses the random password it saved.
+You login and start up Vidalia. Vidalia attempts to talk to the already
+running Tor. Vidalia generates a random password, but it is different than
+the saved password in the Tor service.</p>
+  
+    <p>You need to reconfigure Tor to not be a service. See the Tor wiki page on
+running <a
+href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService">
+Tor as a service</a> for more information on how to remove the Tor service.</p>
+  </li>
+</ul>
+
+
+<a name="torexited"/> 
+<h3>Tor Exited Unexpectedly</h3> 
+<p> 
+If Tor exits immediately after trying to start, you most likely have another
+Tor process already running. Check the <a href="log.html">message log</a> to
+see if any of the last few messages in the list are highlighted in yellow
+and contain a message similar to the following:
+</p>
+<pre>
+connection_create_listener(): Could not bind to 127.0.0.1:9050: Address already in use. 
+Is Tor already running?
+</pre>
+<p>
+If you find an error message like the one above, you will need to stop the
+other Tor process before starting a new one with Vidalia. On Windows, you
+would need to look for <i>tor.exe</i> in your Task Manager. On most other
+operating systems, the <i>ps</i> command can help you find the other Tor
+process.
+</p>
+<p>
+If Tor had been running successfully for awhile (that is, longer than a few
+seconds), then you should check the <a href="log.html">message log</a> for
+information about any errors Tor experienced before it exited. Such errors
+will be highlighted in either red or yellow.
+</p>
+
+<a name="stop"/>
+<h3>Vidalia Can't Stop Tor</h3>
+<p>
+If Vidalia cannot stop Tor, you should check your <a href="log.html">message
+log</a> to see if Tor reported any errors while trying to exit.
+</p>
+
+</body>
+</html>
+
diff --git a/src/vidalia/help/content/fo/bridges.html b/src/vidalia/help/content/fo/bridges.html
new file mode 100644
index 0000000..77439b5
--- /dev/null
+++ b/src/vidalia/help/content/fo/bridges.html
@@ -0,0 +1,71 @@
+
+
+<!--
+**  $Id$
+** 
+**  This file is part of Vidalia, and is subject to the license terms in the
+**  LICENSE file, found in the top level directory of this distribution. If 
+**  you did not receive the LICENSE file with this file, you may obtain it
+**  from the Vidalia source package distributed by the Vidalia Project at
+**  http://www.torproject.org/projects/vidalia.html. No part of Vidalia, 
+**  including this file, may be copied, modified, propagated, or distributed 
+**  except according to the terms described in the LICENSE file.
+-->
+<html>
+<body>
+
+<h1>Bridge Relays</h1>
+<hr />
+
+<a name="about"/>
+<h3>What are bridge relays?</h3>
+<p>
+Some Internet Service Providers (ISPs) attempt to prevent users from
+accessing the Tor network by blocking connections to known Tor
+relays. Bridge relays (or <i>bridges</i> for short) are relays that help
+these censored users access the Tor network. Unlike other Tor relays,
+bridges are not listed in the same public directories as normal
+relays. Since there is no complete public list of them, even if your ISP is
+filtering connections to all the known Tor relays, they probably won't be
+able to block all the bridges.
+</p>
+
+<a name="finding"/>
+<h3>How do I find a bridge relay?</h3>
+<p>
+There are two main ways to learn about a bridge address: 
+<ol>
+  <li>Get some friends to run private bridges for you</li>
+  <li>Use some of the public bridges</li>
+</ol>
+</p>
+
+<p>
+To use private bridges, ask your friends to run Vidalia and Tor in an
+uncensored area of the Internet, and then click on <i>Help censored
+users</i> in Vidalia's <a href="server.html">Relay settings page</a>. Then
+they should privately send you the <i>Bridge address</i> line at the bottom
+of their Relay page. Unlike running an exit relay, running a bridge relay
+just passes data to and from the Tor network, so it shouldn't expose the
+operator to any abuse complaints.
+</p>
+
+<p>
+You can find public bridge addresses by visiting
+<b>https://bridges.torproject.org</b>.  The answers you get from that page
+will change every few days, so check back periodically if you need more
+bridge addresses. Another way to find public bridge addresses is to send
+mail to <b>bridges at torproject.org</b> with the line <b>get bridges</b> by
+itself in the body of the mail. However, so we can make it harder for an
+attacker to learn lots of bridge addresses, you must send this request from
+a Gmail account.
+</p>
+
+<p>
+Configuring more than one bridge address will make your Tor connection more
+stable, in case some of the bridges become unreachable.
+</p>
+
+</body>
+</html>
+
diff --git a/src/vidalia/help/content/fo/log.html b/src/vidalia/help/content/fo/log.html
new file mode 100644
index 0000000..b0ef886
--- /dev/null
+++ b/src/vidalia/help/content/fo/log.html
@@ -0,0 +1,102 @@
+
+
+<!--
+**  $Id$
+** 
+**  This file is part of Vidalia, and is subject to the license terms in the
+**  LICENSE file, found in the top level directory of this distribution. If 
+**  you did not receive the LICENSE file with this file, you may obtain it
+**  from the Vidalia source package distributed by the Vidalia Project at
+**  http://www.torproject.org/projects/vidalia.html. No part of Vidalia, 
+**  including this file, may be copied, modified, propagated, or distributed 
+**  except according to the terms described in the LICENSE file.
+-->
+<html>
+<body>
+
+<h1>Message Log</h1>
+<hr />
+
+The message log lets you see status information about a running Tor
+process.  <a name="basic"/> Each message has a <i>severity</i> associated
+with it, ranging from <b>Error</b> (most serious) to <b>Debug</b> (most
+verbose). See the help section on <a href="#severities">message
+severities</a> for more information.  <a name="severities"/>
+<h3>Message Severities</h3>
+<p>
+A message's severity tells you how important the message is. A higher
+severity message usually indicates that something has gone wrong with
+Tor. Lower severity messages appear frequently during normal Tor operations
+and usually do not need to be logged.
+</p>
+
+<p>
+The possible message severities, from most severe to least severe, are:
+</p>
+<ul>
+  <li>
+    <b>Error</b>: Messages that appear when something has gone very wrong and
+Tor cannot proceed. These messages will be highlighted in <i>red</i> in the
+message log.
+  </li>
+  <li>
+    <b>Warning</b>: Messages that only appear when something has gone wrong with
+Tor, but are not fatal and Tor will continue running. These messages will be
+highlighted in <i>yellow</i>.
+  </li>
+  <li>
+    <b>Notice</b>: Messages that appear infrequently during normal Tor operation
+and are not considered errors, but you still may care about.
+  </li>
+  <li>
+    <b>Info</b>: Messages that appear frequently during normal Tor operation and
+are not usually of interest to most users.
+  </li>
+  <li>
+    <b>Debug</b>: Extremely verbose messages that are primarily of interest to
+developers. You should generally not log debug messages unless you know what
+you are doing.
+  </li>
+</ul>
+
+<p>
+Most users should only log <i>Error</i>, <i>Warning</i>, and <i>Notice</i>
+messages.
+</p>
+
+<p>
+To select which message severities you would like to see, do the following:
+<ol>
+  <li>Open the message log from the Vidalia tray menu.</li>
+  <li>Click on <i>Settings</i> at the top of the message log window.</li>
+  <li>
+    Check message severities you would like to see from the Message Filter group
+on the left and uncheck message severities you would like to hide.
+  </li>
+  <li>Click <i>Save Settings</i> to apply your new message filter.</li>
+</ol>
+</p>
+
+
+<a name="logfile"/>
+<h3>Logging to a File</h3>
+<p>
+Vidalia can also write log messages to a file, as well as logging them in
+the message log window. To enable logging to a file, follow these steps:
+</p>
+
+<ol>
+  <li>Open the message log from the Vidalia tray menu.</li>
+  <li>Click on <i>Settings</i> at the top of the message log window.</li>
+  <li>Check the box labeled <i>Automatically save new log messages to a file</i>.</li>
+  <li>
+    If you would like to change the file to which messages will be written,
+either type the path and filename into the text box, or click <i>Browse</i>
+to navigate to a location for your log file.
+  </li>
+  <li>Click <i>Save Settings</i> to save your log destination.</li>
+</ol>
+
+</body>
+</html>
+
diff --git a/src/vidalia/help/content/fo/netview.html b/src/vidalia/help/content/fo/netview.html
new file mode 100644
index 0000000..bdb2f50
--- /dev/null
+++ b/src/vidalia/help/content/fo/netview.html
@@ -0,0 +1,174 @@
+
+
+<!--
+**  $Id$
+** 
+**  This file is part of Vidalia, and is subject to the license terms in the
+**  LICENSE file, found in the top level directory of this distribution. If 
+**  you did not receive the LICENSE file with this file, you may obtain it
+**  from the Vidalia source package distributed by the Vidalia Project at
+**  http://www.torproject.org/projects/vidalia.html. No part of Vidalia, 
+**  including this file, may be copied, modified, propagated, or distributed 
+**  except according to the terms described in the LICENSE file.
+-->
+<html>
+<body>
+
+<h1>Network Viewer</h1>
+<hr />
+
+<p>
+The network viewer lets you see relays in the Tor network and where your
+traffic is going.
+</p>
+
+
+<a name="overview"/>
+<h3>Overview</h3>
+<p>
+When you want to communicate anonymously through Tor (say, connecting to a
+website), Tor creates a tunnel, or <i>circuit</i>, of encrypted connections
+through a series of relays on the network. Your application's traffic is
+then sent as a <i>stream</i> through that circuit. For efficiency, multiple
+streams may share the same circuit.
+</p>
+
+<a name="netmap"/>
+<h3>Network Map</h3>
+<p>
+The network map consists of a map of the world, with red pinpoints
+indicating the geographic location of relays in the Tor network. Green lines
+are drawn between relays to indicate the path of circuits that your Tor
+client has created through the Tor network.
+</p>
+<p>
+You can zoom in on locations in the map by clicking the <b>Zoom In</b> and
+<b>Zoom Out</b> buttons in the toolbar. You can also scroll around on the
+map by clicking on the map and then dragging it in whatever direction you
+would like to move the map.
+</p>
+<p>
+The geographic location of a Tor relay is determined by looking up the IP
+address of the relay in a GeoIP database, created by MaxMind and located at
+geoip.vidalia-project.net.
+</p>
+<p>
+In the middle of the dialog, below the network map, you will see a list of
+your current circuits, as well as any application traffic currently on those
+circuits. When the network map first loads, you will probably see a
+connection to geoip.vidalia-project.net, which occurs when Vidalia is
+looking up geographic information for the list of Tor relays. It is
+important to note that this request is done through Tor, so your location is
+not revealed to the GeoIP relay. The results of the lookups will be cached
+locally in order to reduce load on Vidalia's GeoIP relays.
+</p>
+
+
+<a name="relaylist"/>
+<h3>Relay Status</h3>
+<p>
+On the left side of the network view, you will see a list of relays in the
+Tor network. Next to each relay is an icon indicating that relay's status.
+The following table summarizes the possible relay status icons:
+</p>
+<p>
+<table border="1">
+<tr>
+  <td><img src="qrc:/images/icons/node-unresponsive.png"/></td>
+  <td valign="middle">
+    The relay is offline or simply not responding.
+  </td>
+</tr>
+<tr>
+  <td><img src="qrc:/images/icons/node-hibernating.png"/></td>
+  <td valign="middle">
+    The relay is <i>hibernating</i>, meaning it is online, but has used up as
+much bandwidth as the operator is willing to allow for a given time period.
+  </td>
+</tr>
+<tr>
+  <td><img src="qrc:/images/icons/node-bw-none.png"/></td>
+  <td valign="middle">
+    The relay is online, but has shown only minimal throughput.
+  </td>
+</tr>
+<tr>
+  <td><img src="qrc:/images/icons/node-bw-low.png"/></td>
+  <td valign="middle">
+    The relay is online and has shown a throughput &gt;= 20 KB/s.
+  </td>
+</tr>
+<tr>
+  <td><img src="qrc:/images/icons/node-bw-med.png"/></td>
+  <td valign="middle">
+    The relay is online and has shown a throughput &gt;= 60 KB/s.
+  </td>
+</tr>
+<tr>
+  <td><img src="qrc:/images/icons/node-bw-high.png"/></td>
+  <td valign="middle">
+    The relay is online and has shown a throughput &gt;= 400 KB/s.
+  </td>
+</tr>
+</table>
+</p>
+<p>
+All bandwidth values are estimates based on the minimum of either the
+maximum bandwidth sustained input or output over any ten second period in
+the past day.
+</p>
+
+
+<a name="details"/>
+<h3>Relay Details</h3>
+<p>
+The relay details panel at the right side of the screen gives you details
+about the relay or relays currently selected in the <a
+href="#relaylist">relay list</a>. If you have selected a circuit or stream
+in the list of your current circuits and streams, this panel will show you
+details about each relay through which your traffic is currently being sent.
+</p>
+<p>
+The fields that you may see in the panel are as follows (<i>Note</i>: not
+all of these fields will always be present):
+</p>
+<p>
+<table>
+<tr>
+  <td><b>Location</b></td>
+  <td>The geographic location of this Tor relay.</td>
+</tr>
+<tr>
+  <td><b>IP Address</b></td>
+  <td>IP address at which this Tor relay can be reached.</td>
+</tr>
+<tr>
+  <td><b>Platform</b></td>
+  <td>
+    Operating system information and Tor version on which this relay is
+currently running.
+  </td>
+</tr>
+<tr>
+  <td><b>Bandwidth</b></td>
+  <td>
+    Estimated maximum amount of bandwidth that the directory relays have seen
+this relay handle recently.
+  </td>
+</tr>
+<tr>
+  <td><b>Uptime</b></td>
+  <td>
+    Length of time this relay has been available, which can be used to help
+estimate this relay's stability.
+  </td>
+</tr>
+<tr>
+  <td><b>Last Updated</b></td>
+  <td>Date this relay's information was last updated.</td>
+</tr>
+</table>
+</p>
+</body>
+</html>
+
diff --git a/src/vidalia/help/content/fo/running.html b/src/vidalia/help/content/fo/running.html
new file mode 100644
index 0000000..2e84804
--- /dev/null
+++ b/src/vidalia/help/content/fo/running.html
@@ -0,0 +1,105 @@
+
+
+<!--
+**  $Id$
+** 
+**  This file is part of Vidalia, and is subject to the license terms in the
+**  LICENSE file, found in the top level directory of this distribution. If 
+**  you did not receive the LICENSE file with this file, you may obtain it
+**  from the Vidalia source package distributed by the Vidalia Project at
+**  http://www.torproject.org/projects/vidalia.html. No part of Vidalia, 
+**  including this file, may be copied, modified, propagated, or distributed 
+**  except according to the terms described in the LICENSE file.
+-->
+<html>
+<body>
+
+<h1>Running Tor</h1>
+<hr />
+
+<p>
+Vidalia can help you control your Tor process by letting you start and stop
+Tor, as well as monitoring Tor's status and letting you know if it exits
+unexpectedly.
+</p>
+
+<a name="starting"/>
+<h3>Starting and Stopping Tor</h3>
+<p>
+To <i>start</i> Tor,
+<ol>
+  <li>Select <i>Start</i> from Vidalia's tray menu or press <i>Ctrl+S</i></li>.
+  <li>
+    Vidalia's tray icon will change from an onion with a red X to a green onion
+when Tor has started.
+  </li>
+</ol>
+If Vidalia is unable to start Tor, Vidalia will display an error message
+telling you what went wrong. You can also look at your <a
+href="log.html">message log</a> to see if Tor printed any more information
+about what went wrong.
+</p>
+
+<p>
+To <i>stop</i> Tor,
+<ol>
+  <li>Select <i>Stop</i> from Vidalia's tray menu or press <i>Ctrl+T</i></li>.
+  <li>
+    Vidalia's tray icon will change from a green onion to a gray onion with a
+red X when Tor has stopped.
+  </li>
+</ol>
+If Vidalia was unable to stop Tor, Vidalia will display an error message
+telling you what went wrong. You can also look at your <a
+href="log.html">message log</a> to see if Tor printed any more information
+about what went wrong.
+</p>
+
+<a name="monitoring"/>
+<h3>Monitoring Tor's Status</h3>
+<p>
+Vidalia tells you about the status of Tor by displaying an icon in your
+system tray or dock area. The following table shows the different states
+indicated by an icon in your system's notification area:
+</p>
+<p>
+<table border="1">
+<tr>
+    <td><img src="qrc:/images/32x32/tor-off.png"/></td>
+    <td valign="middle">
+      Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor.
+    </td>
+</tr>
+<tr>
+    <td><img src="qrc:/images/32x32/tor-starting.png"/></td>
+    <td valign="middle">
+      Tor is starting up. You can check the <a href="log.html">message log</a> for
+status information about Tor while it is starting.
+    </td>
+</tr>
+<tr>
+    <td><img src="qrc:/images/32x32/tor-on.png"/></td>
+    <td valign="middle">
+      Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia
+menu. Tor will print informational messages to the <a
+href="log.html">message log</a> while it is running, if you want to see what
+Tor is doing.
+    </td>
+</tr>
+<tr>
+    <td><img src="qrc:/images/32x32/tor-stopping.png"/></td>
+    <td valign="middle">Tor is in the process of shutting down.</td>
+</tr>
+</table>
+</p>
+
+<p>
+If Tor exits unexpectedly, Vidalia will change its icon to the dark onion
+with a red X and display an error message letting you know what went
+wrong. You can also check the <a href="log.html">message log</a> for details
+about any problems Tor encountered before it exited.
+</p>
+
+</body>
+</html>
+
diff --git a/src/vidalia/help/content/fo/services.html b/src/vidalia/help/content/fo/services.html
new file mode 100644
index 0000000..9d30a80
--- /dev/null
+++ b/src/vidalia/help/content/fo/services.html
@@ -0,0 +1,138 @@
+
+
+<!--
+**  $Id $
+** 
+**  This file is part of Vidalia, and is subject to the license terms in the
+**  LICENSE file, found in the top level directory of this distribution. If 
+**  you did not receive the LICENSE file with this file, you may obtain it
+**  from the Vidalia source package distributed by the Vidalia Project at
+**  http://www.torproject.org/projects/vidalia.html. No part of Vidalia, 
+**  including this file, may be copied, modified, propagated, or distributed 
+**  except according to the terms described in the LICENSE file.
+-->
+<html>
+<body>
+
+<h1>Hidden Services</h1>
+<hr />
+
+Remark: Support for hidden services is new in Vidalia. You should expect it
+to have bugs, some of which possibly corrupting your hidden service
+configuration. So, don't rely on it, or rather, don't blame us if something
+goes wrong. If you find bugs or have comments on this new feature, please
+let us know! We need your feedback.  <a name="about"/>
+<h3>What is a hidden service?</h3>
+<p>
+Hidden services allow you to provide any kind of TCP-based service, e.g. an
+HTTP service, to others without revealing your IP address. The protocol to
+provide a hidden service is built on top of the same circuits that Tor uses
+for anonymous browsing and roughly has similar anonymity properties.
+</p>
+
+<p>
+For more information on hidden service you may want to read section 5 of
+Tor's design paper (doc/design-paper/tor-design.pdf) or the Rendezvous
+Specification (doc/spec/rend-spec.txt).
+</p>
+
+<a name="provide"/>
+<h3>How do I provide a hidden service?</h3>
+<p>
+Providing a hidden service consists of at least two steps:
+<ol>
+  <li>Install a web server locally (or a server for whatever service you want to
+provide, e.g. IRC) to listen for local requests.</li>
+  <li>Configure your hidden service, so that Tor relays requests coming from Tor
+users to your local server.</li>
+</ol>
+There is a fine tutorial on the Tor website
+(https://www.torproject.org/docs/tor-hidden-service.html) that describes
+these steps in more detail.
+</p>
+
+<a name="data"/>
+<h3>What data do I need to provide?</h3>
+<p>
+The services table contains five columns containing data about configured
+hidden services:
+<ul>
+  <li>Onion Address (generated): The service (or onion) address is generated by
+Tor to uniquely identify your service. Give this onion address to the people
+who shall be able to access your service. You may use the "Copy to
+clipboard" button for that to avoid typos. If you have just created a hidden
+service, the field says "[Created by Tor]"; in order to make it display the
+real onion address, you need to save your configuration and re-open the
+settings window.</li>
+  <li>Virtual Port (required): This is the TCP port that clients will need to know
+in order to access your service. Typically, you will want to use the
+service-specific port here, e.g. port 80 for HTTP. Note that the virtual
+port usually has nothing to do with firewall settings, because it is only
+used Tor-internally.</li>
+  <li>Target (optional): Usually you want Tor to relay connection requests to
+localhost on a different port than the one you specified in "Virtual
+Port". Therefore, you can specify a target consisting of physical address
+and port to which requests to your hidden service are redirected, e.g. to
+localhost:5222 (or on whatever port your server is listening). If you don't
+specify any target, Tor will redirect requests to the port specified in
+"Virtual Port" on localhost.</li>
+  <li>Service Directory (required): Tor needs to store some hidden-service
+specific files in a separate directory, e.g. a private key and a hostname
+file containing the onion address. This directory should be distinct from a
+directory containing content that the service provides. A good place for a
+service directory might be a sub directory in Tor's data directory. -- Note
+that you cannot change the directory of a running service (it wouldn't make
+much sense to allow it, because Vidalia is not supposed to move directories
+on your hard disk!). If you want to move a hidden service to another
+directory, please proceed as follows: Start by disabling the service in
+Vidalia and save the configuration. Then move the directory on your hard
+disk to the new place. Finally, change the directory in Vidalia to the new
+location, enable the service again, and save the new configuration.</li>
+  <li>Enabled: If this checkbox is disabled, Vidalia will not configure the given
+hidden service in Tor. This can be useful for keeping the configuration of a
+currently unused service for later use. All non-enabled services are stored
+in the Vidalia-specific configuration file vidalia.conf.</li>
+</ul>
+</p>
+
+<a name="buttons"/>
+<h3>What are the five buttons used for?</h3>
+<p>
+<ul>
+  <li>Add service: Creates a new empty service configuration.</li>
+  <li>Remove service: Permanently removes a hidden service configuration.  (If you
+want to temporarily remove a service, uncheck its Enabled checkbox.)</li>
+  <li>Copy to clipboard: Copies the onion address to the clipboard, so that you
+can tell it to whoever shall be able to use your service.</li>
+  <li>Browse: Lets you browse to find a local hidden service directory.</li>
+</ul>
+</p>
+
+<a name="advanced"/>
+<h3>How can I configure advanced hidden service settings?</h3>
+<p>
+Tor allows configuration of more specific settings for hidden services,
+e.g. forcing to use (or avoiding) certain nodes as introduction points, or
+providing multiple virtual ports for the same service.
+</p>
+
+<p>
+However, we decided to simplify things in Vidalia and provide only the most
+common settings. If you want to configure advanced settings, you need to do
+so in Tor's torrc file. Vidalia will not remove those settings even when you
+are editing your hidden services. If you specify more than one virtual port,
+only the first will be displayed and be editable.
+</p>
+
+<a name="client"/>
+<h3>How does Vidalia help me to access other hidden services?</h3>
+<p>
+Not at all. There is no need to do so. If you want to access another hidden
+service, type the service's onion address in your browser (or appropriate
+client application if it's not a web service), and Tor does the rest for
+you. There is no need to specifically configure Tor for that.
+</p>
+
+</body>
+</html>
+
diff --git a/src/vidalia/help/content/fo/troubleshooting.html b/src/vidalia/help/content/fo/troubleshooting.html
new file mode 100644
index 0000000..69b8367
--- /dev/null
+++ b/src/vidalia/help/content/fo/troubleshooting.html
@@ -0,0 +1,155 @@
+
+
+<!--
+**  $Id$
+** 
+**  This file is part of Vidalia, and is subject to the license terms in the
+**  LICENSE file, found in the top level directory of this distribution. If 
+**  you did not receive the LICENSE file with this file, you may obtain it
+**  from the Vidalia source package distributed by the Vidalia Project at
+**  http://www.torproject.org/projects/vidalia.html. No part of Vidalia, 
+**  including this file, may be copied, modified, propagated, or distributed 
+**  except according to the terms described in the LICENSE file.
+-->
+<html>
+<body>
+
+<h1>Troubleshooting</h1>
+<hr />
+
+Listed below are some of the common problems or questions people have while
+running Tor. If you can't find anything about the particular problem you're
+having, check out our website at <i>www.vidalia-project.net</i> for more
+support and information.  <a name="start"/>
+<h3>I Can't Start Tor</h3>
+<p>
+The most likely reason that Vidalia could not start Tor is because Vidalia
+is looking for your Tor installation in the wrong directory. You can tell
+Vidalia where Tor is located by updating the <i>Tor Executable</i> option in
+the <a href="config.html#general">general configuration settings</a>.
+</p>
+<p>
+Another possible reason that Tor cannot start is because there is already
+another Tor process running. Check your list of running process and stop the
+previous Tor process, if you find one. Then, try running Tor again.
+</p>
+<p>
+If that did not help, check your <a href="log.html">message log</a> to see
+if Tor printed any information about errors it encountered while trying to
+start.
+</p>
+
+<a name="connect"/>
+<h3>Vidalia Can't Connect to Tor</h3>
+<p>
+Vidalia manages Tor by communicating with it via Tor's <i>control port</i>. 
+</p>
+<p>
+The most common reason that Vidalia cannot connect to Tor is because Tor
+started, but encountered an error and exited immediately. You should check
+your <a href="log.html">message log</a> to see if Tor reported any errors
+while it started.
+</p>
+<p>
+If Tor is listening on a different port than Vidalia expects, Vidalia will
+be unable to connect to Tor. You rarely need to change this setting, but if
+there is another service running on your machine that conflicts with Tor's
+control port, you will need to specify a different port. You can change this
+setting in Vidalia's <a href="config.html#advanced">advanced configuration
+settings</a>.
+</p>
+
+<a name="password"/>
+<h3>Why is Vidalia asking me for a "control password"?</h3>
+<p>
+Vidalia interacts with the Tor software via Tor's "control port". The
+control port lets Vidalia receive status updates from Tor, request a new
+identity, configure Tor's settings, etc. Each time Vidalia starts Tor,
+Vidalia sets a random password for Tor's control port to prevent other
+applications from also connecting to the control port and potentially
+compromising your anonymity.
+</p>
+
+<p>
+Usually this process of generating and setting a random control password
+happens in the background. There are three common situations, though, where
+Vidalia may prompt you for a password:
+</p>
+
+<ul>
+  <li>
+    You're already running Vidalia and Tor. For example, this situation can
+happen if you installed the Vidalia bundle and now you're trying to run the
+Tor Browser Bundle. In that case, you'll need to close the old Vidalia and
+Tor before you can run this one.
+  </li>
+
+  <li>
+    <p>Vidalia crashed, but left Tor running with the last known random
+password. After you restart Vidalia, it generates a new random password, but
+Vidalia can't talk to Tor, because the random passwords are different.</p>
+    
+    <p>If the dialog that prompts you for a control password has a <i>Reset</i>
+button, you can click the button and Vidalia will restart Tor with a new
+random control password.
+    </p>
+    
+    <p>If you do not see a <i>Reset</i> button, or if Vidalia is unable to restart
+Tor for you, you can still fix the problem manually. Simply go into your
+process or task manager, and terminate the Tor process. Then use Vidalia to
+restart Tor and all will work again.</p>
+  </li>
+
+  <li>
+    <p>You had previously set Tor to run as a service. When Tor is set to run as a
+service, it starts up when the system boots. If you configured Tor to start
+as a service through Vidalia, a random password was set and saved in
+Tor. When you reboot, Tor starts up and uses the random password it saved.
+You login and start up Vidalia. Vidalia attempts to talk to the already
+running Tor. Vidalia generates a random password, but it is different than
+the saved password in the Tor service.</p>
+  
+    <p>You need to reconfigure Tor to not be a service. See the Tor wiki page on
+running <a
+href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService">
+Tor as a service</a> for more information on how to remove the Tor service.</p>
+  </li>
+</ul>
+
+
+<a name="torexited"/> 
+<h3>Tor Exited Unexpectedly</h3> 
+<p> 
+If Tor exits immediately after trying to start, you most likely have another
+Tor process already running. Check the <a href="log.html">message log</a> to
+see if any of the last few messages in the list are highlighted in yellow
+and contain a message similar to the following:
+</p>
+<pre>
+connection_create_listener(): Could not bind to 127.0.0.1:9050: Address already in use. 
+Is Tor already running?
+</pre>
+<p>
+If you find an error message like the one above, you will need to stop the
+other Tor process before starting a new one with Vidalia. On Windows, you
+would need to look for <i>tor.exe</i> in your Task Manager. On most other
+operating systems, the <i>ps</i> command can help you find the other Tor
+process.
+</p>
+<p>
+If Tor had been running successfully for awhile (that is, longer than a few
+seconds), then you should check the <a href="log.html">message log</a> for
+information about any errors Tor experienced before it exited. Such errors
+will be highlighted in either red or yellow.
+</p>
+
+<a name="stop"/>
+<h3>Vidalia Can't Stop Tor</h3>
+<p>
+If Vidalia cannot stop Tor, you should check your <a href="log.html">message
+log</a> to see if Tor reported any errors while trying to exit.
+</p>
+
+</body>
+</html>
+
diff --git a/src/vidalia/help/content/he/bridges.html b/src/vidalia/help/content/he/bridges.html
new file mode 100644
index 0000000..77439b5
--- /dev/null
+++ b/src/vidalia/help/content/he/bridges.html
@@ -0,0 +1,71 @@
+
+
+<!--
+**  $Id$
+** 
+**  This file is part of Vidalia, and is subject to the license terms in the
+**  LICENSE file, found in the top level directory of this distribution. If 
+**  you did not receive the LICENSE file with this file, you may obtain it
+**  from the Vidalia source package distributed by the Vidalia Project at
+**  http://www.torproject.org/projects/vidalia.html. No part of Vidalia, 
+**  including this file, may be copied, modified, propagated, or distributed 
+**  except according to the terms described in the LICENSE file.
+-->
+<html>
+<body>
+
+<h1>Bridge Relays</h1>
+<hr />
+
+<a name="about"/>
+<h3>What are bridge relays?</h3>
+<p>
+Some Internet Service Providers (ISPs) attempt to prevent users from
+accessing the Tor network by blocking connections to known Tor
+relays. Bridge relays (or <i>bridges</i> for short) are relays that help
+these censored users access the Tor network. Unlike other Tor relays,
+bridges are not listed in the same public directories as normal
+relays. Since there is no complete public list of them, even if your ISP is
+filtering connections to all the known Tor relays, they probably won't be
+able to block all the bridges.
+</p>
+
+<a name="finding"/>
+<h3>How do I find a bridge relay?</h3>
+<p>
+There are two main ways to learn about a bridge address: 
+<ol>
+  <li>Get some friends to run private bridges for you</li>
+  <li>Use some of the public bridges</li>
+</ol>
+</p>
+
+<p>
+To use private bridges, ask your friends to run Vidalia and Tor in an
+uncensored area of the Internet, and then click on <i>Help censored
+users</i> in Vidalia's <a href="server.html">Relay settings page</a>. Then
+they should privately send you the <i>Bridge address</i> line at the bottom
+of their Relay page. Unlike running an exit relay, running a bridge relay
+just passes data to and from the Tor network, so it shouldn't expose the
+operator to any abuse complaints.
+</p>
+
+<p>
+You can find public bridge addresses by visiting
+<b>https://bridges.torproject.org</b>.  The answers you get from that page
+will change every few days, so check back periodically if you need more
+bridge addresses. Another way to find public bridge addresses is to send
+mail to <b>bridges at torproject.org</b> with the line <b>get bridges</b> by
+itself in the body of the mail. However, so we can make it harder for an
+attacker to learn lots of bridge addresses, you must send this request from
+a Gmail account.
+</p>
+
+<p>
+Configuring more than one bridge address will make your Tor connection more
+stable, in case some of the bridges become unreachable.
+</p>
+
+</body>
+</html>
+
diff --git a/src/vidalia/help/content/he/config.html b/src/vidalia/help/content/he/config.html
new file mode 100644
index 0000000..35fc842
--- /dev/null
+++ b/src/vidalia/help/content/he/config.html
@@ -0,0 +1,185 @@
+
+
+<!--
+**  $Id$
+** 
+**  This file is part of Vidalia, and is subject to the license terms in the
+**  LICENSE file, found in the top level directory of this distribution. If 
+**  you did not receive the LICENSE file with this file, you may obtain it
+**  from the Vidalia source package distributed by the Vidalia Project at
+**  http://www.torproject.org/projects/vidalia.html. No part of Vidalia, 
+**  including this file, may be copied, modified, propagated, or distributed 
+**  except according to the terms described in the LICENSE file.
+-->
+<html>
+<body>
+
+<h1>Configuring Vidalia and Tor</h1>
+<hr />
+
+<p>
+Vidalia allows you to configure some of the most commonly modified aspects
+of Vidalia and Tor. It also lets you set up and manage a <a
+href="server.html">Tor relay</a> so you can help the Tor network grow.
+</p>
+
+<a name="general"/>
+<h3>General Settings</h3>
+<p>
+Settings on the <i>General</i> page are the most commonly modified settings.
+</p>
+<ul>
+  <li><b>Tor Executable</b>: This is the Tor executable that Vidalia will run when
+you select <i>Start</i> from the tray menu. If you have multiple versions of
+Tor installed, you can tell Vidalia which version you would like to run by
+clicking the <i>Browse</i> button and navigating to the particular Tor
+installation you want.
+  </li>
+  <li><b>Startup Options</b>: This setting allows you to have Vidalia
+automatically start Tor when Vidalia starts. You can also configure Vidalia
+to run when your system starts (<i>Windows only</i>).
+  </li>
+</ul>
+
+<a name="network"/>
+<h3>Network Settings</h3>
+<p>
+The <i>Network</i> settings page lets you change how Tor connects to the Tor
+network.
+</p>
+<ul>
+  <li><b>I use a proxy to access the Internet</b>: If your Internet connection
+requires an HTTP proxy, you can configure Tor to send all of its directory
+requests and Tor relay connections through your proxy. You must specify at
+least the hostname or address of your proxy, and the port on which your
+proxy is listening for connections. If your proxy requires authentication,
+you can also enter the <i>Username</i> and <i>Password</i> you use to
+connect to your proxy.  Otherwise, you can leave those fields blank.
+  </li>
+  <li><b>My firewall only lets me connect to certain ports</b>: If you are behind
+a restrictive firewall or proxy that limits the ports you are able to
+connect to, you can configure Tor to connect directly only to relays
+listening on the ports allowed by your firewall or proxy. Simply enter a
+list of ports permitted by your firewall or proxy, separated by
+commas. (<i>Example: 80,443,8080</i>)
+  </li>
+  <li><b>My ISP blocks connections to the Tor network</b>: If your ISP (Internet
+Service Provider) blocks connections to the Tor network, Tor can attempt to
+avoid being filtered by encrypting its directory connections and connecting
+to the Tor network through relays called <i>bridges</i> (Tor 0.2.0.3-alpha
+or newer only). You can add bridge relays by specifying either their address
+and port number, or their address, port number, and fingerprint.<br/>
+
+    Below are examples of valid bridge address formats:
+    <ul>
+      <li>
+        128.213.48.13:8080
+      </li>
+      <li>
+        128.213.48.13:8080 1054 13B1 DBDA F867 B226 74D2 52DF 3D9F A367 1F73
+      </li>
+      <li>
+        128.213.48.13:8080 105413B1DBDAF867B22674D252DF3D9FA3671F73
+      </li>
+    </ul>
+    Even if you do not know any bridge relay addresses, checking this checkbox
+may still be helpful. Tor will encrypt its directory requests, which can
+defeat blocking mechanisms that try to filter Tor's requests for information
+about other relays. If connections to normal Tor relays are also blocked,
+then you will need to learn a bridge relay address somehow and add it
+here. See the help topic on <a href="bridges.html#finding">finding bridge
+relays</a> for more information on how to learn new bridge relay addresses
+and fingerprints.
+  </li>
+</ul>
+
+<a name="relay"/>
+<h3>Relay Settings</h3>
+<p>
+<i> See <a href="server.html">this help topic</a> for detailed information
+about setting up and managing a Tor relay.  </i>
+</p>
+
+<a name="appearance"/>
+<h3>Appearance Settings</h3>
+<p>
+The settings on the <i>Appearance</i> page allow you to customize the look
+and feel of Vidalia.
+</p>
+<ul>
+  <li><b>Language</b>: Vidalia's interface has been translated into many languages
+by helpful volunteers. When Vidalia is first run, it will try to guess which
+language your computer is currently using. If Vidalia guesses incorrectly,
+or if you prefer a different language, you can choose another language from
+the dropdown box. You will need to restart Vidalia after changing the
+displayed language for the changes to take effect.
+  </li>
+  <li><b>Style</b>: In most cases, Vidalia will default to using your platform's
+default interface style. If you dislike the default, you can choose
+whichever interface style you prefer from the dropdown box.
+  </li>
+</ul>
+
+<a name="advanced"/>
+<h3>Advanced Settings</h3>
+<p>
+The settings on the <i>Advanced</i> page should generally only be modified
+by more experienced users.
+</p>
+<ul>
+  <li><b>Control Address &amp; Port</b>: The <i>Control Port</i> is the port which
+Vidalia uses to talk to Tor.  This doesn't need to be changed unless you
+have a conflict with another service on your machine, or if you are using
+Vidalia to control and monitor a Tor process running on another machine.
+  </li>
+  <li><b>Control Port Authentication</b>: Control port authentication is used to
+limit the applications on your machine that can connect to and reconfigure
+your Tor installation. The available authentication methods are:
+    <ul>  
+      <li>
+        <b>None</b> -- No authentication is required. Use of this option is
+<b>strongly</b> discouraged. Any application or user on your computer can
+reconfigure your Tor installation.
+      </li>
+      <li> 
+        <b>Password</b> <i>(Default)</i> -- If this method is selected, you can
+specify a password that Tor will require each time a user or application
+connects to Tor's control port. If Vidalia starts Tor for you, you can have
+Vidalia randomly generate a new password each time it starts Tor by checking
+the <i>Randomly Generate</i> checkbox.
+      </li>
+      <li>
+        <b>Cookie</b> -- If cookie authentication is selected, Tor will write a file
+(or, <i>cookie</i>) containing random bytes to its data directory when it
+starts. Any user or application that tries to connect to Tor's control port
+must be able to provide the contents of this cookie.
+      </li>
+    </ul>
+  </li>
+  <li><b>Tor Configuration File</b> <i>(optional)</i>: You can use this option to
+have Vidalia start Tor using a specific <i>torrc</i>, Tor's configuration
+file. If you leave this field blank, Tor will uses its own default torrc
+location.
+  </li>
+  <li><b>Tor Data Directory</b> <i>(optional)</i>: You can specify the directory
+in which Tor will store its saved data, such as cached Tor relay
+information, Tor relay keys, and configuration files. If you leave this
+field blank, Tor will use its own default data directory location.
+  </li>
+  <li><b>Permissions</b> <i>(optional, not available on Windows)</i>: If you enter
+a value for <b>Run as User</b>, Tor will <i>setuid</i> to this user when it
+starts.  If you enter a value for <b>Run as Group</b>, Tor will
+<i>setgid</i> to this group when it starts.
+  </li>
+</ul>
+
+<a name="services"/>
+<h3>Hidden Service Settings</h3>
+<p>
+Hidden services allow you to provide any kind of TCP-based service, e.g.  an
+HTTP service, to others without revealing your IP address.
+</p>
+
+</body>
+</html>
+
diff --git a/src/vidalia/help/content/he/index.html b/src/vidalia/help/content/he/index.html
new file mode 100644
index 0000000..378a4cd
--- /dev/null
+++ b/src/vidalia/help/content/he/index.html
@@ -0,0 +1,41 @@
+
+
+<!--
+**  $Id$
+** 
+**  This file is part of Vidalia, and is subject to the license terms in the
+**  LICENSE file, found in the top level directory of this distribution. If 
+**  you did not receive the LICENSE file with this file, you may obtain it
+**  from the Vidalia source package distributed by the Vidalia Project at
+**  http://www.torproject.org/projects/vidalia.html. No part of Vidalia, 
+**  including this file, may be copied, modified, propagated, or distributed 
+**  except according to the terms described in the LICENSE file.
+-->
+<html>
+<body>
+
+<h1>Vidalia Help</h1>
+<hr />
+
+<p>
+Select a help topic from the tree on the left or click on the Search button
+above the list of topics to search through all available help topics.
+</p>
+
+<p>
+You can use the <i>Find</i> button on the toolbar above to search within a
+particular help topic.
+</p>
+
+<p>
+The <i>Home</i> button above will bring you back to this home page.
+</p>
+
+<p>
+See the <a href="links.html">Helpful Links</a> topic for some places you can
+visit to find additional help and information about Vidalia and Tor.
+</p>
+
+</body>
+</html>
+
diff --git a/src/vidalia/help/content/he/links.html b/src/vidalia/help/content/he/links.html
new file mode 100644
index 0000000..d2f441a
--- /dev/null
+++ b/src/vidalia/help/content/he/links.html
@@ -0,0 +1,67 @@
+
+
+<!--
+**  $Id$
+** 
+**  This file is part of Vidalia, and is subject to the license terms in the
+**  LICENSE file, found in the top level directory of this distribution. If 
+**  you did not receive the LICENSE file with this file, you may obtain it
+**  from the Vidalia source package distributed by the Vidalia Project at
+**  http://www.torproject.org/projects/vidalia.html. No part of Vidalia, 
+**  including this file, may be copied, modified, propagated, or distributed 
+**  except according to the terms described in the LICENSE file.
+-->
+<html>
+<body>
+
+<h1>Helpful Links</h1>
+<hr />
+
+<h3>Vidalia</h3>
+<table>
+<tr>
+  <td>&nbsp;&nbsp;&nbsp;</td>
+  <td>Homepage</td>
+  <td>
+    <a href="https://www.torproject.org/vidalia/">
+https://www.torproject.org/vidalia/</a>
+  </td>
+</tr>
+<tr>
+  <td>&nbsp;&nbsp;&nbsp;</td>
+  <td>Wiki and Bugtracker</td>
+  <td>
+    <a href="http://trac.torproject.org/"> http://trac.torproject.org/</a>
+  </td>
+</tr>
+</table>
+
+<h3>Tor</h3>
+<table>
+<tr>
+  <td>&nbsp;&nbsp;&nbsp;</td>
+  <td>Homepage</td>
+  <td>
+    <a href="https://www.torproject.org/">https://www.torproject.org/</a>
+  </td>
+</tr>
+<tr>
+  <td>&nbsp;&nbsp;&nbsp;</td>
+  <td>FAQ</td>
+  <td>
+    <a href="https://www.torproject.org/docs/faq.html">
+https://www.torproject.org/docs/faq.html</a>
+  </td>
+</tr>
+<tr>
+  <td>&nbsp;&nbsp;&nbsp;</td>
+  <td>Wiki and Bugtracker</td>
+  <td>
+    <a href="https://trac.torproject.org/"> https://trac.torproject.org/</a>
+  </td>
+</tr>
+</table>
+
+</body>
+</html>
+
diff --git a/src/vidalia/help/content/he/log.html b/src/vidalia/help/content/he/log.html
new file mode 100644
index 0000000..b0ef886
--- /dev/null
+++ b/src/vidalia/help/content/he/log.html
@@ -0,0 +1,102 @@
+
+
+<!--
+**  $Id$
+** 
+**  This file is part of Vidalia, and is subject to the license terms in the
+**  LICENSE file, found in the top level directory of this distribution. If 
+**  you did not receive the LICENSE file with this file, you may obtain it
+**  from the Vidalia source package distributed by the Vidalia Project at
+**  http://www.torproject.org/projects/vidalia.html. No part of Vidalia, 
+**  including this file, may be copied, modified, propagated, or distributed 
+**  except according to the terms described in the LICENSE file.
+-->
+<html>
+<body>
+
+<h1>Message Log</h1>
+<hr />
+
+The message log lets you see status information about a running Tor
+process.  <a name="basic"/> Each message has a <i>severity</i> associated
+with it, ranging from <b>Error</b> (most serious) to <b>Debug</b> (most
+verbose). See the help section on <a href="#severities">message
+severities</a> for more information.  <a name="severities"/>
+<h3>Message Severities</h3>
+<p>
+A message's severity tells you how important the message is. A higher
+severity message usually indicates that something has gone wrong with
+Tor. Lower severity messages appear frequently during normal Tor operations
+and usually do not need to be logged.
+</p>
+
+<p>
+The possible message severities, from most severe to least severe, are:
+</p>
+<ul>
+  <li>
+    <b>Error</b>: Messages that appear when something has gone very wrong and
+Tor cannot proceed. These messages will be highlighted in <i>red</i> in the
+message log.
+  </li>
+  <li>
+    <b>Warning</b>: Messages that only appear when something has gone wrong with
+Tor, but are not fatal and Tor will continue running. These messages will be
+highlighted in <i>yellow</i>.
+  </li>
+  <li>
+    <b>Notice</b>: Messages that appear infrequently during normal Tor operation
+and are not considered errors, but you still may care about.
+  </li>
+  <li>
+    <b>Info</b>: Messages that appear frequently during normal Tor operation and
+are not usually of interest to most users.
+  </li>
+  <li>
+    <b>Debug</b>: Extremely verbose messages that are primarily of interest to
+developers. You should generally not log debug messages unless you know what
+you are doing.
+  </li>
+</ul>
+
+<p>
+Most users should only log <i>Error</i>, <i>Warning</i>, and <i>Notice</i>
+messages.
+</p>
+
+<p>
+To select which message severities you would like to see, do the following:
+<ol>
+  <li>Open the message log from the Vidalia tray menu.</li>
+  <li>Click on <i>Settings</i> at the top of the message log window.</li>
+  <li>
+    Check message severities you would like to see from the Message Filter group
+on the left and uncheck message severities you would like to hide.
+  </li>
+  <li>Click <i>Save Settings</i> to apply your new message filter.</li>
+</ol>
+</p>
+
+
+<a name="logfile"/>
+<h3>Logging to a File</h3>
+<p>
+Vidalia can also write log messages to a file, as well as logging them in
+the message log window. To enable logging to a file, follow these steps:
+</p>
+
+<ol>
+  <li>Open the message log from the Vidalia tray menu.</li>
+  <li>Click on <i>Settings</i> at the top of the message log window.</li>
+  <li>Check the box labeled <i>Automatically save new log messages to a file</i>.</li>
+  <li>
+    If you would like to change the file to which messages will be written,
+either type the path and filename into the text box, or click <i>Browse</i>
+to navigate to a location for your log file.
+  </li>
+  <li>Click <i>Save Settings</i> to save your log destination.</li>
+</ol>
+
+</body>
+</html>
+
diff --git a/src/vidalia/help/content/he/netview.html b/src/vidalia/help/content/he/netview.html
new file mode 100644
index 0000000..bdb2f50
--- /dev/null
+++ b/src/vidalia/help/content/he/netview.html
@@ -0,0 +1,174 @@
+
+
+<!--
+**  $Id$
+** 
+**  This file is part of Vidalia, and is subject to the license terms in the
+**  LICENSE file, found in the top level directory of this distribution. If 
+**  you did not receive the LICENSE file with this file, you may obtain it
+**  from the Vidalia source package distributed by the Vidalia Project at
+**  http://www.torproject.org/projects/vidalia.html. No part of Vidalia, 
+**  including this file, may be copied, modified, propagated, or distributed 
+**  except according to the terms described in the LICENSE file.
+-->
+<html>
+<body>
+
+<h1>Network Viewer</h1>
+<hr />
+
+<p>
+The network viewer lets you see relays in the Tor network and where your
+traffic is going.
+</p>
+
+
+<a name="overview"/>
+<h3>Overview</h3>
+<p>
+When you want to communicate anonymously through Tor (say, connecting to a
+website), Tor creates a tunnel, or <i>circuit</i>, of encrypted connections
+through a series of relays on the network. Your application's traffic is
+then sent as a <i>stream</i> through that circuit. For efficiency, multiple
+streams may share the same circuit.
+</p>
+
+<a name="netmap"/>
+<h3>Network Map</h3>
+<p>
+The network map consists of a map of the world, with red pinpoints
+indicating the geographic location of relays in the Tor network. Green lines
+are drawn between relays to indicate the path of circuits that your Tor
+client has created through the Tor network.
+</p>
+<p>
+You can zoom in on locations in the map by clicking the <b>Zoom In</b> and
+<b>Zoom Out</b> buttons in the toolbar. You can also scroll around on the
+map by clicking on the map and then dragging it in whatever direction you
+would like to move the map.
+</p>
+<p>
+The geographic location of a Tor relay is determined by looking up the IP
+address of the relay in a GeoIP database, created by MaxMind and located at
+geoip.vidalia-project.net.
+</p>
+<p>
+In the middle of the dialog, below the network map, you will see a list of
+your current circuits, as well as any application traffic currently on those
+circuits. When the network map first loads, you will probably see a
+connection to geoip.vidalia-project.net, which occurs when Vidalia is
+looking up geographic information for the list of Tor relays. It is
+important to note that this request is done through Tor, so your location is
+not revealed to the GeoIP relay. The results of the lookups will be cached
+locally in order to reduce load on Vidalia's GeoIP relays.
+</p>
+
+
+<a name="relaylist"/>
+<h3>Relay Status</h3>
+<p>
+On the left side of the network view, you will see a list of relays in the
+Tor network. Next to each relay is an icon indicating that relay's status.
+The following table summarizes the possible relay status icons:
+</p>
+<p>
+<table border="1">
+<tr>
+  <td><img src="qrc:/images/icons/node-unresponsive.png"/></td>
+  <td valign="middle">
+    The relay is offline or simply not responding.
+  </td>
+</tr>
+<tr>
+  <td><img src="qrc:/images/icons/node-hibernating.png"/></td>
+  <td valign="middle">
+    The relay is <i>hibernating</i>, meaning it is online, but has used up as
+much bandwidth as the operator is willing to allow for a given time period.
+  </td>
+</tr>
+<tr>
+  <td><img src="qrc:/images/icons/node-bw-none.png"/></td>
+  <td valign="middle">
+    The relay is online, but has shown only minimal throughput.
+  </td>
+</tr>
+<tr>
+  <td><img src="qrc:/images/icons/node-bw-low.png"/></td>
+  <td valign="middle">
+    The relay is online and has shown a throughput &gt;= 20 KB/s.
+  </td>
+</tr>
+<tr>
+  <td><img src="qrc:/images/icons/node-bw-med.png"/></td>
+  <td valign="middle">
+    The relay is online and has shown a throughput &gt;= 60 KB/s.
+  </td>
+</tr>
+<tr>
+  <td><img src="qrc:/images/icons/node-bw-high.png"/></td>
+  <td valign="middle">
+    The relay is online and has shown a throughput &gt;= 400 KB/s.
+  </td>
+</tr>
+</table>
+</p>
+<p>
+All bandwidth values are estimates based on the minimum of either the
+maximum bandwidth sustained input or output over any ten second period in
+the past day.
+</p>
+
+
+<a name="details"/>
+<h3>Relay Details</h3>
+<p>
+The relay details panel at the right side of the screen gives you details
+about the relay or relays currently selected in the <a
+href="#relaylist">relay list</a>. If you have selected a circuit or stream
+in the list of your current circuits and streams, this panel will show you
+details about each relay through which your traffic is currently being sent.
+</p>
+<p>
+The fields that you may see in the panel are as follows (<i>Note</i>: not
+all of these fields will always be present):
+</p>
+<p>
+<table>
+<tr>
+  <td><b>Location</b></td>
+  <td>The geographic location of this Tor relay.</td>
+</tr>
+<tr>
+  <td><b>IP Address</b></td>
+  <td>IP address at which this Tor relay can be reached.</td>
+</tr>
+<tr>
+  <td><b>Platform</b></td>
+  <td>
+    Operating system information and Tor version on which this relay is
+currently running.
+  </td>
+</tr>
+<tr>
+  <td><b>Bandwidth</b></td>
+  <td>
+    Estimated maximum amount of bandwidth that the directory relays have seen
+this relay handle recently.
+  </td>
+</tr>
+<tr>
+  <td><b>Uptime</b></td>
+  <td>
+    Length of time this relay has been available, which can be used to help
+estimate this relay's stability.
+  </td>
+</tr>
+<tr>
+  <td><b>Last Updated</b></td>
+  <td>Date this relay's information was last updated.</td>
+</tr>
+</table>
+</p>
+</body>
+</html>
+
diff --git a/src/vidalia/help/content/he/running.html b/src/vidalia/help/content/he/running.html
new file mode 100644
index 0000000..2e84804
--- /dev/null
+++ b/src/vidalia/help/content/he/running.html
@@ -0,0 +1,105 @@
+
+
+<!--
+**  $Id$
+** 
+**  This file is part of Vidalia, and is subject to the license terms in the
+**  LICENSE file, found in the top level directory of this distribution. If 
+**  you did not receive the LICENSE file with this file, you may obtain it
+**  from the Vidalia source package distributed by the Vidalia Project at
+**  http://www.torproject.org/projects/vidalia.html. No part of Vidalia, 
+**  including this file, may be copied, modified, propagated, or distributed 
+**  except according to the terms described in the LICENSE file.
+-->
+<html>
+<body>
+
+<h1>Running Tor</h1>
+<hr />
+
+<p>
+Vidalia can help you control your Tor process by letting you start and stop
+Tor, as well as monitoring Tor's status and letting you know if it exits
+unexpectedly.
+</p>
+
+<a name="starting"/>
+<h3>Starting and Stopping Tor</h3>
+<p>
+To <i>start</i> Tor,
+<ol>
+  <li>Select <i>Start</i> from Vidalia's tray menu or press <i>Ctrl+S</i></li>.
+  <li>
+    Vidalia's tray icon will change from an onion with a red X to a green onion
+when Tor has started.
+  </li>
+</ol>
+If Vidalia is unable to start Tor, Vidalia will display an error message
+telling you what went wrong. You can also look at your <a
+href="log.html">message log</a> to see if Tor printed any more information
+about what went wrong.
+</p>
+
+<p>
+To <i>stop</i> Tor,
+<ol>
+  <li>Select <i>Stop</i> from Vidalia's tray menu or press <i>Ctrl+T</i></li>.
+  <li>
+    Vidalia's tray icon will change from a green onion to a gray onion with a
+red X when Tor has stopped.
+  </li>
+</ol>
+If Vidalia was unable to stop Tor, Vidalia will display an error message
+telling you what went wrong. You can also look at your <a
+href="log.html">message log</a> to see if Tor printed any more information
+about what went wrong.
+</p>
+
+<a name="monitoring"/>
+<h3>Monitoring Tor's Status</h3>
+<p>
+Vidalia tells you about the status of Tor by displaying an icon in your
+system tray or dock area. The following table shows the different states
+indicated by an icon in your system's notification area:
+</p>
+<p>
+<table border="1">
+<tr>
+    <td><img src="qrc:/images/32x32/tor-off.png"/></td>
+    <td valign="middle">
+      Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor.
+    </td>
+</tr>
+<tr>
+    <td><img src="qrc:/images/32x32/tor-starting.png"/></td>
+    <td valign="middle">
+      Tor is starting up. You can check the <a href="log.html">message log</a> for
+status information about Tor while it is starting.
+    </td>
+</tr>
+<tr>
+    <td><img src="qrc:/images/32x32/tor-on.png"/></td>
+    <td valign="middle">
+      Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia
+menu. Tor will print informational messages to the <a
+href="log.html">message log</a> while it is running, if you want to see what
+Tor is doing.
+    </td>
+</tr>
+<tr>
+    <td><img src="qrc:/images/32x32/tor-stopping.png"/></td>
+    <td valign="middle">Tor is in the process of shutting down.</td>
+</tr>
+</table>
+</p>
+
+<p>
+If Tor exits unexpectedly, Vidalia will change its icon to the dark onion
+with a red X and display an error message letting you know what went
+wrong. You can also check the <a href="log.html">message log</a> for details
+about any problems Tor encountered before it exited.
+</p>
+
+</body>
+</html>
+
diff --git a/src/vidalia/help/content/he/server.html b/src/vidalia/help/content/he/server.html
new file mode 100644
index 0000000..f7baa0f
--- /dev/null
+++ b/src/vidalia/help/content/he/server.html
@@ -0,0 +1,238 @@
+
+
+<!--
+**  $Id$
+** 
+**  This file is part of Vidalia, and is subject to the license terms in the
+**  LICENSE file, found in the top level directory of this distribution. If 
+**  you did not receive the LICENSE file with this file, you may obtain it
+**  from the Vidalia source package distributed by the Vidalia Project at
+**  http://www.torproject.org/projects/vidalia.html. No part of Vidalia, 
+**  including this file, may be copied, modified, propagated, or distributed 
+**  except according to the terms described in the LICENSE file.
+-->
+<html>
+<body>
+
+<h1>Setting Up a Tor Relay</h1>
+<hr />
+
+The Tor network is made up of volunteers all over the world who donate some
+of their spare bandwidth by running a Tor relay. Vidalia helps you do your
+part by making it easy to set up a relay of your own.  <a name="basic"/>
+<h3>Basic Settings</h3>
+<p>
+If you decide you want to help the Tor network grow by running a relay, you
+can follow these steps to get started:
+</p>
+<ol>
+  <li>
+    Open the <i>Configuration Dialog</i> by selecting <i>Settings</i> from the
+tray menu or <i>Preferences</i> from your system menubar on Macintosh
+systems.
+  </li>
+  <li>Select the <i>Relay</i> configuration page.</li>
+  <li>
+    Decide whether you want to run a normal Tor relay or a <i>bridge</i> relay
+(Tor 0.2.0.8-alpha or newer). Bridge relays help censored Tor users who are
+blocked from accessing the Tor network directly.  Check the box labeled
+<i>Relay traffic for the Tor network</i> if you want to run a normal Tor
+relay or <i>Help censored users reach the Tor network</i> if you want to run
+a bridge relay.
+  </li>
+  <li>Enter the following information:</li>
+    <ul>
+      <li><b>Nickname</b>: The name which your relay will be known as on the Tor
+network. An example of a relay nickname is "MyVidaliaRelay".
+      </li>
+      <li><b>Contact Info</b>: Your e-mail address. This address will only be used to
+contact you in case there is an important Tor security update or something
+goes wrong with your relay. You might also include your PGP or GPG key ID
+and fingerprint.
+      </li>
+      <li><b>Relay Port</b>: The port on which your relay will listen for traffic from
+clients or other Tor relays.
+      </li>
+    </ul>
+  <li>
+    If you would like to mirror Tor's directory of relays for others on the
+network you can check the box labeled <i>Mirror the Relay Directory</i>.  If
+you do not have much bandwidth, uncheck this box. If you do decide to mirror
+the relay directory, make sure the <i>Directory Port</i> is different than
+the <i>Relay port</i> you entered above. Bridge relays <i>must</i> mirror
+the relay directory.
+  </li>
+</ol>
+
+<a name="bandwidth"/>
+<h3>Bandwidth Limits</h3>
+<p>
+Running a Tor relay can consume a large amount of bandwidth; however, Tor
+allows you to limit the amount of bandwidth that you are willing to
+contribute to the Tor network. You can run a relay, while still keeping your
+network connection usable for your own use.
+</p>
+<p>
+You should select the option in the dropdown box that best matches your
+connection speed. If you select <i>Custom</i>, you will be able to specify
+your own limits.
+</p>
+<h4>Custom Limits</h4>
+<p>
+The <i>maximum rate</i> is a pool of bytes used to fulfill requests during
+short periods of traffic higher than your specified <i>average rate</i>, but
+still maintains the average over a long period. A low average rate but a
+high maximum rate enforces a long-term average while still allowing more
+traffic during peak times if the average hasn't been reached lately. If your
+average rate is the same as your <i>maximum rate</i>, then Tor will never
+exceed the specified rate. Your <i>maximum rate</i> must always be greater
+than or equal to your <i>average rate</i>.
+</p>
+<p>
+The <i>average rate</i> is the maximum long-term average bandwidth allowed
+(in kilobytes per second). For example, you might want to choose 2 megabytes
+per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable
+connection). Tor requires a minimum of 20 kilobytes per second to run a
+relay.
+</p>
+<p>
+It is important to remember that Tor measures bandwidth in <b>bytes</b>, not
+bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For
+example, if your relay acts as a directory mirror, you may be sending more
+outgoing bytes than incoming. If you find this is the case and is putting
+too much strain on your bandwidth, you should consider unchecking the
+checkbox labeled <i>Mirror the relay directory</i>.
+</p>
+
+<a name="exitpolicy"/>
+<h3>Exit Policies</h3>
+<p>
+Exit policies give you a way to specify what kinds of resources on the
+Internet you are willing let other Tor users access from your Tor relay.
+Tor uses a default list of exit policies that restrict some services, such
+as mail to prevent spam and some default file sharing ports to reduce abuse
+of the Tor network. 
+</p>
+<p>
+Each of the checkboxes represents a type of resource that you can allow Tor
+users to access through your relay. If you uncheck the box next to a
+particular type of resource, Tor users will not be allowed to access that
+resource from your relay. If the box labeled <i>Misc Other Services</i> is
+checked, Tor users will be able to access other services not covered by the
+other checkboxes or Tor's default exit policy.
+</p>
+
+<p>
+For completeness, the following table lists the specific port numbers
+represented by each of the exit policy checkboxes. The <b>Description</b>
+column describes the resources Tor clients will be allowed to access through
+your relay, if the associated box is checked.
+</p>
+
+<table border="1">
+<tr>
+  <td><b>Checkbox</b></td>
+  <td><b>Ports</b></td>
+  <td><b>Description</b></td>
+</tr>
+<tr>
+  <td>Websites</td>
+  <td valign="middle">80</td>
+  <td>Normal, unencrypted Web browsing</td>
+</tr>
+<tr>
+  <td>Secure Websites (SSL)</td>
+  <td valign="middle">443</td>
+  <td>Encrypted Web browsing</td>
+</tr>
+<tr>
+  <td>Retrieve Mail (POP, IMAP)</td>
+  <td valign="middle">110, 143, 993, 995</td>
+  <td>Downloading email (does not permit sending email)</td>
+</tr>
+<tr>
+  <td>Instant Messaging (IM)</td>
+  <td valign="middle">703, 1863, 5050, 5190, 5222, 5223, 8300, 8888</td>
+  <td>Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber</td>
+</tr>
+<tr>
+  <td>Internet Relay Chat (IRC)</td>
+  <td valign="middle">6660-6669, 6697, 7000-7001</td>
+  <td>IRC clients and servers</td>
+</tr>
+<tr>
+  <td>Misc. Other Services</td>
+  <td valign="middle">*</td>
+  <td>All other applications that aren't covered by the previous checkboxes</td>
+</tr>
+</table>
+
+<p>
+If you do not want to let other Tor users make connections outside the Tor
+network from your relay, you can uncheck all of the checkboxes. Even if you
+uncheck all of the checkboxes, your relay is still useful to the Tor
+network.  Your relay will allow other Tor users to connect to the Tor
+network and will help relay traffic between other Tor relays.
+</p>
+<p>
+If you chose to run a bridge relay, the <i>Exit Policies</i> tab will be
+grayed out, since bridge relays do not allow exit connections. Bridges are
+only used by Tor clients to connect to the Tor network.
+</p>
+
+
+<a name="upnp"/>
+<h3>Port Forwarding</h3>
+<p>
+Many home users connect to the Internet via a <i>router</i>, which allows
+multiple computers on a local network to share the same Internet
+connection.  Some users may also be behind a <i>firewall</i> that blocks
+incoming connections to your computer from other computers on the Internet.
+If you want to run a Tor relay, however, other Tor clients and relays must
+be able to connect to your relay through your home router or firewall. 
+</p>
+
+<p>
+To make your relay publicly accessible, your router or firewall needs to
+know which ports to allow through to your computer by setting up what is
+known as <i>port forwarding</i>. Port forwarding configures your router or
+firewall to "forward" all connections to certain ports on your router or
+firewall to local ports on your computer.
+</p>
+
+<p>
+If you check the box labeled <i>Attempt to automatically configure port
+forwarding</i>, Vidalia will attempt to automatically set up port forwarding
+on your local network connection so that other Tor clients can connect to
+your relay. Not all routers support automatic port forwarding, though. You
+can use the <i>Test</i> button next to the checkbox to find out if Vidalia
+is able to automatically set up port forwarding for you.
+</p>
+
+<p>
+If the <i>Test</i> button finds that Vidalia is unable to set up port
+forwarding for you, you may need to enable this feature on your router or
+set up port forwarding manually. Some network devices have a feature called
+<i>Universal Plug-and-Play</i> (UPnP). If you can access your router's
+administrative interface, you should look for an option to enable UPnP. The
+administrative interface for most routers can be accessed by opening <a
+href="http://192.168.0.1/">http://192.168.0.1</a> or <a
+href="http://192.168.1.1/">http://192.168.1.1</a> in your Web browser. You
+should consult your router's instruction manual for more information.
+</p>
+
+<p>
+If you need to set up port forwarding manually, the website <a
+href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm">
+portforward.com</a> has instructions for how to set up port forwarding for
+many types of routers and firewalls. At a minimum, you will need to forward
+your <i>Relay Port</i>, which defaults to port 443 on Windows and 9001 on
+all other operating systems. If you also checked the checkbox labeled
+<i>Mirror the relay directory</i>, then you will also need to forward your
+<i>Directory Port</i>. The <i>Directory Port</i> is set to port 9030 by
+default on all operating systems.
+</p>
+
+</body>
+</html>
+
diff --git a/src/vidalia/help/content/he/services.html b/src/vidalia/help/content/he/services.html
new file mode 100644
index 0000000..9d30a80
--- /dev/null
+++ b/src/vidalia/help/content/he/services.html
@@ -0,0 +1,138 @@
+
+
+<!--
+**  $Id $
+** 
+**  This file is part of Vidalia, and is subject to the license terms in the
+**  LICENSE file, found in the top level directory of this distribution. If 
+**  you did not receive the LICENSE file with this file, you may obtain it
+**  from the Vidalia source package distributed by the Vidalia Project at
+**  http://www.torproject.org/projects/vidalia.html. No part of Vidalia, 
+**  including this file, may be copied, modified, propagated, or distributed 
+**  except according to the terms described in the LICENSE file.
+-->
+<html>
+<body>
+
+<h1>Hidden Services</h1>
+<hr />
+
+Remark: Support for hidden services is new in Vidalia. You should expect it
+to have bugs, some of which possibly corrupting your hidden service
+configuration. So, don't rely on it, or rather, don't blame us if something
+goes wrong. If you find bugs or have comments on this new feature, please
+let us know! We need your feedback.  <a name="about"/>
+<h3>What is a hidden service?</h3>
+<p>
+Hidden services allow you to provide any kind of TCP-based service, e.g. an
+HTTP service, to others without revealing your IP address. The protocol to
+provide a hidden service is built on top of the same circuits that Tor uses
+for anonymous browsing and roughly has similar anonymity properties.
+</p>
+
+<p>
+For more information on hidden service you may want to read section 5 of
+Tor's design paper (doc/design-paper/tor-design.pdf) or the Rendezvous
+Specification (doc/spec/rend-spec.txt).
+</p>
+
+<a name="provide"/>
+<h3>How do I provide a hidden service?</h3>
+<p>
+Providing a hidden service consists of at least two steps:
+<ol>
+  <li>Install a web server locally (or a server for whatever service you want to
+provide, e.g. IRC) to listen for local requests.</li>
+  <li>Configure your hidden service, so that Tor relays requests coming from Tor
+users to your local server.</li>
+</ol>
+There is a fine tutorial on the Tor website
+(https://www.torproject.org/docs/tor-hidden-service.html) that describes
+these steps in more detail.
+</p>
+
+<a name="data"/>
+<h3>What data do I need to provide?</h3>
+<p>
+The services table contains five columns containing data about configured
+hidden services:
+<ul>
+  <li>Onion Address (generated): The service (or onion) address is generated by
+Tor to uniquely identify your service. Give this onion address to the people
+who shall be able to access your service. You may use the "Copy to
+clipboard" button for that to avoid typos. If you have just created a hidden
+service, the field says "[Created by Tor]"; in order to make it display the
+real onion address, you need to save your configuration and re-open the
+settings window.</li>
+  <li>Virtual Port (required): This is the TCP port that clients will need to know
+in order to access your service. Typically, you will want to use the
+service-specific port here, e.g. port 80 for HTTP. Note that the virtual
+port usually has nothing to do with firewall settings, because it is only
+used Tor-internally.</li>
+  <li>Target (optional): Usually you want Tor to relay connection requests to
+localhost on a different port than the one you specified in "Virtual
+Port". Therefore, you can specify a target consisting of physical address
+and port to which requests to your hidden service are redirected, e.g. to
+localhost:5222 (or on whatever port your server is listening). If you don't
+specify any target, Tor will redirect requests to the port specified in
+"Virtual Port" on localhost.</li>
+  <li>Service Directory (required): Tor needs to store some hidden-service
+specific files in a separate directory, e.g. a private key and a hostname
+file containing the onion address. This directory should be distinct from a
+directory containing content that the service provides. A good place for a
+service directory might be a sub directory in Tor's data directory. -- Note
+that you cannot change the directory of a running service (it wouldn't make
+much sense to allow it, because Vidalia is not supposed to move directories
+on your hard disk!). If you want to move a hidden service to another
+directory, please proceed as follows: Start by disabling the service in
+Vidalia and save the configuration. Then move the directory on your hard
+disk to the new place. Finally, change the directory in Vidalia to the new
+location, enable the service again, and save the new configuration.</li>
+  <li>Enabled: If this checkbox is disabled, Vidalia will not configure the given
+hidden service in Tor. This can be useful for keeping the configuration of a
+currently unused service for later use. All non-enabled services are stored
+in the Vidalia-specific configuration file vidalia.conf.</li>
+</ul>
+</p>
+
+<a name="buttons"/>
+<h3>What are the five buttons used for?</h3>
+<p>
+<ul>
+  <li>Add service: Creates a new empty service configuration.</li>
+  <li>Remove service: Permanently removes a hidden service configuration.  (If you
+want to temporarily remove a service, uncheck its Enabled checkbox.)</li>
+  <li>Copy to clipboard: Copies the onion address to the clipboard, so that you
+can tell it to whoever shall be able to use your service.</li>
+  <li>Browse: Lets you browse to find a local hidden service directory.</li>
+</ul>
+</p>
+
+<a name="advanced"/>
+<h3>How can I configure advanced hidden service settings?</h3>
+<p>
+Tor allows configuration of more specific settings for hidden services,
+e.g. forcing to use (or avoiding) certain nodes as introduction points, or
+providing multiple virtual ports for the same service.
+</p>
+
+<p>
+However, we decided to simplify things in Vidalia and provide only the most
+common settings. If you want to configure advanced settings, you need to do
+so in Tor's torrc file. Vidalia will not remove those settings even when you
+are editing your hidden services. If you specify more than one virtual port,
+only the first will be displayed and be editable.
+</p>
+
+<a name="client"/>
+<h3>How does Vidalia help me to access other hidden services?</h3>
+<p>
+Not at all. There is no need to do so. If you want to access another hidden
+service, type the service's onion address in your browser (or appropriate
+client application if it's not a web service), and Tor does the rest for
+you. There is no need to specifically configure Tor for that.
+</p>
+
+</body>
+</html>
+
diff --git a/src/vidalia/help/content/he/troubleshooting.html b/src/vidalia/help/content/he/troubleshooting.html
new file mode 100644
index 0000000..69b8367
--- /dev/null
+++ b/src/vidalia/help/content/he/troubleshooting.html
@@ -0,0 +1,155 @@
+
+
+<!--
+**  $Id$
+** 
+**  This file is part of Vidalia, and is subject to the license terms in the
+**  LICENSE file, found in the top level directory of this distribution. If 
+**  you did not receive the LICENSE file with this file, you may obtain it
+**  from the Vidalia source package distributed by the Vidalia Project at
+**  http://www.torproject.org/projects/vidalia.html. No part of Vidalia, 
+**  including this file, may be copied, modified, propagated, or distributed 
+**  except according to the terms described in the LICENSE file.
+-->
+<html>
+<body>
+
+<h1>Troubleshooting</h1>
+<hr />
+
+Listed below are some of the common problems or questions people have while
+running Tor. If you can't find anything about the particular problem you're
+having, check out our website at <i>www.vidalia-project.net</i> for more
+support and information.  <a name="start"/>
+<h3>I Can't Start Tor</h3>
+<p>
+The most likely reason that Vidalia could not start Tor is because Vidalia
+is looking for your Tor installation in the wrong directory. You can tell
+Vidalia where Tor is located by updating the <i>Tor Executable</i> option in
+the <a href="config.html#general">general configuration settings</a>.
+</p>
+<p>
+Another possible reason that Tor cannot start is because there is already
+another Tor process running. Check your list of running process and stop the
+previous Tor process, if you find one. Then, try running Tor again.
+</p>
+<p>
+If that did not help, check your <a href="log.html">message log</a> to see
+if Tor printed any information about errors it encountered while trying to
+start.
+</p>
+
+<a name="connect"/>
+<h3>Vidalia Can't Connect to Tor</h3>
+<p>
+Vidalia manages Tor by communicating with it via Tor's <i>control port</i>. 
+</p>
+<p>
+The most common reason that Vidalia cannot connect to Tor is because Tor
+started, but encountered an error and exited immediately. You should check
+your <a href="log.html">message log</a> to see if Tor reported any errors
+while it started.
+</p>
+<p>
+If Tor is listening on a different port than Vidalia expects, Vidalia will
+be unable to connect to Tor. You rarely need to change this setting, but if
+there is another service running on your machine that conflicts with Tor's
+control port, you will need to specify a different port. You can change this
+setting in Vidalia's <a href="config.html#advanced">advanced configuration
+settings</a>.
+</p>
+
+<a name="password"/>
+<h3>Why is Vidalia asking me for a "control password"?</h3>
+<p>
+Vidalia interacts with the Tor software via Tor's "control port". The
+control port lets Vidalia receive status updates from Tor, request a new
+identity, configure Tor's settings, etc. Each time Vidalia starts Tor,
+Vidalia sets a random password for Tor's control port to prevent other
+applications from also connecting to the control port and potentially
+compromising your anonymity.
+</p>
+
+<p>
+Usually this process of generating and setting a random control password
+happens in the background. There are three common situations, though, where
+Vidalia may prompt you for a password:
+</p>
+
+<ul>
+  <li>
+    You're already running Vidalia and Tor. For example, this situation can
+happen if you installed the Vidalia bundle and now you're trying to run the
+Tor Browser Bundle. In that case, you'll need to close the old Vidalia and
+Tor before you can run this one.
+  </li>
+
+  <li>
+    <p>Vidalia crashed, but left Tor running with the last known random
+password. After you restart Vidalia, it generates a new random password, but
+Vidalia can't talk to Tor, because the random passwords are different.</p>
+    
+    <p>If the dialog that prompts you for a control password has a <i>Reset</i>
+button, you can click the button and Vidalia will restart Tor with a new
+random control password.
+    </p>
+    
+    <p>If you do not see a <i>Reset</i> button, or if Vidalia is unable to restart
+Tor for you, you can still fix the problem manually. Simply go into your
+process or task manager, and terminate the Tor process. Then use Vidalia to
+restart Tor and all will work again.</p>
+  </li>
+
+  <li>
+    <p>You had previously set Tor to run as a service. When Tor is set to run as a
+service, it starts up when the system boots. If you configured Tor to start
+as a service through Vidalia, a random password was set and saved in
+Tor. When you reboot, Tor starts up and uses the random password it saved.
+You login and start up Vidalia. Vidalia attempts to talk to the already
+running Tor. Vidalia generates a random password, but it is different than
+the saved password in the Tor service.</p>
+  
+    <p>You need to reconfigure Tor to not be a service. See the Tor wiki page on
+running <a
+href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService">
+Tor as a service</a> for more information on how to remove the Tor service.</p>
+  </li>
+</ul>
+
+
+<a name="torexited"/> 
+<h3>Tor Exited Unexpectedly</h3> 
+<p> 
+If Tor exits immediately after trying to start, you most likely have another
+Tor process already running. Check the <a href="log.html">message log</a> to
+see if any of the last few messages in the list are highlighted in yellow
+and contain a message similar to the following:
+</p>
+<pre>
+connection_create_listener(): Could not bind to 127.0.0.1:9050: Address already in use. 
+Is Tor already running?
+</pre>
+<p>
+If you find an error message like the one above, you will need to stop the
+other Tor process before starting a new one with Vidalia. On Windows, you
+would need to look for <i>tor.exe</i> in your Task Manager. On most other
+operating systems, the <i>ps</i> command can help you find the other Tor
+process.
+</p>
+<p>
+If Tor had been running successfully for awhile (that is, longer than a few
+seconds), then you should check the <a href="log.html">message log</a> for
+information about any errors Tor experienced before it exited. Such errors
+will be highlighted in either red or yellow.
+</p>
+
+<a name="stop"/>
+<h3>Vidalia Can't Stop Tor</h3>
+<p>
+If Vidalia cannot stop Tor, you should check your <a href="log.html">message
+log</a> to see if Tor reported any errors while trying to exit.
+</p>
+
+</body>
+</html>
+
diff --git a/src/vidalia/help/content/ka/bridges.html b/src/vidalia/help/content/ka/bridges.html
new file mode 100644
index 0000000..77439b5
--- /dev/null
+++ b/src/vidalia/help/content/ka/bridges.html
@@ -0,0 +1,71 @@
+
+
+<!--
+**  $Id$
+** 
+**  This file is part of Vidalia, and is subject to the license terms in the
+**  LICENSE file, found in the top level directory of this distribution. If 
+**  you did not receive the LICENSE file with this file, you may obtain it
+**  from the Vidalia source package distributed by the Vidalia Project at
+**  http://www.torproject.org/projects/vidalia.html. No part of Vidalia, 
+**  including this file, may be copied, modified, propagated, or distributed 
+**  except according to the terms described in the LICENSE file.
+-->
+<html>
+<body>
+
+<h1>Bridge Relays</h1>
+<hr />
+
+<a name="about"/>
+<h3>What are bridge relays?</h3>
+<p>
+Some Internet Service Providers (ISPs) attempt to prevent users from
+accessing the Tor network by blocking connections to known Tor
+relays. Bridge relays (or <i>bridges</i> for short) are relays that help
+these censored users access the Tor network. Unlike other Tor relays,
+bridges are not listed in the same public directories as normal
+relays. Since there is no complete public list of them, even if your ISP is
+filtering connections to all the known Tor relays, they probably won't be
+able to block all the bridges.
+</p>
+
+<a name="finding"/>
+<h3>How do I find a bridge relay?</h3>
+<p>
+There are two main ways to learn about a bridge address: 
+<ol>
+  <li>Get some friends to run private bridges for you</li>
+  <li>Use some of the public bridges</li>
+</ol>
+</p>
+
+<p>
+To use private bridges, ask your friends to run Vidalia and Tor in an
+uncensored area of the Internet, and then click on <i>Help censored
+users</i> in Vidalia's <a href="server.html">Relay settings page</a>. Then
+they should privately send you the <i>Bridge address</i> line at the bottom
+of their Relay page. Unlike running an exit relay, running a bridge relay
+just passes data to and from the Tor network, so it shouldn't expose the
+operator to any abuse complaints.
+</p>
+
+<p>
+You can find public bridge addresses by visiting
+<b>https://bridges.torproject.org</b>.  The answers you get from that page
+will change every few days, so check back periodically if you need more
+bridge addresses. Another way to find public bridge addresses is to send
+mail to <b>bridges at torproject.org</b> with the line <b>get bridges</b> by
+itself in the body of the mail. However, so we can make it harder for an
+attacker to learn lots of bridge addresses, you must send this request from
+a Gmail account.
+</p>
+
+<p>
+Configuring more than one bridge address will make your Tor connection more
+stable, in case some of the bridges become unreachable.
+</p>
+
+</body>
+</html>
+
diff --git a/src/vidalia/help/content/ka/config.html b/src/vidalia/help/content/ka/config.html
new file mode 100644
index 0000000..35fc842
--- /dev/null
+++ b/src/vidalia/help/content/ka/config.html
@@ -0,0 +1,185 @@
+
+
+<!--
+**  $Id$
+** 
+**  This file is part of Vidalia, and is subject to the license terms in the
+**  LICENSE file, found in the top level directory of this distribution. If 
+**  you did not receive the LICENSE file with this file, you may obtain it
+**  from the Vidalia source package distributed by the Vidalia Project at
+**  http://www.torproject.org/projects/vidalia.html. No part of Vidalia, 
+**  including this file, may be copied, modified, propagated, or distributed 
+**  except according to the terms described in the LICENSE file.
+-->
+<html>
+<body>
+
+<h1>Configuring Vidalia and Tor</h1>
+<hr />
+
+<p>
+Vidalia allows you to configure some of the most commonly modified aspects
+of Vidalia and Tor. It also lets you set up and manage a <a
+href="server.html">Tor relay</a> so you can help the Tor network grow.
+</p>
+
+<a name="general"/>
+<h3>General Settings</h3>
+<p>
+Settings on the <i>General</i> page are the most commonly modified settings.
+</p>
+<ul>
+  <li><b>Tor Executable</b>: This is the Tor executable that Vidalia will run when
+you select <i>Start</i> from the tray menu. If you have multiple versions of
+Tor installed, you can tell Vidalia which version you would like to run by
+clicking the <i>Browse</i> button and navigating to the particular Tor
+installation you want.
+  </li>
+  <li><b>Startup Options</b>: This setting allows you to have Vidalia
+automatically start Tor when Vidalia starts. You can also configure Vidalia
+to run when your system starts (<i>Windows only</i>).
+  </li>
+</ul>
+
+<a name="network"/>
+<h3>Network Settings</h3>
+<p>
+The <i>Network</i> settings page lets you change how Tor connects to the Tor
+network.
+</p>
+<ul>
+  <li><b>I use a proxy to access the Internet</b>: If your Internet connection
+requires an HTTP proxy, you can configure Tor to send all of its directory
+requests and Tor relay connections through your proxy. You must specify at
+least the hostname or address of your proxy, and the port on which your
+proxy is listening for connections. If your proxy requires authentication,
+you can also enter the <i>Username</i> and <i>Password</i> you use to
+connect to your proxy.  Otherwise, you can leave those fields blank.
+  </li>
+  <li><b>My firewall only lets me connect to certain ports</b>: If you are behind
+a restrictive firewall or proxy that limits the ports you are able to
+connect to, you can configure Tor to connect directly only to relays
+listening on the ports allowed by your firewall or proxy. Simply enter a
+list of ports permitted by your firewall or proxy, separated by
+commas. (<i>Example: 80,443,8080</i>)
+  </li>
+  <li><b>My ISP blocks connections to the Tor network</b>: If your ISP (Internet
+Service Provider) blocks connections to the Tor network, Tor can attempt to
+avoid being filtered by encrypting its directory connections and connecting
+to the Tor network through relays called <i>bridges</i> (Tor 0.2.0.3-alpha
+or newer only). You can add bridge relays by specifying either their address
+and port number, or their address, port number, and fingerprint.<br/>
+
+    Below are examples of valid bridge address formats:
+    <ul>
+      <li>
+        128.213.48.13:8080
+      </li>
+      <li>
+        128.213.48.13:8080 1054 13B1 DBDA F867 B226 74D2 52DF 3D9F A367 1F73
+      </li>
+      <li>
+        128.213.48.13:8080 105413B1DBDAF867B22674D252DF3D9FA3671F73
+      </li>
+    </ul>
+    Even if you do not know any bridge relay addresses, checking this checkbox
+may still be helpful. Tor will encrypt its directory requests, which can
+defeat blocking mechanisms that try to filter Tor's requests for information
+about other relays. If connections to normal Tor relays are also blocked,
+then you will need to learn a bridge relay address somehow and add it
+here. See the help topic on <a href="bridges.html#finding">finding bridge
+relays</a> for more information on how to learn new bridge relay addresses
+and fingerprints.
+  </li>
+</ul>
+
+<a name="relay"/>
+<h3>Relay Settings</h3>
+<p>
+<i> See <a href="server.html">this help topic</a> for detailed information
+about setting up and managing a Tor relay.  </i>
+</p>
+
+<a name="appearance"/>
+<h3>Appearance Settings</h3>
+<p>
+The settings on the <i>Appearance</i> page allow you to customize the look
+and feel of Vidalia.
+</p>
+<ul>
+  <li><b>Language</b>: Vidalia's interface has been translated into many languages
+by helpful volunteers. When Vidalia is first run, it will try to guess which
+language your computer is currently using. If Vidalia guesses incorrectly,
+or if you prefer a different language, you can choose another language from
+the dropdown box. You will need to restart Vidalia after changing the
+displayed language for the changes to take effect.
+  </li>
+  <li><b>Style</b>: In most cases, Vidalia will default to using your platform's
+default interface style. If you dislike the default, you can choose
+whichever interface style you prefer from the dropdown box.
+  </li>
+</ul>
+
+<a name="advanced"/>
+<h3>Advanced Settings</h3>
+<p>
+The settings on the <i>Advanced</i> page should generally only be modified
+by more experienced users.
+</p>
+<ul>
+  <li><b>Control Address &amp; Port</b>: The <i>Control Port</i> is the port which
+Vidalia uses to talk to Tor.  This doesn't need to be changed unless you
+have a conflict with another service on your machine, or if you are using
+Vidalia to control and monitor a Tor process running on another machine.
+  </li>
+  <li><b>Control Port Authentication</b>: Control port authentication is used to
+limit the applications on your machine that can connect to and reconfigure
+your Tor installation. The available authentication methods are:
+    <ul>  
+      <li>
+        <b>None</b> -- No authentication is required. Use of this option is
+<b>strongly</b> discouraged. Any application or user on your computer can
+reconfigure your Tor installation.
+      </li>
+      <li> 
+        <b>Password</b> <i>(Default)</i> -- If this method is selected, you can
+specify a password that Tor will require each time a user or application
+connects to Tor's control port. If Vidalia starts Tor for you, you can have
+Vidalia randomly generate a new password each time it starts Tor by checking
+the <i>Randomly Generate</i> checkbox.
+      </li>
+      <li>
+        <b>Cookie</b> -- If cookie authentication is selected, Tor will write a file
+(or, <i>cookie</i>) containing random bytes to its data directory when it
+starts. Any user or application that tries to connect to Tor's control port
+must be able to provide the contents of this cookie.
+      </li>
+    </ul>
+  </li>
+  <li><b>Tor Configuration File</b> <i>(optional)</i>: You can use this option to
+have Vidalia start Tor using a specific <i>torrc</i>, Tor's configuration
+file. If you leave this field blank, Tor will uses its own default torrc
+location.
+  </li>
+  <li><b>Tor Data Directory</b> <i>(optional)</i>: You can specify the directory
+in which Tor will store its saved data, such as cached Tor relay
+information, Tor relay keys, and configuration files. If you leave this
+field blank, Tor will use its own default data directory location.
+  </li>
+  <li><b>Permissions</b> <i>(optional, not available on Windows)</i>: If you enter
+a value for <b>Run as User</b>, Tor will <i>setuid</i> to this user when it
+starts.  If you enter a value for <b>Run as Group</b>, Tor will
+<i>setgid</i> to this group when it starts.
+  </li>
+</ul>
+
+<a name="services"/>
+<h3>Hidden Service Settings</h3>
+<p>
+Hidden services allow you to provide any kind of TCP-based service, e.g.  an
+HTTP service, to others without revealing your IP address.
+</p>
+
+</body>
+</html>
+
diff --git a/src/vidalia/help/content/ka/index.html b/src/vidalia/help/content/ka/index.html
new file mode 100644
index 0000000..378a4cd
--- /dev/null
+++ b/src/vidalia/help/content/ka/index.html
@@ -0,0 +1,41 @@
+
+
+<!--
+**  $Id$
+** 
+**  This file is part of Vidalia, and is subject to the license terms in the
+**  LICENSE file, found in the top level directory of this distribution. If 
+**  you did not receive the LICENSE file with this file, you may obtain it
+**  from the Vidalia source package distributed by the Vidalia Project at
+**  http://www.torproject.org/projects/vidalia.html. No part of Vidalia, 
+**  including this file, may be copied, modified, propagated, or distributed 
+**  except according to the terms described in the LICENSE file.
+-->
+<html>
+<body>
+
+<h1>Vidalia Help</h1>
+<hr />
+
+<p>
+Select a help topic from the tree on the left or click on the Search button
+above the list of topics to search through all available help topics.
+</p>
+
+<p>
+You can use the <i>Find</i> button on the toolbar above to search within a
+particular help topic.
+</p>
+
+<p>
+The <i>Home</i> button above will bring you back to this home page.
+</p>
+
+<p>
+See the <a href="links.html">Helpful Links</a> topic for some places you can
+visit to find additional help and information about Vidalia and Tor.
+</p>
+
+</body>
+</html>
+
diff --git a/src/vidalia/help/content/ka/links.html b/src/vidalia/help/content/ka/links.html
new file mode 100644
index 0000000..d2f441a
--- /dev/null
+++ b/src/vidalia/help/content/ka/links.html
@@ -0,0 +1,67 @@
+
+
+<!--
+**  $Id$
+** 
+**  This file is part of Vidalia, and is subject to the license terms in the
+**  LICENSE file, found in the top level directory of this distribution. If 
+**  you did not receive the LICENSE file with this file, you may obtain it
+**  from the Vidalia source package distributed by the Vidalia Project at
+**  http://www.torproject.org/projects/vidalia.html. No part of Vidalia, 
+**  including this file, may be copied, modified, propagated, or distributed 
+**  except according to the terms described in the LICENSE file.
+-->
+<html>
+<body>
+
+<h1>Helpful Links</h1>
+<hr />
+
+<h3>Vidalia</h3>
+<table>
+<tr>
+  <td>&nbsp;&nbsp;&nbsp;</td>
+  <td>Homepage</td>
+  <td>
+    <a href="https://www.torproject.org/vidalia/">
+https://www.torproject.org/vidalia/</a>
+  </td>
+</tr>
+<tr>
+  <td>&nbsp;&nbsp;&nbsp;</td>
+  <td>Wiki and Bugtracker</td>
+  <td>
+    <a href="http://trac.torproject.org/"> http://trac.torproject.org/</a>
+  </td>
+</tr>
+</table>
+
+<h3>Tor</h3>
+<table>
+<tr>
+  <td>&nbsp;&nbsp;&nbsp;</td>
+  <td>Homepage</td>
+  <td>
+    <a href="https://www.torproject.org/">https://www.torproject.org/</a>
+  </td>
+</tr>
+<tr>
+  <td>&nbsp;&nbsp;&nbsp;</td>
+  <td>FAQ</td>
+  <td>
+    <a href="https://www.torproject.org/docs/faq.html">
+https://www.torproject.org/docs/faq.html</a>
+  </td>
+</tr>
+<tr>
+  <td>&nbsp;&nbsp;&nbsp;</td>
+  <td>Wiki and Bugtracker</td>
+  <td>
+    <a href="https://trac.torproject.org/"> https://trac.torproject.org/</a>
+  </td>
+</tr>
+</table>
+
+</body>
+</html>
+
diff --git a/src/vidalia/help/content/ka/log.html b/src/vidalia/help/content/ka/log.html
new file mode 100644
index 0000000..b0ef886
--- /dev/null
+++ b/src/vidalia/help/content/ka/log.html
@@ -0,0 +1,102 @@
+
+
+<!--
+**  $Id$
+** 
+**  This file is part of Vidalia, and is subject to the license terms in the
+**  LICENSE file, found in the top level directory of this distribution. If 
+**  you did not receive the LICENSE file with this file, you may obtain it
+**  from the Vidalia source package distributed by the Vidalia Project at
+**  http://www.torproject.org/projects/vidalia.html. No part of Vidalia, 
+**  including this file, may be copied, modified, propagated, or distributed 
+**  except according to the terms described in the LICENSE file.
+-->
+<html>
+<body>
+
+<h1>Message Log</h1>
+<hr />
+
+The message log lets you see status information about a running Tor
+process.  <a name="basic"/> Each message has a <i>severity</i> associated
+with it, ranging from <b>Error</b> (most serious) to <b>Debug</b> (most
+verbose). See the help section on <a href="#severities">message
+severities</a> for more information.  <a name="severities"/>
+<h3>Message Severities</h3>
+<p>
+A message's severity tells you how important the message is. A higher
+severity message usually indicates that something has gone wrong with
+Tor. Lower severity messages appear frequently during normal Tor operations
+and usually do not need to be logged.
+</p>
+
+<p>
+The possible message severities, from most severe to least severe, are:
+</p>
+<ul>
+  <li>
+    <b>Error</b>: Messages that appear when something has gone very wrong and
+Tor cannot proceed. These messages will be highlighted in <i>red</i> in the
+message log.
+  </li>
+  <li>
+    <b>Warning</b>: Messages that only appear when something has gone wrong with
+Tor, but are not fatal and Tor will continue running. These messages will be
+highlighted in <i>yellow</i>.
+  </li>
+  <li>
+    <b>Notice</b>: Messages that appear infrequently during normal Tor operation
+and are not considered errors, but you still may care about.
+  </li>
+  <li>
+    <b>Info</b>: Messages that appear frequently during normal Tor operation and
+are not usually of interest to most users.
+  </li>
+  <li>
+    <b>Debug</b>: Extremely verbose messages that are primarily of interest to
+developers. You should generally not log debug messages unless you know what
+you are doing.
+  </li>
+</ul>
+
+<p>
+Most users should only log <i>Error</i>, <i>Warning</i>, and <i>Notice</i>
+messages.
+</p>
+
+<p>
+To select which message severities you would like to see, do the following:
+<ol>
+  <li>Open the message log from the Vidalia tray menu.</li>
+  <li>Click on <i>Settings</i> at the top of the message log window.</li>
+  <li>
+    Check message severities you would like to see from the Message Filter group
+on the left and uncheck message severities you would like to hide.
+  </li>
+  <li>Click <i>Save Settings</i> to apply your new message filter.</li>
+</ol>
+</p>
+
+
+<a name="logfile"/>
+<h3>Logging to a File</h3>
+<p>
+Vidalia can also write log messages to a file, as well as logging them in
+the message log window. To enable logging to a file, follow these steps:
+</p>
+
+<ol>
+  <li>Open the message log from the Vidalia tray menu.</li>
+  <li>Click on <i>Settings</i> at the top of the message log window.</li>
+  <li>Check the box labeled <i>Automatically save new log messages to a file</i>.</li>
+  <li>
+    If you would like to change the file to which messages will be written,
+either type the path and filename into the text box, or click <i>Browse</i>
+to navigate to a location for your log file.
+  </li>
+  <li>Click <i>Save Settings</i> to save your log destination.</li>
+</ol>
+
+</body>
+</html>
+
diff --git a/src/vidalia/help/content/ka/netview.html b/src/vidalia/help/content/ka/netview.html
new file mode 100644
index 0000000..bdb2f50
--- /dev/null
+++ b/src/vidalia/help/content/ka/netview.html
@@ -0,0 +1,174 @@
+
+
+<!--
+**  $Id$
+** 
+**  This file is part of Vidalia, and is subject to the license terms in the
+**  LICENSE file, found in the top level directory of this distribution. If 
+**  you did not receive the LICENSE file with this file, you may obtain it
+**  from the Vidalia source package distributed by the Vidalia Project at
+**  http://www.torproject.org/projects/vidalia.html. No part of Vidalia, 
+**  including this file, may be copied, modified, propagated, or distributed 
+**  except according to the terms described in the LICENSE file.
+-->
+<html>
+<body>
+
+<h1>Network Viewer</h1>
+<hr />
+
+<p>
+The network viewer lets you see relays in the Tor network and where your
+traffic is going.
+</p>
+
+
+<a name="overview"/>
+<h3>Overview</h3>
+<p>
+When you want to communicate anonymously through Tor (say, connecting to a
+website), Tor creates a tunnel, or <i>circuit</i>, of encrypted connections
+through a series of relays on the network. Your application's traffic is
+then sent as a <i>stream</i> through that circuit. For efficiency, multiple
+streams may share the same circuit.
+</p>
+
+<a name="netmap"/>
+<h3>Network Map</h3>
+<p>
+The network map consists of a map of the world, with red pinpoints
+indicating the geographic location of relays in the Tor network. Green lines
+are drawn between relays to indicate the path of circuits that your Tor
+client has created through the Tor network.
+</p>
+<p>
+You can zoom in on locations in the map by clicking the <b>Zoom In</b> and
+<b>Zoom Out</b> buttons in the toolbar. You can also scroll around on the
+map by clicking on the map and then dragging it in whatever direction you
+would like to move the map.
+</p>
+<p>
+The geographic location of a Tor relay is determined by looking up the IP
+address of the relay in a GeoIP database, created by MaxMind and located at
+geoip.vidalia-project.net.
+</p>
+<p>
+In the middle of the dialog, below the network map, you will see a list of
+your current circuits, as well as any application traffic currently on those
+circuits. When the network map first loads, you will probably see a
+connection to geoip.vidalia-project.net, which occurs when Vidalia is
+looking up geographic information for the list of Tor relays. It is
+important to note that this request is done through Tor, so your location is
+not revealed to the GeoIP relay. The results of the lookups will be cached
+locally in order to reduce load on Vidalia's GeoIP relays.
+</p>
+
+
+<a name="relaylist"/>
+<h3>Relay Status</h3>
+<p>
+On the left side of the network view, you will see a list of relays in the
+Tor network. Next to each relay is an icon indicating that relay's status.
+The following table summarizes the possible relay status icons:
+</p>
+<p>
+<table border="1">
+<tr>
+  <td><img src="qrc:/images/icons/node-unresponsive.png"/></td>
+  <td valign="middle">
+    The relay is offline or simply not responding.
+  </td>
+</tr>
+<tr>
+  <td><img src="qrc:/images/icons/node-hibernating.png"/></td>
+  <td valign="middle">
+    The relay is <i>hibernating</i>, meaning it is online, but has used up as
+much bandwidth as the operator is willing to allow for a given time period.
+  </td>
+</tr>
+<tr>
+  <td><img src="qrc:/images/icons/node-bw-none.png"/></td>
+  <td valign="middle">
+    The relay is online, but has shown only minimal throughput.
+  </td>
+</tr>
+<tr>
+  <td><img src="qrc:/images/icons/node-bw-low.png"/></td>
+  <td valign="middle">
+    The relay is online and has shown a throughput &gt;= 20 KB/s.
+  </td>
+</tr>
+<tr>
+  <td><img src="qrc:/images/icons/node-bw-med.png"/></td>
+  <td valign="middle">
+    The relay is online and has shown a throughput &gt;= 60 KB/s.
+  </td>
+</tr>
+<tr>
+  <td><img src="qrc:/images/icons/node-bw-high.png"/></td>
+  <td valign="middle">
+    The relay is online and has shown a throughput &gt;= 400 KB/s.
+  </td>
+</tr>
+</table>
+</p>
+<p>
+All bandwidth values are estimates based on the minimum of either the
+maximum bandwidth sustained input or output over any ten second period in
+the past day.
+</p>
+
+
+<a name="details"/>
+<h3>Relay Details</h3>
+<p>
+The relay details panel at the right side of the screen gives you details
+about the relay or relays currently selected in the <a
+href="#relaylist">relay list</a>. If you have selected a circuit or stream
+in the list of your current circuits and streams, this panel will show you
+details about each relay through which your traffic is currently being sent.
+</p>
+<p>
+The fields that you may see in the panel are as follows (<i>Note</i>: not
+all of these fields will always be present):
+</p>
+<p>
+<table>
+<tr>
+  <td><b>Location</b></td>
+  <td>The geographic location of this Tor relay.</td>
+</tr>
+<tr>
+  <td><b>IP Address</b></td>
+  <td>IP address at which this Tor relay can be reached.</td>
+</tr>
+<tr>
+  <td><b>Platform</b></td>
+  <td>
+    Operating system information and Tor version on which this relay is
+currently running.
+  </td>
+</tr>
+<tr>
+  <td><b>Bandwidth</b></td>
+  <td>
+    Estimated maximum amount of bandwidth that the directory relays have seen
+this relay handle recently.
+  </td>
+</tr>
+<tr>
+  <td><b>Uptime</b></td>
+  <td>
+    Length of time this relay has been available, which can be used to help
+estimate this relay's stability.
+  </td>
+</tr>
+<tr>
+  <td><b>Last Updated</b></td>
+  <td>Date this relay's information was last updated.</td>
+</tr>
+</table>
+</p>
+</body>
+</html>
+
diff --git a/src/vidalia/help/content/ka/running.html b/src/vidalia/help/content/ka/running.html
new file mode 100644
index 0000000..2e84804
--- /dev/null
+++ b/src/vidalia/help/content/ka/running.html
@@ -0,0 +1,105 @@
+
+
+<!--
+**  $Id$
+** 
+**  This file is part of Vidalia, and is subject to the license terms in the
+**  LICENSE file, found in the top level directory of this distribution. If 
+**  you did not receive the LICENSE file with this file, you may obtain it
+**  from the Vidalia source package distributed by the Vidalia Project at
+**  http://www.torproject.org/projects/vidalia.html. No part of Vidalia, 
+**  including this file, may be copied, modified, propagated, or distributed 
+**  except according to the terms described in the LICENSE file.
+-->
+<html>
+<body>
+
+<h1>Running Tor</h1>
+<hr />
+
+<p>
+Vidalia can help you control your Tor process by letting you start and stop
+Tor, as well as monitoring Tor's status and letting you know if it exits
+unexpectedly.
+</p>
+
+<a name="starting"/>
+<h3>Starting and Stopping Tor</h3>
+<p>
+To <i>start</i> Tor,
+<ol>
+  <li>Select <i>Start</i> from Vidalia's tray menu or press <i>Ctrl+S</i></li>.
+  <li>
+    Vidalia's tray icon will change from an onion with a red X to a green onion
+when Tor has started.
+  </li>
+</ol>
+If Vidalia is unable to start Tor, Vidalia will display an error message
+telling you what went wrong. You can also look at your <a
+href="log.html">message log</a> to see if Tor printed any more information
+about what went wrong.
+</p>
+
+<p>
+To <i>stop</i> Tor,
+<ol>
+  <li>Select <i>Stop</i> from Vidalia's tray menu or press <i>Ctrl+T</i></li>.
+  <li>
+    Vidalia's tray icon will change from a green onion to a gray onion with a
+red X when Tor has stopped.
+  </li>
+</ol>
+If Vidalia was unable to stop Tor, Vidalia will display an error message
+telling you what went wrong. You can also look at your <a
+href="log.html">message log</a> to see if Tor printed any more information
+about what went wrong.
+</p>
+
+<a name="monitoring"/>
+<h3>Monitoring Tor's Status</h3>
+<p>
+Vidalia tells you about the status of Tor by displaying an icon in your
+system tray or dock area. The following table shows the different states
+indicated by an icon in your system's notification area:
+</p>
+<p>
+<table border="1">
+<tr>
+    <td><img src="qrc:/images/32x32/tor-off.png"/></td>
+    <td valign="middle">
+      Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor.
+    </td>
+</tr>
+<tr>
+    <td><img src="qrc:/images/32x32/tor-starting.png"/></td>
+    <td valign="middle">
+      Tor is starting up. You can check the <a href="log.html">message log</a> for
+status information about Tor while it is starting.
+    </td>
+</tr>
+<tr>
+    <td><img src="qrc:/images/32x32/tor-on.png"/></td>
+    <td valign="middle">
+      Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia
+menu. Tor will print informational messages to the <a
+href="log.html">message log</a> while it is running, if you want to see what
+Tor is doing.
+    </td>
+</tr>
+<tr>
+    <td><img src="qrc:/images/32x32/tor-stopping.png"/></td>
+    <td valign="middle">Tor is in the process of shutting down.</td>
+</tr>
+</table>
+</p>
+
+<p>
+If Tor exits unexpectedly, Vidalia will change its icon to the dark onion
+with a red X and display an error message letting you know what went
+wrong. You can also check the <a href="log.html">message log</a> for details
+about any problems Tor encountered before it exited.
+</p>
+
+</body>
+</html>
+
diff --git a/src/vidalia/help/content/ka/server.html b/src/vidalia/help/content/ka/server.html
new file mode 100644
index 0000000..f7baa0f
--- /dev/null
+++ b/src/vidalia/help/content/ka/server.html
@@ -0,0 +1,238 @@
+
+
+<!--
+**  $Id$
+** 
+**  This file is part of Vidalia, and is subject to the license terms in the
+**  LICENSE file, found in the top level directory of this distribution. If 
+**  you did not receive the LICENSE file with this file, you may obtain it
+**  from the Vidalia source package distributed by the Vidalia Project at
+**  http://www.torproject.org/projects/vidalia.html. No part of Vidalia, 
+**  including this file, may be copied, modified, propagated, or distributed 
+**  except according to the terms described in the LICENSE file.
+-->
+<html>
+<body>
+
+<h1>Setting Up a Tor Relay</h1>
+<hr />
+
+The Tor network is made up of volunteers all over the world who donate some
+of their spare bandwidth by running a Tor relay. Vidalia helps you do your
+part by making it easy to set up a relay of your own.  <a name="basic"/>
+<h3>Basic Settings</h3>
+<p>
+If you decide you want to help the Tor network grow by running a relay, you
+can follow these steps to get started:
+</p>
+<ol>
+  <li>
+    Open the <i>Configuration Dialog</i> by selecting <i>Settings</i> from the
+tray menu or <i>Preferences</i> from your system menubar on Macintosh
+systems.
+  </li>
+  <li>Select the <i>Relay</i> configuration page.</li>
+  <li>
+    Decide whether you want to run a normal Tor relay or a <i>bridge</i> relay
+(Tor 0.2.0.8-alpha or newer). Bridge relays help censored Tor users who are
+blocked from accessing the Tor network directly.  Check the box labeled
+<i>Relay traffic for the Tor network</i> if you want to run a normal Tor
+relay or <i>Help censored users reach the Tor network</i> if you want to run
+a bridge relay.
+  </li>
+  <li>Enter the following information:</li>
+    <ul>
+      <li><b>Nickname</b>: The name which your relay will be known as on the Tor
+network. An example of a relay nickname is "MyVidaliaRelay".
+      </li>
+      <li><b>Contact Info</b>: Your e-mail address. This address will only be used to
+contact you in case there is an important Tor security update or something
+goes wrong with your relay. You might also include your PGP or GPG key ID
+and fingerprint.
+      </li>
+      <li><b>Relay Port</b>: The port on which your relay will listen for traffic from
+clients or other Tor relays.
+      </li>
+    </ul>
+  <li>
+    If you would like to mirror Tor's directory of relays for others on the
+network you can check the box labeled <i>Mirror the Relay Directory</i>.  If
+you do not have much bandwidth, uncheck this box. If you do decide to mirror
+the relay directory, make sure the <i>Directory Port</i> is different than
+the <i>Relay port</i> you entered above. Bridge relays <i>must</i> mirror
+the relay directory.
+  </li>
+</ol>
+
+<a name="bandwidth"/>
+<h3>Bandwidth Limits</h3>
+<p>
+Running a Tor relay can consume a large amount of bandwidth; however, Tor
+allows you to limit the amount of bandwidth that you are willing to
+contribute to the Tor network. You can run a relay, while still keeping your
+network connection usable for your own use.
+</p>
+<p>
+You should select the option in the dropdown box that best matches your
+connection speed. If you select <i>Custom</i>, you will be able to specify
+your own limits.
+</p>
+<h4>Custom Limits</h4>
+<p>
+The <i>maximum rate</i> is a pool of bytes used to fulfill requests during
+short periods of traffic higher than your specified <i>average rate</i>, but
+still maintains the average over a long period. A low average rate but a
+high maximum rate enforces a long-term average while still allowing more
+traffic during peak times if the average hasn't been reached lately. If your
+average rate is the same as your <i>maximum rate</i>, then Tor will never
+exceed the specified rate. Your <i>maximum rate</i> must always be greater
+than or equal to your <i>average rate</i>.
+</p>
+<p>
+The <i>average rate</i> is the maximum long-term average bandwidth allowed
+(in kilobytes per second). For example, you might want to choose 2 megabytes
+per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable
+connection). Tor requires a minimum of 20 kilobytes per second to run a
+relay.
+</p>
+<p>
+It is important to remember that Tor measures bandwidth in <b>bytes</b>, not
+bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For
+example, if your relay acts as a directory mirror, you may be sending more
+outgoing bytes than incoming. If you find this is the case and is putting
+too much strain on your bandwidth, you should consider unchecking the
+checkbox labeled <i>Mirror the relay directory</i>.
+</p>
+
+<a name="exitpolicy"/>
+<h3>Exit Policies</h3>
+<p>
+Exit policies give you a way to specify what kinds of resources on the
+Internet you are willing let other Tor users access from your Tor relay.
+Tor uses a default list of exit policies that restrict some services, such
+as mail to prevent spam and some default file sharing ports to reduce abuse
+of the Tor network. 
+</p>
+<p>
+Each of the checkboxes represents a type of resource that you can allow Tor
+users to access through your relay. If you uncheck the box next to a
+particular type of resource, Tor users will not be allowed to access that
+resource from your relay. If the box labeled <i>Misc Other Services</i> is
+checked, Tor users will be able to access other services not covered by the
+other checkboxes or Tor's default exit policy.
+</p>
+
+<p>
+For completeness, the following table lists the specific port numbers
+represented by each of the exit policy checkboxes. The <b>Description</b>
+column describes the resources Tor clients will be allowed to access through
+your relay, if the associated box is checked.
+</p>
+
+<table border="1">
+<tr>
+  <td><b>Checkbox</b></td>
+  <td><b>Ports</b></td>
+  <td><b>Description</b></td>
+</tr>
+<tr>
+  <td>Websites</td>
+  <td valign="middle">80</td>
+  <td>Normal, unencrypted Web browsing</td>
+</tr>
+<tr>
+  <td>Secure Websites (SSL)</td>
+  <td valign="middle">443</td>
+  <td>Encrypted Web browsing</td>
+</tr>
+<tr>
+  <td>Retrieve Mail (POP, IMAP)</td>
+  <td valign="middle">110, 143, 993, 995</td>
+  <td>Downloading email (does not permit sending email)</td>
+</tr>
+<tr>
+  <td>Instant Messaging (IM)</td>
+  <td valign="middle">703, 1863, 5050, 5190, 5222, 5223, 8300, 8888</td>
+  <td>Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber</td>
+</tr>
+<tr>
+  <td>Internet Relay Chat (IRC)</td>
+  <td valign="middle">6660-6669, 6697, 7000-7001</td>
+  <td>IRC clients and servers</td>
+</tr>
+<tr>
+  <td>Misc. Other Services</td>
+  <td valign="middle">*</td>
+  <td>All other applications that aren't covered by the previous checkboxes</td>
+</tr>
+</table>
+
+<p>
+If you do not want to let other Tor users make connections outside the Tor
+network from your relay, you can uncheck all of the checkboxes. Even if you
+uncheck all of the checkboxes, your relay is still useful to the Tor
+network.  Your relay will allow other Tor users to connect to the Tor
+network and will help relay traffic between other Tor relays.
+</p>
+<p>
+If you chose to run a bridge relay, the <i>Exit Policies</i> tab will be
+grayed out, since bridge relays do not allow exit connections. Bridges are
+only used by Tor clients to connect to the Tor network.
+</p>
+
+
+<a name="upnp"/>
+<h3>Port Forwarding</h3>
+<p>
+Many home users connect to the Internet via a <i>router</i>, which allows
+multiple computers on a local network to share the same Internet
+connection.  Some users may also be behind a <i>firewall</i> that blocks
+incoming connections to your computer from other computers on the Internet.
+If you want to run a Tor relay, however, other Tor clients and relays must
+be able to connect to your relay through your home router or firewall. 
+</p>
+
+<p>
+To make your relay publicly accessible, your router or firewall needs to
+know which ports to allow through to your computer by setting up what is
+known as <i>port forwarding</i>. Port forwarding configures your router or
+firewall to "forward" all connections to certain ports on your router or
+firewall to local ports on your computer.
+</p>
+
+<p>
+If you check the box labeled <i>Attempt to automatically configure port
+forwarding</i>, Vidalia will attempt to automatically set up port forwarding
+on your local network connection so that other Tor clients can connect to
+your relay. Not all routers support automatic port forwarding, though. You
+can use the <i>Test</i> button next to the checkbox to find out if Vidalia
+is able to automatically set up port forwarding for you.
+</p>
+
+<p>
+If the <i>Test</i> button finds that Vidalia is unable to set up port
+forwarding for you, you may need to enable this feature on your router or
+set up port forwarding manually. Some network devices have a feature called
+<i>Universal Plug-and-Play</i> (UPnP). If you can access your router's
+administrative interface, you should look for an option to enable UPnP. The
+administrative interface for most routers can be accessed by opening <a
+href="http://192.168.0.1/">http://192.168.0.1</a> or <a
+href="http://192.168.1.1/">http://192.168.1.1</a> in your Web browser. You
+should consult your router's instruction manual for more information.
+</p>
+
+<p>
+If you need to set up port forwarding manually, the website <a
+href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm">
+portforward.com</a> has instructions for how to set up port forwarding for
+many types of routers and firewalls. At a minimum, you will need to forward
+your <i>Relay Port</i>, which defaults to port 443 on Windows and 9001 on
+all other operating systems. If you also checked the checkbox labeled
+<i>Mirror the relay directory</i>, then you will also need to forward your
+<i>Directory Port</i>. The <i>Directory Port</i> is set to port 9030 by
+default on all operating systems.
+</p>
+
+</body>
+</html>
+
diff --git a/src/vidalia/help/content/ka/services.html b/src/vidalia/help/content/ka/services.html
new file mode 100644
index 0000000..9d30a80
--- /dev/null
+++ b/src/vidalia/help/content/ka/services.html
@@ -0,0 +1,138 @@
+
+
+<!--
+**  $Id $
+** 
+**  This file is part of Vidalia, and is subject to the license terms in the
+**  LICENSE file, found in the top level directory of this distribution. If 
+**  you did not receive the LICENSE file with this file, you may obtain it
+**  from the Vidalia source package distributed by the Vidalia Project at
+**  http://www.torproject.org/projects/vidalia.html. No part of Vidalia, 
+**  including this file, may be copied, modified, propagated, or distributed 
+**  except according to the terms described in the LICENSE file.
+-->
+<html>
+<body>
+
+<h1>Hidden Services</h1>
+<hr />
+
+Remark: Support for hidden services is new in Vidalia. You should expect it
+to have bugs, some of which possibly corrupting your hidden service
+configuration. So, don't rely on it, or rather, don't blame us if something
+goes wrong. If you find bugs or have comments on this new feature, please
+let us know! We need your feedback.  <a name="about"/>
+<h3>What is a hidden service?</h3>
+<p>
+Hidden services allow you to provide any kind of TCP-based service, e.g. an
+HTTP service, to others without revealing your IP address. The protocol to
+provide a hidden service is built on top of the same circuits that Tor uses
+for anonymous browsing and roughly has similar anonymity properties.
+</p>
+
+<p>
+For more information on hidden service you may want to read section 5 of
+Tor's design paper (doc/design-paper/tor-design.pdf) or the Rendezvous
+Specification (doc/spec/rend-spec.txt).
+</p>
+
+<a name="provide"/>
+<h3>How do I provide a hidden service?</h3>
+<p>
+Providing a hidden service consists of at least two steps:
+<ol>
+  <li>Install a web server locally (or a server for whatever service you want to
+provide, e.g. IRC) to listen for local requests.</li>
+  <li>Configure your hidden service, so that Tor relays requests coming from Tor
+users to your local server.</li>
+</ol>
+There is a fine tutorial on the Tor website
+(https://www.torproject.org/docs/tor-hidden-service.html) that describes
+these steps in more detail.
+</p>
+
+<a name="data"/>
+<h3>What data do I need to provide?</h3>
+<p>
+The services table contains five columns containing data about configured
+hidden services:
+<ul>
+  <li>Onion Address (generated): The service (or onion) address is generated by
+Tor to uniquely identify your service. Give this onion address to the people
+who shall be able to access your service. You may use the "Copy to
+clipboard" button for that to avoid typos. If you have just created a hidden
+service, the field says "[Created by Tor]"; in order to make it display the
+real onion address, you need to save your configuration and re-open the
+settings window.</li>
+  <li>Virtual Port (required): This is the TCP port that clients will need to know
+in order to access your service. Typically, you will want to use the
+service-specific port here, e.g. port 80 for HTTP. Note that the virtual
+port usually has nothing to do with firewall settings, because it is only
+used Tor-internally.</li>
+  <li>Target (optional): Usually you want Tor to relay connection requests to
+localhost on a different port than the one you specified in "Virtual
+Port". Therefore, you can specify a target consisting of physical address
+and port to which requests to your hidden service are redirected, e.g. to
+localhost:5222 (or on whatever port your server is listening). If you don't
+specify any target, Tor will redirect requests to the port specified in
+"Virtual Port" on localhost.</li>
+  <li>Service Directory (required): Tor needs to store some hidden-service
+specific files in a separate directory, e.g. a private key and a hostname
+file containing the onion address. This directory should be distinct from a
+directory containing content that the service provides. A good place for a
+service directory might be a sub directory in Tor's data directory. -- Note
+that you cannot change the directory of a running service (it wouldn't make
+much sense to allow it, because Vidalia is not supposed to move directories
+on your hard disk!). If you want to move a hidden service to another
+directory, please proceed as follows: Start by disabling the service in
+Vidalia and save the configuration. Then move the directory on your hard
+disk to the new place. Finally, change the directory in Vidalia to the new
+location, enable the service again, and save the new configuration.</li>
+  <li>Enabled: If this checkbox is disabled, Vidalia will not configure the given
+hidden service in Tor. This can be useful for keeping the configuration of a
+currently unused service for later use. All non-enabled services are stored
+in the Vidalia-specific configuration file vidalia.conf.</li>
+</ul>
+</p>
+
+<a name="buttons"/>
+<h3>What are the five buttons used for?</h3>
+<p>
+<ul>
+  <li>Add service: Creates a new empty service configuration.</li>
+  <li>Remove service: Permanently removes a hidden service configuration.  (If you
+want to temporarily remove a service, uncheck its Enabled checkbox.)</li>
+  <li>Copy to clipboard: Copies the onion address to the clipboard, so that you
+can tell it to whoever shall be able to use your service.</li>
+  <li>Browse: Lets you browse to find a local hidden service directory.</li>
+</ul>
+</p>
+
+<a name="advanced"/>
+<h3>How can I configure advanced hidden service settings?</h3>
+<p>
+Tor allows configuration of more specific settings for hidden services,
+e.g. forcing to use (or avoiding) certain nodes as introduction points, or
+providing multiple virtual ports for the same service.
+</p>
+
+<p>
+However, we decided to simplify things in Vidalia and provide only the most
+common settings. If you want to configure advanced settings, you need to do
+so in Tor's torrc file. Vidalia will not remove those settings even when you
+are editing your hidden services. If you specify more than one virtual port,
+only the first will be displayed and be editable.
+</p>
+
+<a name="client"/>
+<h3>How does Vidalia help me to access other hidden services?</h3>
+<p>
+Not at all. There is no need to do so. If you want to access another hidden
+service, type the service's onion address in your browser (or appropriate
+client application if it's not a web service), and Tor does the rest for
+you. There is no need to specifically configure Tor for that.
+</p>
+
+</body>
+</html>
+
diff --git a/src/vidalia/help/content/ka/troubleshooting.html b/src/vidalia/help/content/ka/troubleshooting.html
new file mode 100644
index 0000000..69b8367
--- /dev/null
+++ b/src/vidalia/help/content/ka/troubleshooting.html
@@ -0,0 +1,155 @@
+
+
+<!--
+**  $Id$
+** 
+**  This file is part of Vidalia, and is subject to the license terms in the
+**  LICENSE file, found in the top level directory of this distribution. If 
+**  you did not receive the LICENSE file with this file, you may obtain it
+**  from the Vidalia source package distributed by the Vidalia Project at
+**  http://www.torproject.org/projects/vidalia.html. No part of Vidalia, 
+**  including this file, may be copied, modified, propagated, or distributed 
+**  except according to the terms described in the LICENSE file.
+-->
+<html>
+<body>
+
+<h1>Troubleshooting</h1>
+<hr />
+
+Listed below are some of the common problems or questions people have while
+running Tor. If you can't find anything about the particular problem you're
+having, check out our website at <i>www.vidalia-project.net</i> for more
+support and information.  <a name="start"/>
+<h3>I Can't Start Tor</h3>
+<p>
+The most likely reason that Vidalia could not start Tor is because Vidalia
+is looking for your Tor installation in the wrong directory. You can tell
+Vidalia where Tor is located by updating the <i>Tor Executable</i> option in
+the <a href="config.html#general">general configuration settings</a>.
+</p>
+<p>
+Another possible reason that Tor cannot start is because there is already
+another Tor process running. Check your list of running process and stop the
+previous Tor process, if you find one. Then, try running Tor again.
+</p>
+<p>
+If that did not help, check your <a href="log.html">message log</a> to see
+if Tor printed any information about errors it encountered while trying to
+start.
+</p>
+
+<a name="connect"/>
+<h3>Vidalia Can't Connect to Tor</h3>
+<p>
+Vidalia manages Tor by communicating with it via Tor's <i>control port</i>. 
+</p>
+<p>
+The most common reason that Vidalia cannot connect to Tor is because Tor
+started, but encountered an error and exited immediately. You should check
+your <a href="log.html">message log</a> to see if Tor reported any errors
+while it started.
+</p>
+<p>
+If Tor is listening on a different port than Vidalia expects, Vidalia will
+be unable to connect to Tor. You rarely need to change this setting, but if
+there is another service running on your machine that conflicts with Tor's
+control port, you will need to specify a different port. You can change this
+setting in Vidalia's <a href="config.html#advanced">advanced configuration
+settings</a>.
+</p>
+
+<a name="password"/>
+<h3>Why is Vidalia asking me for a "control password"?</h3>
+<p>
+Vidalia interacts with the Tor software via Tor's "control port". The
+control port lets Vidalia receive status updates from Tor, request a new
+identity, configure Tor's settings, etc. Each time Vidalia starts Tor,
+Vidalia sets a random password for Tor's control port to prevent other
+applications from also connecting to the control port and potentially
+compromising your anonymity.
+</p>
+
+<p>
+Usually this process of generating and setting a random control password
+happens in the background. There are three common situations, though, where
+Vidalia may prompt you for a password:
+</p>
+
+<ul>
+  <li>
+    You're already running Vidalia and Tor. For example, this situation can
+happen if you installed the Vidalia bundle and now you're trying to run the
+Tor Browser Bundle. In that case, you'll need to close the old Vidalia and
+Tor before you can run this one.
+  </li>
+
+  <li>
+    <p>Vidalia crashed, but left Tor running with the last known random
+password. After you restart Vidalia, it generates a new random password, but
+Vidalia can't talk to Tor, because the random passwords are different.</p>
+    
+    <p>If the dialog that prompts you for a control password has a <i>Reset</i>
+button, you can click the button and Vidalia will restart Tor with a new
+random control password.
+    </p>
+    
+    <p>If you do not see a <i>Reset</i> button, or if Vidalia is unable to restart
+Tor for you, you can still fix the problem manually. Simply go into your
+process or task manager, and terminate the Tor process. Then use Vidalia to
+restart Tor and all will work again.</p>
+  </li>
+
+  <li>
+    <p>You had previously set Tor to run as a service. When Tor is set to run as a
+service, it starts up when the system boots. If you configured Tor to start
+as a service through Vidalia, a random password was set and saved in
+Tor. When you reboot, Tor starts up and uses the random password it saved.
+You login and start up Vidalia. Vidalia attempts to talk to the already
+running Tor. Vidalia generates a random password, but it is different than
+the saved password in the Tor service.</p>
+  
+    <p>You need to reconfigure Tor to not be a service. See the Tor wiki page on
+running <a
+href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService">
+Tor as a service</a> for more information on how to remove the Tor service.</p>
+  </li>
+</ul>
+
+
+<a name="torexited"/> 
+<h3>Tor Exited Unexpectedly</h3> 
+<p> 
+If Tor exits immediately after trying to start, you most likely have another
+Tor process already running. Check the <a href="log.html">message log</a> to
+see if any of the last few messages in the list are highlighted in yellow
+and contain a message similar to the following:
+</p>
+<pre>
+connection_create_listener(): Could not bind to 127.0.0.1:9050: Address already in use. 
+Is Tor already running?
+</pre>
+<p>
+If you find an error message like the one above, you will need to stop the
+other Tor process before starting a new one with Vidalia. On Windows, you
+would need to look for <i>tor.exe</i> in your Task Manager. On most other
+operating systems, the <i>ps</i> command can help you find the other Tor
+process.
+</p>
+<p>
+If Tor had been running successfully for awhile (that is, longer than a few
+seconds), then you should check the <a href="log.html">message log</a> for
+information about any errors Tor experienced before it exited. Such errors
+will be highlighted in either red or yellow.
+</p>
+
+<a name="stop"/>
+<h3>Vidalia Can't Stop Tor</h3>
+<p>
+If Vidalia cannot stop Tor, you should check your <a href="log.html">message
+log</a> to see if Tor reported any errors while trying to exit.
+</p>
+
+</body>
+</html>
+
diff --git a/src/vidalia/help/content/nap/bridges.html b/src/vidalia/help/content/nap/bridges.html
new file mode 100644
index 0000000..77439b5
--- /dev/null
+++ b/src/vidalia/help/content/nap/bridges.html
@@ -0,0 +1,71 @@
+
+
+<!--
+**  $Id$
+** 
+**  This file is part of Vidalia, and is subject to the license terms in the
+**  LICENSE file, found in the top level directory of this distribution. If 
+**  you did not receive the LICENSE file with this file, you may obtain it
+**  from the Vidalia source package distributed by the Vidalia Project at
+**  http://www.torproject.org/projects/vidalia.html. No part of Vidalia, 
+**  including this file, may be copied, modified, propagated, or distributed 
+**  except according to the terms described in the LICENSE file.
+-->
+<html>
+<body>
+
+<h1>Bridge Relays</h1>
+<hr />
+
+<a name="about"/>
+<h3>What are bridge relays?</h3>
+<p>
+Some Internet Service Providers (ISPs) attempt to prevent users from
+accessing the Tor network by blocking connections to known Tor
+relays. Bridge relays (or <i>bridges</i> for short) are relays that help
+these censored users access the Tor network. Unlike other Tor relays,
+bridges are not listed in the same public directories as normal
+relays. Since there is no complete public list of them, even if your ISP is
+filtering connections to all the known Tor relays, they probably won't be
+able to block all the bridges.
+</p>
+
+<a name="finding"/>
+<h3>How do I find a bridge relay?</h3>
+<p>
+There are two main ways to learn about a bridge address: 
+<ol>
+  <li>Get some friends to run private bridges for you</li>
+  <li>Use some of the public bridges</li>
+</ol>
+</p>
+
+<p>
+To use private bridges, ask your friends to run Vidalia and Tor in an
+uncensored area of the Internet, and then click on <i>Help censored
+users</i> in Vidalia's <a href="server.html">Relay settings page</a>. Then
+they should privately send you the <i>Bridge address</i> line at the bottom
+of their Relay page. Unlike running an exit relay, running a bridge relay
+just passes data to and from the Tor network, so it shouldn't expose the
+operator to any abuse complaints.
+</p>
+
+<p>
+You can find public bridge addresses by visiting
+<b>https://bridges.torproject.org</b>.  The answers you get from that page
+will change every few days, so check back periodically if you need more
+bridge addresses. Another way to find public bridge addresses is to send
+mail to <b>bridges at torproject.org</b> with the line <b>get bridges</b> by
+itself in the body of the mail. However, so we can make it harder for an
+attacker to learn lots of bridge addresses, you must send this request from
+a Gmail account.
+</p>
+
+<p>
+Configuring more than one bridge address will make your Tor connection more
+stable, in case some of the bridges become unreachable.
+</p>
+
+</body>
+</html>
+
diff --git a/src/vidalia/help/content/nap/config.html b/src/vidalia/help/content/nap/config.html
new file mode 100644
index 0000000..35fc842
--- /dev/null
+++ b/src/vidalia/help/content/nap/config.html
@@ -0,0 +1,185 @@
+
+
+<!--
+**  $Id$
+** 
+**  This file is part of Vidalia, and is subject to the license terms in the
+**  LICENSE file, found in the top level directory of this distribution. If 
+**  you did not receive the LICENSE file with this file, you may obtain it
+**  from the Vidalia source package distributed by the Vidalia Project at
+**  http://www.torproject.org/projects/vidalia.html. No part of Vidalia, 
+**  including this file, may be copied, modified, propagated, or distributed 
+**  except according to the terms described in the LICENSE file.
+-->
+<html>
+<body>
+
+<h1>Configuring Vidalia and Tor</h1>
+<hr />
+
+<p>
+Vidalia allows you to configure some of the most commonly modified aspects
+of Vidalia and Tor. It also lets you set up and manage a <a
+href="server.html">Tor relay</a> so you can help the Tor network grow.
+</p>
+
+<a name="general"/>
+<h3>General Settings</h3>
+<p>
+Settings on the <i>General</i> page are the most commonly modified settings.
+</p>
+<ul>
+  <li><b>Tor Executable</b>: This is the Tor executable that Vidalia will run when
+you select <i>Start</i> from the tray menu. If you have multiple versions of
+Tor installed, you can tell Vidalia which version you would like to run by
+clicking the <i>Browse</i> button and navigating to the particular Tor
+installation you want.
+  </li>
+  <li><b>Startup Options</b>: This setting allows you to have Vidalia
+automatically start Tor when Vidalia starts. You can also configure Vidalia
+to run when your system starts (<i>Windows only</i>).
+  </li>
+</ul>
+
+<a name="network"/>
+<h3>Network Settings</h3>
+<p>
+The <i>Network</i> settings page lets you change how Tor connects to the Tor
+network.
+</p>
+<ul>
+  <li><b>I use a proxy to access the Internet</b>: If your Internet connection
+requires an HTTP proxy, you can configure Tor to send all of its directory
+requests and Tor relay connections through your proxy. You must specify at
+least the hostname or address of your proxy, and the port on which your
+proxy is listening for connections. If your proxy requires authentication,
+you can also enter the <i>Username</i> and <i>Password</i> you use to
+connect to your proxy.  Otherwise, you can leave those fields blank.
+  </li>
+  <li><b>My firewall only lets me connect to certain ports</b>: If you are behind
+a restrictive firewall or proxy that limits the ports you are able to
+connect to, you can configure Tor to connect directly only to relays
+listening on the ports allowed by your firewall or proxy. Simply enter a
+list of ports permitted by your firewall or proxy, separated by
+commas. (<i>Example: 80,443,8080</i>)
+  </li>
+  <li><b>My ISP blocks connections to the Tor network</b>: If your ISP (Internet
+Service Provider) blocks connections to the Tor network, Tor can attempt to
+avoid being filtered by encrypting its directory connections and connecting
+to the Tor network through relays called <i>bridges</i> (Tor 0.2.0.3-alpha
+or newer only). You can add bridge relays by specifying either their address
+and port number, or their address, port number, and fingerprint.<br/>
+
+    Below are examples of valid bridge address formats:
+    <ul>
+      <li>
+        128.213.48.13:8080
+      </li>
+      <li>
+        128.213.48.13:8080 1054 13B1 DBDA F867 B226 74D2 52DF 3D9F A367 1F73
+      </li>
+      <li>
+        128.213.48.13:8080 105413B1DBDAF867B22674D252DF3D9FA3671F73
+      </li>
+    </ul>
+    Even if you do not know any bridge relay addresses, checking this checkbox
+may still be helpful. Tor will encrypt its directory requests, which can
+defeat blocking mechanisms that try to filter Tor's requests for information
+about other relays. If connections to normal Tor relays are also blocked,
+then you will need to learn a bridge relay address somehow and add it
+here. See the help topic on <a href="bridges.html#finding">finding bridge
+relays</a> for more information on how to learn new bridge relay addresses
+and fingerprints.
+  </li>
+</ul>
+
+<a name="relay"/>
+<h3>Relay Settings</h3>
+<p>
+<i> See <a href="server.html">this help topic</a> for detailed information
+about setting up and managing a Tor relay.  </i>
+</p>
+
+<a name="appearance"/>
+<h3>Appearance Settings</h3>
+<p>
+The settings on the <i>Appearance</i> page allow you to customize the look
+and feel of Vidalia.
+</p>
+<ul>
+  <li><b>Language</b>: Vidalia's interface has been translated into many languages
+by helpful volunteers. When Vidalia is first run, it will try to guess which
+language your computer is currently using. If Vidalia guesses incorrectly,
+or if you prefer a different language, you can choose another language from
+the dropdown box. You will need to restart Vidalia after changing the
+displayed language for the changes to take effect.
+  </li>
+  <li><b>Style</b>: In most cases, Vidalia will default to using your platform's
+default interface style. If you dislike the default, you can choose
+whichever interface style you prefer from the dropdown box.
+  </li>
+</ul>
+
+<a name="advanced"/>
+<h3>Advanced Settings</h3>
+<p>
+The settings on the <i>Advanced</i> page should generally only be modified
+by more experienced users.
+</p>
+<ul>
+  <li><b>Control Address &amp; Port</b>: The <i>Control Port</i> is the port which
+Vidalia uses to talk to Tor.  This doesn't need to be changed unless you
+have a conflict with another service on your machine, or if you are using
+Vidalia to control and monitor a Tor process running on another machine.
+  </li>
+  <li><b>Control Port Authentication</b>: Control port authentication is used to
+limit the applications on your machine that can connect to and reconfigure
+your Tor installation. The available authentication methods are:
+    <ul>  
+      <li>
+        <b>None</b> -- No authentication is required. Use of this option is
+<b>strongly</b> discouraged. Any application or user on your computer can
+reconfigure your Tor installation.
+      </li>
+      <li> 
+        <b>Password</b> <i>(Default)</i> -- If this method is selected, you can
+specify a password that Tor will require each time a user or application
+connects to Tor's control port. If Vidalia starts Tor for you, you can have
+Vidalia randomly generate a new password each time it starts Tor by checking
+the <i>Randomly Generate</i> checkbox.
+      </li>
+      <li>
+        <b>Cookie</b> -- If cookie authentication is selected, Tor will write a file
+(or, <i>cookie</i>) containing random bytes to its data directory when it
+starts. Any user or application that tries to connect to Tor's control port
+must be able to provide the contents of this cookie.
+      </li>
+    </ul>
+  </li>
+  <li><b>Tor Configuration File</b> <i>(optional)</i>: You can use this option to
+have Vidalia start Tor using a specific <i>torrc</i>, Tor's configuration
+file. If you leave this field blank, Tor will uses its own default torrc
+location.
+  </li>
+  <li><b>Tor Data Directory</b> <i>(optional)</i>: You can specify the directory
+in which Tor will store its saved data, such as cached Tor relay
+information, Tor relay keys, and configuration files. If you leave this
+field blank, Tor will use its own default data directory location.
+  </li>
+  <li><b>Permissions</b> <i>(optional, not available on Windows)</i>: If you enter
+a value for <b>Run as User</b>, Tor will <i>setuid</i> to this user when it
+starts.  If you enter a value for <b>Run as Group</b>, Tor will
+<i>setgid</i> to this group when it starts.
+  </li>
+</ul>
+
+<a name="services"/>
+<h3>Hidden Service Settings</h3>
+<p>
+Hidden services allow you to provide any kind of TCP-based service, e.g.  an
+HTTP service, to others without revealing your IP address.
+</p>
+
+</body>
+</html>
+
diff --git a/src/vidalia/help/content/nap/index.html b/src/vidalia/help/content/nap/index.html
new file mode 100644
index 0000000..378a4cd
--- /dev/null
+++ b/src/vidalia/help/content/nap/index.html
@@ -0,0 +1,41 @@
+
+
+<!--
+**  $Id$
+** 
+**  This file is part of Vidalia, and is subject to the license terms in the
+**  LICENSE file, found in the top level directory of this distribution. If 
+**  you did not receive the LICENSE file with this file, you may obtain it
+**  from the Vidalia source package distributed by the Vidalia Project at
+**  http://www.torproject.org/projects/vidalia.html. No part of Vidalia, 
+**  including this file, may be copied, modified, propagated, or distributed 
+**  except according to the terms described in the LICENSE file.
+-->
+<html>
+<body>
+
+<h1>Vidalia Help</h1>
+<hr />
+
+<p>
+Select a help topic from the tree on the left or click on the Search button
+above the list of topics to search through all available help topics.
+</p>
+
+<p>
+You can use the <i>Find</i> button on the toolbar above to search within a
+particular help topic.
+</p>
+
+<p>
+The <i>Home</i> button above will bring you back to this home page.
+</p>
+
+<p>
+See the <a href="links.html">Helpful Links</a> topic for some places you can
+visit to find additional help and information about Vidalia and Tor.
+</p>
+
+</body>
+</html>
+
diff --git a/src/vidalia/help/content/nap/links.html b/src/vidalia/help/content/nap/links.html
new file mode 100644
index 0000000..d2f441a
--- /dev/null
+++ b/src/vidalia/help/content/nap/links.html
@@ -0,0 +1,67 @@
+
+
+<!--
+**  $Id$
+** 
+**  This file is part of Vidalia, and is subject to the license terms in the
+**  LICENSE file, found in the top level directory of this distribution. If 
+**  you did not receive the LICENSE file with this file, you may obtain it
+**  from the Vidalia source package distributed by the Vidalia Project at
+**  http://www.torproject.org/projects/vidalia.html. No part of Vidalia, 
+**  including this file, may be copied, modified, propagated, or distributed 
+**  except according to the terms described in the LICENSE file.
+-->
+<html>
+<body>
+
+<h1>Helpful Links</h1>
+<hr />
+
+<h3>Vidalia</h3>
+<table>
+<tr>
+  <td>&nbsp;&nbsp;&nbsp;</td>
+  <td>Homepage</td>
+  <td>
+    <a href="https://www.torproject.org/vidalia/">
+https://www.torproject.org/vidalia/</a>
+  </td>
+</tr>
+<tr>
+  <td>&nbsp;&nbsp;&nbsp;</td>
+  <td>Wiki and Bugtracker</td>
+  <td>
+    <a href="http://trac.torproject.org/"> http://trac.torproject.org/</a>
+  </td>
+</tr>
+</table>
+
+<h3>Tor</h3>
+<table>
+<tr>
+  <td>&nbsp;&nbsp;&nbsp;</td>
+  <td>Homepage</td>
+  <td>
+    <a href="https://www.torproject.org/">https://www.torproject.org/</a>
+  </td>
+</tr>
+<tr>
+  <td>&nbsp;&nbsp;&nbsp;</td>
+  <td>FAQ</td>
+  <td>
+    <a href="https://www.torproject.org/docs/faq.html">
+https://www.torproject.org/docs/faq.html</a>
+  </td>
+</tr>
+<tr>
+  <td>&nbsp;&nbsp;&nbsp;</td>
+  <td>Wiki and Bugtracker</td>
+  <td>
+    <a href="https://trac.torproject.org/"> https://trac.torproject.org/</a>
+  </td>
+</tr>
+</table>
+
+</body>
+</html>
+
diff --git a/src/vidalia/help/content/nap/log.html b/src/vidalia/help/content/nap/log.html
new file mode 100644
index 0000000..b0ef886
--- /dev/null
+++ b/src/vidalia/help/content/nap/log.html
@@ -0,0 +1,102 @@
+
+
+<!--
+**  $Id$
+** 
+**  This file is part of Vidalia, and is subject to the license terms in the
+**  LICENSE file, found in the top level directory of this distribution. If 
+**  you did not receive the LICENSE file with this file, you may obtain it
+**  from the Vidalia source package distributed by the Vidalia Project at
+**  http://www.torproject.org/projects/vidalia.html. No part of Vidalia, 
+**  including this file, may be copied, modified, propagated, or distributed 
+**  except according to the terms described in the LICENSE file.
+-->
+<html>
+<body>
+
+<h1>Message Log</h1>
+<hr />
+
+The message log lets you see status information about a running Tor
+process.  <a name="basic"/> Each message has a <i>severity</i> associated
+with it, ranging from <b>Error</b> (most serious) to <b>Debug</b> (most
+verbose). See the help section on <a href="#severities">message
+severities</a> for more information.  <a name="severities"/>
+<h3>Message Severities</h3>
+<p>
+A message's severity tells you how important the message is. A higher
+severity message usually indicates that something has gone wrong with
+Tor. Lower severity messages appear frequently during normal Tor operations
+and usually do not need to be logged.
+</p>
+
+<p>
+The possible message severities, from most severe to least severe, are:
+</p>
+<ul>
+  <li>
+    <b>Error</b>: Messages that appear when something has gone very wrong and
+Tor cannot proceed. These messages will be highlighted in <i>red</i> in the
+message log.
+  </li>
+  <li>
+    <b>Warning</b>: Messages that only appear when something has gone wrong with
+Tor, but are not fatal and Tor will continue running. These messages will be
+highlighted in <i>yellow</i>.
+  </li>
+  <li>
+    <b>Notice</b>: Messages that appear infrequently during normal Tor operation
+and are not considered errors, but you still may care about.
+  </li>
+  <li>
+    <b>Info</b>: Messages that appear frequently during normal Tor operation and
+are not usually of interest to most users.
+  </li>
+  <li>
+    <b>Debug</b>: Extremely verbose messages that are primarily of interest to
+developers. You should generally not log debug messages unless you know what
+you are doing.
+  </li>
+</ul>
+
+<p>
+Most users should only log <i>Error</i>, <i>Warning</i>, and <i>Notice</i>
+messages.
+</p>
+
+<p>
+To select which message severities you would like to see, do the following:
+<ol>
+  <li>Open the message log from the Vidalia tray menu.</li>
+  <li>Click on <i>Settings</i> at the top of the message log window.</li>
+  <li>
+    Check message severities you would like to see from the Message Filter group
+on the left and uncheck message severities you would like to hide.
+  </li>
+  <li>Click <i>Save Settings</i> to apply your new message filter.</li>
+</ol>
+</p>
+
+
+<a name="logfile"/>
+<h3>Logging to a File</h3>
+<p>
+Vidalia can also write log messages to a file, as well as logging them in
+the message log window. To enable logging to a file, follow these steps:
+</p>
+
+<ol>
+  <li>Open the message log from the Vidalia tray menu.</li>
+  <li>Click on <i>Settings</i> at the top of the message log window.</li>
+  <li>Check the box labeled <i>Automatically save new log messages to a file</i>.</li>
+  <li>
+    If you would like to change the file to which messages will be written,
+either type the path and filename into the text box, or click <i>Browse</i>
+to navigate to a location for your log file.
+  </li>
+  <li>Click <i>Save Settings</i> to save your log destination.</li>
+</ol>
+
+</body>
+</html>
+
diff --git a/src/vidalia/help/content/nap/netview.html b/src/vidalia/help/content/nap/netview.html
new file mode 100644
index 0000000..bdb2f50
--- /dev/null
+++ b/src/vidalia/help/content/nap/netview.html
@@ -0,0 +1,174 @@
+
+
+<!--
+**  $Id$
+** 
+**  This file is part of Vidalia, and is subject to the license terms in the
+**  LICENSE file, found in the top level directory of this distribution. If 
+**  you did not receive the LICENSE file with this file, you may obtain it
+**  from the Vidalia source package distributed by the Vidalia Project at
+**  http://www.torproject.org/projects/vidalia.html. No part of Vidalia, 
+**  including this file, may be copied, modified, propagated, or distributed 
+**  except according to the terms described in the LICENSE file.
+-->
+<html>
+<body>
+
+<h1>Network Viewer</h1>
+<hr />
+
+<p>
+The network viewer lets you see relays in the Tor network and where your
+traffic is going.
+</p>
+
+
+<a name="overview"/>
+<h3>Overview</h3>
+<p>
+When you want to communicate anonymously through Tor (say, connecting to a
+website), Tor creates a tunnel, or <i>circuit</i>, of encrypted connections
+through a series of relays on the network. Your application's traffic is
+then sent as a <i>stream</i> through that circuit. For efficiency, multiple
+streams may share the same circuit.
+</p>
+
+<a name="netmap"/>
+<h3>Network Map</h3>
+<p>
+The network map consists of a map of the world, with red pinpoints
+indicating the geographic location of relays in the Tor network. Green lines
+are drawn between relays to indicate the path of circuits that your Tor
+client has created through the Tor network.
+</p>
+<p>
+You can zoom in on locations in the map by clicking the <b>Zoom In</b> and
+<b>Zoom Out</b> buttons in the toolbar. You can also scroll around on the
+map by clicking on the map and then dragging it in whatever direction you
+would like to move the map.
+</p>
+<p>
+The geographic location of a Tor relay is determined by looking up the IP
+address of the relay in a GeoIP database, created by MaxMind and located at
+geoip.vidalia-project.net.
+</p>
+<p>
+In the middle of the dialog, below the network map, you will see a list of
+your current circuits, as well as any application traffic currently on those
+circuits. When the network map first loads, you will probably see a
+connection to geoip.vidalia-project.net, which occurs when Vidalia is
+looking up geographic information for the list of Tor relays. It is
+important to note that this request is done through Tor, so your location is
+not revealed to the GeoIP relay. The results of the lookups will be cached
+locally in order to reduce load on Vidalia's GeoIP relays.
+</p>
+
+
+<a name="relaylist"/>
+<h3>Relay Status</h3>
+<p>
+On the left side of the network view, you will see a list of relays in the
+Tor network. Next to each relay is an icon indicating that relay's status.
+The following table summarizes the possible relay status icons:
+</p>
+<p>
+<table border="1">
+<tr>
+  <td><img src="qrc:/images/icons/node-unresponsive.png"/></td>
+  <td valign="middle">
+    The relay is offline or simply not responding.
+  </td>
+</tr>
+<tr>
+  <td><img src="qrc:/images/icons/node-hibernating.png"/></td>
+  <td valign="middle">
+    The relay is <i>hibernating</i>, meaning it is online, but has used up as
+much bandwidth as the operator is willing to allow for a given time period.
+  </td>
+</tr>
+<tr>
+  <td><img src="qrc:/images/icons/node-bw-none.png"/></td>
+  <td valign="middle">
+    The relay is online, but has shown only minimal throughput.
+  </td>
+</tr>
+<tr>
+  <td><img src="qrc:/images/icons/node-bw-low.png"/></td>
+  <td valign="middle">
+    The relay is online and has shown a throughput &gt;= 20 KB/s.
+  </td>
+</tr>
+<tr>
+  <td><img src="qrc:/images/icons/node-bw-med.png"/></td>
+  <td valign="middle">
+    The relay is online and has shown a throughput &gt;= 60 KB/s.
+  </td>
+</tr>
+<tr>
+  <td><img src="qrc:/images/icons/node-bw-high.png"/></td>
+  <td valign="middle">
+    The relay is online and has shown a throughput &gt;= 400 KB/s.
+  </td>
+</tr>
+</table>
+</p>
+<p>
+All bandwidth values are estimates based on the minimum of either the
+maximum bandwidth sustained input or output over any ten second period in
+the past day.
+</p>
+
+
+<a name="details"/>
+<h3>Relay Details</h3>
+<p>
+The relay details panel at the right side of the screen gives you details
+about the relay or relays currently selected in the <a
+href="#relaylist">relay list</a>. If you have selected a circuit or stream
+in the list of your current circuits and streams, this panel will show you
+details about each relay through which your traffic is currently being sent.
+</p>
+<p>
+The fields that you may see in the panel are as follows (<i>Note</i>: not
+all of these fields will always be present):
+</p>
+<p>
+<table>
+<tr>
+  <td><b>Location</b></td>
+  <td>The geographic location of this Tor relay.</td>
+</tr>
+<tr>
+  <td><b>IP Address</b></td>
+  <td>IP address at which this Tor relay can be reached.</td>
+</tr>
+<tr>
+  <td><b>Platform</b></td>
+  <td>
+    Operating system information and Tor version on which this relay is
+currently running.
+  </td>
+</tr>
+<tr>
+  <td><b>Bandwidth</b></td>
+  <td>
+    Estimated maximum amount of bandwidth that the directory relays have seen
+this relay handle recently.
+  </td>
+</tr>
+<tr>
+  <td><b>Uptime</b></td>
+  <td>
+    Length of time this relay has been available, which can be used to help
+estimate this relay's stability.
+  </td>
+</tr>
+<tr>
+  <td><b>Last Updated</b></td>
+  <td>Date this relay's information was last updated.</td>
+</tr>
+</table>
+</p>
+</body>
+</html>
+
diff --git a/src/vidalia/help/content/nap/running.html b/src/vidalia/help/content/nap/running.html
new file mode 100644
index 0000000..2e84804
--- /dev/null
+++ b/src/vidalia/help/content/nap/running.html
@@ -0,0 +1,105 @@
+
+
+<!--
+**  $Id$
+** 
+**  This file is part of Vidalia, and is subject to the license terms in the
+**  LICENSE file, found in the top level directory of this distribution. If 
+**  you did not receive the LICENSE file with this file, you may obtain it
+**  from the Vidalia source package distributed by the Vidalia Project at
+**  http://www.torproject.org/projects/vidalia.html. No part of Vidalia, 
+**  including this file, may be copied, modified, propagated, or distributed 
+**  except according to the terms described in the LICENSE file.
+-->
+<html>
+<body>
+
+<h1>Running Tor</h1>
+<hr />
+
+<p>
+Vidalia can help you control your Tor process by letting you start and stop
+Tor, as well as monitoring Tor's status and letting you know if it exits
+unexpectedly.
+</p>
+
+<a name="starting"/>
+<h3>Starting and Stopping Tor</h3>
+<p>
+To <i>start</i> Tor,
+<ol>
+  <li>Select <i>Start</i> from Vidalia's tray menu or press <i>Ctrl+S</i></li>.
+  <li>
+    Vidalia's tray icon will change from an onion with a red X to a green onion
+when Tor has started.
+  </li>
+</ol>
+If Vidalia is unable to start Tor, Vidalia will display an error message
+telling you what went wrong. You can also look at your <a
+href="log.html">message log</a> to see if Tor printed any more information
+about what went wrong.
+</p>
+
+<p>
+To <i>stop</i> Tor,
+<ol>
+  <li>Select <i>Stop</i> from Vidalia's tray menu or press <i>Ctrl+T</i></li>.
+  <li>
+    Vidalia's tray icon will change from a green onion to a gray onion with a
+red X when Tor has stopped.
+  </li>
+</ol>
+If Vidalia was unable to stop Tor, Vidalia will display an error message
+telling you what went wrong. You can also look at your <a
+href="log.html">message log</a> to see if Tor printed any more information
+about what went wrong.
+</p>
+
+<a name="monitoring"/>
+<h3>Monitoring Tor's Status</h3>
+<p>
+Vidalia tells you about the status of Tor by displaying an icon in your
+system tray or dock area. The following table shows the different states
+indicated by an icon in your system's notification area:
+</p>
+<p>
+<table border="1">
+<tr>
+    <td><img src="qrc:/images/32x32/tor-off.png"/></td>
+    <td valign="middle">
+      Tor is stopped. Select <i>Start</i> from the Vidalia menu to start Tor.
+    </td>
+</tr>
+<tr>
+    <td><img src="qrc:/images/32x32/tor-starting.png"/></td>
+    <td valign="middle">
+      Tor is starting up. You can check the <a href="log.html">message log</a> for
+status information about Tor while it is starting.
+    </td>
+</tr>
+<tr>
+    <td><img src="qrc:/images/32x32/tor-on.png"/></td>
+    <td valign="middle">
+      Tor is running. If you want to stop Tor, select <i>Stop</i> from the Vidalia
+menu. Tor will print informational messages to the <a
+href="log.html">message log</a> while it is running, if you want to see what
+Tor is doing.
+    </td>
+</tr>
+<tr>
+    <td><img src="qrc:/images/32x32/tor-stopping.png"/></td>
+    <td valign="middle">Tor is in the process of shutting down.</td>
+</tr>
+</table>
+</p>
+
+<p>
+If Tor exits unexpectedly, Vidalia will change its icon to the dark onion
+with a red X and display an error message letting you know what went
+wrong. You can also check the <a href="log.html">message log</a> for details
+about any problems Tor encountered before it exited.
+</p>
+
+</body>
+</html>
+
diff --git a/src/vidalia/help/content/nap/server.html b/src/vidalia/help/content/nap/server.html
new file mode 100644
index 0000000..f7baa0f
--- /dev/null
+++ b/src/vidalia/help/content/nap/server.html
@@ -0,0 +1,238 @@
+
+
+<!--
+**  $Id$
+** 
+**  This file is part of Vidalia, and is subject to the license terms in the
+**  LICENSE file, found in the top level directory of this distribution. If 
+**  you did not receive the LICENSE file with this file, you may obtain it
+**  from the Vidalia source package distributed by the Vidalia Project at
+**  http://www.torproject.org/projects/vidalia.html. No part of Vidalia, 
+**  including this file, may be copied, modified, propagated, or distributed 
+**  except according to the terms described in the LICENSE file.
+-->
+<html>
+<body>
+
+<h1>Setting Up a Tor Relay</h1>
+<hr />
+
+The Tor network is made up of volunteers all over the world who donate some
+of their spare bandwidth by running a Tor relay. Vidalia helps you do your
+part by making it easy to set up a relay of your own.  <a name="basic"/>
+<h3>Basic Settings</h3>
+<p>
+If you decide you want to help the Tor network grow by running a relay, you
+can follow these steps to get started:
+</p>
+<ol>
+  <li>
+    Open the <i>Configuration Dialog</i> by selecting <i>Settings</i> from the
+tray menu or <i>Preferences</i> from your system menubar on Macintosh
+systems.
+  </li>
+  <li>Select the <i>Relay</i> configuration page.</li>
+  <li>
+    Decide whether you want to run a normal Tor relay or a <i>bridge</i> relay
+(Tor 0.2.0.8-alpha or newer). Bridge relays help censored Tor users who are
+blocked from accessing the Tor network directly.  Check the box labeled
+<i>Relay traffic for the Tor network</i> if you want to run a normal Tor
+relay or <i>Help censored users reach the Tor network</i> if you want to run
+a bridge relay.
+  </li>
+  <li>Enter the following information:</li>
+    <ul>
+      <li><b>Nickname</b>: The name which your relay will be known as on the Tor
+network. An example of a relay nickname is "MyVidaliaRelay".
+      </li>
+      <li><b>Contact Info</b>: Your e-mail address. This address will only be used to
+contact you in case there is an important Tor security update or something
+goes wrong with your relay. You might also include your PGP or GPG key ID
+and fingerprint.
+      </li>
+      <li><b>Relay Port</b>: The port on which your relay will listen for traffic from
+clients or other Tor relays.
+      </li>
+    </ul>
+  <li>
+    If you would like to mirror Tor's directory of relays for others on the
+network you can check the box labeled <i>Mirror the Relay Directory</i>.  If
+you do not have much bandwidth, uncheck this box. If you do decide to mirror
+the relay directory, make sure the <i>Directory Port</i> is different than
+the <i>Relay port</i> you entered above. Bridge relays <i>must</i> mirror
+the relay directory.
+  </li>
+</ol>
+
+<a name="bandwidth"/>
+<h3>Bandwidth Limits</h3>
+<p>
+Running a Tor relay can consume a large amount of bandwidth; however, Tor
+allows you to limit the amount of bandwidth that you are willing to
+contribute to the Tor network. You can run a relay, while still keeping your
+network connection usable for your own use.
+</p>
+<p>
+You should select the option in the dropdown box that best matches your
+connection speed. If you select <i>Custom</i>, you will be able to specify
+your own limits.
+</p>
+<h4>Custom Limits</h4>
+<p>
+The <i>maximum rate</i> is a pool of bytes used to fulfill requests during
+short periods of traffic higher than your specified <i>average rate</i>, but
+still maintains the average over a long period. A low average rate but a
+high maximum rate enforces a long-term average while still allowing more
+traffic during peak times if the average hasn't been reached lately. If your
+average rate is the same as your <i>maximum rate</i>, then Tor will never
+exceed the specified rate. Your <i>maximum rate</i> must always be greater
+than or equal to your <i>average rate</i>.
+</p>
+<p>
+The <i>average rate</i> is the maximum long-term average bandwidth allowed
+(in kilobytes per second). For example, you might want to choose 2 megabytes
+per second (2048 KB/s), or 50 kilobytes per second (a medium-speed cable
+connection). Tor requires a minimum of 20 kilobytes per second to run a
+relay.
+</p>
+<p>
+It is important to remember that Tor measures bandwidth in <b>bytes</b>, not
+bits. Also, Tor only looks at incoming bytes instead of outgoing bytes. For
+example, if your relay acts as a directory mirror, you may be sending more
+outgoing bytes than incoming. If you find this is the case and is putting
+too much strain on your bandwidth, you should consider unchecking the
+checkbox labeled <i>Mirror the relay directory</i>.
+</p>
+
+<a name="exitpolicy"/>
+<h3>Exit Policies</h3>
+<p>
+Exit policies give you a way to specify what kinds of resources on the
+Internet you are willing let other Tor users access from your Tor relay.
+Tor uses a default list of exit policies that restrict some services, such
+as mail to prevent spam and some default file sharing ports to reduce abuse
+of the Tor network. 
+</p>
+<p>
+Each of the checkboxes represents a type of resource that you can allow Tor
+users to access through your relay. If you uncheck the box next to a
+particular type of resource, Tor users will not be allowed to access that
+resource from your relay. If the box labeled <i>Misc Other Services</i> is
+checked, Tor users will be able to access other services not covered by the
+other checkboxes or Tor's default exit policy.
+</p>
+
+<p>
+For completeness, the following table lists the specific port numbers
+represented by each of the exit policy checkboxes. The <b>Description</b>
+column describes the resources Tor clients will be allowed to access through
+your relay, if the associated box is checked.
+</p>
+
+<table border="1">
+<tr>
+  <td><b>Checkbox</b></td>
+  <td><b>Ports</b></td>
+  <td><b>Description</b></td>
+</tr>
+<tr>
+  <td>Websites</td>
+  <td valign="middle">80</td>
+  <td>Normal, unencrypted Web browsing</td>
+</tr>
+<tr>
+  <td>Secure Websites (SSL)</td>
+  <td valign="middle">443</td>
+  <td>Encrypted Web browsing</td>
+</tr>
+<tr>
+  <td>Retrieve Mail (POP, IMAP)</td>
+  <td valign="middle">110, 143, 993, 995</td>
+  <td>Downloading email (does not permit sending email)</td>
+</tr>
+<tr>
+  <td>Instant Messaging (IM)</td>
+  <td valign="middle">703, 1863, 5050, 5190, 5222, 5223, 8300, 8888</td>
+  <td>Instant messaging applications like MSN Messenger, AIM, ICQ, and Jabber</td>
+</tr>
+<tr>
+  <td>Internet Relay Chat (IRC)</td>
+  <td valign="middle">6660-6669, 6697, 7000-7001</td>
+  <td>IRC clients and servers</td>
+</tr>
+<tr>
+  <td>Misc. Other Services</td>
+  <td valign="middle">*</td>
+  <td>All other applications that aren't covered by the previous checkboxes</td>
+</tr>
+</table>
+
+<p>
+If you do not want to let other Tor users make connections outside the Tor
+network from your relay, you can uncheck all of the checkboxes. Even if you
+uncheck all of the checkboxes, your relay is still useful to the Tor
+network.  Your relay will allow other Tor users to connect to the Tor
+network and will help relay traffic between other Tor relays.
+</p>
+<p>
+If you chose to run a bridge relay, the <i>Exit Policies</i> tab will be
+grayed out, since bridge relays do not allow exit connections. Bridges are
+only used by Tor clients to connect to the Tor network.
+</p>
+
+
+<a name="upnp"/>
+<h3>Port Forwarding</h3>
+<p>
+Many home users connect to the Internet via a <i>router</i>, which allows
+multiple computers on a local network to share the same Internet
+connection.  Some users may also be behind a <i>firewall</i> that blocks
+incoming connections to your computer from other computers on the Internet.
+If you want to run a Tor relay, however, other Tor clients and relays must
+be able to connect to your relay through your home router or firewall. 
+</p>
+
+<p>
+To make your relay publicly accessible, your router or firewall needs to
+know which ports to allow through to your computer by setting up what is
+known as <i>port forwarding</i>. Port forwarding configures your router or
+firewall to "forward" all connections to certain ports on your router or
+firewall to local ports on your computer.
+</p>
+
+<p>
+If you check the box labeled <i>Attempt to automatically configure port
+forwarding</i>, Vidalia will attempt to automatically set up port forwarding
+on your local network connection so that other Tor clients can connect to
+your relay. Not all routers support automatic port forwarding, though. You
+can use the <i>Test</i> button next to the checkbox to find out if Vidalia
+is able to automatically set up port forwarding for you.
+</p>
+
+<p>
+If the <i>Test</i> button finds that Vidalia is unable to set up port
+forwarding for you, you may need to enable this feature on your router or
+set up port forwarding manually. Some network devices have a feature called
+<i>Universal Plug-and-Play</i> (UPnP). If you can access your router's
+administrative interface, you should look for an option to enable UPnP. The
+administrative interface for most routers can be accessed by opening <a
+href="http://192.168.0.1/">http://192.168.0.1</a> or <a
+href="http://192.168.1.1/">http://192.168.1.1</a> in your Web browser. You
+should consult your router's instruction manual for more information.
+</p>
+
+<p>
+If you need to set up port forwarding manually, the website <a
+href="http://www.portforward.com/english/routers/port_forwarding/routerindex.htm">
+portforward.com</a> has instructions for how to set up port forwarding for
+many types of routers and firewalls. At a minimum, you will need to forward
+your <i>Relay Port</i>, which defaults to port 443 on Windows and 9001 on
+all other operating systems. If you also checked the checkbox labeled
+<i>Mirror the relay directory</i>, then you will also need to forward your
+<i>Directory Port</i>. The <i>Directory Port</i> is set to port 9030 by
+default on all operating systems.
+</p>
+
+</body>
+</html>
+
diff --git a/src/vidalia/help/content/nap/services.html b/src/vidalia/help/content/nap/services.html
new file mode 100644
index 0000000..9d30a80
--- /dev/null
+++ b/src/vidalia/help/content/nap/services.html
@@ -0,0 +1,138 @@
+
+
+<!--
+**  $Id $
+** 
+**  This file is part of Vidalia, and is subject to the license terms in the
+**  LICENSE file, found in the top level directory of this distribution. If 
+**  you did not receive the LICENSE file with this file, you may obtain it
+**  from the Vidalia source package distributed by the Vidalia Project at
+**  http://www.torproject.org/projects/vidalia.html. No part of Vidalia, 
+**  including this file, may be copied, modified, propagated, or distributed 
+**  except according to the terms described in the LICENSE file.
+-->
+<html>
+<body>
+
+<h1>Hidden Services</h1>
+<hr />
+
+Remark: Support for hidden services is new in Vidalia. You should expect it
+to have bugs, some of which possibly corrupting your hidden service
+configuration. So, don't rely on it, or rather, don't blame us if something
+goes wrong. If you find bugs or have comments on this new feature, please
+let us know! We need your feedback.  <a name="about"/>
+<h3>What is a hidden service?</h3>
+<p>
+Hidden services allow you to provide any kind of TCP-based service, e.g. an
+HTTP service, to others without revealing your IP address. The protocol to
+provide a hidden service is built on top of the same circuits that Tor uses
+for anonymous browsing and roughly has similar anonymity properties.
+</p>
+
+<p>
+For more information on hidden service you may want to read section 5 of
+Tor's design paper (doc/design-paper/tor-design.pdf) or the Rendezvous
+Specification (doc/spec/rend-spec.txt).
+</p>
+
+<a name="provide"/>
+<h3>How do I provide a hidden service?</h3>
+<p>
+Providing a hidden service consists of at least two steps:
+<ol>
+  <li>Install a web server locally (or a server for whatever service you want to
+provide, e.g. IRC) to listen for local requests.</li>
+  <li>Configure your hidden service, so that Tor relays requests coming from Tor
+users to your local server.</li>
+</ol>
+There is a fine tutorial on the Tor website
+(https://www.torproject.org/docs/tor-hidden-service.html) that describes
+these steps in more detail.
+</p>
+
+<a name="data"/>
+<h3>What data do I need to provide?</h3>
+<p>
+The services table contains five columns containing data about configured
+hidden services:
+<ul>
+  <li>Onion Address (generated): The service (or onion) address is generated by
+Tor to uniquely identify your service. Give this onion address to the people
+who shall be able to access your service. You may use the "Copy to
+clipboard" button for that to avoid typos. If you have just created a hidden
+service, the field says "[Created by Tor]"; in order to make it display the
+real onion address, you need to save your configuration and re-open the
+settings window.</li>
+  <li>Virtual Port (required): This is the TCP port that clients will need to know
+in order to access your service. Typically, you will want to use the
+service-specific port here, e.g. port 80 for HTTP. Note that the virtual
+port usually has nothing to do with firewall settings, because it is only
+used Tor-internally.</li>
+  <li>Target (optional): Usually you want Tor to relay connection requests to
+localhost on a different port than the one you specified in "Virtual
+Port". Therefore, you can specify a target consisting of physical address
+and port to which requests to your hidden service are redirected, e.g. to
+localhost:5222 (or on whatever port your server is listening). If you don't
+specify any target, Tor will redirect requests to the port specified in
+"Virtual Port" on localhost.</li>
+  <li>Service Directory (required): Tor needs to store some hidden-service
+specific files in a separate directory, e.g. a private key and a hostname
+file containing the onion address. This directory should be distinct from a
+directory containing content that the service provides. A good place for a
+service directory might be a sub directory in Tor's data directory. -- Note
+that you cannot change the directory of a running service (it wouldn't make
+much sense to allow it, because Vidalia is not supposed to move directories
+on your hard disk!). If you want to move a hidden service to another
+directory, please proceed as follows: Start by disabling the service in
+Vidalia and save the configuration. Then move the directory on your hard
+disk to the new place. Finally, change the directory in Vidalia to the new
+location, enable the service again, and save the new configuration.</li>
+  <li>Enabled: If this checkbox is disabled, Vidalia will not configure the given
+hidden service in Tor. This can be useful for keeping the configuration of a
+currently unused service for later use. All non-enabled services are stored
+in the Vidalia-specific configuration file vidalia.conf.</li>
+</ul>
+</p>
+
+<a name="buttons"/>
+<h3>What are the five buttons used for?</h3>
+<p>
+<ul>
+  <li>Add service: Creates a new empty service configuration.</li>
+  <li>Remove service: Permanently removes a hidden service configuration.  (If you
+want to temporarily remove a service, uncheck its Enabled checkbox.)</li>
+  <li>Copy to clipboard: Copies the onion address to the clipboard, so that you
+can tell it to whoever shall be able to use your service.</li>
+  <li>Browse: Lets you browse to find a local hidden service directory.</li>
+</ul>
+</p>
+
+<a name="advanced"/>
+<h3>How can I configure advanced hidden service settings?</h3>
+<p>
+Tor allows configuration of more specific settings for hidden services,
+e.g. forcing to use (or avoiding) certain nodes as introduction points, or
+providing multiple virtual ports for the same service.
+</p>
+
+<p>
+However, we decided to simplify things in Vidalia and provide only the most
+common settings. If you want to configure advanced settings, you need to do
+so in Tor's torrc file. Vidalia will not remove those settings even when you
+are editing your hidden services. If you specify more than one virtual port,
+only the first will be displayed and be editable.
+</p>
+
+<a name="client"/>
+<h3>How does Vidalia help me to access other hidden services?</h3>
+<p>
+Not at all. There is no need to do so. If you want to access another hidden
+service, type the service's onion address in your browser (or appropriate
+client application if it's not a web service), and Tor does the rest for
+you. There is no need to specifically configure Tor for that.
+</p>
+
+</body>
+</html>
+
diff --git a/src/vidalia/help/content/nap/troubleshooting.html b/src/vidalia/help/content/nap/troubleshooting.html
new file mode 100644
index 0000000..69b8367
--- /dev/null
+++ b/src/vidalia/help/content/nap/troubleshooting.html
@@ -0,0 +1,155 @@
+
+
+<!--
+**  $Id$
+** 
+**  This file is part of Vidalia, and is subject to the license terms in the
+**  LICENSE file, found in the top level directory of this distribution. If 
+**  you did not receive the LICENSE file with this file, you may obtain it
+**  from the Vidalia source package distributed by the Vidalia Project at
+**  http://www.torproject.org/projects/vidalia.html. No part of Vidalia, 
+**  including this file, may be copied, modified, propagated, or distributed 
+**  except according to the terms described in the LICENSE file.
+-->
+<html>
+<body>
+
+<h1>Troubleshooting</h1>
+<hr />
+
+Listed below are some of the common problems or questions people have while
+running Tor. If you can't find anything about the particular problem you're
+having, check out our website at <i>www.vidalia-project.net</i> for more
+support and information.  <a name="start"/>
+<h3>I Can't Start Tor</h3>
+<p>
+The most likely reason that Vidalia could not start Tor is because Vidalia
+is looking for your Tor installation in the wrong directory. You can tell
+Vidalia where Tor is located by updating the <i>Tor Executable</i> option in
+the <a href="config.html#general">general configuration settings</a>.
+</p>
+<p>
+Another possible reason that Tor cannot start is because there is already
+another Tor process running. Check your list of running process and stop the
+previous Tor process, if you find one. Then, try running Tor again.
+</p>
+<p>
+If that did not help, check your <a href="log.html">message log</a> to see
+if Tor printed any information about errors it encountered while trying to
+start.
+</p>
+
+<a name="connect"/>
+<h3>Vidalia Can't Connect to Tor</h3>
+<p>
+Vidalia manages Tor by communicating with it via Tor's <i>control port</i>. 
+</p>
+<p>
+The most common reason that Vidalia cannot connect to Tor is because Tor
+started, but encountered an error and exited immediately. You should check
+your <a href="log.html">message log</a> to see if Tor reported any errors
+while it started.
+</p>
+<p>
+If Tor is listening on a different port than Vidalia expects, Vidalia will
+be unable to connect to Tor. You rarely need to change this setting, but if
+there is another service running on your machine that conflicts with Tor's
+control port, you will need to specify a different port. You can change this
+setting in Vidalia's <a href="config.html#advanced">advanced configuration
+settings</a>.
+</p>
+
+<a name="password"/>
+<h3>Why is Vidalia asking me for a "control password"?</h3>
+<p>
+Vidalia interacts with the Tor software via Tor's "control port". The
+control port lets Vidalia receive status updates from Tor, request a new
+identity, configure Tor's settings, etc. Each time Vidalia starts Tor,
+Vidalia sets a random password for Tor's control port to prevent other
+applications from also connecting to the control port and potentially
+compromising your anonymity.
+</p>
+
+<p>
+Usually this process of generating and setting a random control password
+happens in the background. There are three common situations, though, where
+Vidalia may prompt you for a password:
+</p>
+
+<ul>
+  <li>
+    You're already running Vidalia and Tor. For example, this situation can
+happen if you installed the Vidalia bundle and now you're trying to run the
+Tor Browser Bundle. In that case, you'll need to close the old Vidalia and
+Tor before you can run this one.
+  </li>
+
+  <li>
+    <p>Vidalia crashed, but left Tor running with the last known random
+password. After you restart Vidalia, it generates a new random password, but
+Vidalia can't talk to Tor, because the random passwords are different.</p>
+    
+    <p>If the dialog that prompts you for a control password has a <i>Reset</i>
+button, you can click the button and Vidalia will restart Tor with a new
+random control password.
+    </p>
+    
+    <p>If you do not see a <i>Reset</i> button, or if Vidalia is unable to restart
+Tor for you, you can still fix the problem manually. Simply go into your
+process or task manager, and terminate the Tor process. Then use Vidalia to
+restart Tor and all will work again.</p>
+  </li>
+
+  <li>
+    <p>You had previously set Tor to run as a service. When Tor is set to run as a
+service, it starts up when the system boots. If you configured Tor to start
+as a service through Vidalia, a random password was set and saved in
+Tor. When you reboot, Tor starts up and uses the random password it saved.
+You login and start up Vidalia. Vidalia attempts to talk to the already
+running Tor. Vidalia generates a random password, but it is different than
+the saved password in the Tor service.</p>
+  
+    <p>You need to reconfigure Tor to not be a service. See the Tor wiki page on
+running <a
+href="https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#WinNTService">
+Tor as a service</a> for more information on how to remove the Tor service.</p>
+  </li>
+</ul>
+
+
+<a name="torexited"/> 
+<h3>Tor Exited Unexpectedly</h3> 
+<p> 
+If Tor exits immediately after trying to start, you most likely have another
+Tor process already running. Check the <a href="log.html">message log</a> to
+see if any of the last few messages in the list are highlighted in yellow
+and contain a message similar to the following:
+</p>
+<pre>
+connection_create_listener(): Could not bind to 127.0.0.1:9050: Address already in use. 
+Is Tor already running?
+</pre>
+<p>
+If you find an error message like the one above, you will need to stop the
+other Tor process before starting a new one with Vidalia. On Windows, you
+would need to look for <i>tor.exe</i> in your Task Manager. On most other
+operating systems, the <i>ps</i> command can help you find the other Tor
+process.
+</p>
+<p>
+If Tor had been running successfully for awhile (that is, longer than a few
+seconds), then you should check the <a href="log.html">message log</a> for
+information about any errors Tor experienced before it exited. Such errors
+will be highlighted in either red or yellow.
+</p>
+
+<a name="stop"/>
+<h3>Vidalia Can't Stop Tor</h3>
+<p>
+If Vidalia cannot stop Tor, you should check your <a href="log.html">message
+log</a> to see if Tor reported any errors while trying to exit.
+</p>
+
+</body>
+</html>
+





More information about the tor-commits mailing list