[vidalia-svn] r2078: Found a couple more user-visible instances of "server" that (in trunk: . src/gui/config)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2007-10-23 02:49:34 -0400 (Tue, 23 Oct 2007)
New Revision: 2078

Modified:
   trunk/
   trunk/src/gui/config/networkpage.ui
   trunk/src/gui/config/serverpage.ui
Log:
 r2215@lysithea:  edmanm | 2007-10-23 02:49:29 -0400
 Found a couple more user-visible instances of "server" that should be "relay".



Property changes on: trunk
___________________________________________________________________
 svk:merge ticket from /local/vidalia/trunk [r2215] on dc66be73-d13e-47ba-a267-8dc7cda68c65

Modified: trunk/src/gui/config/networkpage.ui
===================================================================
--- trunk/src/gui/config/networkpage.ui	2007-10-23 06:29:42 UTC (rev 2077)
+++ trunk/src/gui/config/networkpage.ui	2007-10-23 06:49:34 UTC (rev 2078)
@@ -173,7 +173,7 @@
       <enum>Qt::NoContextMenu</enum>
      </property>
      <property name="toolTip" >
-      <string>Check to configure Tor to only connect to servers using ports allowed by your firewall</string>
+      <string>Check to configure Tor to only connect to relays using ports allowed by your firewall</string>
      </property>
      <property name="text" >
       <string>My firewall only lets me connect to certain ports</string>
@@ -232,7 +232,7 @@
    <item>
     <widget class="QCheckBox" name="chkUseBridges" >
      <property name="toolTip" >
-      <string>Check to configure Tor to use bridge servers to access the Tor network</string>
+      <string>Check to configure Tor to use bridge relays to access the Tor network</string>
      </property>
      <property name="text" >
       <string>My ISP blocks connections to the Tor network</string>

Modified: trunk/src/gui/config/serverpage.ui
===================================================================
--- trunk/src/gui/config/serverpage.ui	2007-10-23 06:29:42 UTC (rev 2077)
+++ trunk/src/gui/config/serverpage.ui	2007-10-23 06:49:34 UTC (rev 2078)
@@ -164,7 +164,7 @@
              <enum>Qt::NoContextMenu</enum>
             </property>
             <property name="toolTip" >
-             <string>Port on which users and other servers can communicate with your relay</string>
+             <string>Port on which users and other relays can communicate with your relay</string>
             </property>
            </widget>
           </item>
@@ -271,7 +271,7 @@
              <enum>Qt::NoContextMenu</enum>
             </property>
             <property name="toolTip" >
-             <string>Name of your server</string>
+             <string>Name of your relay</string>
             </property>
             <property name="text" >
              <string/>