[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[vidalia-svn] r2057: New Thing: instead of flip-flopping seemingly at random betw (in trunk: . src/gui src/gui/config src/gui/help/content/en src/gui/network)
Author: edmanm
Date: 2007-10-21 04:15:51 -0400 (Sun, 21 Oct 2007)
New Revision: 2057
Modified:
trunk/
trunk/src/gui/config/configdialog.cpp
trunk/src/gui/config/serverpage.cpp
trunk/src/gui/config/serverpage.ui
trunk/src/gui/help/content/en/config.html
trunk/src/gui/help/content/en/contents.xml
trunk/src/gui/help/content/en/netview.html
trunk/src/gui/help/content/en/server.html
trunk/src/gui/mainwindow.cpp
trunk/src/gui/network/netviewer.cpp
trunk/src/gui/network/netviewer.ui
trunk/src/gui/network/routerlistwidget.cpp
Log:
r2175@lysithea: edmanm | 2007-10-21 04:15:43 -0400
New Thing: instead of flip-flopping seemingly at random between "server",
"relay", and "router", we'll just always say "relay" in user-visible strings.
There are still many places in the code where we flip-flop.
Property changes on: trunk
___________________________________________________________________
svk:merge ticket from /local/vidalia/trunk [r2175] on dc66be73-d13e-47ba-a267-8dc7cda68c65
Modified: trunk/src/gui/config/configdialog.cpp
===================================================================
--- trunk/src/gui/config/configdialog.cpp 2007-10-21 06:54:19 UTC (rev 2056)
+++ trunk/src/gui/config/configdialog.cpp 2007-10-21 08:15:51 UTC (rev 2057)
@@ -68,7 +68,7 @@
ui.stackPages->add(new ServerPage(ui.stackPages),
createPageAction(QIcon(IMAGE_SERVER),
- tr("Server"), grp));
+ tr("Relay"), grp));
ui.stackPages->add(new AppearancePage(ui.stackPages),
createPageAction(QIcon(IMAGE_APPEARANCE),
Modified: trunk/src/gui/config/serverpage.cpp
===================================================================
--- trunk/src/gui/config/serverpage.cpp 2007-10-21 06:54:19 UTC (rev 2056)
+++ trunk/src/gui/config/serverpage.cpp 2007-10-21 08:15:51 UTC (rev 2057)
@@ -134,11 +134,11 @@
if (ui.rdoBridgeMode->isChecked()) {
int ret = VMessageBox::warning(this,
tr("Bridge Support Unavailable"),
- p(tr("You have configured Tor to act as a bridge server "
+ p(tr("You have configured Tor to act as a bridge relay "
"for censored users, but your version of Tor does not "
"support bridges.")) +
p(tr("Please upgrade your Tor software or configure Tor to "
- "act as a normal relay server.")),
+ "act as a normal Tor relay.")),
VMessageBox::ShowSettings|VMessageBox::Default,
VMessageBox::Cancel);
if (ret == VMessageBox::ShowSettings) {
@@ -206,7 +206,7 @@
/* A server must have an ORPort and a nickname */
if (ui.lineServerPort->text().isEmpty() ||
ui.lineServerNickname->text().isEmpty()) {
- errmsg = tr("You must specify at least a server nickname and port.");
+ errmsg = tr("You must specify at least a relay nickname and port.");
return false;
}
/* If the bandwidth rates aren't set, use some defaults before saving */
Modified: trunk/src/gui/config/serverpage.ui
===================================================================
--- trunk/src/gui/config/serverpage.ui 2007-10-21 06:54:19 UTC (rev 2056)
+++ trunk/src/gui/config/serverpage.ui 2007-10-21 08:15:51 UTC (rev 2057)
@@ -133,7 +133,7 @@
<enum>Qt::NoContextMenu</enum>
</property>
<property name="text" >
- <string>Server Port:</string>
+ <string>Relay Port:</string>
</property>
<property name="alignment" >
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
@@ -169,7 +169,7 @@
<enum>Qt::NoContextMenu</enum>
</property>
<property name="toolTip" >
- <string>Port on which users and other servers can communicate with your server</string>
+ <string>Port on which users and other servers can communicate with your relay</string>
</property>
</widget>
</item>
@@ -257,8 +257,7 @@
</property>
<property name="toolTip" >
<string>Email address at which you may be reached if there is a
-problem with your server. You might also include your PGP or GPG
-fingerprint.</string>
+problem with your relay. You might also include your PGP or GPG fingerprint.</string>
</property>
</widget>
</item>
@@ -287,10 +286,10 @@
<enum>Qt::NoContextMenu</enum>
</property>
<property name="toolTip" >
- <string>Enable to mirror the server directory</string>
+ <string>Enable to mirror the Tor relay directory</string>
</property>
<property name="text" >
- <string>Mirror the Server Directory </string>
+ <string>Mirror the Relay Directory </string>
</property>
</widget>
</item>
Modified: trunk/src/gui/help/content/en/config.html
===================================================================
--- trunk/src/gui/help/content/en/config.html 2007-10-21 06:54:19 UTC (rev 2056)
+++ trunk/src/gui/help/content/en/config.html 2007-10-21 08:15:51 UTC (rev 2057)
@@ -29,7 +29,7 @@
<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
+href="server.html">Tor relay</a> so you can help the Tor network
grow.
</p>
@@ -62,7 +62,7 @@
<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 server connections through
+ 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
@@ -70,24 +70,24 @@
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 that limits the ports you are
- able to connect to, you can configure Tor to connect directly only to
- servers listening on the ports allowed by your firewall. Simply enter a
- list of ports permitted by your firewall, separated by commas. (<i>Example:
- 80,443,8080</i>)
+ 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 servers
+ 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 servers by specifying either their address and port number, or by
+ 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.31.0.34:8080
+ 128.213.48.13:8080
</li>
<li>
128.213.48.13:8080 1054 13B1 DBDA F867 B226 74D2 52DF 3D9F A367 1F73
@@ -96,15 +96,21 @@
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.
</li>
</ul>
-<a name="server"/>
-<h3>Server Settings</h3>
+<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 server.
+ See <a href="relay.html">this help topic</a> for detailed
+ information about setting up and managing a Tor relay.
</i>
</p>
@@ -154,7 +160,7 @@
</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 server information, Tor server keys, and configuration
+ 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>
Modified: trunk/src/gui/help/content/en/contents.xml
===================================================================
--- trunk/src/gui/help/content/en/contents.xml 2007-10-21 06:54:19 UTC (rev 2056)
+++ trunk/src/gui/help/content/en/contents.xml 2007-10-21 08:15:51 UTC (rev 2057)
@@ -3,7 +3,7 @@
Vidalia is distributed under the following license:
- Copyright (C) 2006, Matt Edman, Justin Hipple
+ Copyright (C) 2006-2007, 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
@@ -34,16 +34,16 @@
<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 id="status" name="Relay Status" html="netview.html" section="status"/>
+ <Topic id="details" name="Relay 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="network" name="Network Settings" html="config.html" section="network"/>
- <Topic id="server" name="Server Settings" html="config.html" section="server"/>
+ <Topic id="server" name="Relay 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="server" name="Setting Up a Tor Relay" html="server.html">
<Topic id="basic" name="Basic Setup" html="server.html" section="basic"/>
<Topic id="bandwidth" name="Bandwidth Limits" html="server.html" section="bandwidth"/>
<Topic id="exitpolicy" name="Exit Policies" html="server.html" section="exitpolicy"/>
Modified: trunk/src/gui/help/content/en/netview.html
===================================================================
--- trunk/src/gui/help/content/en/netview.html 2007-10-21 06:54:19 UTC (rev 2056)
+++ trunk/src/gui/help/content/en/netview.html 2007-10-21 08:15:51 UTC (rev 2057)
@@ -28,7 +28,7 @@
<hr />
<p>
-The network viewer lets you see servers in the Tor network and where
+The network viewer lets you see relays in the Tor network and where
your traffic is going.
</p>
@@ -38,7 +38,7 @@
<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
+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>
@@ -47,8 +47,8 @@
<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
+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>
@@ -58,8 +58,8 @@
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
+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>
@@ -67,32 +67,32 @@
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
+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 server. The results of the lookups will be cached locally in order to
-reduce load on Vidalia's GeoIP servers.
+GeoIP relay. The results of the lookups will be cached locally in order to
+reduce load on Vidalia's GeoIP relays.
</p>
-<a name="serverlist"/>
-<h3>Server Status</h3>
+<a name="relaylist"/>
+<h3>Relay 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:
+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 server is offline or simply not responding.
+ 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 server is <i>hibernating</i>, meaning it is online, but has used up as
+ 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>
@@ -100,25 +100,25 @@
<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.
+ 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 server is online and has shown a throughput >= 20 KB/s.
+ The relay is online and has shown a throughput >= 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 >= 60 KB/s.
+ The relay is online and has shown a throughput >= 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 >= 400 KB/s.
+ The relay is online and has shown a throughput >= 400 KB/s.
</td>
</tr>
</table>
@@ -131,14 +131,13 @@
<a name="details"/>
-<h3>Server Details</h3>
+<h3>Relay 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
+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 server through which your traffic is currently being
-relayed.
+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
@@ -148,36 +147,36 @@
<table>
<tr>
<td><b>Location</b></td>
- <td>The geographic location of this Tor server.</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 server can be reached.</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 server is
+ 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 servers have
- seen this server handle recently.
+ 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 server has been available, which can be used to help
- estimate this server's stability.
+ 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 server's information was last updated.</td>
+ <td>Date this relay's information was last updated.</td>
</tr>
</table>
</p>
Modified: trunk/src/gui/help/content/en/server.html
===================================================================
--- trunk/src/gui/help/content/en/server.html 2007-10-21 06:54:19 UTC (rev 2056)
+++ trunk/src/gui/help/content/en/server.html 2007-10-21 08:15:51 UTC (rev 2057)
@@ -3,7 +3,7 @@
Vidalia is distributed under the following license:
- Copyright (C) 2006, Matt Edman, Justin Hipple
+ Copyright (C) 2006-2007, 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
@@ -24,17 +24,17 @@
<html>
<body>
-<h1>Running a Tor Server</h1>
+<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 server. Vidalia helps you do your part by
-making it easy to set up a server of your own.
+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 server, you
+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>
@@ -43,54 +43,47 @@
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>Select the <i>Relay</i> configuration page.</li>
<li>
- Decide whether you want to run a normal relay server or a <i>bridge</i>
- server (Tor 0.2.0.3-alpha or newer). Bridge servers help censored Tor users
+ Decide whether you want to run a normal Tor relay or a <i>bridge</i>
+ relay (Tor 0.2.0.3-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 relay or <i>Help censored users reach the Tor network</i>
- if you want to run a bridge server.
+ 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:
<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".
+ 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 server. You might also include your PGP
+ something goes wrong with your relay. 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><b>Relay Port</b>:
+ The port on which your relay will listen for traffic from clients or
+ other Tor relays.
</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 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 server directory, make sure the <i>Directory Port</i> is
- different than the <i>Server port</i> you entered above.
+ decide to mirror the relay directory, make sure the <i>Directory Port</i> is
+ different than the <i>Relay 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
+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 server, while still keeping your network
+to the Tor network. You can run a relay, while still keeping your network
connection usable for your own use.
</p>
<p>
@@ -114,44 +107,44 @@
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.
+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 server acts as a directory mirror, you may be sending more
+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 server directory</i>.
+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 server.
+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 server. If you uncheck the box next to a
+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 server. If the box labeled <i>Misc Other Services</i>
+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>
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.
+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 server, the <i>Exit Policies</i> tab will be
-grayed out, since bridge servers do not allow exit connections.
+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.
</p>
</html>
Modified: trunk/src/gui/mainwindow.cpp
===================================================================
--- trunk/src/gui/mainwindow.cpp 2007-10-21 06:54:19 UTC (rev 2056)
+++ trunk/src/gui/mainwindow.cpp 2007-10-21 08:15:51 UTC (rev 2057)
@@ -423,7 +423,7 @@
connect(ui.lblStartStopTor, SIGNAL(clicked()), this, SLOT(start()));
} else if (status == Stopping) {
if (_delayedShutdownStarted) {
- statusText = tr("Your Tor server is shutting down.\n"
+ statusText = tr("Your Tor relay is shutting down.\n"
"Click 'Stop Tor' again to force Tor to stop now.");
} else {
statusText = tr("Tor is shutting down");
@@ -620,12 +620,12 @@
* gracefully so clients have time to find new servers. */
if (server.isServerEnabled() && !_delayedShutdownStarted) {
/* Ask the user if they want to shutdown nicely. */
- int response = VMessageBox::question(this, tr("Server is Enabled"),
- tr("You are currently running a Tor server. "
- "Terminating your server will interrupt any "
+ int response = VMessageBox::question(this, tr("Relaying is Enabled"),
+ tr("You are currently running a Tor relay. "
+ "Terminating your relay will interrupt any "
"open connections from clients.\n\n"
"Would you like to shutdown gracefully and "
- "give clients time to find a new server?"),
+ "give clients time to find a new relay?"),
VMessageBox::Yes|VMessageBox::Default,
VMessageBox::No,
VMessageBox::Cancel|VMessageBox::Escape);
Modified: trunk/src/gui/network/netviewer.cpp
===================================================================
--- trunk/src/gui/network/netviewer.cpp 2007-10-21 06:54:19 UTC (rev 2056)
+++ trunk/src/gui/network/netviewer.cpp 2007-10-21 08:15:51 UTC (rev 2057)
@@ -297,7 +297,7 @@
/* Get descriptors for all the given IDs */
QList<RouterDescriptor> rds = _torControl->getDescriptorListById(ids);
- vInfo("Loading %1 server descriptors for the network map.")
+ vInfo("Loading %1 relay descriptors for the network map.")
.arg(rds.size());
foreach (RouterDescriptor rd, rds) {
/* Load the router descriptor and add it to the router list. */
Modified: trunk/src/gui/network/netviewer.ui
===================================================================
--- trunk/src/gui/network/netviewer.ui 2007-10-21 06:54:19 UTC (rev 2056)
+++ trunk/src/gui/network/netviewer.ui 2007-10-21 08:15:51 UTC (rev 2057)
@@ -253,10 +253,10 @@
<string>Refresh</string>
</property>
<property name="statusTip" >
- <string>Refresh the list of routers and connections</string>
+ <string>Refresh the list of Tor relays and connections</string>
</property>
<property name="toolTip" >
- <string>Refresh the list of routers and connections</string>
+ <string>Refresh the list of Tor relays and connections</string>
</property>
<property name="font" >
<font>
Modified: trunk/src/gui/network/routerlistwidget.cpp
===================================================================
--- trunk/src/gui/network/routerlistwidget.cpp 2007-10-21 06:54:19 UTC (rev 2056)
+++ trunk/src/gui/network/routerlistwidget.cpp 2007-10-21 08:15:51 UTC (rev 2057)
@@ -41,7 +41,7 @@
/* Create and initialize columns */
setHeaderLabels(QStringList() << QString("")
<< QString("")
- << tr("Server"));
+ << tr("Relay"));
/* Sort by descending server bandwidth */
sortItems(StatusColumn, Qt::DescendingOrder);
@@ -52,7 +52,7 @@
/* Set up the router item context menu */
_routerContextMenu = new QMenu(this);
- _zoomToRouterAct = new QAction(QIcon(IMG_ZOOM), tr("Zoom to Server"), this);
+ _zoomToRouterAct = new QAction(QIcon(IMG_ZOOM), tr("Zoom to Relay"), this);
_routerContextMenu->addAction(_zoomToRouterAct);
}
@@ -227,7 +227,7 @@
/* Set our status tip to the number of servers in the list */
if (rd.online())
_onlineRouterCount++;
- setStatusTip(tr("%1 servers online (%2 total)")
+ setStatusTip(tr("%1 relays online (%2 total)")
.arg(_onlineRouterCount)
.arg(topLevelItemCount()));
}