Changed string TOR to Tor.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8412 b45a01b8-16f6-495d-af2f-9b41ad6348cc

retroshare-gui/src/gui/GenCertDialog.cpp

@@ -165,7 +165,7 @@ GenCertDialog::GenCertDialog(bool onlyGenerateIdentity, QWidget *parent)
 #if QT_VERSION >= 0x040700
 	ui.email_input->setPlaceholderText(tr("[Optional] Visible to your friends, and friends of friends.")) ;
 	ui.node_input->setPlaceholderText(tr("[Required] Examples: Home, Laptop,...")) ;
-	ui.hiddenaddr_input->setPlaceholderText(tr("[Required] Examples: xa76giaf6ifda7ri63i263.onion (obtained by you from TOR)")) ;
+	ui.hiddenaddr_input->setPlaceholderText(tr("[Required] Examples: xa76giaf6ifda7ri63i263.onion (obtained by you from Tor)")) ;
 	ui.name_input->setPlaceholderText(tr("[Required] Visible to your friends, and friends of friends."));
 	ui.password_input->setPlaceholderText(tr("[Required] This password protects your private PGP key."));
 	ui.password_input_2->setPlaceholderText(tr("[Required] Type the same password again here."));

retroshare-gui/src/gui/GenCertDialog.ui

@@ -304,7 +304,7 @@ Alternatively you can use an existing profile. Just uncheck "Create a new profil
        <item>
         <widget class="QLabel" name="hiddenaddr_label">
          <property name="text">
-          <string>TOR address</string>
+          <string>Tor address</string>
          </property>
         </widget>
        </item>
@@ -477,7 +477,7 @@ anonymous, you can use a fake email.</string>
       <number>1</number>
      </property>
      <property name="text">
-      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This is a TOR Onion address of the form: xa76giaf6ifda7ri63i263.onion &lt;/p&gt;&lt;p&gt;In order to get one, you must configure TOR to create a new hidden service. If you do not yet have one, you can still go on, and make it right later in Retroshare's Options-&amp;gt;Server-&amp;gt;TOR configuration panel.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This is a Tor Onion address of the form: xa76giaf6ifda7ri63i263.onion &lt;/p&gt;&lt;p&gt;In order to get one, you must configure Tor to create a new hidden service. If you do not yet have one, you can still go on, and make it right later in Retroshare's Options-&amp;gt;Server-&amp;gt;Tor configuration panel.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
      </property>
      <property name="scaledContents">
       <bool>false</bool>

retroshare-gui/src/gui/common/StatusDefs.cpp

@@ -179,7 +179,7 @@ QString StatusDefs::connectStateString(RsPeerDetails &details)
 		isConnected = true;
 		break;
 	case RS_PEER_CONNECTSTATE_CONNECTED_TOR:
-		stateString = qApp->translate("StatusDefs", "Connected: TOR");
+		stateString = qApp->translate("StatusDefs", "Connected: Tor");
 		isConnected = true;
 		break;
 	case RS_PEER_CONNECTSTATE_CONNECTED_UNKNOWN:
@@ -257,7 +257,7 @@ QString StatusDefs::connectStateIpString(RsPeerDetails &details)
 		stateString += qApp->translate("StatusDefs", "UDP");
 		break;
 	case RS_PEER_CONNECTSTATE_CONNECTED_TOR:
-		stateString += qApp->translate("StatusDefs", "TOR");
+		stateString += qApp->translate("StatusDefs", "Tor");
 		stateString += QString(details.actAsServer ? "-in" : "-out");
 		break;
 	case RS_PEER_CONNECTSTATE_CONNECTED_UNKNOWN:

retroshare-gui/src/gui/settings/ServerPage.cpp

@@ -696,7 +696,7 @@ void ServerPage::updateStatus()
 	else
         ui.iconlabel_ext->setPixmap(QPixmap(":/images/ledoff1.png"));
 
-    // check for TOR
+    // check for Tor
     updateTorOutProxyIndicator();
 }
 
@@ -852,7 +852,7 @@ void ServerPage::loadHiddenNode()
 	 *  NETMODE: HiddenNode FIXED.
 	 *  Disc/DHT: Discovery / No Discovery.
 	 *  Local Address: 127.0.0.1, Port: Listening Port. (listening port changable)
-	 *  External Address ==> TOR Address: 17621376587.onion + PORT.
+	 *  External Address ==> Tor Address: 17621376587.onion + PORT.
 	 *
 	 *  Known / Previous IPs: empty / removed.
 	 *  Ask about IP: Disabled.
@@ -901,7 +901,7 @@ void ServerPage::loadHiddenNode()
 	ui.localPort -> setValue(detail.localPort);
 		/* set the server address */
 
-	ui.extAddress->setText(tr("Hidden - See TOR Config"));
+	ui.extAddress->setText(tr("Hidden - See Tor Config"));
 
 	ui.showDiscStatusBar->setChecked(Settings->getStatusBarFlags() & STATUSBAR_DISC);
     ui.showDiscStatusBar->hide() ;	// hidden because not functional at the moment.
@@ -1080,7 +1080,7 @@ void ServerPage::updateTorOutProxyIndicator()
     else
     {
         ui.iconlabel_tor_outgoing->setPixmap(QPixmap(ICON_STATUS_UNKNOWN)) ;
-        ui.iconlabel_tor_outgoing->setToolTip(tr("TOR proxy is not enabled")) ;
+        ui.iconlabel_tor_outgoing->setToolTip(tr("Tor proxy is not enabled")) ;
     }
 }
 void ServerPage::updateLocInProxyIndicator()
@@ -1092,12 +1092,12 @@ void ServerPage::updateLocInProxyIndicator()
     {
         socket.disconnectFromHost();
         ui.iconlabel_tor_incoming->setPixmap(QPixmap(ICON_STATUS_OK)) ;
-        ui.iconlabel_tor_incoming->setToolTip(tr("You are reachable through TOR.")) ;
+        ui.iconlabel_tor_incoming->setToolTip(tr("You are reachable through Tor.")) ;
     }
     else
     {
         ui.iconlabel_tor_incoming->setPixmap(QPixmap(ICON_STATUS_UNKNOWN)) ;
-        ui.iconlabel_tor_incoming->setToolTip(tr("TOR proxy is not enabled or broken.\nAre you running a TOR hidden service?\nCheck your ports!")) ;
+        ui.iconlabel_tor_incoming->setToolTip(tr("Tor proxy is not enabled or broken.\nAre you running a Tor hidden service?\nCheck your ports!")) ;
     }
 }
 void ServerPage::updateTorInProxyIndicator()
@@ -1144,7 +1144,7 @@ void ServerPage::handleNetworkReply(QNetworkReply *reply)
     {
         std::cerr <<"Connected!" << std::endl;
         ui.iconlabel_tor_incoming->setPixmap(QPixmap(ICON_STATUS_OK)) ;
-        ui.iconlabel_tor_incoming->setToolTip(tr("You are reachable through TOR.")) ;
+        ui.iconlabel_tor_incoming->setToolTip(tr("You are reachable through Tor.")) ;
         //ui.testIncomingTor_PB->setIcon(QIcon(ICON_STATUS_OK)) ;
     }
     else
@@ -1153,7 +1153,7 @@ void ServerPage::handleNetworkReply(QNetworkReply *reply)
 
         //ui.testIncomingTor_PB->setIcon(QIcon(ICON_STATUS_UNKNOWN)) ;
         ui.iconlabel_tor_incoming->setPixmap(QPixmap(ICON_STATUS_UNKNOWN)) ;
-        ui.iconlabel_tor_incoming->setToolTip(tr("TOR proxy is not enabled or broken.\nAre you running a TOR hidden service?\nCheck your ports!")) ;
+        ui.iconlabel_tor_incoming->setToolTip(tr("Tor proxy is not enabled or broken.\nAre you running a Tor hidden service?\nCheck your ports!")) ;
     }
 
     reply->close();

retroshare-gui/src/gui/settings/ServerPage.ui

@@ -54,7 +54,7 @@
             </font>
            </property>
            <property name="toolTip">
-            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This Retroshare node is running in &amp;quot;Hidden Mode&amp;quot;. That means it can only be reached though the TOR network.&lt;/p&gt;&lt;p&gt;As such, some network options are disabled.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This Retroshare node is running in &amp;quot;Hidden Mode&amp;quot;. That means it can only be reached though the Tor network.&lt;/p&gt;&lt;p&gt;As such, some network options are disabled.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
            </property>
            <property name="text">
             <string>[Hidden mode]</string>
@@ -755,13 +755,13 @@ behind a firewall or a VPN.</string>
      </widget>
      <widget class="QWidget" name="TorTAB">
       <attribute name="title">
-       <string>TOR Configuration</string>
+       <string>Tor Configuration</string>
       </attribute>
       <layout class="QVBoxLayout" name="verticalLayout_8">
        <item>
         <widget class="QGroupBox" name="torpage_outgoing">
          <property name="title">
-          <string>Outgoing TOR Connections</string>
+          <string>Outgoing Tor Connections</string>
          </property>
          <layout class="QVBoxLayout" name="verticalLayout_5">
           <item>
@@ -771,7 +771,7 @@ behind a firewall or a VPN.</string>
               <item>
                <widget class="QLabel" name="label_3">
                 <property name="text">
-                 <string>TOR Socks Proxy</string>
+                 <string>Tor Socks Proxy</string>
                 </property>
                </widget>
               </item>
@@ -811,7 +811,7 @@ behind a firewall or a VPN.</string>
               <item>
                <widget class="QLabel" name="label_9">
                 <property name="text">
-                 <string>TOR outgoing Okay</string>
+                 <string>Tor outgoing Okay</string>
                 </property>
                </widget>
               </item>
@@ -834,10 +834,10 @@ behind a firewall or a VPN.</string>
              <bool>true</bool>
             </property>
             <property name="plainText">
-             <string>TOR Socks Proxy default: 127.0.01:9050.  Set in torrc config and update here.
+             <string>Tor Socks Proxy default: 127.0.01:9050.  Set in torrc config and update here.
 
 You can connect to Hidden Nodes, even if you 
-are running a standard Node, so why not setup TOR? </string>
+are running a standard Node, so why not setup Tor? </string>
             </property>
            </widget>
           </item>
@@ -853,7 +853,7 @@ are running a standard Node, so why not setup TOR? </string>
           </sizepolicy>
          </property>
          <property name="title">
-          <string>Incoming TOR Connections</string>
+          <string>Incoming Tor Connections</string>
          </property>
          <layout class="QVBoxLayout" name="verticalLayout_7">
           <item>
@@ -873,7 +873,7 @@ are running a standard Node, so why not setup TOR? </string>
               <item>
                <widget class="QPushButton" name="testIncomingTor_PB">
                 <property name="toolTip">
-                 <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This button simulates a SSL connection to your TOR address using the TOR proxy. If your TOR node is reachable, it should cause a SSL handshake error, which RS will interpret as a valid connection state. This operation might also cause several &quot;security warning&quot; about connections from your local host IP (127.0.0.1) in the News Feed if you enabled it,&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                 <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This button simulates a SSL connection to your Tor address using the Tor proxy. If your Tor node is reachable, it should cause a SSL handshake error, which RS will interpret as a valid connection state. This operation might also cause several &quot;security warning&quot; about connections from your local host IP (127.0.0.1) in the News Feed if you enabled it,&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
                 </property>
                 <property name="text">
                  <string>Test</string>
@@ -909,14 +909,14 @@ are running a standard Node, so why not setup TOR? </string>
             <item row="1" column="1">
              <widget class="QLineEdit" name="torpage_onionAddress">
               <property name="toolTip">
-               <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This is your onion address. It should look like &lt;span style=&quot; font-weight:600;&quot;&gt;[something].onion. &lt;/span&gt;If you configured a hidden service with TOR, the onion address is generated automatically by TOR.  You can get it in e.g. &lt;span style=&quot; font-weight:600;&quot;&gt;/var/lib/tor/[service name]/hostname&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+               <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This is your onion address. It should look like &lt;span style=&quot; font-weight:600;&quot;&gt;[something].onion. &lt;/span&gt;If you configured a hidden service with Tor, the onion address is generated automatically by Tor.  You can get it in e.g. &lt;span style=&quot; font-weight:600;&quot;&gt;/var/lib/tor/[service name]/hostname&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
               </property>
              </widget>
             </item>
             <item row="0" column="1">
              <widget class="QLineEdit" name="torpage_localAddress">
               <property name="toolTip">
-               <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This is the local address to which the TOR hidden service points at your localhost. Most of the time, &lt;span style=&quot; font-weight:600;&quot;&gt;127.0.0.1&lt;/span&gt; is the right answer.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+               <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This is the local address to which the Tor hidden service points at your localhost. Most of the time, &lt;span style=&quot; font-weight:600;&quot;&gt;127.0.0.1&lt;/span&gt; is the right answer.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
               </property>
              </widget>
             </item>
@@ -941,7 +941,7 @@ are running a standard Node, so why not setup TOR? </string>
               <item>
                <widget class="QLabel" name="label_16">
                 <property name="text">
-                 <string>TOR incoming  ok</string>
+                 <string>Tor incoming  ok</string>
                 </property>
                </widget>
               </item>
@@ -1010,14 +1010,14 @@ HiddenServicePort 9191 127.0.0.1:9191</string>
              <bool>true</bool>
             </property>
             <property name="plainText">
-             <string>To Receive Connections, you must first setup a TOR Hidden Service. 
+             <string>To Receive Connections, you must first setup a Tor Hidden Service. 
-See TOR documentation for HOWTO details.
+See Tor documentation for HOWTO details.
 
 Once this is done, paste the Onion Address in the box above.
-This is your external address on the TOR network.
+This is your external address on the Tor network.
-Finally make sure that the Ports match the TOR configuration.
+Finally make sure that the Ports match the Tor configuration.
 
-If you have issues connecting over TOR check the TOR logs too.</string>
+If you have issues connecting over Tor check the Tor logs too.</string>
             </property>
            </widget>
           </item>

retroshare-gui/src/lang/retroshare_en.ts

@@ -4544,10 +4544,6 @@ anonymous, you can use a fake email.</source>
         <source>Node</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>TOR address</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Create new node</source>
         <translation type="unfinished"></translation>
@@ -4637,10 +4633,6 @@ Alternatively you can use an existing profile. Just uncheck &quot;Create a new p
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This is your connection port.&lt;/p&gt;&lt;p&gt;Any value between 1024 and 65535 &lt;/p&gt;&lt;p&gt;should be ok. You can change it later.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This is a TOR Onion address of the form: xa76giaf6ifda7ri63i263.onion &lt;/p&gt;&lt;p&gt;In order to get one, you must configure TOR to create a new hidden service. If you do not yet have one, you can still go on, and make it right later in Retroshare&apos;s Options-&amp;gt;Server-&amp;gt;TOR configuration panel.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>PGP key length</source>
         <translation type="unfinished"></translation>
@@ -4657,10 +4649,6 @@ Alternatively you can use an existing profile. Just uncheck &quot;Create a new p
         <source>Click to create your node and/or profile</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>[Required] Examples: xa76giaf6ifda7ri63i263.onion (obtained by you from TOR)</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>[Required] This password protects your private PGP key.</source>
         <translation type="unfinished"></translation>
@@ -4770,6 +4758,18 @@ Fill in your PGP password when asked, to sign your new key.</source>
         <source>You can create a new profile with this form.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Tor address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This is a Tor Onion address of the form: xa76giaf6ifda7ri63i263.onion &lt;/p&gt;&lt;p&gt;In order to get one, you must configure Tor to create a new hidden service. If you do not yet have one, you can still go on, and make it right later in Retroshare&apos;s Options-&amp;gt;Server-&amp;gt;Tor configuration panel.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>[Required] Examples: xa76giaf6ifda7ri63i263.onion (obtained by you from Tor)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>GeneralPage</name>
@@ -12233,29 +12233,6 @@ behind a firewall or a VPN.</source>
         <source>Acceptable ports range from 10 to 65535. Normally ports below 1024 are reserved by your system.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>TOR Configuration</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Outgoing TOR Connections</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>TOR Socks Proxy</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>TOR Socks Proxy default: 127.0.01:9050.  Set in torrc config and update here.
-
-You can connect to Hidden Nodes, even if you 
-are running a standard Node, so why not setup TOR? </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Incoming TOR Connections</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Onion Address</source>
         <translation type="unfinished"></translation>
@@ -12269,17 +12246,6 @@ are running a standard Node, so why not setup TOR? </source>
 HiddenServicePort 9191 127.0.0.1:9191</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>To Receive Connections, you must first setup a TOR Hidden Service. 
-See TOR documentation for HOWTO details.
-
-Once this is done, paste the Onion Address in the box above.
-This is your external address on the TOR network.
-Finally make sure that the Ports match the TOR configuration.
-
-If you have issues connecting over TOR check the TOR logs too.</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Discovery On (recommended)</source>
         <translation type="unfinished"></translation>
@@ -12288,22 +12254,10 @@ If you have issues connecting over TOR check the TOR logs too.</source>
         <source>Discovery Off</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Hidden - See TOR Config</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Proxy seems to work.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>TOR proxy is not enabled</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This Retroshare node is running in &amp;quot;Hidden Mode&amp;quot;. That means it can only be reached though the TOR network.&lt;/p&gt;&lt;p&gt;As such, some network options are disabled.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>[Hidden mode]</source>
         <translation type="unfinished"></translation>
@@ -12332,36 +12286,10 @@ If you have issues connecting over TOR check the TOR logs too.</source>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The upload limit covers the entire software. Too small an upload limit might eventually block low priority services (forums, channels). A minimum recommended value is 50KB/s. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>TOR outgoing Okay</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Test</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This is your onion address. It should look like &lt;span style=&quot; font-weight:600;&quot;&gt;[something].onion. &lt;/span&gt;If you configured a hidden service with TOR, the onion address is generated automatically by TOR.  You can get it in e.g. &lt;span style=&quot; font-weight:600;&quot;&gt;/var/lib/tor/[service name]/hostname&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This is the local address to which the TOR hidden service points at your localhost. Most of the time, &lt;span style=&quot; font-weight:600;&quot;&gt;127.0.0.1&lt;/span&gt; is the right answer.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>TOR incoming  ok</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>You are reachable through TOR.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>TOR proxy is not enabled or broken.
-Are you running a TOR hidden service?
-Check your ports!</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Network</source>
         <translation type="unfinished"></translation>
@@ -12458,10 +12386,6 @@ Check your ports!</source>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This list gets automatically filled with information gathered at multiple sources: masquerading peers reported by the DHT, IP ranges entered by you, and IP ranges reported by your friends. Default settings should protect you against large scale traffic relaying.&lt;/p&gt;&lt;p&gt;Automatically guessing masquerading IPs can put your friends IPs in the blacklist. In this case, use the context menu to whitelist them.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This button simulates a SSL connection to your TOR address using the TOR proxy. If your TOR node is reachable, it should cause a SSL handshake error, which RS will interpret as a valid connection state. This operation might also cause several &quot;security warning&quot; about connections from your local host IP (127.0.0.1) in the News Feed if you enabled it,&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>activate IP filtering</source>
         <translation type="unfinished"></translation>
@@ -12490,6 +12414,82 @@ Check your ports!</source>
         <source>Automatically ban ranges of DHT masquerading IPs starting at</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This Retroshare node is running in &amp;quot;Hidden Mode&amp;quot;. That means it can only be reached though the Tor network.&lt;/p&gt;&lt;p&gt;As such, some network options are disabled.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tor Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Outgoing Tor Connections</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tor Socks Proxy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tor outgoing Okay</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tor Socks Proxy default: 127.0.01:9050.  Set in torrc config and update here.
+
+You can connect to Hidden Nodes, even if you 
+are running a standard Node, so why not setup Tor? </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Incoming Tor Connections</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This button simulates a SSL connection to your Tor address using the Tor proxy. If your Tor node is reachable, it should cause a SSL handshake error, which RS will interpret as a valid connection state. This operation might also cause several &quot;security warning&quot; about connections from your local host IP (127.0.0.1) in the News Feed if you enabled it,&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This is your onion address. It should look like &lt;span style=&quot; font-weight:600;&quot;&gt;[something].onion. &lt;/span&gt;If you configured a hidden service with Tor, the onion address is generated automatically by Tor.  You can get it in e.g. &lt;span style=&quot; font-weight:600;&quot;&gt;/var/lib/tor/[service name]/hostname&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This is the local address to which the Tor hidden service points at your localhost. Most of the time, &lt;span style=&quot; font-weight:600;&quot;&gt;127.0.0.1&lt;/span&gt; is the right answer.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tor incoming  ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>To Receive Connections, you must first setup a Tor Hidden Service. 
+See Tor documentation for HOWTO details.
+
+Once this is done, paste the Onion Address in the box above.
+This is your external address on the Tor network.
+Finally make sure that the Ports match the Tor configuration.
+
+If you have issues connecting over Tor check the Tor logs too.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hidden - See Tor Config</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tor proxy is not enabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You are reachable through Tor.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tor proxy is not enabled or broken.
+Are you running a Tor hidden service?
+Check your ports!</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ServicePermissionDialog</name>
@@ -13111,10 +13111,6 @@ This choice can be reverted in settings.</source>
         <source>DHT: Contact</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Connected: TOR</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>inbound connection</source>
         <translation type="unfinished"></translation>
@@ -13132,11 +13128,15 @@ This choice can be reverted in settings.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>TOR</source>
+        <source>unkown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>unkown</source>
+        <source>Connected: Tor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tor</source>
         <translation type="unfinished"></translation>
     </message>
 </context>