[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[vidalia-svn] r1452: Finish adding desolator's Spanish translation. (in trunk: . doc src/gui/help/content src/gui/help/content/es src/gui/res src/gui/res/flags src/lang)



Author: edmanm
Date: 2006-11-09 00:24:19 -0500 (Thu, 09 Nov 2006)
New Revision: 1452

Added:
   trunk/src/gui/help/content/es/
   trunk/src/gui/help/content/es/config.html
   trunk/src/gui/help/content/es/contents.xml
   trunk/src/gui/help/content/es/index.html
   trunk/src/gui/help/content/es/links.html
   trunk/src/gui/help/content/es/log.html
   trunk/src/gui/help/content/es/netview.html
   trunk/src/gui/help/content/es/running.html
   trunk/src/gui/help/content/es/server.html
   trunk/src/gui/help/content/es/troubleshooting.html
   trunk/src/gui/res/flags/es.png
Modified:
   trunk/AUTHORS
   trunk/doc/vidalia.1.in
   trunk/src/gui/help/content/content.qrc
   trunk/src/gui/res/vidalia_common.qrc
   trunk/src/lang/lang.pri
   trunk/src/lang/lang.qrc
   trunk/src/lang/languagesupport.cpp
Log:
Finish adding desolator's Spanish translation.


Modified: trunk/AUTHORS
===================================================================
--- trunk/AUTHORS	2006-11-09 05:00:52 UTC (rev 1451)
+++ trunk/AUTHORS	2006-11-09 05:24:19 UTC (rev 1452)
@@ -47,5 +47,6 @@
   Norwegian   xiando
   Polish      ZeeWolf
   Russian     ygrek
+  Spanish     desolator
   Simplified Chinese    Wu Xiaoguang
 

Modified: trunk/doc/vidalia.1.in
===================================================================
--- trunk/doc/vidalia.1.in	2006-11-09 05:00:52 UTC (rev 1451)
+++ trunk/doc/vidalia.1.in	2006-11-09 05:24:19 UTC (rev 1452)
@@ -31,7 +31,7 @@
 Sets Vidalia's interface style. [Windows|Motif|CDE|Plastique]
 .TP
 \fB\-lang \fI<langcode>\fR
-Sets Vidalia's language. [bg|de|en|fi|fr|hu|it|nb|nl|pl|ru|zh-cn]
+Sets Vidalia's language. [bg|de|en|es|fi|fr|hu|it|nb|nl|pl|ru|zh-cn]
 
 .SH SEE ALSO
 .BR tor (1)

Modified: trunk/src/gui/help/content/content.qrc
===================================================================
--- trunk/src/gui/help/content/content.qrc	2006-11-09 05:00:52 UTC (rev 1451)
+++ trunk/src/gui/help/content/content.qrc	2006-11-09 05:24:19 UTC (rev 1452)
@@ -30,6 +30,16 @@
     <file>de/troubleshooting.html</file>
     <file>de/netview.html</file>
     <file>de/links.html</file>
+    <!-- Spanish -->
+    <file>es/contents.xml</file>
+    <file>es/index.html</file>
+    <file>es/running.html</file>
+    <file>es/log.html</file>
+    <file>es/config.html</file>
+    <file>es/server.html</file>
+    <file>es/troubleshooting.html</file>
+    <file>es/netview.html</file>
+    <file>es/links.html</file>
     <!-- Finnish -->
     <file>fi/contents.xml</file>
     <file>fi/index.html</file>

Added: trunk/src/gui/help/content/es/config.html
===================================================================
--- trunk/src/gui/help/content/es/config.html	                        (rev 0)
+++ trunk/src/gui/help/content/es/config.html	2006-11-09 05:24:19 UTC (rev 1452)
@@ -0,0 +1,91 @@
+<!--
+  $Id$
+  Vidalia is distributed under the following license:
+
+  Copyright (C) 2006,  Matt Edman, Justin Hipple
+
+  This program is free software; you can redistribute it and/or
+  modify it under the terms of the GNU General Public License
+  as published by the Free Software Foundation; either version 2
+  of the License, or (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  
+  02110-1301, USA.
+-->
+
+<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 server</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="server"/>
+<h3>Server Settings</h3>
+<p>
+<i>
+  See <a href="server.html">this help topic</a> for detailed
+  information about setting up and managing a Tor server.
+</i>
+</p>
+
+<a name="advanced"/>
+<h3>Advanced Settings</h3>
+<p>
+The settings on the <i>Advanced Settings</i> page should generally only be
+modified by more experienced users.
+</p>
+<ul>
+  <li><b>Control 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.
+  </li>
+  <li><b>Tor Configuration File</b>:
+    You can use this option to have Vidalia start Tor using a 
+    specific <i>torrc</i>, Tor's configuration file.
+  </li>
+  <li><b>Permissions</b>:
+    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>
+
+</body>
+</html>
+


Property changes on: trunk/src/gui/help/content/es/config.html
___________________________________________________________________
Name: svn:keywords
   + Id

Added: trunk/src/gui/help/content/es/contents.xml
===================================================================
--- trunk/src/gui/help/content/es/contents.xml	                        (rev 0)
+++ trunk/src/gui/help/content/es/contents.xml	2006-11-09 05:24:19 UTC (rev 1452)
@@ -0,0 +1,58 @@
+<!--
+  $Id$
+  
+  Vidalia is distributed under the following license:
+
+  Copyright (C) 2006,  Matt Edman, Justin Hipple
+
+  This program is free software; you can redistribute it and/or
+  modify it under the terms of the GNU General Public License
+  as published by the Free Software Foundation; either version 2
+  of the License, or (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  
+  02110-1301, USA.
+-->
+
+<Contents name="Vidalia Help" html="index.html">
+  <Topic id="running" name="Running Tor" html="running.html">
+    <Topic id="starting" name="Starting and Stopping Tor" html="running.html" section="starting"/>
+    <Topic id="monitoring" name="Monitoring Tor's Status" html="running.html" section="monitoring"/>
+  </Topic>
+  <Topic id="log" name="Message Log" html="log.html">
+    <Topic id="basic" name="Basic Information" html="log.html" section="basic"/>
+    <Topic id="severities" name="Message Severities" html="log.html" section="severities"/>
+    <Topic id="logfile" name="Logging to a File" html="log.html" section="tofile"/>
+  </Topic>
+  <Topic id="netview" name="Network Viewer" html="netview.html">
+    <Topic id="overview" name="Overview" html="netview.html" section="overview"/>
+    <Topic id="netmap" name="Network Map" html="netview.html" section="netmap"/>
+    <Topic id="status" name="Server Status" html="netview.html" section="status"/>
+    <Topic id="details" name="Server Details" html="netview.html" section="details"/>
+  </Topic>
+  <Topic id="config" name="Configuring Tor" html="config.html">
+    <Topic id="general" name="General Settings" html="config.html" section="general"/>
+    <Topic id="server" name="Server Settings" html="config.html" section="server"/>
+    <Topic id="advanced" name="Advanced Settings" html="config.html" section="advanced"/>
+  </Topic>
+  <Topic id="server" name="Running a Server" html="server.html">
+    <Topic id="basic" name="Basic Setup" html="server.html" section="basic"/>
+    <Topic id="bandwidth" name="Rate Limiting" html="server.html" section="bandwidth"/>
+    <Topic id="exitpolicy" name="Exit Policies" html="server.html" section="exitpolicy"/>
+  </Topic>
+  <Topic id="troubleshooting" name="Troubleshooting" html="troubleshooting.html">
+    <Topic id="start" name="I Can't Start Tor" html="troubleshooting.html" section="start"/>
+    <Topic id="connect" name="Vidalia Can't Connect to Tor" html="troubleshooting.html" section="connect"/>
+    <Topic id="torexited" name="Tor exited unexpectedly" html="troubleshooting.html" section="torexited"/>
+    <Topic id="stop" name="Vidalia Can't Stop Tor" html="troubleshooting.html" section="stop"/>
+  </Topic>
+  <Topic id="links" name="Helpful Links" html="links.html"/>
+</Contents>
+


Property changes on: trunk/src/gui/help/content/es/contents.xml
___________________________________________________________________
Name: svn:keywords
   + Id

Added: trunk/src/gui/help/content/es/index.html
===================================================================
--- trunk/src/gui/help/content/es/index.html	                        (rev 0)
+++ trunk/src/gui/help/content/es/index.html	2006-11-09 05:24:19 UTC (rev 1452)
@@ -0,0 +1,51 @@
+<!--
+  $Id$
+  
+  Vidalia is distributed under the following license:
+
+  Copyright (C) 2006,  Matt Edman, Justin Hipple
+
+  This program is free software; you can redistribute it and/or
+  modify it under the terms of the GNU General Public License
+  as published by the Free Software Foundation; either version 2
+  of the License, or (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  
+  02110-1301, USA.
+-->
+
+<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>
+


Property changes on: trunk/src/gui/help/content/es/index.html
___________________________________________________________________
Name: svn:keywords
   + Id

Added: trunk/src/gui/help/content/es/links.html
===================================================================
--- trunk/src/gui/help/content/es/links.html	                        (rev 0)
+++ trunk/src/gui/help/content/es/links.html	2006-11-09 05:24:19 UTC (rev 1452)
@@ -0,0 +1,74 @@
+<!--
+  $Id$
+  
+  Vidalia is distributed under the following license:
+
+  Copyright (C) 2006,  Matt Edman, Justin Hipple
+
+  This program is free software; you can redistribute it and/or
+  modify it under the terms of the GNU General Public License
+  as published by the Free Software Foundation; either version 2
+  of the License, or (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  
+  02110-1301, USA.
+-->
+
+<html>
+<body>
+
+<h1>Helpful Links</h1>
+<hr />
+
+<h3>Vidalia</h3>
+<table>
+<tr>
+  <td>&nbsp;&nbsp;&nbsp;</td>
+  <td>Homepage</td>
+  <td><i>http://www.vidalia-project.net/</i></td>
+</tr>
+<tr>
+  <td>&nbsp;&nbsp;&nbsp;</td>
+  <td>Wiki</td>
+  <td><i>http://trac.vidalia-project.net/wiki</i></td>
+</tr>
+<tr>
+  <td>&nbsp;&nbsp;&nbsp;</td>
+  <td>Bugtracker</td>
+  <td><i>http://trac.vidalia-project.net/report</i></td>
+</tr>
+</table>
+
+<h3>Tor</h3>
+<table>
+<tr>
+  <td>&nbsp;&nbsp;&nbsp;</td>
+  <td>Homepage</td>
+  <td><i>http://tor.eff.org/</i></td>
+</tr>
+<tr>
+  <td>&nbsp;&nbsp;&nbsp;</td>
+  <td>FAQ</td>
+  <td><i>http://wiki.noreply.org/noreply/TheOnionRouter/TorFAQ</i></td>
+</tr>
+<tr>
+  <td>&nbsp;&nbsp;&nbsp;</td>
+  <td>Wiki</td>
+  <td><i>http://wiki.noreply.org/noreply/TheOnionRouter</i></td>
+</tr>
+<tr>
+  <td>&nbsp;&nbsp;&nbsp;</td>
+  <td>Bugtracker</td>
+  <td><i>http://bugs.noreply.org/flyspray/</i></td>
+</table>
+
+</body>
+</html>
+


Property changes on: trunk/src/gui/help/content/es/links.html
___________________________________________________________________
Name: svn:keywords
   + Id

Added: trunk/src/gui/help/content/es/log.html
===================================================================
--- trunk/src/gui/help/content/es/log.html	                        (rev 0)
+++ trunk/src/gui/help/content/es/log.html	2006-11-09 05:24:19 UTC (rev 1452)
@@ -0,0 +1,116 @@
+<!--
+  $Id$
+  
+  Vidalia is distributed under the following license:
+
+  Copyright (C) 2006,  Matt Edman, Justin Hipple
+
+  This program is free software; you can redistribute it and/or
+  modify it under the terms of the GNU General Public License
+  as published by the Free Software Foundation; either version 2
+  of the License, or (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  
+  02110-1301, USA.
+-->
+
+<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>: Message 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>Show Settings</i> at the bottom 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>Show Settings</i> at the bottom of the message log window.</li>
+  <li>Check the box labeled <i>Save Messages to File</i>.
+  <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>
+


Property changes on: trunk/src/gui/help/content/es/log.html
___________________________________________________________________
Name: svn:keywords
   + Id

Added: trunk/src/gui/help/content/es/netview.html
===================================================================
--- trunk/src/gui/help/content/es/netview.html	                        (rev 0)
+++ trunk/src/gui/help/content/es/netview.html	2006-11-09 05:24:19 UTC (rev 1452)
@@ -0,0 +1,193 @@
+<!--
+  $Id$
+  
+  Vidalia is distributed under the following license:
+
+  Copyright (C) 2006,  Matt Edman, Justin Hipple
+
+  This program is free software; you can redistribute it and/or
+  modify it under the terms of the GNU General Public License
+  as published by the Free Software Foundation; either version 2
+  of the License, or (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  
+  02110-1301, USA.
+-->
+
+<html>
+<body>
+
+<h1>Network Viewer</h1>
+<hr />
+
+<p>
+The network viewer lets you see servers 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 servers 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 servers in the Tor network. Green lines are drawn
+between servers 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 server is determined by looking up the IP
+address of the server 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 servers. It is important to note
+that this request is done through Tor, so your location is not revealed to the
+GeoIP server. The results of the lookups will be cached locally in order to
+reduce load on Vidalia's GeoIP servers.
+</p>
+
+
+<a name="serverlist"/>
+<h3>Server Status</h3>
+<p>
+On the left side of the network view, you will see a list of servers in the
+Tor network. Next to each server is an icon indicating that server's status.
+The following table summarizes the possible server status icons:
+</p>
+<p>
+<table border="1">
+<tr>
+  <td><img src="qrc:/images/icons/node-unresponsive.png"/></td>
+  <td valign="middle">
+    The server is offline or simply not responding.
+  </td>
+</tr>
+<tr>
+  <td><img src="qrc:/images/icons/node-hibernating.png"/></td>
+  <td valign="middle">
+    The server 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 server 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 server 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 server 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 server 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>Server Details</h3>
+<p>
+The server details panel at the right side of the screen gives you details
+about the server or servers currently selected in the 
+<a href="#serverlist">server 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 server through which your traffic is currently being
+relayed.
+</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 server.</td>
+</tr>
+<tr>
+  <td><b>IP Address</b></td>
+  <td>IP address at which this Tor server can be reached.</td>
+</tr>
+<tr>
+  <td><b>Platform</b></td>
+  <td>
+    Operating system information and Tor version on which this server is
+    currently running.
+  </td>
+</tr>
+<tr>
+  <td><b>Contact</b></td>
+  <td>
+    Contact information for this server's operator, in case there is a
+    problem with the server.
+  </td>
+</tr>
+<tr>
+  <td><b>Bandwidth</b></td>
+  <td>
+    Estimated maximum amount of bandwidth that the directory servers have 
+    seen this server handle recently.
+  </td>
+</tr>
+<tr>
+  <td><b>Uptime</b></td>
+  <td>
+    Length of time this server has been available, which can be used to help
+    estimate this server's stability.
+  </td>
+</tr>
+<tr>
+  <td><b>Last Updated</b></td>
+  <td>Date this server's information was last updated.</td>
+</tr>
+</table>
+</p>
+</body>
+</html>
+


Property changes on: trunk/src/gui/help/content/es/netview.html
___________________________________________________________________
Name: svn:keywords
   + Id

Added: trunk/src/gui/help/content/es/running.html
===================================================================
--- trunk/src/gui/help/content/es/running.html	                        (rev 0)
+++ trunk/src/gui/help/content/es/running.html	2006-11-09 05:24:19 UTC (rev 1452)
@@ -0,0 +1,117 @@
+<!--
+  $Id$
+  
+  Vidalia is distributed under the following license:
+
+  Copyright (C) 2006,  Matt Edman, Justin Hipple
+
+  This program is free software; you can redistribute it and/or
+  modify it under the terms of the GNU General Public License
+  as published by the Free Software Foundation; either version 2
+  of the License, or (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  
+  02110-1301, USA.
+-->
+
+<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>
+


Property changes on: trunk/src/gui/help/content/es/running.html
___________________________________________________________________
Name: svn:keywords
   + Id

Added: trunk/src/gui/help/content/es/server.html
===================================================================
--- trunk/src/gui/help/content/es/server.html	                        (rev 0)
+++ trunk/src/gui/help/content/es/server.html	2006-11-09 05:24:19 UTC (rev 1452)
@@ -0,0 +1,146 @@
+<!--
+  $Id$
+  
+  Vidalia is distributed under the following license:
+
+  Copyright (C) 2006,  Matt Edman, Justin Hipple
+
+  This program is free software; you can redistribute it and/or
+  modify it under the terms of the GNU General Public License
+  as published by the Free Software Foundation; either version 2
+  of the License, or (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  
+  02110-1301, USA.
+-->
+
+<html>
+<body>
+
+<h1>Running a Tor Server</h1>
+<hr />
+
+The Tor network is made up of volunteers all over the world who donate some of
+their spare bandwidth by running a server. Vidalia helps you do your part by
+making it easy to set up a server 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 server, 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>Server</i> configuration page.</li>
+  <li>Check the box labeled <i>Relay traffic for the Tor network</i>.
+  <li>Enter the following information:
+    <ul>
+      <li><b>Nickname</b>:
+        The name which your server will be known as on the Tor network. An
+        example of a server nickname is "myVidaliaServer".
+      </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 server. You might also include your PGP
+        or GPG key ID and fingerprint.
+      </li>
+      <li><b>Server Port</b>:
+        The port on which your server will listen for traffic from clients or
+        other Tor servers.
+      </li>
+      <li><b>Address</b>:
+        Enter an address at which your computer can be reached by other Tor
+        servers on the Internet. If you don't know your public IP address, you
+        can click on <i>Get Address</i> and Vidalia will contact an external
+        site (e.g., <i>http://www.vidalia-project.net/iptest/ip.php</i>) to
+        find out what it thinks your public IP address is.
+      </li>
+    </ul>
+  <li>
+    If you would like to mirror Tor's directory of servers for others on the
+    network you can check the box labeled <i>Mirror the Server Directory</i>.
+    If you do not have much bandwidth, uncheck this box. If you do
+    decide to mirror the server directory, make sure the <i>Directory Port</i> is
+    different than the <i>Server port</i> you entered above.
+  </li>
+</ol>
+
+<a name="bandwidth"/>
+<h3>Bandwidth Limits</h3>
+<p>
+Running a Tor server 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 server, 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
+server.
+</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 server 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 server 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 server. 
+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 server. If you uncheck the box next to a
+particular type of resource, Tor users will not be allowed to access that
+resource from your server. 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>
+If you do not want to let other Tor users make connections outside the Tor
+network from your server, you can uncheck all of the checkboxes. Even if you
+uncheck all of the checkboxes, your server is still useful to the Tor network.
+Your server will allow other Tor users to connect to the Tor network and will
+help relay traffic between other Tor servers.
+</p>
+</html>
+


Property changes on: trunk/src/gui/help/content/es/server.html
___________________________________________________________________
Name: svn:keywords
   + Id

Added: trunk/src/gui/help/content/es/troubleshooting.html
===================================================================
--- trunk/src/gui/help/content/es/troubleshooting.html	                        (rev 0)
+++ trunk/src/gui/help/content/es/troubleshooting.html	2006-11-09 05:24:19 UTC (rev 1452)
@@ -0,0 +1,108 @@
+<!--
+  $Id$
+  
+  Vidalia is distributed under the following license:
+
+  Copyright (C) 2006,  Matt Edman, Justin Hipple
+
+  This program is free software; you can redistribute it and/or
+  modify it under the terms of the GNU General Public License
+  as published by the Free Software Foundation; either version 2
+  of the License, or (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  
+  02110-1301, USA.
+-->
+
+<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="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>
+


Property changes on: trunk/src/gui/help/content/es/troubleshooting.html
___________________________________________________________________
Name: svn:keywords
   + Id

Added: trunk/src/gui/res/flags/es.png
===================================================================
(Binary files differ)


Property changes on: trunk/src/gui/res/flags/es.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: trunk/src/gui/res/vidalia_common.qrc
===================================================================
--- trunk/src/gui/res/vidalia_common.qrc	2006-11-09 05:00:52 UTC (rev 1451)
+++ trunk/src/gui/res/vidalia_common.qrc	2006-11-09 05:24:19 UTC (rev 1452)
@@ -77,6 +77,7 @@
         <file>flags/bg.png</file>
         <file>flags/de.png</file>
         <file>flags/en.png</file>
+        <file>flags/es.png</file>
         <file>flags/fi.png</file>
         <file>flags/fr.png</file>
         <file>flags/hu.png</file>

Modified: trunk/src/lang/lang.pri
===================================================================
--- trunk/src/lang/lang.pri	2006-11-09 05:00:52 UTC (rev 1451)
+++ trunk/src/lang/lang.pri	2006-11-09 05:24:19 UTC (rev 1452)
@@ -28,6 +28,7 @@
 TRANSLATIONS += $$PWD/vidalia_bg.ts \
                 $$PWD/vidalia_de.ts \
                 $$PWD/vidalia_en.ts \
+                $$PWD/vidalia_es.ts \
                 $$PWD/vidalia_fi.ts \
                 $$PWD/vidalia_fr.ts \
                 $$PWD/vidalia_hu.ts \

Modified: trunk/src/lang/lang.qrc
===================================================================
--- trunk/src/lang/lang.qrc	2006-11-09 05:00:52 UTC (rev 1451)
+++ trunk/src/lang/lang.qrc	2006-11-09 05:24:19 UTC (rev 1452)
@@ -3,6 +3,7 @@
     <file alias="bg">vidalia_bg.qm</file>
     <file alias="de">vidalia_de.qm</file>
     <file alias="en">vidalia_en.qm</file>
+    <file alias="es">vidalia_es.qm</file>
     <file alias="fi">vidalia_fi.qm</file>
     <file alias="fr">vidalia_fr.qm</file>
     <file alias="hu">vidalia_hu.qm</file>

Modified: trunk/src/lang/languagesupport.cpp
===================================================================
--- trunk/src/lang/languagesupport.cpp	2006-11-09 05:00:52 UTC (rev 1451)
+++ trunk/src/lang/languagesupport.cpp	2006-11-09 05:24:19 UTC (rev 1452)
@@ -42,6 +42,8 @@
       QString::fromUtf8("\320\221\321\212\320\273\320\263\320"
                         "\260\321\200\321\201\320\272\320\270"));
     languages.insert("de",    "Deutsch");
+    languages.insert("es",    
+      QString::fromUtf8("espa\303\261ol"));
     languages.insert("fi",    "suomi");
     languages.insert("fr",    
       QString::fromUtf8("fran\303\247ais"));